diff --git a/src/AutoPilotPlugins/CMakeLists.txt b/src/AutoPilotPlugins/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9a3013213a87f7ec236535249dc644d87d3057ff
--- /dev/null
+++ b/src/AutoPilotPlugins/CMakeLists.txt
@@ -0,0 +1,62 @@
+
+add_library(AutoPilotPlugins
+	APM/APMAirframeComponent.cc
+	APM/APMAirframeComponentAirframes.cc
+	APM/APMAirframeComponentController.cc
+	APM/APMAirframeLoader.cc
+	APM/APMAutoPilotPlugin.cc
+	APM/APMCameraComponent.cc
+	APM/APMCompassCal.cc
+	APM/APMFlightModesComponent.cc
+	APM/APMFlightModesComponentController.cc
+	APM/APMLightsComponent.cc
+	APM/APMPowerComponent.cc
+	APM/APMRadioComponent.cc
+	APM/APMSafetyComponent.cc
+	APM/APMSensorsComponent.cc
+	APM/APMSensorsComponentController.cc
+	APM/APMSubFrameComponent.cc
+	APM/APMTuningComponent.cc
+	APM/APMHeliComponent.cc
+
+	Common/ESP8266Component.cc
+	Common/ESP8266ComponentController.cc
+	Common/MotorComponent.cc
+	Common/RadioComponentController.cc
+	Common/SyslinkComponent.cc
+	Common/SyslinkComponentController.cc
+
+	PX4/AirframeComponent.cc
+	PX4/AirframeComponentAirframes.cc
+	PX4/AirframeComponentController.cc
+	PX4/CameraComponent.cc
+	PX4/FlightModesComponent.cc
+	PX4/PowerComponent.cc
+	PX4/PowerComponentController.cc
+	PX4/PX4AdvancedFlightModesController.cc
+	PX4/PX4AirframeLoader.cc
+	PX4/PX4AutoPilotPlugin.cc
+	PX4/PX4RadioComponent.cc
+	PX4/PX4SimpleFlightModesController.cc
+	PX4/PX4TuningComponent.cc
+	PX4/SafetyComponent.cc
+	PX4/SensorsComponent.cc
+	PX4/SensorsComponentController.cc
+
+	AutoPilotPlugin.cc
+	Generic/GenericAutoPilotPlugin.cc
+)
+
+target_link_libraries(AutoPilotPlugins
+	PUBLIC
+		qgc
+)
+
+target_include_directories(AutoPilotPlugins
+	PUBLIC
+		${CMAKE_CURRENT_SOURCE_DIR}
+		APM
+		Common
+		PX4
+	)
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7462991e64adbf52feae26df468bbec855bcdd12..ba2721636cf9a619d918b88d831fa2e4c5f1ac58 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,10 +7,6 @@ include_directories(
 	QtLocationPlugin/QMLControl
 	${Qt5Location_PRIVATE_INCLUDE_DIRS}
 
-	AutoPilotPlugins
-	AutoPilotPlugins/APM
-	AutoPilotPlugins/Common
-	AutoPilotPlugins/PX4
 	Camera
 	comm
 	FactSystem
@@ -215,52 +211,6 @@ add_library(qgc
 
 	${EXTRA_SRC}
 
-	AutoPilotPlugins/APM/APMAirframeComponent.cc
-	AutoPilotPlugins/APM/APMAirframeComponentAirframes.cc
-	AutoPilotPlugins/APM/APMAirframeComponentController.cc
-	AutoPilotPlugins/APM/APMAirframeLoader.cc
-	AutoPilotPlugins/APM/APMAutoPilotPlugin.cc
-	AutoPilotPlugins/APM/APMCameraComponent.cc
-	AutoPilotPlugins/APM/APMCompassCal.cc
-	AutoPilotPlugins/APM/APMFlightModesComponent.cc
-	AutoPilotPlugins/APM/APMFlightModesComponentController.cc
-	AutoPilotPlugins/APM/APMLightsComponent.cc
-	AutoPilotPlugins/APM/APMPowerComponent.cc
-	AutoPilotPlugins/APM/APMRadioComponent.cc
-	AutoPilotPlugins/APM/APMSafetyComponent.cc
-	AutoPilotPlugins/APM/APMSensorsComponent.cc
-	AutoPilotPlugins/APM/APMSensorsComponentController.cc
-	AutoPilotPlugins/APM/APMSubFrameComponent.cc
-	AutoPilotPlugins/APM/APMTuningComponent.cc
-	AutoPilotPlugins/APM/APMHeliComponent.cc
-
-	AutoPilotPlugins/Common/ESP8266Component.cc
-	AutoPilotPlugins/Common/ESP8266ComponentController.cc
-	AutoPilotPlugins/Common/MotorComponent.cc
-	AutoPilotPlugins/Common/RadioComponentController.cc
-	AutoPilotPlugins/Common/SyslinkComponent.cc
-	AutoPilotPlugins/Common/SyslinkComponentController.cc
-
-	AutoPilotPlugins/PX4/AirframeComponent.cc
-	AutoPilotPlugins/PX4/AirframeComponentAirframes.cc
-	AutoPilotPlugins/PX4/AirframeComponentController.cc
-	AutoPilotPlugins/PX4/CameraComponent.cc
-	AutoPilotPlugins/PX4/FlightModesComponent.cc
-	AutoPilotPlugins/PX4/PowerComponent.cc
-	AutoPilotPlugins/PX4/PowerComponentController.cc
-	AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc
-	AutoPilotPlugins/PX4/PX4AirframeLoader.cc
-	AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc
-	AutoPilotPlugins/PX4/PX4RadioComponent.cc
-	AutoPilotPlugins/PX4/PX4SimpleFlightModesController.cc
-	AutoPilotPlugins/PX4/PX4TuningComponent.cc
-	AutoPilotPlugins/PX4/SafetyComponent.cc
-	AutoPilotPlugins/PX4/SensorsComponent.cc
-	AutoPilotPlugins/PX4/SensorsComponentController.cc
-
-	AutoPilotPlugins/AutoPilotPlugin.cc
-	AutoPilotPlugins/Generic/GenericAutoPilotPlugin.cc
-
 	Camera/QGCCameraControl.cc
 	Camera/QGCCameraIO.cc
 	Camera/QGCCameraManager.cc
@@ -483,6 +433,7 @@ add_subdirectory(AnalyzeView)
 add_subdirectory(Airmap)
 add_subdirectory(api)
 add_subdirectory(Audio)
+add_subdirectory(AutoPilotPlugins)
 add_subdirectory(GPS)
 
 target_link_libraries(qgc
@@ -508,6 +459,7 @@ target_link_libraries(qgc
 	AnalyzeView
 	api
 	Audio
+	AutoPilotPlugins
 	gps
 	qwt # LinechartWidget
 )