diff --git a/pandatool/src/softegg/softNodeDesc.cxx b/pandatool/src/softegg/softNodeDesc.cxx
index 48ad8cb1ce..68c11aaec8 100755
--- a/pandatool/src/softegg/softNodeDesc.cxx
+++ b/pandatool/src/softegg/softNodeDesc.cxx
@@ -17,6 +17,10 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "softNodeDesc.h"
+#include "config_softegg.h"
+#include "eggGroup.h"
+#include "eggXfmSAnim.h"
+#include "softToEggConverter.h"
 
 TypeHandle SoftNodeDesc::_type_handle;
 
diff --git a/pandatool/src/softegg/softNodeTree.cxx b/pandatool/src/softegg/softNodeTree.cxx
index 6b59049f04..5821ae3777 100755
--- a/pandatool/src/softegg/softNodeTree.cxx
+++ b/pandatool/src/softegg/softNodeTree.cxx
@@ -27,6 +27,7 @@
 #include "eggTable.h"
 #include "eggXfmSAnim.h"
 #include "eggData.h"
+#include "softToEggConverter.h"
 #include "dcast.h"
 
 #include <SAA.h>
diff --git a/pandatool/src/softegg/softToEggConverter.cxx b/pandatool/src/softegg/softToEggConverter.cxx
index b9405906f5..aa52b7b913 100755
--- a/pandatool/src/softegg/softToEggConverter.cxx
+++ b/pandatool/src/softegg/softToEggConverter.cxx
@@ -39,7 +39,7 @@
 
 SoftToEggConverter stec;
 
-static const int    TEX_PER_MAT = 1;
+const int    TEX_PER_MAT = 1;
 
 ////////////////////////////////////////////////////////////////////
 //     Function: SoftToEggConverter::Constructor
diff --git a/pandatool/src/softegg/softToEggConverter.h b/pandatool/src/softegg/softToEggConverter.h
index f78436ae14..ee5b2ab439 100755
--- a/pandatool/src/softegg/softToEggConverter.h
+++ b/pandatool/src/softegg/softToEggConverter.h
@@ -19,6 +19,14 @@
 #ifndef SOFTTOEGGCONVERTER_H
 #define SOFTTOEGGCONVERTER_H
 
+#include "pandatoolbase.h"
+#include "somethingToEggConverter.h"
+#include "softNodeTree.h"
+
+#include "eggTextureCollection.h"
+#include "distanceUnit.h"
+#include "coordinateSystem.h"
+
 #ifdef _MIN
 #undef _MIN
 #endif
@@ -26,17 +34,9 @@
 #undef _MAX
 #endif
 
-#include "pandatoolbase.h"
-#include "somethingToEggConverter.h"
-#include "softNodeTree.h"
-
 #include <SAA.h>
 #include <SI_macros.h>
 
-#include "eggTextureCollection.h"
-#include "distanceUnit.h"
-#include "coordinateSystem.h"
-
 class EggData;
 class EggGroup;
 class EggTable;
@@ -173,5 +173,6 @@ public:
   static TransformType string_transform_type(const string &arg);
 };
 
+extern const int TEX_PER_MAT;
 
 #endif