diff --git a/direct/metalibs/direct/Sources.pp b/direct/metalibs/direct/Sources.pp
index e2e43c873a..9c06538266 100644
--- a/direct/metalibs/direct/Sources.pp
+++ b/direct/metalibs/direct/Sources.pp
@@ -8,9 +8,13 @@
 #define BUILDING_DLL BUILDING_DIRECT
 
 #define COMPONENT_LIBS \
-   directbase dcparser showbase deadrec directd interval
+  directbase dcparser showbase deadrec directd interval
 
-#define OTHER_LIBS panda pandaexpress dtoolconfig dtool
+#define OTHER_LIBS \
+  panda:m \
+  pandaexpress:m \
+  interrogatedb:c dconfig:c dtoolconfig:m \
+  dtoolutil:c dtoolbase:c dtool:m
 
 #begin metalib_target
   #define TARGET direct
diff --git a/direct/src/dcparse/Sources.pp b/direct/src/dcparse/Sources.pp
index d18897aa7d..a874e9f606 100644
--- a/direct/src/dcparse/Sources.pp
+++ b/direct/src/dcparse/Sources.pp
@@ -1,7 +1,9 @@
-#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
-                   dtoolutil:c dtoolbase:c dtool:m
 #define LOCAL_LIBS \
-    dcparser
+  dcparser
+#define OTHER_LIBS \
+  express:c \
+  interrogatedb:c dconfig:c dtoolconfig:m \
+  dtoolutil:c dtoolbase:c dtool:m
 #define C++FLAGS -DWITHIN_PANDA
 
 #begin bin_target
diff --git a/direct/src/deadrec/Sources.pp b/direct/src/deadrec/Sources.pp
index d4077978fa..58fdc1b0bd 100644
--- a/direct/src/deadrec/Sources.pp
+++ b/direct/src/deadrec/Sources.pp
@@ -1,5 +1,11 @@
 #begin lib_target
   #define TARGET deadrec
+  #define LOCAL_LIBS \
+    directbase
+  #define OTHER_LIBS \
+    express:c linmath:c \
+    interrogatedb:c dconfig:c \
+    dtoolutil:c dtoolbase:c dtool:m
 
   #define COMBINED_SOURCES $[TARGET]_composite1.cxx
 
@@ -14,7 +20,4 @@
 
   #define IGATESCAN \
     all
-
-  #define LOCAL_LIBS \
-    directbase
 #end lib_target
diff --git a/direct/src/interval/Sources.pp b/direct/src/interval/Sources.pp
index 79d54761df..7866a4802d 100644
--- a/direct/src/interval/Sources.pp
+++ b/direct/src/interval/Sources.pp
@@ -3,7 +3,11 @@
   #define LOCAL_LIBS \
     directbase
   #define OTHER_LIBS \
-    pgraph:c putil:c panda:m express:c pandaexpress:m dtoolconfig dtool
+    downloader:c linmath:c lerp:c \
+    chan:c event:c gobj:c pnmimage:c mathutil:c \
+    pgraph:c putil:c panda:m express:c pandaexpress:m \
+    interrogatedb:c dconfig:c dtoolconfig:m \
+    dtoolutil:c dtoolbase:c dtool:m
 
   #define SOURCES \
     config_interval.cxx config_interval.h \
diff --git a/direct/src/showbase/Sources.pp b/direct/src/showbase/Sources.pp
index a822c64c33..8cb4fe8cfb 100644
--- a/direct/src/showbase/Sources.pp
+++ b/direct/src/showbase/Sources.pp
@@ -3,7 +3,12 @@
   #define LOCAL_LIBS \
     directbase
   #define OTHER_LIBS \
-    linmath:c putil:c panda:m express:c pandaexpress:m dtoolconfig dtool
+    linmath:c \
+    event:c \
+    putil:c panda:m \
+    express:c pandaexpress:m \
+    interrogatedb:c dconfig:c dtoolconfig:m \
+    dtoolutil:c dtoolbase:c dtool:m
 
   #define SOURCES \
     showBase.cxx showBase.h mersenne.cxx mersenne.h