diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2e175ca2087c50d37fb48da0479d0a883300fbcf..713c4c15e5c4659fa57d4624e0993d339079a70c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,8 +8,6 @@ include_directories(
 	${Qt5Location_PRIVATE_INCLUDE_DIRS}
 
 	Camera
-	FactSystem
-	FactSystem/FactControls
 	FlightDisplay
 	FlightMap/Widgets
 	FollowMe
@@ -62,11 +60,6 @@ if(BUILD_TESTING)
 
 	list(APPEND QGC_SRC
 
-		FactSystem/FactSystemTestBase.cc
-		FactSystem/FactSystemTestGeneric.cc
-		FactSystem/FactSystemTestPX4.cc
-		FactSystem/ParameterManagerTest.cc
-
 		qgcunittest/FileDialogTest.cc
 		qgcunittest/FileManagerTest.cc
 		qgcunittest/FlightGearTest.cc
@@ -168,15 +161,6 @@ add_library(qgc
 	Camera/QGCCameraIO.cc
 	Camera/QGCCameraManager.cc
 
-	FactSystem/Fact.cc
-	FactSystem/FactControls/FactPanelController.cc
-	FactSystem/FactGroup.cc
-	FactSystem/FactMetaData.cc
-	FactSystem/FactSystem.cc
-	FactSystem/FactValueSliderListModel.cc
-	FactSystem/ParameterManager.cc
-	FactSystem/SettingsFact.cc
-
 	FlightDisplay/VideoManager.cc
 
 	FlightMap/Widgets/ValuesWidgetController.cc
@@ -283,6 +267,7 @@ add_subdirectory(api)
 add_subdirectory(Audio)
 add_subdirectory(AutoPilotPlugins)
 add_subdirectory(comm)
+add_subdirectory(FactSystem)
 add_subdirectory(FirmwarePlugin)
 add_subdirectory(GPS)
 add_subdirectory(MissionManager)
@@ -314,6 +299,7 @@ target_link_libraries(qgc
 	Audio
 	AutoPilotPlugins
 	comm
+	FactSystem
 	FirmwarePlugin
 	gps
 	qwt # LinechartWidget
diff --git a/src/FactSystem/CMakeLists.txt b/src/FactSystem/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f8d3cace35c5a911d22ae4d774b8ec1753a69e6f
--- /dev/null
+++ b/src/FactSystem/CMakeLists.txt
@@ -0,0 +1,34 @@
+
+set(EXTRA_SRC)
+if(BUILD_TESTING)
+	list(APPEND EXTRA_SRC
+		FactSystemTestBase.cc
+		FactSystemTestGeneric.cc
+		FactSystemTestPX4.cc
+		ParameterManagerTest.cc
+	)
+endif()
+
+add_library(FactSystem
+	Fact.cc
+	FactControls/FactPanelController.cc
+	FactGroup.cc
+	FactMetaData.cc
+	FactSystem.cc
+	FactValueSliderListModel.cc
+	ParameterManager.cc
+	SettingsFact.cc
+	${EXTRA_SRC}
+)
+
+target_link_libraries(FactSystem
+	PUBLIC
+		qgc
+)
+
+target_include_directories(FactSystem
+	PUBLIC
+		${CMAKE_CURRENT_SOURCE_DIR}
+		FactControls
+)
+
diff --git a/src/QmlControls/CMakeLists.txt b/src/QmlControls/CMakeLists.txt
index c2add00bb7ebc84640e5884d8ca53c1852228fdc..9c58f8494c79185390c2a73dbec9695db497b1ca 100644
--- a/src/QmlControls/CMakeLists.txt
+++ b/src/QmlControls/CMakeLists.txt
@@ -22,6 +22,8 @@ target_link_libraries(QmlControls
 		Qt5::Widgets
 
 		qgc
+
+		FactSystem
 )
 
 target_include_directories(QmlControls PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})