diff --git a/silecs-diagnostic-cpp/CMakeLists.txt b/silecs-diagnostic-cpp/CMakeLists.txt
index 4118ab86cebe635e8e0d7fb1f708f9aa006168a7..3c831524425d743836745f4da6ef01b5af28fdc7 100644
--- a/silecs-diagnostic-cpp/CMakeLists.txt
+++ b/silecs-diagnostic-cpp/CMakeLists.txt
@@ -5,6 +5,10 @@ project(silecs-diagnostic LANGUAGES CXX)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
 # TODO: Which of these compiler options are actually required?
 add_compile_options(
     -Wall
diff --git a/silecs-diagnostic-cpp/src/silecs-diagnostic/diagnostictoolmainview.cpp b/silecs-diagnostic-cpp/src/silecs-diagnostic/diagnostictoolmainview.cpp
index b5f8c567fbd505c3b58f262ca3c6ea9924234578..7f299d47fff2074f1b26ea1131848affe7f30661 100755
--- a/silecs-diagnostic-cpp/src/silecs-diagnostic/diagnostictoolmainview.cpp
+++ b/silecs-diagnostic-cpp/src/silecs-diagnostic/diagnostictoolmainview.cpp
@@ -19,7 +19,7 @@ Contributors:
 #include <QtWidgets/QMenu>
 
 #include <silecs-diagnostic/diagnostictoolmainview.h>
-#include <silecs-diagnostic/generated/ui_diagnostictoolmainview.h>
+#include <resources/gui/ui_diagnostictoolmainview.h>
 #include <silecs-diagnostic/utils.h>
 
 #include <silecs-communication/interface/utility/XMLParser.h>
diff --git a/silecs-diagnostic-cpp/src/silecs-diagnostic/displayarraydialog.cpp b/silecs-diagnostic-cpp/src/silecs-diagnostic/displayarraydialog.cpp
index abe15f4508b3ec429c5cb94888f69460ffdce69f..7d9f8501bef0b457847e3050e751c764f053bde0 100755
--- a/silecs-diagnostic-cpp/src/silecs-diagnostic/displayarraydialog.cpp
+++ b/silecs-diagnostic-cpp/src/silecs-diagnostic/displayarraydialog.cpp
@@ -12,7 +12,7 @@ Contributors:
 
 
 #include <silecs-diagnostic/displayarraydialog.h>
-#include <silecs-diagnostic/generated/ui_displayarraydialog.h>
+#include <resources/gui/ui_displayarraydialog.h>
 
 #include <QtCore/QDebug>
 
diff --git a/silecs-diagnostic-cpp/src/silecs-diagnostic/generated/.gitignore b/silecs-diagnostic-cpp/src/silecs-diagnostic/generated/.gitignore
deleted file mode 100644
index dee64ae2a5e005eb61b1038c547a4be9f871a29d..0000000000000000000000000000000000000000
--- a/silecs-diagnostic-cpp/src/silecs-diagnostic/generated/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/ui_*
-/moc_*
-/qrc_*
\ No newline at end of file
diff --git a/silecs-diagnostic-cpp/src/silecs-diagnostic/logindialog.cpp b/silecs-diagnostic-cpp/src/silecs-diagnostic/logindialog.cpp
index c83c215f4eea374137ae0b82aea7db92b4075049..6096bc6fdbdba314b95c3aa5fbb8da5c6155c441 100755
--- a/silecs-diagnostic-cpp/src/silecs-diagnostic/logindialog.cpp
+++ b/silecs-diagnostic-cpp/src/silecs-diagnostic/logindialog.cpp
@@ -12,7 +12,7 @@ Contributors:
 
 
 #include <silecs-diagnostic/logindialog.h>
-#include <silecs-diagnostic/generated/ui_logindialog.h>
+#include <resources/gui/ui_logindialog.h>
 
 
 LoginDialog::LoginDialog(QWidget *parent) :