diff --git a/zone/net.cpp b/zone/net.cpp
index cca1eb59f..c42242801 100644
--- a/zone/net.cpp
+++ b/zone/net.cpp
@@ -18,34 +18,6 @@
 */
 #include "../common/debug.h"
 #include "../common/features.h"
-#include <iostream>
-using namespace std;
-#include <string>
-#include <stdlib.h>
-#include <stdio.h>
-#include <signal.h>
-#include <time.h>
-	#ifdef _CRTDBG_MAP_ALLOC
-		#undef new
-	#endif
-#include <fstream>
-	#ifdef _CRTDBG_MAP_ALLOC
-		#define new new(_NORMAL_BLOCK, __FILE__, __LINE__)
-	#endif
-using namespace std;
-#ifdef _WINDOWS
-#include <conio.h>
-#define snprintf	_snprintf
-#if (_MSC_VER < 1500)
-	#define vsnprintf	_vsnprintf
-#endif
-#define strncasecmp	_strnicmp
-#define strcasecmp	_stricmp
-#endif
-
-volatile bool RunLoops = true;
-extern volatile bool ZoneLoaded;
-
 #include "../common/queue.h"
 #include "../common/timer.h"
 #include "../common/EQStream.h"
@@ -54,7 +26,6 @@ extern volatile bool ZoneLoaded;
 #include "../common/Mutex.h"
 #include "../common/version.h"
 #include "../common/EQEMuError.h"
-#include "ZoneConfig.h"
 #include "../common/packet_dump_file.h"
 #include "../common/opcodemgr.h"
 #include "../common/guilds.h"
@@ -68,11 +39,12 @@ extern volatile bool ZoneLoaded;
 #include "../common/ipc_mutex.h"
 #include "../common/memory_mapped_file.h"
 #include "../common/eqemu_exception.h"
+#include "../common/spdat.h"
 
+#include "ZoneConfig.h"
 #include "masterentity.h"
 #include "worldserver.h"
 #include "net.h"
-#include "../common/spdat.h"
 #include "zone.h"
 #include "command.h"
 #include "parser.h"
@@ -85,6 +57,48 @@ extern volatile bool ZoneLoaded;
 #include "tasks.h"
 #include "QuestParserCollection.h"
 
+#include <iostream>
+#include <string>
+#include <fstream>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+
+#ifdef _CRTDBG_MAP_ALLOC
+	#undef new
+#endif
+	
+#ifdef _CRTDBG_MAP_ALLOC
+	#define new new(_NORMAL_BLOCK, __FILE__, __LINE__)
+#endif
+	
+#ifdef _WINDOWS
+    #include <conio.h>
+    
+    #if (_MSC_VER < 1500)
+        #define vsnprintf	_vsnprintf
+    #endif
+    
+    #define snprintf	_snprintf
+    #define strncasecmp	_strnicmp
+    #define strcasecmp	_stricmp
+#endif
+
+#ifdef _WINDOWS
+    #include <process.h>
+#else
+    #include <pthread.h>
+    #include "../common/unix.h"
+#endif
+
+volatile bool RunLoops = true;
+extern volatile bool ZoneLoaded;
+
+
+
+
 TimeoutManager timeout_manager;
 NetConnection net;
 EntityList entity_list;
@@ -105,12 +119,7 @@ const SPDat_Spell_Struct* spells;
 void LoadSpells(EQEmu::MemoryMappedFile **mmf);
 int32 SPDAT_RECORDS = -1;
 
-#ifdef _WINDOWS
-#include <process.h>
-#else
-#include <pthread.h>
-#include "../common/unix.h"
-#endif
+
 
 void Shutdown();
 extern void MapOpcodes();