diff --git a/pandatool/src/maxegg/maxDllEntry.cxx b/pandatool/src/maxegg/maxDllEntry.cxx
deleted file mode 100755
index d6649ff40f..0000000000
--- a/pandatool/src/maxegg/maxDllEntry.cxx
+++ /dev/null
@@ -1,78 +0,0 @@
-/**********************************************************************
- *<
-        FILE: DllEntry.cpp
-
-        DESCRIPTION: Contains the Dll Entry stuff
-
-        CREATED BY: 
-
-        HISTORY: 
-
- *>     Copyright (c) 2000, All Rights Reserved.
- **********************************************************************/
-
-
-extern ClassDesc* GetMaxEggPluginDesc();
-
-HINSTANCE hInstance;
-int controlsInit = FALSE;
-
-// This function is called by Windows when the DLL is loaded.  This 
-// function may also be called many times during time critical operations
-// like rendering.  Therefore developers need to be careful what they
-// do inside this function.  In the code below, note how after the DLL is
-// loaded the first time only a few statements are executed.
-
-BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
-{
-        hInstance = hinstDLL;                           // Hang on to this DLL's instance handle.
-
-        if (!controlsInit) {
-                controlsInit = TRUE;
-                InitCustomControls(hInstance);  // Initialize MAX's custom controls
-                InitCommonControls();                   // Initialize Win95 controls
-        }
-
-        return (TRUE);
-}
-
-// This function returns a string that describes the DLL and where the user
-// could purchase the DLL if they don't have it.
-__declspec( dllexport ) const TCHAR* LibDescription()
-{
-        return GetString(IDS_LIBDESCRIPTION);
-}
-
-// This function returns the number of plug-in classes this DLL operates on.
-//TODO: Must change this number when adding a new class
-__declspec( dllexport ) int LibNumberClasses()
-{
-        return 1;
-}
-
-// This function returns the descriptions of the plug-in classes this DLL operates on.
-__declspec( dllexport ) ClassDesc* LibClassDesc(int i)
-{
-        switch(i) {
-                case 0: return GetMaxEggPluginDesc();
-                default: return NULL;
-        }
-}
-
-// This function returns a pre-defined constant indicating the version of 
-// the system under which it was compiled.  It is used to allow the system
-// to catch obsolete DLLs.
-__declspec( dllexport ) ULONG LibVersion()
-{
-        return VERSION_3DSMAX;
-}
-
-TCHAR *GetString(int id)
-{
-        static TCHAR buf[256];
-
-        if (hInstance)
-                return LoadString(hInstance, id, buf, sizeof(buf)) ? buf : NULL;
-        return NULL;
-}
-
diff --git a/pandatool/src/maxegg/maxEgg.cxx b/pandatool/src/maxegg/maxEgg.cxx
index ea4db5f5f9..c1b911e9d0 100755
--- a/pandatool/src/maxegg/maxEgg.cxx
+++ b/pandatool/src/maxegg/maxEgg.cxx
@@ -503,3 +503,74 @@ IOResult MaxEggPlugin::Load(ILoad *iload) {
     
     return IO_OK;
 }
+
+/**********************************************************************
+ *
+ * DLL Initialization
+ *
+ **********************************************************************/
+
+extern ClassDesc* GetMaxEggPluginDesc();
+
+HINSTANCE hInstance;
+int controlsInit = FALSE;
+
+// This function is called by Windows when the DLL is loaded.  This 
+// function may also be called many times during time critical operations
+// like rendering.  Therefore developers need to be careful what they
+// do inside this function.  In the code below, note how after the DLL is
+// loaded the first time only a few statements are executed.
+
+BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
+{
+        hInstance = hinstDLL;                           // Hang on to this DLL's instance handle.
+
+        if (!controlsInit) {
+                controlsInit = TRUE;
+                InitCustomControls(hInstance);  // Initialize MAX's custom controls
+                InitCommonControls();                   // Initialize Win95 controls
+        }
+
+        return (TRUE);
+}
+
+// This function returns a string that describes the DLL and where the user
+// could purchase the DLL if they don't have it.
+__declspec( dllexport ) const TCHAR* LibDescription()
+{
+        return GetString(IDS_LIBDESCRIPTION);
+}
+
+// This function returns the number of plug-in classes this DLL operates on.
+//TODO: Must change this number when adding a new class
+__declspec( dllexport ) int LibNumberClasses()
+{
+        return 1;
+}
+
+// This function returns the descriptions of the plug-in classes this DLL operates on.
+__declspec( dllexport ) ClassDesc* LibClassDesc(int i)
+{
+        switch(i) {
+                case 0: return GetMaxEggPluginDesc();
+                default: return NULL;
+        }
+}
+
+// This function returns a pre-defined constant indicating the version of 
+// the system under which it was compiled.  It is used to allow the system
+// to catch obsolete DLLs.
+__declspec( dllexport ) ULONG LibVersion()
+{
+        return VERSION_3DSMAX;
+}
+
+TCHAR *GetString(int id)
+{
+        static TCHAR buf[256];
+
+        if (hInstance)
+                return LoadString(hInstance, id, buf, sizeof(buf)) ? buf : NULL;
+        return NULL;
+}
+
diff --git a/pandatool/src/maxegg/maxEggExpOptions.cxx b/pandatool/src/maxegg/maxOptionsDialog.cxx
old mode 100755
new mode 100644
similarity index 100%
rename from pandatool/src/maxegg/maxEggExpOptions.cxx
rename to pandatool/src/maxegg/maxOptionsDialog.cxx
diff --git a/pandatool/src/maxegg/maxEggExpOptions.h b/pandatool/src/maxegg/maxOptionsDialog.h
old mode 100755
new mode 100644
similarity index 100%
rename from pandatool/src/maxegg/maxEggExpOptions.h
rename to pandatool/src/maxegg/maxOptionsDialog.h
diff --git a/pandatool/src/maxegg/maxToEgg.cxx b/pandatool/src/maxegg/maxToEgg.cxx
deleted file mode 100755
index e69de29bb2..0000000000
diff --git a/pandatool/src/maxegg/maxToEgg.h b/pandatool/src/maxegg/maxToEgg.h
deleted file mode 100755
index e69de29bb2..0000000000
diff --git a/pandatool/src/maxegg/maxegg_composite1.cxx b/pandatool/src/maxegg/maxegg_composite1.cxx
index 43b18557fa..d6647db551 100755
--- a/pandatool/src/maxegg/maxegg_composite1.cxx
+++ b/pandatool/src/maxegg/maxegg_composite1.cxx
@@ -47,15 +47,12 @@
 
 #include "maxNodeDesc.h"
 #include "maxNodeTree.h"
-#include "maxToEgg.h"
-#include "maxEggExpOptions.h"
+#include "maxOptionsDialog.h"
 #include "maxToEggConverter.h"
 #include "maxEgg.h"
 
-#include "maxDllEntry.cxx"
-#include "maxEgg.cxx"
-#include "maxEggExpOptions.cxx"
 #include "maxNodeDesc.cxx"
 #include "maxNodeTree.cxx"
-#include "maxToEgg.cxx"
+#include "maxOptionsDialog.cxx"
 #include "maxToEggConverter.cxx"
+#include "maxEgg.cxx"