diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index 90f9f9046..c7bb96266 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -41,6 +41,7 @@ set( libSources
     modulesystem/InstanceKey.cpp
     modulesystem/Module.cpp
     modulesystem/Requirement.cpp
+    modulesystem/RequirementsChecker.cpp
 
     # Network service
     network/Manager.cpp
diff --git a/src/libcalamaresui/modulesystem/RequirementsChecker.cpp b/src/libcalamares/modulesystem/RequirementsChecker.cpp
similarity index 100%
rename from src/libcalamaresui/modulesystem/RequirementsChecker.cpp
rename to src/libcalamares/modulesystem/RequirementsChecker.cpp
diff --git a/src/libcalamaresui/modulesystem/RequirementsChecker.h b/src/libcalamares/modulesystem/RequirementsChecker.h
similarity index 99%
rename from src/libcalamaresui/modulesystem/RequirementsChecker.h
rename to src/libcalamares/modulesystem/RequirementsChecker.h
index 7cda10fbc..450495dc1 100644
--- a/src/libcalamaresui/modulesystem/RequirementsChecker.h
+++ b/src/libcalamares/modulesystem/RequirementsChecker.h
@@ -25,7 +25,6 @@
 #include <QTimer>
 #include <QVector>
 
-
 namespace Calamares
 {
 
@@ -44,7 +43,7 @@ public:
     RequirementsChecker( QVector< Module* > modules, QObject* parent = nullptr );
     virtual ~RequirementsChecker() override;
 
-public slots:
+public Q_SLOTS:
     /// @brief Start checking all the requirements
     void run();
 
diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt
index 1f554fceb..e813b0009 100644
--- a/src/libcalamaresui/CMakeLists.txt
+++ b/src/libcalamaresui/CMakeLists.txt
@@ -9,7 +9,6 @@ set( calamaresui_SOURCES
     modulesystem/ModuleFactory.cpp
     modulesystem/ModuleManager.cpp
     modulesystem/ProcessJobModule.cpp
-    modulesystem/RequirementsChecker.cpp
     modulesystem/ViewModule.cpp
 
     utils/CalamaresUtilsGui.cpp
diff --git a/src/libcalamaresui/modulesystem/ModuleManager.cpp b/src/libcalamaresui/modulesystem/ModuleManager.cpp
index aa05c6843..8d4b2342f 100644
--- a/src/libcalamaresui/modulesystem/ModuleManager.cpp
+++ b/src/libcalamaresui/modulesystem/ModuleManager.cpp
@@ -19,11 +19,11 @@
 
 #include "ModuleManager.h"
 
-#include "RequirementsChecker.h"
-#include "Settings.h"
 #include "ViewManager.h"
 
+#include "Settings.h"
 #include "modulesystem/Module.h"
+#include "modulesystem/RequirementsChecker.h"
 #include "utils/Logger.h"
 #include "utils/Yaml.h"
 #include "viewpages/ExecutionViewStep.h"