diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9be8fce153d467cf571a338e8a48319261bb0cda..28ce963e31b3ff391226c662525cb63548cc9049 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -119,6 +119,8 @@ add_library(qgc
 	QGCTemporaryFile.h
 	QGCToolbox.cc
 	QGCToolbox.h
+	QGCZlib.cc
+	QGCZlib.h
 	RunGuard.cc
 	RunGuard.h
 	ShapeFileHelper.cc
@@ -168,6 +170,7 @@ target_link_libraries(qgc
 	PRIVATE
 		shp
                 Qt5::QuickControls2
+                z # zlib
 
 	PUBLIC
 		Qt5::QuickWidgets
diff --git a/src/Vehicle/CMakeLists.txt b/src/Vehicle/CMakeLists.txt
index 85b9cd115eb9b74530c7a22a06dcbfb04547c624..6d271954b3f332813e9d3001984902da92e26ff1 100644
--- a/src/Vehicle/CMakeLists.txt
+++ b/src/Vehicle/CMakeLists.txt
@@ -2,24 +2,46 @@
 set(EXTRA_SRC)
 if(BUILD_TESTING)
 	list(APPEND EXTRA_SRC
-		SendMavCommandTest.cc
-		SendMavCommandTest.h
+		FTPManagerTest.cc
+		FTPManagerTest.h
+		InitialConnectTest.cc
+		InitialConnectTest.h
+		RequestMessageTest.cc
+		RequestMessageTest.h
+		SendMavCommandWithHandlerTest.cc
+		SendMavCommandWithHandlerTest.h
+		SendMavCommandWithSignallingTest.cc
+		SendMavCommandWithSignallingTest.h
 	)
 endif()
 
 add_library(Vehicle
+	CompInfo.cc
+	CompInfo.h
+	CompInfoParam.cc
+	CompInfoParam.h
+	CompInfoVersion.cc
+	CompInfoVersion.h
+	ComponentInformationManager.cc
+	ComponentInformationManager.h
+	FTPManager.cc
+	FTPManager.h
 	GPSRTKFactGroup.cc
 	GPSRTKFactGroup.h
+	InitialConnectStateMachine.cc
+	InitialConnectStateMachine.h
 	MAVLinkLogManager.cc
 	MAVLinkLogManager.h
 	MultiVehicleManager.cc
 	MultiVehicleManager.h
-	TrajectoryPoints.cc
-	TrajectoryPoints.h
+	StateMachine.cc
+	StateMachine.h
 	TerrainFactGroup.cc
 	TerrainFactGroup.h
 	TerrainProtocolHandler.cc
 	TerrainProtocolHandler.h
+	TrajectoryPoints.cc
+	TrajectoryPoints.h
 	Vehicle.cc
 	Vehicle.h
 	VehicleObjectAvoidance.cc
diff --git a/src/comm/CMakeLists.txt b/src/comm/CMakeLists.txt
index f01dcf254213c3265ca55dcff3c6bf365085cc5e..3f269f72200d416c7086a4afdd160a12dcac6705 100644
--- a/src/comm/CMakeLists.txt
+++ b/src/comm/CMakeLists.txt
@@ -3,25 +3,41 @@ set(EXTRA_SRC)
 if(BUILD_TESTING)
 	list(APPEND EXTRA_SRC
 		MockLink.cc
-		MockLinkFileServer.cc
+		MockLink.h
+		MockLinkFTP.cc
+		MockLinkFTP.h
 		MockLinkMissionItemHandler.cc
+		MockLinkMissionItemHandler.h
 	)
 endif()
 
 add_library(comm
 	#BluetoothLink.cc
+	#BluetoothLink.h
 	LinkConfiguration.cc
+	LinkConfiguration.h
 	LinkInterface.cc
+	LinkInterface.h
 	LinkManager.cc
+	LinkManager.h
 	LogReplayLink.cc
+	LogReplayLink.h
 	MavlinkMessagesTimer.cc
+	MavlinkMessagesTimer.h
 	MAVLinkProtocol.cc
+	MAVLinkProtocol.h
 	QGCMAVLink.cc
+	QGCMAVLink.h
 	QGCSerialPortInfo.cc
+	QGCSerialPortInfo.h
 	SerialLink.cc
+	SerialLink.h
 	TCPLink.cc
-	UDPLink.cc
+	TCPLink.h
 	UdpIODevice.cc
+	UdpIODevice.h
+	UDPLink.cc
+	UDPLink.h
 
 	${EXTRA_SRC}
 )
diff --git a/src/uas/CMakeLists.txt b/src/uas/CMakeLists.txt
index edb9b2d301966aa5513fcaf980698ab9e076d377..f6c21716779f7e8d28533f5e1849229d89e1d7d6 100644
--- a/src/uas/CMakeLists.txt
+++ b/src/uas/CMakeLists.txt
@@ -1,13 +1,10 @@
 
 add_library(uas
-	FileManager.cc
 	UAS.cc
-	UASMessageHandler.cc
-
-	# HEADERS
-	# shouldn't be listed here, but aren't named properly for AUTOMOC
 	UAS.h
 	UASInterface.h
+	UASMessageHandler.cc
+	UASMessageHandler.h
 )
 
 target_link_libraries(uas