diff --git a/pandatool/src/maxegg/maxEgg.cxx b/pandatool/src/maxegg/maxEgg.cxx
index c1b911e9d0..88a90232e0 100755
--- a/pandatool/src/maxegg/maxEgg.cxx
+++ b/pandatool/src/maxegg/maxEgg.cxx
@@ -8,9 +8,264 @@
   exporter for 3D Studio Max.
 */
 
-// Discreet-Generated ID for this app.
-#define MNEG Logger::ST_MAP_ME_TO_APP_SPECIFIC_SYSTEM2
-#define MNEG_GEOMETRY_GENERATION Logger::ST_MAP_ME_TO_APP_SPECIFIC_SYSTEM3
+#include "maxEgg.h"
+
+
+const double meshVerts[252][3] = {
+    {0.729464, -0.919852, 0.714986},
+    {0.466137, -0.594656, 0.160201},
+    {-0.265897, -1.14704, 0.714986},
+    {0.466137, -0.594656, 0.160201},
+    {-0.177333, -0.741523, 0.160201},
+    {-0.265897, -1.14704, 0.714986},
+    {-0.265897, -1.14704, 0.714986},
+    {-0.177333, -0.741523, 0.160201},
+    {-1.06411, -0.510479, 0.714986},
+    {-0.177333, -0.741523, 0.160201},
+    {-0.693356, -0.330009, 0.160201},
+    {-1.06411, -0.510479, 0.714986},
+    {-1.06411, 0.510479, 0.714986},
+    {-1.06411, -0.510479, 0.714986},
+    {-0.693356, 0.330009, 0.160201},
+    {-0.693356, -0.330009, 0.160201},
+    {-0.693356, 0.330009, 0.160201},
+    {-1.06411, -0.510479, 0.714986},
+    {-0.265897, 1.14704, 0.714986},
+    {-1.06411, 0.510479, 0.714986},
+    {-0.177333, 0.741523, 0.160201},
+    {-0.693356, 0.330009, 0.160201},
+    {-0.177333, 0.741523, 0.160201},
+    {-1.06411, 0.510479, 0.714986},
+    {0.729464, 0.919852, 0.714986},
+    {-0.265897, 1.14704, 0.714986},
+    {0.466137, 0.594656, 0.160201},
+    {-0.177333, 0.741523, 0.160201},
+    {0.466137, 0.594656, 0.160201},
+    {-0.265897, 1.14704, 0.714986},
+    {1.17244, 0.0, 0.714986},
+    {0.729464, 0.919852, 0.714986},
+    {0.752508, 0.0, 0.160201},
+    {0.466137, 0.594656, 0.160201},
+    {0.752508, 0.0, 0.160201},
+    {0.729464, 0.919852, 0.714986},
+    {0.729464, -0.919852, 0.714986},
+    {1.17244, 0.0, 0.714986},
+    {0.466137, -0.594656, 0.160201},
+    {0.752508, 0.0, 0.160201},
+    {0.466137, -0.594656, 0.160201},
+    {1.17244, 0.0, 0.714986},
+    {-0.286334, -1.26822, 1.44995},
+    {0.814187, -1.01703, 1.44995},
+    {-0.265897, -1.14704, 0.714986},
+    {0.729464, -0.919852, 0.714986},
+    {-0.265897, -1.14704, 0.714986},
+    {0.814187, -1.01703, 1.44995},
+    {-1.16888, -0.564412, 1.44995},
+    {-0.286334, -1.26822, 1.44995},
+    {-1.06411, -0.510479, 0.714986},
+    {-0.265897, -1.14704, 0.714986},
+    {-1.06411, -0.510479, 0.714986},
+    {-0.286334, -1.26822, 1.44995},
+    {-1.16888, 0.564411, 1.44995},
+    {-1.16888, -0.564412, 1.44995},
+    {-1.06411, 0.510479, 0.714986},
+    {-1.06411, -0.510479, 0.714986},
+    {-1.06411, 0.510479, 0.714986},
+    {-1.16888, -0.564412, 1.44995},
+    {-1.16888, 0.564411, 1.44995},
+    {-1.06411, 0.510479, 0.714986},
+    {-0.286334, 1.26822, 1.44995},
+    {-1.06411, 0.510479, 0.714986},
+    {-0.265897, 1.14704, 0.714986},
+    {-0.286334, 1.26822, 1.44995},
+    {-0.286334, 1.26822, 1.44995},
+    {-0.265897, 1.14704, 0.714986},
+    {0.814187, 1.01703, 1.44995},
+    {-0.265897, 1.14704, 0.714986},
+    {0.729464, 0.919852, 0.714986},
+    {0.814187, 1.01703, 1.44995},
+    {1.30396, 0.0, 1.44995},
+    {0.814187, 1.01703, 1.44995},
+    {1.17244, 0.0, 0.714986},
+    {0.729464, 0.919852, 0.714986},
+    {1.17244, 0.0, 0.714986},
+    {0.814187, 1.01703, 1.44995},
+    {1.30396, 0.0, 1.44995},
+    {1.17244, 0.0, 0.714986},
+    {0.814187, -1.01703, 1.44995},
+    {1.17244, 0.0, 0.714986},
+    {0.729464, -0.919852, 0.714986},
+    {0.814187, -1.01703, 1.44995},
+    {-0.286334, -1.26822, 1.44995},
+    {-0.227573, -1.05763, 2.16723},
+    {0.814187, -1.01703, 1.44995},
+    {0.814187, -1.01703, 1.44995},
+    {-0.227573, -1.05763, 2.16723},
+    {0.690208, -0.848157, 2.16723},
+    {-1.16888, -0.564412, 1.44995},
+    {-0.963577, -0.470692, 2.16723},
+    {-0.286334, -1.26822, 1.44995},
+    {-0.286334, -1.26822, 1.44995},
+    {-0.963577, -0.470692, 2.16723},
+    {-0.227573, -1.05763, 2.16723},
+    {-1.16888, -0.564412, 1.44995},
+    {-1.16888, 0.564411, 1.44995},
+    {-0.963577, -0.470692, 2.16723},
+    {-1.16888, 0.564411, 1.44995},
+    {-0.963577, 0.470692, 2.16723},
+    {-0.963577, -0.470692, 2.16723},
+    {-1.16888, 0.564411, 1.44995},
+    {-0.286334, 1.26822, 1.44995},
+    {-0.963577, 0.470692, 2.16723},
+    {-0.286334, 1.26822, 1.44995},
+    {-0.227574, 1.05763, 2.16723},
+    {-0.963577, 0.470692, 2.16723},
+    {-0.286334, 1.26822, 1.44995},
+    {0.814187, 1.01703, 1.44995},
+    {-0.227574, 1.05763, 2.16723},
+    {0.814187, 1.01703, 1.44995},
+    {0.690208, 0.848157, 2.16723},
+    {-0.227574, 1.05763, 2.16723},
+    {0.814187, 1.01703, 1.44995},
+    {1.30396, 0.0, 1.44995},
+    {0.690208, 0.848157, 2.16723},
+    {1.30396, 0.0, 1.44995},
+    {1.09866, 0.0, 2.16723},
+    {0.690208, 0.848157, 2.16723},
+    {0.814187, -1.01703, 1.44995},
+    {0.690208, -0.848157, 2.16723},
+    {1.30396, 0.0, 1.44995},
+    {1.30396, 0.0, 1.44995},
+    {0.690208, -0.848157, 2.16723},
+    {1.09866, 0.0, 2.16723},
+    {-0.227573, -1.05763, 2.16723},
+    {-0.154893, -0.759032, 2.72566},
+    {0.690208, -0.848157, 2.16723},
+    {0.690208, -0.848157, 2.16723},
+    {-0.154893, -0.759032, 2.72566},
+    {0.50377, -0.608696, 2.72566},
+    {-0.963577, -0.470692, 2.16723},
+    {-0.683099, -0.337801, 2.72566},
+    {-0.227573, -1.05763, 2.16723},
+    {-0.227573, -1.05763, 2.16723},
+    {-0.683099, -0.337801, 2.72566},
+    {-0.154893, -0.759032, 2.72566},
+    {-0.963577, -0.470692, 2.16723},
+    {-0.963577, 0.470692, 2.16723},
+    {-0.683099, -0.337801, 2.72566},
+    {-0.963577, 0.470692, 2.16723},
+    {-0.683099, 0.337801, 2.72566},
+    {-0.683099, -0.337801, 2.72566},
+    {-0.963577, 0.470692, 2.16723},
+    {-0.227574, 1.05763, 2.16723},
+    {-0.683099, 0.337801, 2.72566},
+    {-0.227574, 1.05763, 2.16723},
+    {-0.154893, 0.759032, 2.72566},
+    {-0.683099, 0.337801, 2.72566},
+    {-0.227574, 1.05763, 2.16723},
+    {0.690208, 0.848157, 2.16723},
+    {-0.154893, 0.759032, 2.72566},
+    {0.690208, 0.848157, 2.16723},
+    {0.50377, 0.608696, 2.72566},
+    {-0.154893, 0.759032, 2.72566},
+    {0.690208, 0.848157, 2.16723},
+    {1.09866, 0.0, 2.16723},
+    {0.50377, 0.608696, 2.72566},
+    {1.09866, 0.0, 2.16723},
+    {0.796903, 0.0, 2.72566},
+    {0.50377, 0.608696, 2.72566},
+    {1.09866, 0.0, 2.16723},
+    {0.690208, -0.848157, 2.16723},
+    {0.796903, 0.0, 2.72566},
+    {0.690208, -0.848157, 2.16723},
+    {0.50377, -0.608696, 2.72566},
+    {0.796903, 0.0, 2.72566},
+    {0.50377, -0.608696, 2.72566},
+    {-0.154893, -0.759032, 2.72566},
+    {0.259722, -0.299638, 3.11175},
+    {-0.154893, -0.759032, 2.72566},
+    {-0.0645132, -0.373643, 3.11175},
+    {0.259722, -0.299638, 3.11175},
+    {-0.154893, -0.759032, 2.72566},
+    {-0.683099, -0.337801, 2.72566},
+    {-0.0645132, -0.373643, 3.11175},
+    {-0.683099, -0.337801, 2.72566},
+    {-0.324529, -0.166287, 3.11175},
+    {-0.0645132, -0.373643, 3.11175},
+    {-0.683099, -0.337801, 2.72566},
+    {-0.683099, 0.337801, 2.72566},
+    {-0.324529, -0.166287, 3.11175},
+    {-0.683099, 0.337801, 2.72566},
+    {-0.324529, 0.166287, 3.11175},
+    {-0.324529, -0.166287, 3.11175},
+    {-0.683099, 0.337801, 2.72566},
+    {-0.154893, 0.759032, 2.72566},
+    {-0.324529, 0.166287, 3.11175},
+    {-0.154893, 0.759032, 2.72566},
+    {-0.0645132, 0.373642, 3.11175},
+    {-0.324529, 0.166287, 3.11175},
+    {-0.154893, 0.759032, 2.72566},
+    {0.50377, 0.608696, 2.72566},
+    {-0.0645132, 0.373642, 3.11175},
+    {0.50377, 0.608696, 2.72566},
+    {0.259722, 0.299638, 3.11175},
+    {-0.0645132, 0.373642, 3.11175},
+    {0.50377, 0.608696, 2.72566},
+    {0.796903, 0.0, 2.72566},
+    {0.259722, 0.299638, 3.11175},
+    {0.796903, 0.0, 2.72566},
+    {0.40402, 0.0, 3.11175},
+    {0.259722, 0.299638, 3.11175},
+    {0.796903, 0.0, 2.72566},
+    {0.50377, -0.608696, 2.72566},
+    {0.40402, 0.0, 3.11175},
+    {0.50377, -0.608696, 2.72566},
+    {0.259722, -0.299638, 3.11175},
+    {0.40402, 0.0, 3.11175},
+    {-0.177333, -0.741523, 0.160201},
+    {0.466137, -0.594656, 0.160201},
+    {-0.00334214, 0.0, 0.00443203},
+    {-0.693356, -0.330009, 0.160201},
+    {-0.177333, -0.741523, 0.160201},
+    {-0.00334214, 0.0, 0.00443203},
+    {-0.693356, 0.330009, 0.160201},
+    {-0.693356, -0.330009, 0.160201},
+    {-0.00334214, 0.0, 0.00443203},
+    {-0.177333, 0.741523, 0.160201},
+    {-0.693356, 0.330009, 0.160201},
+    {-0.00334214, 0.0, 0.00443203},
+    {0.466137, 0.594656, 0.160201},
+    {-0.177333, 0.741523, 0.160201},
+    {-0.00334214, 0.0, 0.00443203},
+    {0.752508, 0.0, 0.160201},
+    {0.466137, 0.594656, 0.160201},
+    {-0.00334214, 0.0, 0.00443203},
+    {0.466137, -0.594656, 0.160201},
+    {0.752508, 0.0, 0.160201},
+    {-0.00334214, 0.0, 0.00443203},
+    {0.259722, -0.299638, 3.11175},
+    {-0.0645132, -0.373643, 3.11175},
+    {0.0207683, 0.0, 3.20912},
+    {-0.0645132, -0.373643, 3.11175},
+    {-0.324529, -0.166287, 3.11175},
+    {0.0207683, 0.0, 3.20912},
+    {-0.324529, -0.166287, 3.11175},
+    {-0.324529, 0.166287, 3.11175},
+    {0.0207683, 0.0, 3.20912},
+    {-0.324529, 0.166287, 3.11175},
+    {-0.0645132, 0.373642, 3.11175},
+    {0.0207683, 0.0, 3.20912},
+    {-0.0645132, 0.373642, 3.11175},
+    {0.259722, 0.299638, 3.11175},
+    {0.0207683, 0.0, 3.20912},
+    {0.259722, 0.299638, 3.11175},
+    {0.40402, 0.0, 3.11175},
+    {0.0207683, 0.0, 3.20912},
+    {0.40402, 0.0, 3.11175},
+    {0.259722, -0.299638, 3.11175},
+    {0.0207683, 0.0, 3.20912}
+};
+  
 
 //Disable the forcing int to true or false performance warning
 #pragma warning(disable: 4800)
@@ -18,6 +273,7 @@
 /* MaxEggPluginClassDesc - A class that describes 3DS Plugin support.
    This basically says "Yes, I am a helper object!"
 */
+
 class MaxEggPluginClassDesc : public ClassDesc 
 {
 public:
diff --git a/pandatool/src/maxegg/maxEgg.h b/pandatool/src/maxegg/maxEgg.h
index 64d9363372..b018fd7318 100755
--- a/pandatool/src/maxegg/maxEgg.h
+++ b/pandatool/src/maxegg/maxEgg.h
@@ -10,18 +10,66 @@
   Panda-converter class, and just sets up the interface and environment
   in which the MaxToEgg class can be "run" as if it were a standalone app.
 */
-#ifndef __MaxEggPlugin__H
-#define __MaxEggPlugin__H
+#ifndef __MaxEgg__H
+#define __MaxEgg__H
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <crtdbg.h>
+#include "errno.h"
+#include "Max.h"
+#include "eggGroup.h"
+#include "eggTable.h"
+#include "eggXfmSAnim.h"
+#include "eggData.h"
+#include "pandatoolbase.h"
+#include "referenceCount.h"
+#include "pointerTo.h"
+#include "namable.h"
+#include "modstack.h"
+
+#include <iostream>
+#include <fstream>
+#include <vector>
+
+#include "windef.h"
+#include "windows.h"
+
+#include "Max.h"
+#include "iparamb2.h"
+#include "iparamm2.h"
+#include "istdplug.h"
+#include "iskin.h"
+#include "maxResource.h"
+#include "stdmat.h"
+#include "phyexp.h"
+#include "surf_api.h"
+#include "bipexp.h"
+
+#include "eggCoordinateSystem.h"
+#include "eggGroup.h"
+#include "eggPolygon.h"
+#include "eggTextureCollection.h"
+#include "eggTexture.h"
+#include "eggVertex.h"
+#include "eggVertexPool.h"
+#include "eggNurbsCurve.h"
+#include "pandatoolbase.h"
+#include "somethingToEgg.h"
+#include "somethingToEggConverter.h"
+#include "eggXfmSAnim.h"
+#include "pathStore.h"
+
+#include "maxNodeDesc.h"
+#include "maxNodeTree.h"
+#include "maxOptionsDialog.h"
+#include "maxToEggConverter.h"
+
+#define MaxEggPlugin_CLASS_ID   Class_ID(0x7ac0d6b7, 0x55731ef6)
 
 #pragma conform(forScope, off)
 
-//Includes & Definitions
-
-/* Error-Reporting Includes
- */
-#define ME Logger::ST_MAP_ME_TO_APP_SPECIFIC_SYSTEM6
-#define MaxEggPlugin_CLASS_ID   Class_ID(0x7ac0d6b7, 0x55731ef6)
-
 /* Externed Globals
  */
 extern HINSTANCE hInstance;
@@ -115,260 +163,4 @@ class MaxEggPlugin : public HelperObject
 };
 
 
-
-const double meshVerts[252][3] = {
-          {0.729464, 0.714986, -0.919852},
-      {0.466137, 0.160201, -0.594656},
-      {-0.265897, 0.714986, -1.14704},
-      {0.466137, 0.160201, -0.594656},
-      {-0.177333, 0.160201, -0.741523},
-      {-0.265897, 0.714986, -1.14704},
-      {-0.265897, 0.714986, -1.14704},
-      {-0.177333, 0.160201, -0.741523},
-      {-1.06411, 0.714986, -0.510479},
-      {-0.177333, 0.160201, -0.741523},
-      {-0.693356, 0.160201, -0.330009},
-      {-1.06411, 0.714986, -0.510479},
-      {-1.06411, 0.714986, 0.510479},
-      {-1.06411, 0.714986, -0.510479},
-      {-0.693356, 0.160201, 0.330009},
-      {-0.693356, 0.160201, -0.330009},
-      {-0.693356, 0.160201, 0.330009},
-      {-1.06411, 0.714986, -0.510479},
-      {-0.265897, 0.714986, 1.14704},
-      {-1.06411, 0.714986, 0.510479},
-      {-0.177333, 0.160201, 0.741523},
-      {-0.693356, 0.160201, 0.330009},
-      {-0.177333, 0.160201, 0.741523},
-      {-1.06411, 0.714986, 0.510479},
-      {0.729464, 0.714986, 0.919852},
-      {-0.265897, 0.714986, 1.14704},
-      {0.466137, 0.160201, 0.594656},
-      {-0.177333, 0.160201, 0.741523},
-      {0.466137, 0.160201, 0.594656},
-      {-0.265897, 0.714986, 1.14704},
-      {1.17244, 0.714986, 0.0},
-      {0.729464, 0.714986, 0.919852},
-      {0.752508, 0.160201, 0.0},
-      {0.466137, 0.160201, 0.594656},
-      {0.752508, 0.160201, 0.0},
-      {0.729464, 0.714986, 0.919852},
-      {0.729464, 0.714986, -0.919852},
-      {1.17244, 0.714986, 0.0},
-      {0.466137, 0.160201, -0.594656},
-      {0.752508, 0.160201, 0.0},
-      {0.466137, 0.160201, -0.594656},
-      {1.17244, 0.714986, 0.0},
-      {-0.286334, 1.44995, -1.26822},
-      {0.814187, 1.44995, -1.01703},
-      {-0.265897, 0.714986, -1.14704},
-      {0.729464, 0.714986, -0.919852},
-      {-0.265897, 0.714986, -1.14704},
-      {0.814187, 1.44995, -1.01703},
-      {-1.16888, 1.44995, -0.564412},
-      {-0.286334, 1.44995, -1.26822},
-      {-1.06411, 0.714986, -0.510479},
-      {-0.265897, 0.714986, -1.14704},
-      {-1.06411, 0.714986, -0.510479},
-      {-0.286334, 1.44995, -1.26822},
-      {-1.16888, 1.44995, 0.564411},
-      {-1.16888, 1.44995, -0.564412},
-      {-1.06411, 0.714986, 0.510479},
-      {-1.06411, 0.714986, -0.510479},
-      {-1.06411, 0.714986, 0.510479},
-      {-1.16888, 1.44995, -0.564412},
-      {-1.16888, 1.44995, 0.564411},
-      {-1.06411, 0.714986, 0.510479},
-      {-0.286334, 1.44995, 1.26822},
-      {-1.06411, 0.714986, 0.510479},
-      {-0.265897, 0.714986, 1.14704},
-      {-0.286334, 1.44995, 1.26822},
-      {-0.286334, 1.44995, 1.26822},
-      {-0.265897, 0.714986, 1.14704},
-      {0.814187, 1.44995, 1.01703},
-      {-0.265897, 0.714986, 1.14704},
-      {0.729464, 0.714986, 0.919852},
-      {0.814187, 1.44995, 1.01703},
-      {1.30396, 1.44995, 0.0},
-      {0.814187, 1.44995, 1.01703},
-      {1.17244, 0.714986, 0.0},
-      {0.729464, 0.714986, 0.919852},
-      {1.17244, 0.714986, 0.0},
-      {0.814187, 1.44995, 1.01703},
-      {1.30396, 1.44995, 0.0},
-      {1.17244, 0.714986, 0.0},
-      {0.814187, 1.44995, -1.01703},
-      {1.17244, 0.714986, 0.0},
-      {0.729464, 0.714986, -0.919852},
-      {0.814187, 1.44995, -1.01703},
-      {-0.286334, 1.44995, -1.26822},
-      {-0.227573, 2.16723, -1.05763},
-      {0.814187, 1.44995, -1.01703},
-      {0.814187, 1.44995, -1.01703},
-      {-0.227573, 2.16723, -1.05763},
-      {0.690208, 2.16723, -0.848157},
-      {-1.16888, 1.44995, -0.564412},
-      {-0.963577, 2.16723, -0.470692},
-      {-0.286334, 1.44995, -1.26822},
-      {-0.286334, 1.44995, -1.26822},
-      {-0.963577, 2.16723, -0.470692},
-      {-0.227573, 2.16723, -1.05763},
-      {-1.16888, 1.44995, -0.564412},
-      {-1.16888, 1.44995, 0.564411},
-      {-0.963577, 2.16723, -0.470692},
-      {-1.16888, 1.44995, 0.564411},
-      {-0.963577, 2.16723, 0.470692},
-      {-0.963577, 2.16723, -0.470692},
-      {-1.16888, 1.44995, 0.564411},
-      {-0.286334, 1.44995, 1.26822},
-      {-0.963577, 2.16723, 0.470692},
-      {-0.286334, 1.44995, 1.26822},
-      {-0.227574, 2.16723, 1.05763},
-      {-0.963577, 2.16723, 0.470692},
-      {-0.286334, 1.44995, 1.26822},
-      {0.814187, 1.44995, 1.01703},
-      {-0.227574, 2.16723, 1.05763},
-      {0.814187, 1.44995, 1.01703},
-      {0.690208, 2.16723, 0.848157},
-      {-0.227574, 2.16723, 1.05763},
-      {0.814187, 1.44995, 1.01703},
-      {1.30396, 1.44995, 0.0},
-      {0.690208, 2.16723, 0.848157},
-      {1.30396, 1.44995, 0.0},
-      {1.09866, 2.16723, 0.0},
-      {0.690208, 2.16723, 0.848157},
-      {0.814187, 1.44995, -1.01703},
-      {0.690208, 2.16723, -0.848157},
-      {1.30396, 1.44995, 0.0},
-      {1.30396, 1.44995, 0.0},
-      {0.690208, 2.16723, -0.848157},
-      {1.09866, 2.16723, 0.0},
-      {-0.227573, 2.16723, -1.05763},
-      {-0.154893, 2.72566, -0.759032},
-      {0.690208, 2.16723, -0.848157},
-      {0.690208, 2.16723, -0.848157},
-      {-0.154893, 2.72566, -0.759032},
-      {0.50377, 2.72566, -0.608696},
-      {-0.963577, 2.16723, -0.470692},
-      {-0.683099, 2.72566, -0.337801},
-      {-0.227573, 2.16723, -1.05763},
-      {-0.227573, 2.16723, -1.05763},
-      {-0.683099, 2.72566, -0.337801},
-      {-0.154893, 2.72566, -0.759032},
-      {-0.963577, 2.16723, -0.470692},
-      {-0.963577, 2.16723, 0.470692},
-      {-0.683099, 2.72566, -0.337801},
-      {-0.963577, 2.16723, 0.470692},
-      {-0.683099, 2.72566, 0.337801},
-      {-0.683099, 2.72566, -0.337801},
-      {-0.963577, 2.16723, 0.470692},
-      {-0.227574, 2.16723, 1.05763},
-      {-0.683099, 2.72566, 0.337801},
-      {-0.227574, 2.16723, 1.05763},
-      {-0.154893, 2.72566, 0.759032},
-      {-0.683099, 2.72566, 0.337801},
-      {-0.227574, 2.16723, 1.05763},
-      {0.690208, 2.16723, 0.848157},
-      {-0.154893, 2.72566, 0.759032},
-      {0.690208, 2.16723, 0.848157},
-      {0.50377, 2.72566, 0.608696},
-      {-0.154893, 2.72566, 0.759032},
-      {0.690208, 2.16723, 0.848157},
-      {1.09866, 2.16723, 0.0},
-      {0.50377, 2.72566, 0.608696},
-      {1.09866, 2.16723, 0.0},
-      {0.796903, 2.72566, 0.0},
-      {0.50377, 2.72566, 0.608696},
-      {1.09866, 2.16723, 0.0},
-      {0.690208, 2.16723, -0.848157},
-      {0.796903, 2.72566, 0.0},
-      {0.690208, 2.16723, -0.848157},
-      {0.50377, 2.72566, -0.608696},
-      {0.796903, 2.72566, 0.0},
-      {0.50377, 2.72566, -0.608696},
-      {-0.154893, 2.72566, -0.759032},
-      {0.259722, 3.11175, -0.299638},
-      {-0.154893, 2.72566, -0.759032},
-      {-0.0645132, 3.11175, -0.373643},
-      {0.259722, 3.11175, -0.299638},
-      {-0.154893, 2.72566, -0.759032},
-      {-0.683099, 2.72566, -0.337801},
-      {-0.0645132, 3.11175, -0.373643},
-      {-0.683099, 2.72566, -0.337801},
-      {-0.324529, 3.11175, -0.166287},
-      {-0.0645132, 3.11175, -0.373643},
-      {-0.683099, 2.72566, -0.337801},
-      {-0.683099, 2.72566, 0.337801},
-      {-0.324529, 3.11175, -0.166287},
-      {-0.683099, 2.72566, 0.337801},
-      {-0.324529, 3.11175, 0.166287},
-      {-0.324529, 3.11175, -0.166287},
-      {-0.683099, 2.72566, 0.337801},
-      {-0.154893, 2.72566, 0.759032},
-      {-0.324529, 3.11175, 0.166287},
-      {-0.154893, 2.72566, 0.759032},
-      {-0.0645132, 3.11175, 0.373642},
-      {-0.324529, 3.11175, 0.166287},
-      {-0.154893, 2.72566, 0.759032},
-      {0.50377, 2.72566, 0.608696},
-      {-0.0645132, 3.11175, 0.373642},
-      {0.50377, 2.72566, 0.608696},
-      {0.259722, 3.11175, 0.299638},
-      {-0.0645132, 3.11175, 0.373642},
-      {0.50377, 2.72566, 0.608696},
-      {0.796903, 2.72566, 0.0},
-      {0.259722, 3.11175, 0.299638},
-      {0.796903, 2.72566, 0.0},
-      {0.40402, 3.11175, 0.0},
-      {0.259722, 3.11175, 0.299638},
-      {0.796903, 2.72566, 0.0},
-      {0.50377, 2.72566, -0.608696},
-      {0.40402, 3.11175, 0.0},
-      {0.50377, 2.72566, -0.608696},
-      {0.259722, 3.11175, -0.299638},
-      {0.40402, 3.11175, 0.0},
-      {-0.177333, 0.160201, -0.741523},
-      {0.466137, 0.160201, -0.594656},
-      {-0.00334214, 0.00443203, 0.0},
-      {-0.693356, 0.160201, -0.330009},
-      {-0.177333, 0.160201, -0.741523},
-      {-0.00334214, 0.00443203, 0.0},
-      {-0.693356, 0.160201, 0.330009},
-      {-0.693356, 0.160201, -0.330009},
-      {-0.00334214, 0.00443203, 0.0},
-      {-0.177333, 0.160201, 0.741523},
-      {-0.693356, 0.160201, 0.330009},
-      {-0.00334214, 0.00443203, 0.0},
-      {0.466137, 0.160201, 0.594656},
-      {-0.177333, 0.160201, 0.741523},
-      {-0.00334214, 0.00443203, 0.0},
-      {0.752508, 0.160201, 0.0},
-      {0.466137, 0.160201, 0.594656},
-      {-0.00334214, 0.00443203, 0.0},
-      {0.466137, 0.160201, -0.594656},
-      {0.752508, 0.160201, 0.0},
-      {-0.00334214, 0.00443203, 0.0},
-      {0.259722, 3.11175, -0.299638},
-      {-0.0645132, 3.11175, -0.373643},
-      {0.0207683, 3.20912, 0.0},
-      {-0.0645132, 3.11175, -0.373643},
-      {-0.324529, 3.11175, -0.166287},
-      {0.0207683, 3.20912, 0.0},
-      {-0.324529, 3.11175, -0.166287},
-      {-0.324529, 3.11175, 0.166287},
-      {0.0207683, 3.20912, 0.0},
-      {-0.324529, 3.11175, 0.166287},
-      {-0.0645132, 3.11175, 0.373642},
-      {0.0207683, 3.20912, 0.0},
-      {-0.0645132, 3.11175, 0.373642},
-      {0.259722, 3.11175, 0.299638},
-      {0.0207683, 3.20912, 0.0},
-      {0.259722, 3.11175, 0.299638},
-      {0.40402, 3.11175, 0.0},
-      {0.0207683, 3.20912, 0.0},
-      {0.40402, 3.11175, 0.0},
-      {0.259722, 3.11175, -0.299638},
-      {0.0207683, 3.20912, 0.0}
-  };
-  
-#endif // __MaxEggPlugin__H
+#endif // __MaxEgg__H
diff --git a/pandatool/src/maxegg/maxNodeDesc.cxx b/pandatool/src/maxegg/maxNodeDesc.cxx
index d52f624f44..01d1b61ce7 100755
--- a/pandatool/src/maxegg/maxNodeDesc.cxx
+++ b/pandatool/src/maxegg/maxNodeDesc.cxx
@@ -13,7 +13,7 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#define MTEC Logger::ST_MAP_ME_TO_APP_SPECIFIC_SYSTEM4
+#include "maxEgg.h"
 
 TypeHandle MaxNodeDesc::_type_handle;
 
diff --git a/pandatool/src/maxegg/maxNodeTree.cxx b/pandatool/src/maxegg/maxNodeTree.cxx
index e8500c1478..455b31b93d 100755
--- a/pandatool/src/maxegg/maxNodeTree.cxx
+++ b/pandatool/src/maxegg/maxNodeTree.cxx
@@ -13,7 +13,7 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-
+#include "maxEgg.h"
 
 ////////////////////////////////////////////////////////////////////
 //     Function: MaxNodeTree::Constructor
diff --git a/pandatool/src/maxegg/maxOptionsDialog.cxx b/pandatool/src/maxegg/maxOptionsDialog.cxx
index 1a54950ffc..46ad865bdc 100644
--- a/pandatool/src/maxegg/maxOptionsDialog.cxx
+++ b/pandatool/src/maxegg/maxOptionsDialog.cxx
@@ -7,10 +7,10 @@
   what to export from 3D Studio max
 */
 
+#include "maxEgg.h"
 
 //Disable the forcing int to true or false performance warning
 #pragma warning(disable: 4800)
-#include "pathStore.h"
 
 void SetICustEdit(HWND wnd, int nIDDlgItem, char *text)
 { 
diff --git a/pandatool/src/maxegg/maxToEggConverter.cxx b/pandatool/src/maxegg/maxToEggConverter.cxx
index a9c47babff..0e5852bc64 100755
--- a/pandatool/src/maxegg/maxToEggConverter.cxx
+++ b/pandatool/src/maxegg/maxToEggConverter.cxx
@@ -13,6 +13,7 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#include "maxEgg.h"
 
 ////////////////////////////////////////////////////////////////////
 //     Function: MaxToEggConverter::Constructor
diff --git a/pandatool/src/maxegg/maxegg_composite1.cxx b/pandatool/src/maxegg/maxegg_composite1.cxx
index d6647db551..553a2193af 100755
--- a/pandatool/src/maxegg/maxegg_composite1.cxx
+++ b/pandatool/src/maxegg/maxegg_composite1.cxx
@@ -1,55 +1,3 @@
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <crtdbg.h>
-#include "errno.h"
-#include "Max.h"
-#include "eggGroup.h"
-#include "eggTable.h"
-#include "eggXfmSAnim.h"
-#include "eggData.h"
-#include "pandatoolbase.h"
-#include "referenceCount.h"
-#include "pointerTo.h"
-#include "namable.h"
-#include "modstack.h"
-
-#include <iostream>
-#include <fstream>
-#include <vector>
-
-#include "windef.h"
-#include "windows.h"
-
-#include "Max.h"
-#include "iparamb2.h"
-#include "iparamm2.h"
-#include "istdplug.h"
-#include "iskin.h"
-#include "maxResource.h"
-#include "stdmat.h"
-#include "phyexp.h"
-#include "surf_api.h"
-#include "bipexp.h"
-
-#include "eggCoordinateSystem.h"
-#include "eggGroup.h"
-#include "eggPolygon.h"
-#include "eggTextureCollection.h"
-#include "eggTexture.h"
-#include "eggVertex.h"
-#include "eggVertexPool.h"
-#include "eggNurbsCurve.h"
-#include "pandatoolbase.h"
-#include "somethingToEgg.h"
-#include "somethingToEggConverter.h"
-#include "eggXfmSAnim.h"
-
-#include "maxNodeDesc.h"
-#include "maxNodeTree.h"
-#include "maxOptionsDialog.h"
-#include "maxToEggConverter.h"
-#include "maxEgg.h"
 
 #include "maxNodeDesc.cxx"
 #include "maxNodeTree.cxx"