diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e1ccc51d9e9694a1acc42c45a73165d05309384e..856a72644308eb9f79708cd2b95fdff9fb0bc0f9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,7 +14,6 @@ include_directories(
 	PositionManager
 	qgcunittest
 	Terrain
-	Vehicle
 	ViewWidgets
 )
 
@@ -68,8 +67,6 @@ if(BUILD_TESTING)
 		qgcunittest/TCPLoopBackServer.cc
 		qgcunittest/UnitTest.cc
 		qgcunittest/UnitTestList.cc
-
-		Vehicle/SendMavCommandTest.cc
 	)
 
 	add_qgc_test(AudioOutputTest)
@@ -137,12 +134,6 @@ add_library(qgc
 
 	Terrain/TerrainQuery.cc
 
-	Vehicle/ADSBVehicle.cc
-	Vehicle/GPSRTKFactGroup.cc
-	Vehicle/MAVLinkLogManager.cc
-	Vehicle/MultiVehicleManager.cc
-	Vehicle/Vehicle.cc
-
 	ViewWidgets/CustomCommandWidget.cc
 	ViewWidgets/CustomCommandWidgetController.cc
 	ViewWidgets/ViewWidgetController.cc
@@ -194,6 +185,7 @@ add_subdirectory(QmlControls)
 add_subdirectory(QtLocationPlugin)
 add_subdirectory(Settings)
 add_subdirectory(uas)
+add_subdirectory(Vehicle)
 add_subdirectory(VehicleSetup)
 add_subdirectory(VideoStreaming)
 
@@ -232,6 +224,7 @@ target_link_libraries(qgc
 	Settings
 	uas
 	ui
+	Vehicle
 	VehicleSetup
 	VideoStreaming
 )
diff --git a/src/Vehicle/CMakeLists.txt b/src/Vehicle/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7a25dcb5e42540c768b3b214709175f16656db30
--- /dev/null
+++ b/src/Vehicle/CMakeLists.txt
@@ -0,0 +1,24 @@
+
+set(EXTRA_SRC)
+if(BUILD_TESTING)
+	list(APPEND EXTRA_SRC
+		SendMavCommandTest.cc
+	)
+endif()
+
+add_library(Vehicle
+	ADSBVehicle.cc
+	GPSRTKFactGroup.cc
+	MAVLinkLogManager.cc
+	MultiVehicleManager.cc
+	Vehicle.cc
+	${EXTRA_SRC}
+)
+
+target_link_libraries(Vehicle
+	PUBLIC
+		qgc
+)
+
+target_include_directories(Vehicle PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+