diff --git a/pandatool/src/dxfprogs/Sources.pp b/pandatool/src/dxfprogs/Sources.pp
index 8a64c610f6..68b0b71942 100644
--- a/pandatool/src/dxfprogs/Sources.pp
+++ b/pandatool/src/dxfprogs/Sources.pp
@@ -8,7 +8,7 @@
   #define OTHER_LIBS \
     linmath:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     dxfPoints.cxx dxfPoints.h
@@ -23,7 +23,7 @@
     egg:c pandaegg:m \
     linmath:c pnmimagetypes:c pnmimage:c putil:c mathutil:c event:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     dxfToEgg.cxx dxfToEgg.h
@@ -38,7 +38,7 @@
     egg:c pandaegg:m \
     putil:c event:c linmath:c pnmimagetypes:c pnmimage:c mathutil:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     eggToDXF.cxx eggToDXF.h \
diff --git a/pandatool/src/egg-optchar/Sources.pp b/pandatool/src/egg-optchar/Sources.pp
index b5bbea2e7d..34f800f1ea 100644
--- a/pandatool/src/egg-optchar/Sources.pp
+++ b/pandatool/src/egg-optchar/Sources.pp
@@ -4,7 +4,7 @@
   egg:c event:c pandaegg:m \
   pnmimagetypes:c pnmimage:c mathutil:c linmath:c putil:c panda:m \
   express:c pandaexpress:m \
-  dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+  interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 #define UNIX_SYS_LIBS m
 
 #begin bin_target
diff --git a/pandatool/src/egg-palettize/Sources.pp b/pandatool/src/egg-palettize/Sources.pp
index 974a57b707..4a8993e056 100644
--- a/pandatool/src/egg-palettize/Sources.pp
+++ b/pandatool/src/egg-palettize/Sources.pp
@@ -7,7 +7,7 @@
     express:c pnmimage:c pnmimagetypes:c \
     event:c mathutil:c \
     pandaegg:m panda:m pandaexpress:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
   #define UNIX_SYS_LIBS m
   
   #define SOURCES \
diff --git a/pandatool/src/egg-qtess/Sources.pp b/pandatool/src/egg-qtess/Sources.pp
index a564039a77..e328ea5198 100644
--- a/pandatool/src/egg-qtess/Sources.pp
+++ b/pandatool/src/egg-qtess/Sources.pp
@@ -8,7 +8,7 @@
     parametrics:c pgraph:c egg:c pandaegg:m \
     pnmimagetypes:c pnmimage:c mathutil:c linmath:c putil:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
   #define UNIX_SYS_LIBS m
 
   #define COMBINED_SOURCES $[TARGET]_composite1.cxx     
diff --git a/pandatool/src/eggprogs/Sources.pp b/pandatool/src/eggprogs/Sources.pp
index f203cda68e..d532761a14 100644
--- a/pandatool/src/eggprogs/Sources.pp
+++ b/pandatool/src/eggprogs/Sources.pp
@@ -4,7 +4,7 @@
   egg:c event:c pandaegg:m \
   pnmimagetypes:c pnmimage:c mathutil:c linmath:c putil:c panda:m \
   express:c pandaexpress:m \
-  dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+  interrogatedb:c dtoolutil:c dtoolbase:c prc: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 a035617369..5c83df26aa 100644
--- a/pandatool/src/fltprogs/Sources.pp
+++ b/pandatool/src/fltprogs/Sources.pp
@@ -9,7 +9,7 @@
     linmath:c pnmimagetypes:c pnmimage:c event:c \
     putil:c mathutil:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     fltCopy.cxx fltCopy.h
@@ -24,7 +24,7 @@
     egg:c pandaegg:m \
     linmath:c pnmimagetypes:c pnmimage:c putil:c event:c mathutil:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     fltTrans.cxx fltTrans.h
@@ -40,7 +40,7 @@
     event:c linmath:c mathutil:c \
     pnmimagetypes:c pnmimage:c putil:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     fltInfo.cxx fltInfo.h
@@ -55,7 +55,7 @@
     egg:c pandaegg:m \
     linmath:c pnmimagetypes:c pnmimage:c putil:c mathutil:c event:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     fltToEgg.cxx fltToEgg.h
@@ -70,7 +70,7 @@
     egg:c pandaegg:m \
     putil:c event:c linmath:c pnmimagetypes:c pnmimage:c mathutil:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     eggToFlt.cxx eggToFlt.h
diff --git a/pandatool/src/gtk-stats/Sources.pp b/pandatool/src/gtk-stats/Sources.pp
index 1790512d7d..50eb05ddaf 100644
--- a/pandatool/src/gtk-stats/Sources.pp
+++ b/pandatool/src/gtk-stats/Sources.pp
@@ -7,7 +7,7 @@
     gtkbase progbase pstatserver
   #define OTHER_LIBS \
     pstatclient:c linmath:c putil:c net:c express:c panda:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m
   #define UNIX_SYS_LIBS \
     m
 
diff --git a/pandatool/src/lwoprogs/Sources.pp b/pandatool/src/lwoprogs/Sources.pp
index c6fea7012c..1baa0ee8d5 100644
--- a/pandatool/src/lwoprogs/Sources.pp
+++ b/pandatool/src/lwoprogs/Sources.pp
@@ -8,7 +8,7 @@
     pnmimagetypes:c pnmimage:c \
     putil:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     lwoToEgg.cxx lwoToEgg.h
@@ -23,7 +23,7 @@
     egg:c pandaegg:m \
     linmath:c pnmimagetypes:c pnmimage:c putil:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     lwoScan.cxx lwoScan.h
diff --git a/pandatool/src/mayaprogs/Sources.pp b/pandatool/src/mayaprogs/Sources.pp
index 59502500d7..fe7737a4be 100644
--- a/pandatool/src/mayaprogs/Sources.pp
+++ b/pandatool/src/mayaprogs/Sources.pp
@@ -40,7 +40,7 @@
     egg:c pandaegg:m \
     linmath:c putil:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   // Irix requires this to be named explicitly.
   #define UNIX_SYS_LIBS \
@@ -61,7 +61,7 @@
     egg:c pandaegg:m \
     linmath:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   // Irix requires this to be named explicitly.
   #define UNIX_SYS_LIBS \
@@ -83,7 +83,7 @@
     framework:m \
     linmath:c putil:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define BUILDING_DLL BUILDING_MISC
 
diff --git a/pandatool/src/mayaprogs/mayaCopy.cxx b/pandatool/src/mayaprogs/mayaCopy.cxx
index 337053e4e7..3502eb5bcd 100644
--- a/pandatool/src/mayaprogs/mayaCopy.cxx
+++ b/pandatool/src/mayaprogs/mayaCopy.cxx
@@ -197,7 +197,8 @@ copy_maya_file(const Filename &source, const Filename &dest,
     }
   }
 
-  for (unsigned int ref_index = 0; ref_index < num_refs; ref_index++) {
+  unsigned int ref_index;
+  for (ref_index = 0; ref_index < num_refs; ref_index++) {
     // one thing we need to do is rename the path to the base file
     // that it is referencing to. This will guarantee that the
     // refencing will stay in the copied directory. Only way I could
@@ -238,7 +239,7 @@ copy_maya_file(const Filename &source, const Filename &dest,
     return false;
   }
   
-  for (unsigned int ref_index = 0; ref_index < num_refs; ref_index++) {
+  for (ref_index = 0; ref_index < num_refs; ref_index++) {
     //maya_cat.info() << "refs filename: " << refs[ref_index].asChar() << "\n";
     //maya_cat.info() << "os_specific filename: " << Filename::from_os_specific(refs[ref_index].asChar()) << "\n";
     Filename filename = 
diff --git a/pandatool/src/vrmlprogs/Sources.pp b/pandatool/src/vrmlprogs/Sources.pp
index 54d020e3ba..f703b8c86c 100644
--- a/pandatool/src/vrmlprogs/Sources.pp
+++ b/pandatool/src/vrmlprogs/Sources.pp
@@ -6,7 +6,7 @@
     egg:c pandaegg:m \
     linmath:c pnmimagetypes:c pnmimage:c putil:c mathutil:c event:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     vrmlToEgg.cxx vrmlToEgg.h
@@ -20,7 +20,7 @@
   #define OTHER_LIBS \
     linmath:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     vrmlTrans.cxx vrmlTrans.h
diff --git a/pandatool/src/xfileprogs/Sources.pp b/pandatool/src/xfileprogs/Sources.pp
index a7d678d2ce..ca270aa23b 100644
--- a/pandatool/src/xfileprogs/Sources.pp
+++ b/pandatool/src/xfileprogs/Sources.pp
@@ -5,7 +5,7 @@
     egg:c pandaegg:m \
     mathutil:c linmath:c putil:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     eggToX.cxx eggToX.h
@@ -19,7 +19,7 @@
     egg:c pandaegg:m \
     mathutil:c linmath:c putil:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     xFileToEgg.cxx xFileToEgg.h
@@ -33,7 +33,7 @@
   #define OTHER_LIBS \
     linmath:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     xFileTrans.cxx xFileTrans.h