diff --git a/world/client.cpp b/world/client.cpp
index 30e6b31c4..e153aa6c0 100644
--- a/world/client.cpp
+++ b/world/client.cpp
@@ -2,10 +2,24 @@
 #include "../common/EQPacket.h"
 #include "../common/EQStreamIntf.h"
 #include "../common/misc.h"
+#include "../common/rulesys.h"
+#include "../common/emu_opcodes.h"
+#include "../common/eq_packet_structs.h"
+#include "../common/packet_dump.h"
+#include "../common/EQStreamIntf.h"
+#include "../common/Item.h"
+#include "../common/races.h"
+#include "../common/classes.h"
+#include "../common/languages.h"
+#include "../common/skills.h"
+#include "../common/extprofile.h"
+#include "../common/StringUtil.h"
+#include "../common/clientversions.h"
+
 #include <iostream>
-using namespace std;
 #include <iomanip>
 using namespace std;
+
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -20,29 +34,19 @@ using namespace std;
 	#include <windows.h>
 	#include <winsock.h>
 #else
+	
+	#ifdef FREEBSD //Timothy Whitman - January 7, 2003
+		#include <sys/types.h>
+	#endif
+
 	#include <sys/socket.h>
-#ifdef FREEBSD //Timothy Whitman - January 7, 2003
-	#include <sys/types.h>
-#endif
 	#include <netinet/in.h>
 	#include <arpa/inet.h>
 	#include <unistd.h>
 #endif
 
-
 #include "client.h"
-#include "../common/emu_opcodes.h"
-#include "../common/eq_packet_structs.h"
-#include "../common/packet_dump.h"
-#include "../common/EQStreamIntf.h"
 #include "worlddb.h"
-#include "../common/Item.h"
-#include "../common/races.h"
-#include "../common/classes.h"
-#include "../common/languages.h"
-#include "../common/skills.h"
-#include "../common/extprofile.h"
-#include "../common/StringUtil.h"
 #include "WorldConfig.h"
 #include "LoginServer.h"
 #include "LoginServerList.h"
@@ -50,9 +54,8 @@ using namespace std;
 #include "zonelist.h"
 #include "clientlist.h"
 #include "wguild_mgr.h"
-#include "../common/rulesys.h"
 #include "SoFCharCreateData.h"
-#include "../common/clientversions.h"
+
 
 std::vector<RaceClassAllocation> character_create_allocations;
 std::vector<RaceClassCombos> character_create_race_class_combos;