diff --git a/src/AnalyzeView/CMakeLists.txt b/src/AnalyzeView/CMakeLists.txt
index 6636ae386ca781d3f854f188952e53c44a5ae801..ce9d5d0f6ff1a7dd63a3ef60eb066aa747e49b61 100644
--- a/src/AnalyzeView/CMakeLists.txt
+++ b/src/AnalyzeView/CMakeLists.txt
@@ -26,5 +26,5 @@ target_link_libraries(AnalyzeView
 		qgc
 )
 
-target_include_directories(AnalyzeView INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(AnalyzeView PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
diff --git a/src/Audio/CMakeLists.txt b/src/Audio/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a6d6599639770793d9f38cb0a0327d49b30f58c7
--- /dev/null
+++ b/src/Audio/CMakeLists.txt
@@ -0,0 +1,25 @@
+
+set(EXTRA_SRC)
+if(BUILD_TESTING)
+	list(APPEND EXTRA_SRC
+		AudioOutputTest.cc
+	)
+endif()
+
+add_library(Audio
+	AudioOutput.cc
+	${EXTRA_SRC}
+)
+
+target_link_libraries(Audio
+	PUBLIC
+	Qt5::Core
+	Qt5::Qml
+	Qt5::TextToSpeech
+	Qt5::Widgets
+
+	qgc
+)
+
+target_include_directories(Audio PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 26e3b1a25ddedb2d70e3c4043ab0d6ede2513f09..de7c5166da8f5f590074a2f6af56dcdc11472eec 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,9 +7,7 @@ include_directories(
 	QtLocationPlugin/QMLControl
 	${Qt5Location_PRIVATE_INCLUDE_DIRS}
 
-	AnalyzeView
 	api
-	Audio
 	AutoPilotPlugins
 	AutoPilotPlugins/APM
 	AutoPilotPlugins/Common
@@ -75,7 +73,6 @@ if(BUILD_TESTING)
 	endfunction()
 
 	list(APPEND QGC_SRC
-		Audio/AudioOutputTest.cc
 
 		comm/MockLink.cc
 		comm/MockLinkFileServer.cc
@@ -224,8 +221,6 @@ add_library(qgc
 	api/QGCSettings.cc
 	api/QmlComponentInfo.cc
 
-	Audio/AudioOutput.cc
-
 	AutoPilotPlugins/APM/APMAirframeComponent.cc
 	AutoPilotPlugins/APM/APMAirframeComponentAirframes.cc
 	AutoPilotPlugins/APM/APMAirframeComponentController.cc
@@ -490,6 +485,11 @@ add_library(qgc
 
 set_source_files_properties(QGCApplication.cc PROPERTIES COMPILE_DEFINITIONS GIT_VERSION="${git_tag}")
 
+add_subdirectory(AnalyzeView)
+add_subdirectory(Airmap)
+add_subdirectory(Audio)
+add_subdirectory(GPS)
+
 target_link_libraries(qgc
 
 	PUBLIC
@@ -510,13 +510,13 @@ target_link_libraries(qgc
 	Qt5::Widgets
 
 	Airmap
+	AnalyzeView
+	Audio
 	gps
 	qwt # LinechartWidget
 )
 
 target_include_directories(qgc INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 
-add_subdirectory(AnalyzeView)
-add_subdirectory(Airmap)
-add_subdirectory(GPS)
+
 
diff --git a/src/GPS/CMakeLists.txt b/src/GPS/CMakeLists.txt
index b015531feeeb83f907b3926078d1c4e28d453e7e..1d3dfab4deff1e78603aff914ee48a0dda7f6127 100644
--- a/src/GPS/CMakeLists.txt
+++ b/src/GPS/CMakeLists.txt
@@ -17,6 +17,8 @@ target_link_libraries(gps
 	Qt5::SerialPort
 	Qt5::Svg
 	Qt5::TextToSpeech
+
+	qgc
 )
 
 target_include_directories(gps INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})