--- Daodan/src/Daodan.c	2013/03/06 18:33:15	690
+++ Daodan/src/Daodan.c	2013/03/07 17:26:13	692
@@ -1,3 +1,4 @@
+#include <windows.h>
 #include <string.h>
 
 #include "Daodan.h"
@@ -11,14 +12,11 @@
 #include "Daodan_WindowHack.h"
 
 #include "Oni.h"
-#include "Oni_Persistence.h"
 
-#include "BFW_Utility.h"
+#include "Oni_GL.h"
+#include "Daodan_GL.h"
 
-#include "oni_gl.h"
-#include "daodan_gl.h"
-
-#include "inifile.h"
+#include "Inifile_Reader.h"
 
 HMODULE DDrDLLModule;
 HMODULE DDrONiModule;
@@ -328,8 +326,6 @@ bool DDrIniCallback(char* section, bool
 				opt_sound = !_stricmp(inifile_cleanstr(value), "true");
 			else if (!_stricmp(name, "switch"))
 				M3gResolutionSwitch = !_stricmp(inifile_cleanstr(value), "true");
-			//else if (!_stricmp(name, "devmode"))
-				//turn_dev_mode_on = !_stricmp(inifile_cleanstr(value), "true");
 			else
 				DDrStartupMessage("unrecognised option \"%s\"", name);
 			break;
@@ -680,9 +676,7 @@ void __cdecl DDrMain(int argc, char* arg
 		DDrPatch_MakeJump((void*)(OniExe + 0x0010f021), (void*)DDrCheater_LevelLoad);
 	}
 
-	//DDrPatch_MakeJump((void*)(OniExe + 0x000378c0, (void*)DDrException);
 	DDrPatch_MakeJump((void*)(OniExe + 0x000245A0), (void*)DDrPrintWarning);
-	//init_daodan_gl();
 	
  	ONiMain(argc, argv);
 }