diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 60e4daf5edde10229db6f73b607002a8749592c2..2a3abc098e9a06cebd20cb65c45a215703cd79a8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,7 +6,6 @@ include_directories(
 
 	${Qt5Location_PRIVATE_INCLUDE_DIRS}
 
-	FlightMap/Widgets
 	FollowMe
 	PositionManager
 	qgcunittest
@@ -111,8 +110,6 @@ add_library(qgc
 
 	${EXTRA_SRC}
 
-	FlightMap/Widgets/ValuesWidgetController.cc
-
 	FollowMe/FollowMe.cc
 
 	PositionManager/PositionManager.cpp
@@ -163,6 +160,7 @@ add_subdirectory(comm)
 add_subdirectory(FactSystem)
 add_subdirectory(FirmwarePlugin)
 add_subdirectory(FlightDisplay)
+add_subdirectory(FlightMap)
 add_subdirectory(GPS)
 add_subdirectory(Joystick)
 add_subdirectory(MissionManager)
@@ -204,6 +202,7 @@ target_link_libraries(qgc
 	FactSystem
 	FirmwarePlugin
 	FlightDisplay
+	FlightMap
 	gps
 	Joystick
 	MissionManager
diff --git a/src/FlightMap/CMakeLists.txt b/src/FlightMap/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..09bd927df0a2544a232d226a04aa8c56318194f7
--- /dev/null
+++ b/src/FlightMap/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+add_library(FlightMap
+	Widgets/ValuesWidgetController.cc
+)
+
+target_link_libraries(FlightMap
+	PUBLIC
+		qgc
+)
+
+target_include_directories(FlightMap
+	PUBLIC
+		${CMAKE_CURRENT_SOURCE_DIR}
+	INTERFACE
+		Widgets
+	)
+