diff --git a/pandatool/src/bam/Sources.pp b/pandatool/src/bam/Sources.pp
index 6492541bc6..723ce483a2 100644
--- a/pandatool/src/bam/Sources.pp
+++ b/pandatool/src/bam/Sources.pp
@@ -1,10 +1,11 @@
 #begin bin_target
   #define TARGET bam-info
   #define LOCAL_LIBS \
-    eggbase progbase config compiler
+    eggbase progbase
   #define OTHER_LIBS \
     loader:c egg:c sgraphutil:c sgattrib:c sgraph:c pnmimagetypes:c \
-    graph:c putil:c express:c panda:m interrogatedb:c dtool:m
+    graph:c putil:c express:c panda:m \
+    interrogatedb:c dtoolutil:c dconfig:c dtool:m
   #define UNIX_SYS_LIBS \
     m
 
@@ -18,10 +19,11 @@
 #begin bin_target
   #define TARGET egg2bam
   #define LOCAL_LIBS \
-    eggbase progbase config compiler
+    eggbase progbase
   #define OTHER_LIBS \
     loader:c egg2sg:c builder:c egg:c pnmimagetypes:c graph:c putil:c \
-    express:c panda:m interrogatedb:c dtool:m
+    express:c panda:m interrogatedb:c \
+    interrogatedb:c dtoolutil:c dconfig:c dtool:m
   #define UNIX_SYS_LIBS \
     m
 
diff --git a/pandatool/src/eggprogs/Sources.pp b/pandatool/src/eggprogs/Sources.pp
index 5fe970a1f5..3215ad9db6 100644
--- a/pandatool/src/eggprogs/Sources.pp
+++ b/pandatool/src/eggprogs/Sources.pp
@@ -1,9 +1,9 @@
 #begin bin_target
   #define TARGET egg-trans
   #define LOCAL_LIBS \
-    eggbase progbase config compiler
+    eggbase progbase
   #define OTHER_LIBS \
-    egg:c linmath:c putil:c express:c panda:m
+    egg:c linmath:c putil:c express:c panda:m dtool
   #define UNIX_SYS_LIBS \
     m
 
diff --git a/pandatool/src/flt/Sources.pp b/pandatool/src/flt/Sources.pp
index eeb01e5308..7f3610de6b 100644
--- a/pandatool/src/flt/Sources.pp
+++ b/pandatool/src/flt/Sources.pp
@@ -1,9 +1,8 @@
 #begin lib_target
   #define TARGET flt
-  #define LOCAL_LIBS \
-    compiler
+  #define LOCAL_LIBS 
   #define OTHER_LIBS \
-    mathutil:c linmath:c putil:c express:c panda:m dtool:m
+    mathutil:c linmath:c putil:c express:c panda:m dtool
   #define UNIX_SYS_LIBS \
     m
 
diff --git a/pandatool/src/gtk-stats/Sources.pp b/pandatool/src/gtk-stats/Sources.pp
index 820689d218..b92f9a5fc5 100644
--- a/pandatool/src/gtk-stats/Sources.pp
+++ b/pandatool/src/gtk-stats/Sources.pp
@@ -4,9 +4,9 @@
 #begin bin_target
   #define TARGET gtk-stats
   #define LOCAL_LIBS \
-    gtkbase progbase pstatserver config compiler
+    gtkbase progbase pstatserver
   #define OTHER_LIBS \
-    pstatclient:c linmath:c putil:c express:c panda:m
+    pstatclient:c linmath:c putil:c express:c panda:m dtool
   #define UNIX_SYS_LIBS \
     m
 
diff --git a/pandatool/src/imageprogs/Sources.pp b/pandatool/src/imageprogs/Sources.pp
index 2ab6eae7d5..9721abf881 100644
--- a/pandatool/src/imageprogs/Sources.pp
+++ b/pandatool/src/imageprogs/Sources.pp
@@ -1,9 +1,9 @@
 #begin bin_target
   #define TARGET image-trans
   #define LOCAL_LIBS \
-    imagebase progbase config compiler
+    imagebase progbase
   #define OTHER_LIBS \
-    pnmimagetypes:c pnmimage:c putil:c express:c panda:m
+    pnmimagetypes:c pnmimage:c putil:c express:c panda:m dtool
   #define UNIX_SYS_LIBS \
     m
 
diff --git a/pandatool/src/maya/Sources.pp b/pandatool/src/maya/Sources.pp
index 6409f827e4..5ca76c6f62 100644
--- a/pandatool/src/maya/Sources.pp
+++ b/pandatool/src/maya/Sources.pp
@@ -12,9 +12,9 @@
   #define USE_MAYA yes
   #define TARGET maya2egg_bin
   #define LOCAL_LIBS \
-    eggbase progbase config compiler
+    eggbase progbase
   #define OTHER_LIBS \
-    egg:c linmath:c putil:c express:c panda:m
+    egg:c linmath:c putil:c express:c panda:m dtool
   #define UNIX_SYS_LIBS \
     m
 
diff --git a/pandatool/src/pstatserver/Sources.pp b/pandatool/src/pstatserver/Sources.pp
index 1ef5d6666c..63959f1573 100644
--- a/pandatool/src/pstatserver/Sources.pp
+++ b/pandatool/src/pstatserver/Sources.pp
@@ -1,9 +1,8 @@
 #begin lib_target
   #define TARGET pstatserver
-  #define LOCAL_LIBS \
-    compiler
+  #define LOCAL_LIBS
   #define OTHER_LIBS \
-    pstatclient:c net:c putil:c express:c panda:m dtool:m
+    pstatclient:c net:c putil:c express:c panda:m dtool
   #define UNIX_SYS_LIBS \
     m
 
diff --git a/pandatool/src/stitch/Sources.pp b/pandatool/src/stitch/Sources.pp
index 7ad2190fd4..bcfc714d48 100644
--- a/pandatool/src/stitch/Sources.pp
+++ b/pandatool/src/stitch/Sources.pp
@@ -23,11 +23,11 @@
 #begin bin_target
   #define TARGET stitch-viewer
   #define LOCAL_LIBS \
-    stitchviewer stitchbase progbase config compiler
+    stitchviewer stitchbase progbase
   #define OTHER_LIBS \
     device:c tform:c graph:c dgraph:c sgraph:c gobj:c sgattrib:c \
     event:c chancfg:c display:c sgraphutil:c light:c putil:c express:c \
-    panda:m
+    panda:m dtool
 
   #define SOURCES \
     stitchViewerProgram.cxx stitchViewerProgram.h
diff --git a/pandatool/src/text-stats/Sources.pp b/pandatool/src/text-stats/Sources.pp
index eaeb418dc2..a30b27ff8c 100644
--- a/pandatool/src/text-stats/Sources.pp
+++ b/pandatool/src/text-stats/Sources.pp
@@ -1,9 +1,9 @@
 #begin bin_target
   #define TARGET text-stats
   #define LOCAL_LIBS \
-    progbase pstatserver config compiler
+    progbase pstatserver
   #define OTHER_LIBS \
-    pstatclient:c linmath:c putil:c express:c panda:m
+    pstatclient:c linmath:c putil:c express:c panda:m dtool
   #define UNIX_SYS_LIBS \
     m