diff --git a/pandatool/src/xfileegg/xFileMesh.cxx b/pandatool/src/xfileegg/xFileMesh.cxx
index 9aefdf6643..93ad91d270 100644
--- a/pandatool/src/xfileegg/xFileMesh.cxx
+++ b/pandatool/src/xfileegg/xFileMesh.cxx
@@ -691,7 +691,7 @@ fill_mesh(XFileDataNode *obj) {
 
   // Some properties are stored as children of the mesh.
   int num_objects = obj->get_num_objects();
-  for (int i = 0; i < num_objects; i++) {
+  for (i = 0; i < num_objects; i++) {
     if (!fill_mesh_child(obj->get_object(i))) {
       return false;
     }
@@ -918,7 +918,7 @@ fill_material_list(XFileDataNode *obj) {
   // Now look for children of the MaterialList object.  These should
   // all be Material objects.
   int num_objects = obj->get_num_objects();
-  for (int i = 0; i < num_objects; i++) {
+  for (i = 0; i < num_objects; i++) {
     XFileDataNode *child = obj->get_object(i);
     if (child->is_standard_object("Material")) {
       XFileMaterial *material = new XFileMaterial;
diff --git a/pandatool/src/xfileprogs/Sources.pp b/pandatool/src/xfileprogs/Sources.pp
index b0c221edfb..a7d678d2ce 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 \
-    dtoolconfig dtool pystub \
+    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 \
-    dtoolconfig dtool pystub \
+    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     xFileToEgg.cxx xFileToEgg.h