diff --git a/pandatool/src/bam/Sources.pp b/pandatool/src/bam/Sources.pp
index a00e194668..e70b86208b 100644
--- a/pandatool/src/bam/Sources.pp
+++ b/pandatool/src/bam/Sources.pp
@@ -7,7 +7,7 @@
     cull:c loader:c egg:c sgraphutil:c sgattrib:c \
     sgraph:c pnmimagetypes:c \
     graph:c putil:c linmath:c express:c panda:m pandaexpress:m \
-    interrogatedb:c dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m pystub
   #define UNIX_SYS_LIBS \
     m
 
@@ -27,7 +27,7 @@
     loader:c egg2sg:c builder:c egg:c pnmimagetypes:c gobj:c \
     chan:c graph:c putil:c linmath:c \
     express:c pandaegg:m panda:m pandaexpress:m \
-    interrogatedb:c dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m pystub
   #define UNIX_SYS_LIBS \
     m
 
diff --git a/pandatool/src/egg-mkfont/Sources.pp b/pandatool/src/egg-mkfont/Sources.pp
index 00c57804ad..756cbfc6f4 100644
--- a/pandatool/src/egg-mkfont/Sources.pp
+++ b/pandatool/src/egg-mkfont/Sources.pp
@@ -3,7 +3,7 @@
 #define OTHER_LIBS \
   pnmimagetypes:c pnmimage:c \
   egg:c linmath:c putil:c express:c pandaegg:m panda:m pandaexpress:m \
-  dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
+  dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m pystub
 
 #define UNIX_SYS_LIBS m
 
diff --git a/pandatool/src/egg-palettize/Sources.pp b/pandatool/src/egg-palettize/Sources.pp
index 8142538df3..f7577cc9a1 100644
--- a/pandatool/src/egg-palettize/Sources.pp
+++ b/pandatool/src/egg-palettize/Sources.pp
@@ -5,7 +5,7 @@
   #define OTHER_LIBS \
     egg:c loader:c linmath:c putil:c express:c pnmimage:c pnmimagetypes:c \
     pandaegg:m panda:m pandaexpress:m \
-    dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
+    dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m pystub
   #define UNIX_SYS_LIBS \
     m
 
diff --git a/pandatool/src/eggprogs/Sources.pp b/pandatool/src/eggprogs/Sources.pp
index ce894040ed..63995fffd8 100644
--- a/pandatool/src/eggprogs/Sources.pp
+++ b/pandatool/src/eggprogs/Sources.pp
@@ -4,7 +4,7 @@
   egg:c pandaegg:m \
   pnmimagetypes:c pnmimage:c linmath:c putil:c panda:m \
   express:c pandaexpress:m \
-  dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
+  dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m pystub
 #define UNIX_SYS_LIBS m
 
 #begin bin_target
diff --git a/pandatool/src/fltprogs/Sources.pp b/pandatool/src/fltprogs/Sources.pp
index fddc37c0c4..a229fa802d 100644
--- a/pandatool/src/fltprogs/Sources.pp
+++ b/pandatool/src/fltprogs/Sources.pp
@@ -7,7 +7,7 @@
   #define OTHER_LIBS \
     linmath:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
+    dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     fltCopy.cxx fltCopy.h
@@ -21,7 +21,7 @@
   #define OTHER_LIBS \
     linmath:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
+    dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     fltTrans.cxx fltTrans.h
@@ -36,7 +36,7 @@
     egg:c pandaegg:m \
     linmath:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
+    dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     fltToEgg.cxx fltToEgg.h
diff --git a/pandatool/src/gtk-stats/Sources.pp b/pandatool/src/gtk-stats/Sources.pp
index cd0114a733..0a7c669ed1 100644
--- a/pandatool/src/gtk-stats/Sources.pp
+++ b/pandatool/src/gtk-stats/Sources.pp
@@ -9,7 +9,7 @@
     gtkbase progbase pstatserver
   #define OTHER_LIBS \
     pstatclient:c linmath:c putil:c express:c panda:m \
-    dtoolutil:c dconfig:c dtoolconfig:m dtool:m
+    dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m
   #define UNIX_SYS_LIBS \
     m
 
diff --git a/pandatool/src/imageprogs/Sources.pp b/pandatool/src/imageprogs/Sources.pp
index 9321ac8226..e37d0de947 100644
--- a/pandatool/src/imageprogs/Sources.pp
+++ b/pandatool/src/imageprogs/Sources.pp
@@ -6,7 +6,8 @@
     imagebase progbase
   #define OTHER_LIBS \
     pnmimagetypes:c pnmimage:c putil:c express:c panda:m \
-    pandaexpress:m dtoolconfig dtool pystub
+    pandaexpress:m \
+    dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m pystub
   #define UNIX_SYS_LIBS \
     m
 
diff --git a/pandatool/src/lwoprogs/Sources.pp b/pandatool/src/lwoprogs/Sources.pp
index 41045bc56d..2fb5678ba7 100644
--- a/pandatool/src/lwoprogs/Sources.pp
+++ b/pandatool/src/lwoprogs/Sources.pp
@@ -6,7 +6,7 @@
     egg:c pandaegg:m \
     linmath:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
+    dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     lwoToEgg.cxx lwoToEgg.h
@@ -20,7 +20,7 @@
   #define OTHER_LIBS \
     linmath:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
+    dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     lwoScan.cxx lwoScan.h
diff --git a/pandatool/src/maya/Sources.pp b/pandatool/src/maya/Sources.pp
index bd31420fa3..bb243d1cca 100644
--- a/pandatool/src/maya/Sources.pp
+++ b/pandatool/src/maya/Sources.pp
@@ -15,7 +15,7 @@
     eggbase progbase
   #define OTHER_LIBS \
     egg:c linmath:c putil:c express:c panda:m \
-    dtoolutil:c dconfig:c dtool:m
+    dtoolutil:c dtoolbase:c dconfig:c dtool:m
   #define UNIX_SYS_LIBS \
     m
 
diff --git a/pandatool/src/softprogs/Sources.pp b/pandatool/src/softprogs/Sources.pp
index 205d290bd0..761447753b 100644
--- a/pandatool/src/softprogs/Sources.pp
+++ b/pandatool/src/softprogs/Sources.pp
@@ -5,7 +5,7 @@
   #define OTHER_LIBS \
     linmath:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
+    dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     softCVS.cxx softCVS.h softFilename.cxx softFilename.h
diff --git a/pandatool/src/text-stats/Sources.pp b/pandatool/src/text-stats/Sources.pp
index 9c81b37c14..f12705850e 100644
--- a/pandatool/src/text-stats/Sources.pp
+++ b/pandatool/src/text-stats/Sources.pp
@@ -7,7 +7,7 @@
     progbase pstatserver
   #define OTHER_LIBS \
     pstatclient:c linmath:c putil:c express:c panda:m pandaexpress:m \
-    dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
+    dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m pystub
   #define UNIX_SYS_LIBS \
     m