diff --git a/d3music/CMakeLists.txt b/d3music/CMakeLists.txt
index 9e3ccb65..7e25415d 100644
--- a/d3music/CMakeLists.txt
+++ b/d3music/CMakeLists.txt
@@ -3,3 +3,6 @@ set(CPPS
   musicapi.cpp)
 
 add_library(d3music STATIC ${HEADERS} ${CPPS})
+target_link_libraries(d3music PRIVATE
+  music
+)
diff --git a/manage/CMakeLists.txt b/manage/CMakeLists.txt
index b4f9ae03..0f13b85d 100644
--- a/manage/CMakeLists.txt
+++ b/manage/CMakeLists.txt
@@ -24,4 +24,6 @@ set(CPPS
 add_library(manage STATIC ${HEADERS} ${CPPS})
 target_link_libraries(manage PRIVATE
   cfile
+  sndlib
+  stream_audio
 )
diff --git a/music/CMakeLists.txt b/music/CMakeLists.txt
index e946a424..08e1709c 100644
--- a/music/CMakeLists.txt
+++ b/music/CMakeLists.txt
@@ -8,4 +8,10 @@ set(CPPS
 add_library(music STATIC ${HEADERS} ${CPPS})
 target_link_libraries(music
   cfile
+  stream_audio
+)
+target_include_directories(music PUBLIC
+  $<BUILD_INTERFACE:
+  ${PROJECT_SOURCE_DIR}/music
+  >
 )
diff --git a/lib/music.h b/music/music.h
similarity index 100%
rename from lib/music.h
rename to music/music.h
diff --git a/physics/CMakeLists.txt b/physics/CMakeLists.txt
index 181cdc02..d793c9a1 100644
--- a/physics/CMakeLists.txt
+++ b/physics/CMakeLists.txt
@@ -6,3 +6,6 @@ set(CPPS
   physics.cpp)
 
 add_library(physics STATIC ${HEADERS} ${CPPS})
+target_link_libraries(physics PRIVATE
+  sndlib
+)
diff --git a/sndlib/CMakeLists.txt b/sndlib/CMakeLists.txt
index e0ec3cb2..e2ea5400 100644
--- a/sndlib/CMakeLists.txt
+++ b/sndlib/CMakeLists.txt
@@ -19,6 +19,7 @@ set(CPPS
 add_library(sndlib STATIC ${CPPS})
 target_link_libraries(sndlib PRIVATE
   cfile
+  stream_audio
 )
 target_include_directories(sndlib PUBLIC
   $<BUILD_INTERFACE:
diff --git a/lib/ds3dlib.h b/sndlib/ds3dlib.h
similarity index 100%
rename from lib/ds3dlib.h
rename to sndlib/ds3dlib.h
diff --git a/lib/hlsoundlib.h b/sndlib/hlsoundlib.h
similarity index 100%
rename from lib/hlsoundlib.h
rename to sndlib/hlsoundlib.h
diff --git a/lib/soundload.h b/sndlib/soundload.h
similarity index 100%
rename from lib/soundload.h
rename to sndlib/soundload.h
diff --git a/lib/ssl_lib.h b/sndlib/ssl_lib.h
similarity index 100%
rename from lib/ssl_lib.h
rename to sndlib/ssl_lib.h
diff --git a/stream_audio/CMakeLists.txt b/stream_audio/CMakeLists.txt
index ca8ebb47..11de004b 100644
--- a/stream_audio/CMakeLists.txt
+++ b/stream_audio/CMakeLists.txt
@@ -4,4 +4,12 @@ set(CPPS
   streamaudio.cpp)
 
 add_library(stream_audio STATIC ${HEADERS} ${CPPS})
-target_link_libraries(stream_audio libacm)
+target_link_libraries(stream_audio
+  libacm
+  sndlib
+)
+target_include_directories(stream_audio PUBLIC
+  $<BUILD_INTERFACE:
+  ${PROJECT_SOURCE_DIR}/stream_audio
+  >
+)
diff --git a/lib/streamaudio.h b/stream_audio/streamaudio.h
similarity index 100%
rename from lib/streamaudio.h
rename to stream_audio/streamaudio.h