diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0ca4c333f2818c22edf525eb68b6c5d616825587..2e175ca2087c50d37fb48da0479d0a883300fbcf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,7 +16,6 @@ include_directories(
 	Joystick
 	PositionManager
 	qgcunittest
-	QmlControls
 	QtLocationPlugin
 	Settings
 	Terrain
@@ -191,19 +190,6 @@ add_library(qgc
 	PositionManager/PositionManager.cpp
 	PositionManager/SimulatedPosition.cc
 
-	QmlControls/AppMessages.cc
-	QmlControls/CoordinateVector.cc
-	QmlControls/EditPositionDialogController.cc
-	QmlControls/ParameterEditorController.cc
-	QmlControls/QGCFileDialogController.cc
-	QmlControls/QGCGeoBoundingCube.cc
-	QmlControls/QGCImageProvider.cc
-	QmlControls/QGroundControlQmlGlobal.cc
-	QmlControls/QmlObjectListModel.cc
-	QmlControls/QmlTestWidget.cc
-	QmlControls/RCChannelMonitorController.cc
-	QmlControls/ScreenToolsController.cc
-
 	QtLocationPlugin/QGCMapEngine.cpp
 	QtLocationPlugin/QGCMapTileSet.cpp
 	QtLocationPlugin/QGCMapUrlEngine.cpp
@@ -300,6 +286,7 @@ add_subdirectory(comm)
 add_subdirectory(FirmwarePlugin)
 add_subdirectory(GPS)
 add_subdirectory(MissionManager)
+add_subdirectory(QmlControls)
 
 
 target_link_libraries(qgc
@@ -331,6 +318,7 @@ target_link_libraries(qgc
 	gps
 	qwt # LinechartWidget
 	MissionManager
+	QmlControls
 	ui
 )
 
diff --git a/src/QmlControls/CMakeLists.txt b/src/QmlControls/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c2add00bb7ebc84640e5884d8ca53c1852228fdc
--- /dev/null
+++ b/src/QmlControls/CMakeLists.txt
@@ -0,0 +1,28 @@
+
+add_library(QmlControls
+	AppMessages.cc
+	CoordinateVector.cc
+	EditPositionDialogController.cc
+	ParameterEditorController.cc
+	QGCFileDialogController.cc
+	QGCGeoBoundingCube.cc
+	QGCImageProvider.cc
+	QGroundControlQmlGlobal.cc
+	QmlObjectListModel.cc
+	QmlTestWidget.cc
+	RCChannelMonitorController.cc
+	ScreenToolsController.cc
+)
+
+target_link_libraries(QmlControls
+	PUBLIC
+		Qt5::Location
+		Qt5::SerialPort
+		Qt5::TextToSpeech
+		Qt5::Widgets
+
+		qgc
+)
+
+target_include_directories(QmlControls PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+