diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 856a72644308eb9f79708cd2b95fdff9fb0bc0f9..f8ce53f46c675142d41869ca03f2680ebf6cfd1c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,7 +6,6 @@ include_directories(
 
 	${Qt5Location_PRIVATE_INCLUDE_DIRS}
 
-	Camera
 	FlightDisplay
 	FlightMap/Widgets
 	FollowMe
@@ -115,10 +114,6 @@ add_library(qgc
 
 	${EXTRA_SRC}
 
-	Camera/QGCCameraControl.cc
-	Camera/QGCCameraIO.cc
-	Camera/QGCCameraManager.cc
-
 	FlightDisplay/VideoManager.cc
 
 	FlightMap/Widgets/ValuesWidgetController.cc
@@ -176,6 +171,7 @@ add_subdirectory(Airmap)
 add_subdirectory(api)
 add_subdirectory(Audio)
 add_subdirectory(AutoPilotPlugins)
+add_subdirectory(Camera)
 add_subdirectory(comm)
 add_subdirectory(FactSystem)
 add_subdirectory(FirmwarePlugin)
@@ -213,6 +209,7 @@ target_link_libraries(qgc
 	api
 	Audio
 	AutoPilotPlugins
+	Camera
 	comm
 	FactSystem
 	FirmwarePlugin
diff --git a/src/Camera/CMakeLists.txt b/src/Camera/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2aa59ef5fdb534a6f4a126285d4236e9bc783d7d
--- /dev/null
+++ b/src/Camera/CMakeLists.txt
@@ -0,0 +1,14 @@
+
+add_library(Camera
+	QGCCameraControl.cc
+	QGCCameraIO.cc
+	QGCCameraManager.cc
+)
+
+target_link_libraries(Camera
+	PUBLIC
+		qgc
+)
+
+target_include_directories(Camera PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+