diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7c6bc1da6f3c9f1d96aa0fcd704a89182303bb95..2dcbd95b3690061e3efc3ac0881b778e857e512f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,8 +24,6 @@ include_directories(
 	Settings
 	Terrain
 	uas
-	ui
-	ui/linechart
 	Vehicle
 	VehicleSetup
 	VideoStreaming
@@ -165,22 +163,7 @@ endif()
 
 set(QGC_UI)
 list(APPEND QGC_UI
-	#src/ui/Linechart.ui
 	QGCQmlWidgetHolder.ui
-	ui/MainWindow.ui
-	ui/MultiVehicleDockWidget.ui
-	ui/QGCHilConfiguration.ui
-	ui/QGCHilFlightGearConfiguration.ui
-	ui/QGCHilJSBSimConfiguration.ui
-	ui/QGCHilXPlaneConfiguration.ui
-	ui/QGCMapRCToParamDialog.ui
-	ui/QGCMAVLinkInspector.ui
-	ui/QGCMAVLinkLogPlayer.ui
-	ui/QGCPluginHost.ui
-	ui/QGCUASFileView.ui
-	ui/QGCUASFileViewMulti.ui
-	ui/QMap3D.ui
-	ui/uas/QGCUnconnectedInfoWidget.ui
 )
 
 add_library(qgc
@@ -290,29 +273,6 @@ add_library(qgc
 	uas/UAS.cc
 	uas/UASMessageHandler.cc
 
-	ui/HILDockWidget.cc
-	ui/linechart/ChartPlot.cc
-	ui/linechart/IncrementalPlot.cc
-	ui/linechart/LinechartPlot.cc
-	ui/linechart/Linecharts.cc
-	ui/linechart/LinechartWidget.cc
-	ui/linechart/Scrollbar.cc
-	ui/linechart/ScrollZoomer.cc
-	ui/MainWindow.cc
-	ui/MAVLinkDecoder.cc
-	ui/MultiVehicleDockWidget.cc
-	ui/QGCHilConfiguration.cc
-	ui/QGCHilFlightGearConfiguration.cc
-	ui/QGCHilJSBSimConfiguration.cc
-	ui/QGCHilXPlaneConfiguration.cc
-	ui/QGCMapRCToParamDialog.cpp
-	ui/QGCMAVLinkInspector.cc
-	ui/QGCMAVLinkLogPlayer.cc
-	ui/QGCPluginHost.cc
-	ui/QGCUASFileView.cc
-	ui/QGCUASFileViewMulti.cc
-	ui/uas/QGCUnconnectedInfoWidget.cc
-
 	Vehicle/ADSBVehicle.cc
 	Vehicle/GPSRTKFactGroup.cc
 	Vehicle/MAVLinkLogManager.cc
@@ -367,12 +327,13 @@ add_library(qgc
 	QtLocationPlugin/QGCMapEngineData.h
 	uas/UAS.h
 	uas/UASInterface.h
-	ui/QGCHilFlightGearConfiguration.h
-	ui/QGCHilJSBSimConfiguration.h
+
 )
 
 set_source_files_properties(QGCApplication.cc PROPERTIES COMPILE_DEFINITIONS GIT_VERSION="${git_tag}")
 
+add_subdirectory(ui)
+
 add_subdirectory(AnalyzeView)
 add_subdirectory(Airmap)
 add_subdirectory(api)
@@ -381,6 +342,7 @@ add_subdirectory(AutoPilotPlugins)
 add_subdirectory(GPS)
 add_subdirectory(MissionManager)
 
+
 target_link_libraries(qgc
 
 	PUBLIC
@@ -408,6 +370,7 @@ target_link_libraries(qgc
 	gps
 	qwt # LinechartWidget
 	MissionManager
+	ui
 )
 
 target_include_directories(qgc INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/src/MissionManager/CMakeLists.txt b/src/MissionManager/CMakeLists.txt
index 427672ff30b5c9a85788602a9a412e6a2fbd0960..99ca3f6b0481bdf194d996e8afcd8ac1cd36a623 100644
--- a/src/MissionManager/CMakeLists.txt
+++ b/src/MissionManager/CMakeLists.txt
@@ -67,6 +67,8 @@ add_library(MissionManager
 target_link_libraries(MissionManager
 	PUBLIC
 		qgc
+	PRIVATE
+		ui
 )
 
 target_include_directories(MissionManager
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d3ce56cff23ba62d996736fd33a697339ca40e64
--- /dev/null
+++ b/src/ui/CMakeLists.txt
@@ -0,0 +1,64 @@
+
+add_library(ui
+
+	HILDockWidget.cc
+	linechart/ChartPlot.cc
+	linechart/IncrementalPlot.cc
+	linechart/LinechartPlot.cc
+	linechart/Linecharts.cc
+	linechart/LinechartWidget.cc
+	linechart/Scrollbar.cc
+	linechart/ScrollZoomer.cc
+
+	MainWindow.cc
+	MAVLinkDecoder.cc
+	MultiVehicleDockWidget.cc
+	QGCHilConfiguration.cc
+	QGCHilFlightGearConfiguration.cc
+	QGCHilJSBSimConfiguration.cc
+	QGCHilXPlaneConfiguration.cc
+	QGCMapRCToParamDialog.cpp
+	QGCMAVLinkInspector.cc
+	QGCMAVLinkLogPlayer.cc
+	QGCPluginHost.cc
+	QGCUASFileView.cc
+	QGCUASFileViewMulti.cc
+
+	uas/QGCUnconnectedInfoWidget.cc
+
+	# HEADERS
+	# shouldn't be listed here, but aren't named properly for AUTOMOC
+	QGCHilFlightGearConfiguration.h
+	QGCHilJSBSimConfiguration.h
+
+	# UI
+	MainWindow.ui
+	MultiVehicleDockWidget.ui
+	QGCHilConfiguration.ui
+	QGCHilFlightGearConfiguration.ui
+	QGCHilJSBSimConfiguration.ui
+	QGCHilXPlaneConfiguration.ui
+	QGCMapRCToParamDialog.ui
+	QGCMAVLinkInspector.ui
+	QGCMAVLinkLogPlayer.ui
+	QGCPluginHost.ui
+	QGCUASFileView.ui
+	QGCUASFileViewMulti.ui
+	QMap3D.ui
+
+	uas/QGCUnconnectedInfoWidget.ui
+)
+
+target_link_libraries(ui
+	PUBLIC
+		qgc
+)
+
+target_include_directories(ui
+	INTERFACE
+		${CMAKE_CURRENT_SOURCE_DIR}
+		${CMAKE_CURRENT_BINARY_DIR}
+	PRIVATE
+		linechart
+	)
+