diff --git a/CMakeLists.txt b/CMakeLists.txt
index b900ace9242..48ac9e962cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,8 +163,6 @@ add_subdirectory(libs)
 add_subdirectory(src)
 
 set(QGC_RESOURCES
-	#HackAndroidFileDialog.qrc
-	HackFileDialog.qrc
 	qgcresources.qrc
 	qgroundcontrol.qrc
 	qgcimages.qrc
diff --git a/src/FlightMap/Widgets/CMakeLists.txt b/src/FlightMap/Widgets/CMakeLists.txt
index f60f708b99a..1433e84623e 100644
--- a/src/FlightMap/Widgets/CMakeLists.txt
+++ b/src/FlightMap/Widgets/CMakeLists.txt
@@ -3,15 +3,14 @@ add_custom_target(FligthMapWidgetsQml
 		CenterMapDropButton.qml
 		CenterMapDropPanel.qml
 		CompassRing.qml
-		InstrumentSwipeView.qml
 		MapFitFunctions.qml
 		PhotoVideoControl.qml
 		QGCArtificialHorizon.qml
 		QGCAttitudeHUD.qml
 		QGCAttitudeWidget.qml
 		QGCCompassWidget.qml
-		QGCInstrumentWidget.qml
 		QGCInstrumentWidgetAlternate.qml
+		QGCInstrumentWidget.qml
 		QGCMapToolButton.qml
 		QGCPitchIndicator.qml
 		QGCWaypointEditor.qml
diff --git a/src/Vehicle/CMakeLists.txt b/src/Vehicle/CMakeLists.txt
index c7eb50693f1..21ce21696b8 100644
--- a/src/Vehicle/CMakeLists.txt
+++ b/src/Vehicle/CMakeLists.txt
@@ -44,10 +44,30 @@ add_library(Vehicle
 	TerrainProtocolHandler.h
 	TrajectoryPoints.cc
 	TrajectoryPoints.h
+	VehicleBatteryFactGroup.cc
+	VehicleBatteryFactGroup.h
 	Vehicle.cc
+	VehicleClockFactGroup.cc
+	VehicleClockFactGroup.h
+	VehicleDistanceSensorFactGroup.cc
+	VehicleDistanceSensorFactGroup.h
+	VehicleEscStatusFactGroup.cc
+	VehicleEscStatusFactGroup.h
+	VehicleEstimatorStatusFactGroup.cc
+	VehicleEstimatorStatusFactGroup.h
+	VehicleGPSFactGroup.cc
+	VehicleGPSFactGroup.h
 	Vehicle.h
 	VehicleObjectAvoidance.cc
 	VehicleObjectAvoidance.h
+	VehicleSetpointFactGroup.cc
+	VehicleSetpointFactGroup.h
+	VehicleTemperatureFactGroup.cc
+	VehicleTemperatureFactGroup.h
+	VehicleVibrationFactGroup.cc
+	VehicleVibrationFactGroup.h
+	VehicleWindFactGroup.cc
+	VehicleWindFactGroup.h
 
 	${EXTRA_SRC}
 )