diff --git a/src/lib/component/view/UndoRedoView.h b/src/lib/component/view/UndoRedoView.h
index 3bcd064a..24522fea 100644
--- a/src/lib/component/view/UndoRedoView.h
+++ b/src/lib/component/view/UndoRedoView.h
@@ -2,6 +2,7 @@
 #define UNDO_REDO_VIEW_H
 
 #include "component/view/View.h"
+#include <vector>
 
 class UndoRedoController;
 struct SearchMatch;
diff --git a/src/lib/utility/interprocess/SharedMemoryGarbageCollector.cpp b/src/lib/utility/interprocess/SharedMemoryGarbageCollector.cpp
index d39f3477..d78cfc96 100644
--- a/src/lib/utility/interprocess/SharedMemoryGarbageCollector.cpp
+++ b/src/lib/utility/interprocess/SharedMemoryGarbageCollector.cpp
@@ -4,7 +4,7 @@
 
 #include "utility/logging/logging.h"
 #include "utility/TimePoint.h"
-#include "utility/utilityApp.h"
+#include "utility/utility.h"
 
 std::string SharedMemoryGarbageCollector::s_memoryNamePrefix = "grbg_cllctr_";
 std::string SharedMemoryGarbageCollector::s_instancesKeyName = "running_instances";
diff --git a/src/lib/utility/utility.cpp b/src/lib/utility/utility.cpp
index ee2eed31..339fbed1 100644
--- a/src/lib/utility/utility.cpp
+++ b/src/lib/utility/utility.cpp
@@ -5,6 +5,17 @@
 
 #include "boost/date_time/time_clock.hpp"
 
+
+ApplicationArchitectureType utility::getApplicationArchitectureType()
+{
+#if defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64) || defined(WIN64)
+    return APPLICATION_ARCHITECTURE_X86_64;
+#else
+    return APPLICATION_ARCHITECTURE_X86_32;
+#endif
+    return APPLICATION_ARCHITECTURE_UNKNOWN;
+}
+
 TimePoint utility::durationStart()
 {
 	return TimePoint::now();
diff --git a/src/lib/utility/utility.h b/src/lib/utility/utility.h
index 1faa6f7f..2b9842aa 100644
--- a/src/lib/utility/utility.h
+++ b/src/lib/utility/utility.h
@@ -10,6 +10,7 @@
 
 #include "boost/date_time/posix_time/posix_time.hpp"
 
+#include "utility/ApplicationArchitectureType.h"
 #include "utility/file/FilePath.h"
 #include "utility/math/Vector2.h"
 #include "utility/TimePoint.h"
@@ -92,6 +93,8 @@ namespace utility
 		return a.size() + b.size() != c.size();
 	}
 
+    ApplicationArchitectureType getApplicationArchitectureType();
+
 	bool intersectionPoint(Vec2f a1, Vec2f b1, Vec2f a2, Vec2f b2, Vec2f* i);
 
 	size_t digits(size_t n);
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp
index 6dd8a4f1..92ed1631 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp
@@ -7,6 +7,7 @@
 #include "utility/ResourcePaths.h"
 #include "utility/utilityPathDetection.h"
 #include "utility/utilityApp.h"
+#include "utility/utility.h"
 
 QtProjectWizzardContentPreferences::QtProjectWizzardContentPreferences(
 	QtProjectWizzardWindow* window
diff --git a/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorWindows.cpp b/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorWindows.cpp
index 957d7189..81c66f1a 100644
--- a/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorWindows.cpp
+++ b/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorWindows.cpp
@@ -5,6 +5,7 @@
 
 #include "utility/file/FilePath.h"
 #include "utility/utilityApp.h"
+#include "utility/utility.h"
 
 JavaPathDetectorWindows::JavaPathDetectorWindows(const std::string javaVersion)
 	: JavaPathDetector("Java " + javaVersion + " for Windows", javaVersion)
diff --git a/src/lib_gui/utility/utilityApp.cpp b/src/lib_gui/utility/utilityApp.cpp
index 8163219e..8720de0f 100644
--- a/src/lib_gui/utility/utilityApp.cpp
+++ b/src/lib_gui/utility/utilityApp.cpp
@@ -78,18 +78,6 @@ void utility::killRunningProcesses()
 	}
 }
 
-ApplicationArchitectureType utility::getApplicationArchitectureType()
-{
-#ifdef Q_PROCESSOR_X86_64
-	return APPLICATION_ARCHITECTURE_X86_64;
-#endif
-
-#ifdef Q_PROCESSOR_X86_32
-	return APPLICATION_ARCHITECTURE_X86_32;
-#endif
-	return APPLICATION_ARCHITECTURE_UNKNOWN;
-}
-
 int utility::getIdealThreadCount()
 {
 	return QThread::idealThreadCount();
diff --git a/src/lib_gui/utility/utilityApp.h b/src/lib_gui/utility/utilityApp.h
index 25a8ba18..8ed90a51 100644
--- a/src/lib_gui/utility/utilityApp.h
+++ b/src/lib_gui/utility/utilityApp.h
@@ -14,8 +14,6 @@ namespace utility
 
 	void killRunningProcesses();
 
-	ApplicationArchitectureType getApplicationArchitectureType();
-
 	int getIdealThreadCount();
 }