diff --git a/panda/metalibs/panda/Sources.pp b/panda/metalibs/panda/Sources.pp
index 6ca0339a13..4fa620b48b 100644
--- a/panda/metalibs/panda/Sources.pp
+++ b/panda/metalibs/panda/Sources.pp
@@ -14,9 +14,9 @@
     gsgmisc light linmath mathutil net pnm \
     pnmimagetypes pnmimage sgattrib sgmanip sgraph sgraphutil \
     switchnode text tform lerp loader putil effects \
-    audio pandabase
+    audio audio_load_midi audio_load_wav pandabase
 
-#define OTHER_LIBS interrogatedb dconfig dtoolutil dtoolbase
+#define OTHER_LIBS dtool
 
 #begin metalib_target
   #define TARGET panda
diff --git a/panda/metalibs/pandadx/Sources.pp b/panda/metalibs/pandadx/Sources.pp
index cb7dcae1d3..3589bb8b74 100644
--- a/panda/metalibs/pandadx/Sources.pp
+++ b/panda/metalibs/pandadx/Sources.pp
@@ -12,7 +12,7 @@
 #define LOCAL_LIBS \
     dxgsg wdxdisplay
 
-#define OTHER_LIBS interrogatedb dconfig dtoolutil dtoolbase
+#define OTHER_LIBS dtool
 
 #begin metalib_target
   #define TARGET pandadx
diff --git a/panda/metalibs/pandaegg/Sources.pp b/panda/metalibs/pandaegg/Sources.pp
index 2f5da22462..1a2c2eb108 100644
--- a/panda/metalibs/pandaegg/Sources.pp
+++ b/panda/metalibs/pandaegg/Sources.pp
@@ -10,7 +10,7 @@
 #define LOCAL_LIBS \
     egg2sg egg builder
 
-#define OTHER_LIBS interrogatedb dconfig dtoolutil dtoolbase
+#define OTHER_LIBS dtool
 
 #begin metalib_target
   #define TARGET pandaegg
diff --git a/panda/metalibs/pandaexpress/Sources.pp b/panda/metalibs/pandaexpress/Sources.pp
index e1fcbe592a..cb494cbc9d 100644
--- a/panda/metalibs/pandaexpress/Sources.pp
+++ b/panda/metalibs/pandaexpress/Sources.pp
@@ -8,7 +8,7 @@
 #define BUILDING_DLL BUILDING_PANDAEXPRESS
 
 #define LOCAL_LIBS downloader event ipc express pandabase
-#define OTHER_LIBS interrogatedb dconfig dtoolutil
+#define OTHER_LIBS dtool
 
 #begin metalib_target
   #define TARGET pandaexpress
diff --git a/panda/metalibs/pandagl/Sources.pp b/panda/metalibs/pandagl/Sources.pp
index 223ee07771..0abbc40c39 100644
--- a/panda/metalibs/pandagl/Sources.pp
+++ b/panda/metalibs/pandagl/Sources.pp
@@ -12,7 +12,7 @@
 #define LOCAL_LIBS \
     glgsg glxdisplay // sgiglxdisplay
 
-#define OTHER_LIBS interrogatedb dconfig dtoolutil dtoolbase
+#define OTHER_LIBS dtool
 
 #begin metalib_target
   #define TARGET pandagl
diff --git a/panda/metalibs/pandaglut/Sources.pp b/panda/metalibs/pandaglut/Sources.pp
index 929ba93e32..6bea54827e 100644
--- a/panda/metalibs/pandaglut/Sources.pp
+++ b/panda/metalibs/pandaglut/Sources.pp
@@ -12,7 +12,7 @@
 #define LOCAL_LIBS \
     glutdisplay // sgiglutdisplay
 
-#define OTHER_LIBS interrogatedb dconfig dtoolutil dtoolbase
+#define OTHER_LIBS dtool
 
 #begin metalib_target
   #define TARGET pandaglut
diff --git a/panda/metalibs/pandaphysics/Sources.pp b/panda/metalibs/pandaphysics/Sources.pp
index 432d6c3fb9..3317ce07f1 100644
--- a/panda/metalibs/pandaphysics/Sources.pp
+++ b/panda/metalibs/pandaphysics/Sources.pp
@@ -10,7 +10,7 @@
 #define LOCAL_LIBS \
     physics particlesystem
 
-#define OTHER_LIBS interrogatedb dconfig dtoolutil dtoolbase
+#define OTHER_LIBS dtool
 
 #begin metalib_target
   #define TARGET pandaphysics
diff --git a/panda/metalibs/pandarib/Sources.pp b/panda/metalibs/pandarib/Sources.pp
index 4a7ac83b9d..654f70224b 100644
--- a/panda/metalibs/pandarib/Sources.pp
+++ b/panda/metalibs/pandarib/Sources.pp
@@ -12,7 +12,7 @@
 #define LOCAL_LIBS \
     ribgsg ribdisplay
 
-#define OTHER_LIBS interrogatedb dconfig dtoolutil dtoolbase
+#define OTHER_LIBS dtool
 
 #begin metalib_target
   #define TARGET pandarib