diff --git a/pandatool/src/eggcharbase/eggBackPointer.cxx b/pandatool/src/eggcharbase/eggBackPointer.cxx
index 400d9e3b2f..b1e269624a 100644
--- a/pandatool/src/eggcharbase/eggBackPointer.cxx
+++ b/pandatool/src/eggcharbase/eggBackPointer.cxx
@@ -13,6 +13,8 @@
 
 #include "eggBackPointer.h"
 
+#include "pnotify.h"
+
 
 TypeHandle EggBackPointer::_type_handle;
 
diff --git a/pandatool/src/eggcharbase/eggCharacterDb.h b/pandatool/src/eggcharbase/eggCharacterDb.h
index 037367dc8b..31af55f231 100644
--- a/pandatool/src/eggcharbase/eggCharacterDb.h
+++ b/pandatool/src/eggcharbase/eggCharacterDb.h
@@ -29,6 +29,7 @@
 */
 
 class EggJointPointer;
+class LMatrix4d;
 
 /**
  * This class is used during joint optimization or restructuring to store the
diff --git a/pandatool/src/eggcharbase/eggJointData.cxx b/pandatool/src/eggcharbase/eggJointData.cxx
index 65ed9505a5..ebf656b113 100644
--- a/pandatool/src/eggcharbase/eggJointData.cxx
+++ b/pandatool/src/eggcharbase/eggJointData.cxx
@@ -12,6 +12,8 @@
  */
 
 #include "eggJointData.h"
+
+#include "eggCharacterDb.h"
 #include "eggJointNodePointer.h"
 #include "eggMatrixTablePointer.h"
 #include "pvector.h"
diff --git a/pandatool/src/eggcharbase/eggJointNodePointer.cxx b/pandatool/src/eggcharbase/eggJointNodePointer.cxx
index c9c891606b..23bf7ea480 100644
--- a/pandatool/src/eggcharbase/eggJointNodePointer.cxx
+++ b/pandatool/src/eggcharbase/eggJointNodePointer.cxx
@@ -14,8 +14,9 @@
 #include "eggJointNodePointer.h"
 
 #include "dcast.h"
-#include "eggObject.h"
+#include "eggCharacterDb.h"
 #include "eggGroup.h"
+#include "eggObject.h"
 #include "pointerTo.h"
 
 
diff --git a/pandatool/src/eggcharbase/eggMatrixTablePointer.cxx b/pandatool/src/eggcharbase/eggMatrixTablePointer.cxx
index 21c9c63516..267296483f 100644
--- a/pandatool/src/eggcharbase/eggMatrixTablePointer.cxx
+++ b/pandatool/src/eggcharbase/eggMatrixTablePointer.cxx
@@ -12,7 +12,9 @@
  */
 
 #include "eggMatrixTablePointer.h"
+
 #include "dcast.h"
+#include "eggCharacterDb.h"
 #include "eggSAnimData.h"
 #include "eggXfmAnimData.h"
 #include "eggXfmSAnim.h"
diff --git a/pandatool/src/palettizer/paletteGroup.cxx b/pandatool/src/palettizer/paletteGroup.cxx
index 182479216f..5f231b2e14 100644
--- a/pandatool/src/palettizer/paletteGroup.cxx
+++ b/pandatool/src/palettizer/paletteGroup.cxx
@@ -17,6 +17,7 @@
 #include "textureImage.h"
 #include "palettizer.h"
 #include "paletteImage.h"
+#include "sourceTextureImage.h"
 
 #include "indent.h"
 #include "datagram.h"
diff --git a/pandatool/src/xfileegg/xFileMaterial.cxx b/pandatool/src/xfileegg/xFileMaterial.cxx
index 11457ebcd5..9eaac25fbd 100644
--- a/pandatool/src/xfileegg/xFileMaterial.cxx
+++ b/pandatool/src/xfileegg/xFileMaterial.cxx
@@ -18,6 +18,7 @@
 #include "eggTexture.h"
 #include "eggPrimitive.h"
 #include "datagram.h"
+#include "config_xfile.h"
 
 #include <string.h>  // for strcmp, strdup
 
diff --git a/pandatool/src/xfileegg/xFileMesh.cxx b/pandatool/src/xfileegg/xFileMesh.cxx
index 4fad113ed4..e253ee385d 100644
--- a/pandatool/src/xfileegg/xFileMesh.cxx
+++ b/pandatool/src/xfileegg/xFileMesh.cxx
@@ -12,6 +12,7 @@
  */
 
 #include "xFileMesh.h"
+#include "xFileToEggConverter.h"
 #include "xFileFace.h"
 #include "xFileVertex.h"
 #include "xFileNormal.h"
@@ -22,6 +23,7 @@
 #include "eggVertexPool.h"
 #include "eggVertex.h"
 #include "eggPolygon.h"
+#include "eggGroup.h"
 #include "eggGroupNode.h"
 
 using std::min;
diff --git a/pandatool/src/xfileegg/xFileMesh.h b/pandatool/src/xfileegg/xFileMesh.h
index 417d7c4253..339ba2038f 100644
--- a/pandatool/src/xfileegg/xFileMesh.h
+++ b/pandatool/src/xfileegg/xFileMesh.h
@@ -22,6 +22,8 @@
 #include "namable.h"
 #include "coordinateSystem.h"
 
+#include "luse.h"
+
 class XFileNode;
 class XFileDataNode;
 class XFileMesh;
diff --git a/pandatool/src/xfileegg/xFileToEggConverter.cxx b/pandatool/src/xfileegg/xFileToEggConverter.cxx
index 130c42546e..91ba21ba97 100644
--- a/pandatool/src/xfileegg/xFileToEggConverter.cxx
+++ b/pandatool/src/xfileegg/xFileToEggConverter.cxx
@@ -19,6 +19,7 @@
 
 #include "eggData.h"
 #include "eggGroup.h"
+#include "eggTable.h"
 #include "eggXfmSAnim.h"
 #include "eggGroupUniquifier.h"
 #include "datagram.h"