diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e38f1a469b5005162b3b4221fea89714c4bb0b09..6cfe725ed28cf639fec3aa619c1fd753d73e53ae 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,7 +16,6 @@ include_directories(
 	Terrain
 	uas
 	Vehicle
-	VehicleSetup
 	VideoStreaming
 	ViewWidgets
 )
@@ -183,13 +182,6 @@ add_library(qgc
 	Vehicle/MultiVehicleManager.cc
 	Vehicle/Vehicle.cc
 
-	VehicleSetup/Bootloader.cc
-	VehicleSetup/FirmwareImage.cc
-	VehicleSetup/FirmwareUpgradeController.cc
-	VehicleSetup/JoystickConfigController.cc
-	VehicleSetup/PX4FirmwareUpgradeThread.cc
-	VehicleSetup/VehicleComponent.cc
-
 	VideoStreaming/VideoItem.cc
 	VideoStreaming/VideoReceiver.cc
 	VideoStreaming/VideoStreaming.cc
@@ -247,6 +239,7 @@ add_subdirectory(MissionManager)
 add_subdirectory(QmlControls)
 add_subdirectory(QtLocationPlugin)
 add_subdirectory(Settings)
+add_subdirectory(VehicleSetup)
 
 
 target_link_libraries(qgc
@@ -283,6 +276,7 @@ target_link_libraries(qgc
 	QtLocationPlugin
 	Settings
 	ui
+	VehicleSetup
 )
 
 target_include_directories(qgc INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/src/VehicleSetup/CMakeLists.txt b/src/VehicleSetup/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..249b95f286a548815b0d36fadd20ee43b0d0dfc0
--- /dev/null
+++ b/src/VehicleSetup/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+add_library(VehicleSetup
+	Bootloader.cc
+	FirmwareImage.cc
+	FirmwareUpgradeController.cc
+	JoystickConfigController.cc
+	PX4FirmwareUpgradeThread.cc
+	VehicleComponent.cc
+)
+
+target_link_libraries(VehicleSetup
+	PUBLIC
+		qgc
+)
+
+target_include_directories(VehicleSetup PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+