diff --git a/panda/src/audio/Sources.pp b/panda/src/audio/Sources.pp
index bf06d2c05e..8de589b787 100644
--- a/panda/src/audio/Sources.pp
+++ b/panda/src/audio/Sources.pp
@@ -4,13 +4,16 @@
 #begin lib_target
   #define TARGET audio
   #define LOCAL_LIBS putil
+  
+  #define COMBINED_SOURCES $[TARGET]_composite1.cxx
 
   #define SOURCES \
-    config_audio.cxx config_audio.h \
-    audioManager.I audioManager.cxx audioManager.h \
-    audioSound.cxx audioSound.h \
-    nullAudioManager.cxx nullAudioManager.h \
-    nullAudioSound.cxx nullAudioSound.h
+    config_audio.h audioManager.I audioManager.h \
+    audioSound.h nullAudioManager.h nullAudioSound.h
+    
+  #define INCLUDED_SOURCES \
+    config_audio.cxx audioManager.cxx audioSound.cxx \
+    nullAudioManager.cxx nullAudioSound.cxx
 
   #define INSTALL_HEADERS \
     config_audio.h \
diff --git a/panda/src/audio/audio_composite1.cxx b/panda/src/audio/audio_composite1.cxx
index 2d1c927fad..7d9e15ea4e 100644
--- a/panda/src/audio/audio_composite1.cxx
+++ b/panda/src/audio/audio_composite1.cxx
@@ -1,4 +1,7 @@
 
 #include "config_audio.cxx"
-#include "audio_gui_functor.cxx"
+#include "audioManager.cxx"
+#include "audioSound.cxx"
+#include "nullAudioManager.cxx"
+#include "nullAudioSound.cxx"