diff --git a/panda/metalibs/panda/Sources.pp b/panda/metalibs/panda/Sources.pp
index 430ed44a80..38baa3b571 100644
--- a/panda/metalibs/panda/Sources.pp
+++ b/panda/metalibs/panda/Sources.pp
@@ -8,15 +8,16 @@
 #define BUILDING_DLL BUILDING_PANDA
 #define USE_NET yes
 
-#define LOCAL_LIBS \
+#define COMPONENT_LIBS \
     pstatclient grutil chan chancfg \
     char chat collide cull device \
     dgraph display gobj graph gsgbase \
     gsgmisc light linmath mathutil net pnm \
     pnmimagetypes pnmimage sgattrib sgmanip sgraph sgraphutil \
-    switchnode text tform lerp loader putil effects \
-    audio audio_load_midi audio_load_wav pandabase
+    switchnode text tform tiff lerp loader putil effects \
+    audio audio_load_midi audio_load_wav pandabase \
 
+#define LOCAL_LIBS downloader event ipc express pandabase
 #define OTHER_LIBS dtool
 
 #begin metalib_target
diff --git a/panda/metalibs/pandadx/Sources.pp b/panda/metalibs/pandadx/Sources.pp
index 3589bb8b74..9454c8333c 100644
--- a/panda/metalibs/pandadx/Sources.pp
+++ b/panda/metalibs/pandadx/Sources.pp
@@ -9,9 +9,9 @@
 #define DIR_TYPE metalib
 #define BUILDING_DLL BUILDING_PANDADX
 
-#define LOCAL_LIBS \
+#define COMPONENT_LIBS \
     dxgsg wdxdisplay
-
+#define LOCAL_LIBS gsgbase display
 #define OTHER_LIBS dtool
 
 #begin metalib_target
diff --git a/panda/metalibs/pandaegg/Sources.pp b/panda/metalibs/pandaegg/Sources.pp
index 1a2c2eb108..9090ac352c 100644
--- a/panda/metalibs/pandaegg/Sources.pp
+++ b/panda/metalibs/pandaegg/Sources.pp
@@ -7,9 +7,10 @@
 #define DIR_TYPE metalib
 #define BUILDING_DLL BUILDING_PANDAEGG
 
-#define LOCAL_LIBS \
+#define COMPONENT_LIBS \
     egg2sg egg builder
 
+#define LOCAL_LIBS putil
 #define OTHER_LIBS dtool
 
 #begin metalib_target
diff --git a/panda/metalibs/pandaexpress/Sources.pp b/panda/metalibs/pandaexpress/Sources.pp
index 57148641e6..b838bc6d02 100644
--- a/panda/metalibs/pandaexpress/Sources.pp
+++ b/panda/metalibs/pandaexpress/Sources.pp
@@ -8,7 +8,7 @@
 #define BUILDING_DLL BUILDING_PANDAEXPRESS
 #define USE_NET yes
 
-#define LOCAL_LIBS downloader event ipc express pandabase
+#define COMPONENT_LIBS downloader event ipc express pandabase
 #define OTHER_LIBS dtool
 
 #begin metalib_target
diff --git a/panda/metalibs/pandagl/Sources.pp b/panda/metalibs/pandagl/Sources.pp
index 0abbc40c39..45aa4c5749 100644
--- a/panda/metalibs/pandagl/Sources.pp
+++ b/panda/metalibs/pandagl/Sources.pp
@@ -9,9 +9,9 @@
 #define DIR_TYPE metalib
 #define BUILDING_DLL BUILDING_PANDAGL
 
-#define LOCAL_LIBS \
+#define COMPONENT_LIBS \
     glgsg glxdisplay // sgiglxdisplay
-
+#define LOCAL_LIBS gsgbase display
 #define OTHER_LIBS dtool
 
 #begin metalib_target
diff --git a/panda/metalibs/pandaglut/Sources.pp b/panda/metalibs/pandaglut/Sources.pp
index 6bea54827e..c182e1fcd8 100644
--- a/panda/metalibs/pandaglut/Sources.pp
+++ b/panda/metalibs/pandaglut/Sources.pp
@@ -9,9 +9,10 @@
 #define DIR_TYPE metalib
 #define BUILDING_DLL BUILDING_PANDAGLUT
 
-#define LOCAL_LIBS \
+#define COMPONENT_LIBS \
     glutdisplay // sgiglutdisplay
 
+#define LOCAL_LIBS glgsg display
 #define OTHER_LIBS dtool
 
 #begin metalib_target
diff --git a/panda/metalibs/pandaphysics/Sources.pp b/panda/metalibs/pandaphysics/Sources.pp
index 3317ce07f1..5fb3704836 100644
--- a/panda/metalibs/pandaphysics/Sources.pp
+++ b/panda/metalibs/pandaphysics/Sources.pp
@@ -7,9 +7,9 @@
 #define DIR_TYPE metalib
 #define BUILDING_DLL BUILDING_PANDAPHYSICS
 
-#define LOCAL_LIBS \
+#define COMPONENT_LIBS \
     physics particlesystem
-
+#define LOCAL_LIBS linmath putil
 #define OTHER_LIBS dtool
 
 #begin metalib_target
diff --git a/panda/metalibs/pandarib/Sources.pp b/panda/metalibs/pandarib/Sources.pp
index 654f70224b..7841007a35 100644
--- a/panda/metalibs/pandarib/Sources.pp
+++ b/panda/metalibs/pandarib/Sources.pp
@@ -9,9 +9,9 @@
 #define DIR_TYPE metalib
 #define BUILDING_DLL BUILDING_PANDARIB
 
-#define LOCAL_LIBS \
+#define COMPONENT_LIBS \
     ribgsg ribdisplay
-
+#define LOCAL_LIBS gsgbase display
 #define OTHER_LIBS dtool
 
 #begin metalib_target
diff --git a/panda/src/tiff/Sources.pp b/panda/src/tiff/Sources.pp
index 5d7efebcb1..6d8e963da0 100644
--- a/panda/src/tiff/Sources.pp
+++ b/panda/src/tiff/Sources.pp
@@ -1,4 +1,4 @@
-#define OTHER_LIBS interrogatedb dconfig dtoolutil dtoolbase
+#define OTHER_LIBS dtool
 
 #begin lib_target
   #define TARGET tiff