diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4038003b4e79968665b7719f2cde7c5f4289a7d..6189f7ee1905293a57400d7aef34c39bbaadf541 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,6 +90,7 @@ include(Qt5QGCConfiguration)
 find_package(Qt5 ${QT_VERSION}
 	COMPONENTS
 		Bluetooth
+		Charts
 		Concurrent
 		Core
 		Location
diff --git a/src/AnalyzeView/CMakeLists.txt b/src/AnalyzeView/CMakeLists.txt
index 9f46fd9932f0719c6446a78ed362c2e8ae2016a8..713e7c70240055b4bdb148c97ec093c1870b301c 100644
--- a/src/AnalyzeView/CMakeLists.txt
+++ b/src/AnalyzeView/CMakeLists.txt
@@ -17,15 +17,14 @@ add_library(AnalyzeView
 	${EXTRA_SRC}
 )
 
-add_custom_target(
-	AnalyzeViewQml
-SOURCES
-	AnalyzePage.qml
-	AnalyzeView.qml
-	GeoTagPage.qml
-	LogDownloadPage.qml
-	MavlinkConsolePage.qml
-	MAVLinkInspectorPage.qml
+add_custom_target(AnalyzeViewQml
+	SOURCES
+		AnalyzePage.qml
+		AnalyzeView.qml
+		GeoTagPage.qml
+		LogDownloadPage.qml
+		MavlinkConsolePage.qml
+		MAVLinkInspectorPage.qml
 )
 
 target_link_libraries(AnalyzeView
@@ -33,6 +32,7 @@ target_link_libraries(AnalyzeView
 		qgc
 
 	PUBLIC
+		Qt5::Charts
 		Qt5::Location
 		Qt5::SerialPort
 		Qt5::TextToSpeech
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 8635a2b6a3cdb525d3942c353546be1a6f2e9d0c..8bec0b34bec096f03cc33e7dfe6da9fb4984461e 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -4,28 +4,22 @@ add_subdirectory(toolbar)
 add_library(ui
 
 	MAVLinkDecoder.cc
-	MultiVehicleDockWidget.cc
-	QGCPluginHost.cc
-
-	# HEADERS
-	# shouldn't be listed here, but aren't named properly for AUTOMOC
 	MAVLinkDecoder.h
-	MultiVehicleDockWidget.h
 	QGCMapRCToParamDialog.h
+	QGCPluginHost.cc
 	QGCPluginHost.h
 
 	# UI
-	MultiVehicleDockWidget.ui
 	QGCMapRCToParamDialog.ui
 	QGCPluginHost.ui
 	QMap3D.ui
 )
 
 add_custom_target(uiQml
-SOURCES
-	AppSettings.qml
-	ExitWithErrorWindow.qml
-	MainRootWindow.qml
+	SOURCES
+		AppSettings.qml
+		ExitWithErrorWindow.qml
+		MainRootWindow.qml
 )
 
 target_link_libraries(ui
@@ -39,5 +33,4 @@ target_include_directories(ui
                 ${CMAKE_CURRENT_BINARY_DIR}
 	PRIVATE
 		linechart
-	)
-
+)