diff --git a/src/ADSB/CMakeLists.txt b/src/ADSB/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2b1e0796d74f76927fe152c3846da8eb709eb7af
--- /dev/null
+++ b/src/ADSB/CMakeLists.txt
@@ -0,0 +1,19 @@
+
+add_library(ADSB
+	ADSBVehicle.cc
+	ADSBVehicle.h
+	ADSBVehicleManager.cc
+	ADSBVehicleManager.h
+)
+
+target_link_libraries(ADSB
+	PUBLIC
+		qgc
+)
+
+target_include_directories(ADSB
+	PUBLIC
+		${CMAKE_CURRENT_SOURCE_DIR}
+	)
+
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6c065c99b69e8b872c63a417dc004b1bd4794a57..4436e9580149b1b3313acd227a41bb9af9900274 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -113,6 +113,7 @@ set_source_files_properties(QGCApplication.cc PROPERTIES COMPILE_DEFINITIONS GIT
 
 add_subdirectory(ui)
 
+add_subdirectory(ADSB)
 add_subdirectory(Airmap)
 add_subdirectory(AnalyzeView)
 add_subdirectory(api)
@@ -148,6 +149,7 @@ target_link_libraries(qgc
 		Qt5::QuickWidgets
 		Qt5::Widgets
 
+                ADSB
 		Airmap
 		AnalyzeView
 		api
diff --git a/src/Settings/CMakeLists.txt b/src/Settings/CMakeLists.txt
index 99cae8de1db28b0ae543e2ecd3b4bf16e3648d8f..55abf6a5e7e88d17a39ab078e23a0060ef104cfb 100644
--- a/src/Settings/CMakeLists.txt
+++ b/src/Settings/CMakeLists.txt
@@ -1,19 +1,35 @@
 
 add_library(Settings
+	ADSBVehicleManagerSettings.cc
+	ADSBVehicleManagerSettings.h
 	APMMavlinkStreamRateSettings.cc
+	APMMavlinkStreamRateSettings.h
 	AppSettings.cc
+	AppSettings.h
 	AutoConnectSettings.cc
+	AutoConnectSettings.h
 	BrandImageSettings.cc
+	BrandImageSettings.h
 	FirmwareUpgradeSettings.cc
+	FirmwareUpgradeSettings.h
 	FlightMapSettings.cc
+	FlightMapSettings.h
 	FlyViewSettings.cc
+	FlyViewSettings.h
 	OfflineMapsSettings.cc
+	OfflineMapsSettings.h
 	PlanViewSettings.cc
+	PlanViewSettings.h
 	RTKSettings.cc
+	RTKSettings.h
 	SettingsGroup.cc
+	SettingsGroup.h
 	SettingsManager.cc
+	SettingsManager.h
 	UnitsSettings.cc
+	UnitsSettings.h
 	VideoSettings.cc
+	VideoSettings.h
 )
 
 target_link_libraries(Settings
diff --git a/src/Vehicle/CMakeLists.txt b/src/Vehicle/CMakeLists.txt
index e9cb7f1a2dcc47da5c8576b4e9b9bd0fc459031a..f87853841e05eb00c8a2e97c6019ef42b7d44c5f 100644
--- a/src/Vehicle/CMakeLists.txt
+++ b/src/Vehicle/CMakeLists.txt
@@ -3,17 +3,24 @@ set(EXTRA_SRC)
 if(BUILD_TESTING)
 	list(APPEND EXTRA_SRC
 		SendMavCommandTest.cc
+		SendMavCommandTest.h
 	)
 endif()
 
 add_library(Vehicle
-	ADSBVehicle.cc
 	GPSRTKFactGroup.cc
+	GPSRTKFactGroup.h
 	MAVLinkLogManager.cc
+	MAVLinkLogManager.h
 	MultiVehicleManager.cc
+	MultiVehicleManager.h
 	TrajectoryPoints.cc
+	TrajectoryPoints.h
 	Vehicle.cc
+	Vehicle.h
 	VehicleObjectAvoidance.cc
+	VehicleObjectAvoidance.h
+
 	${EXTRA_SRC}
 )