diff --git a/src/AutoPilotPlugins/CMakeLists.txt b/src/AutoPilotPlugins/CMakeLists.txt
index 9a3013213a87f7ec236535249dc644d87d3057ff..15b5d7c4c0815c6e20d37caa5d351b7e76728506 100644
--- a/src/AutoPilotPlugins/CMakeLists.txt
+++ b/src/AutoPilotPlugins/CMakeLists.txt
@@ -9,7 +9,9 @@ add_library(AutoPilotPlugins
 	APM/APMCompassCal.cc
 	APM/APMFlightModesComponent.cc
 	APM/APMFlightModesComponentController.cc
+	APM/APMHeliComponent.cc
 	APM/APMLightsComponent.cc
+	APM/APMMotorComponent.cc
 	APM/APMPowerComponent.cc
 	APM/APMRadioComponent.cc
 	APM/APMSafetyComponent.cc
@@ -17,7 +19,6 @@ add_library(AutoPilotPlugins
 	APM/APMSensorsComponentController.cc
 	APM/APMSubFrameComponent.cc
 	APM/APMTuningComponent.cc
-	APM/APMHeliComponent.cc
 
 	Common/ESP8266Component.cc
 	Common/ESP8266ComponentController.cc
diff --git a/src/Settings/CMakeLists.txt b/src/Settings/CMakeLists.txt
index 05a79ac3f9b6803e04c94b801f1288aaec1d8de1..e9757b772898c557dee3e576b0f8c7b0ae218d25 100644
--- a/src/Settings/CMakeLists.txt
+++ b/src/Settings/CMakeLists.txt
@@ -4,7 +4,8 @@ add_library(Settings
 	AutoConnectSettings.cc
 	BrandImageSettings.cc
 	FlightMapSettings.cc
-	GuidedSettings.cc
+	FlyViewSettings.cc
+	PlanViewSettings.cc
 	RTKSettings.cc
 	SettingsGroup.cc
 	SettingsManager.cc