Standardize header order

Also remove some extra new lines and fix eAthena's PartyTab define guards.

46 files changed, 190 insertions, 184 deletions

diff --git a/src/net/download.cpp b/src/net/download.cpp
index ecc36a0c..9a1dcdd1 100644
--- a/src/net/download.cpp
+++ b/src/net/download.cpp
@@ -24,10 +24,11 @@
 #include "log.h"
 #include "main.h"
 
+#include <curl/curl.h>
+
 #include <SDL.h>
 #include <SDL_thread.h>
 
-#include <curl/curl.h>
 #include <zlib.h>
 
 const char *DOWNLOAD_ERROR_MESSAGE_THREAD = "Could not create download thread!";
diff --git a/src/net/download.h b/src/net/download.h
index 1e1f806f..3bea2276 100644
--- a/src/net/download.h
+++ b/src/net/download.h
@@ -20,6 +20,7 @@
  */
 
 #include <SDL_types.h>
+
 #include <stdio.h>
 #include <string>
 
diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp
index a58154f6..72068f6b 100644
--- a/src/net/ea/adminhandler.cpp
+++ b/src/net/ea/adminhandler.cpp
@@ -21,11 +21,6 @@
 
 #include "net/ea/adminhandler.h"
 
-#include "net/chathandler.h"
-#include "net/net.h"
-
-#include "net/ea/protocol.h"
-
 #include "being.h"
 #include "beingmanager.h"
 #include "game.h"
@@ -33,6 +28,11 @@
 
 #include "gui/widgets/chattab.h"
 
+#include "net/chathandler.h"
+#include "net/net.h"
+
+#include "net/ea/protocol.h"
+
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 6c943454..932f88d9 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -21,8 +21,6 @@
 
 #include "net/ea/beinghandler.h"
 
-#include "net/ea/protocol.h"
-
 #include "being.h"
 #include "beingmanager.h"
 #include "effectmanager.h"
@@ -34,6 +32,8 @@
 
 #include "gui/partywindow.h"
 
+#include "net/ea/protocol.h"
+
 #include "resources/colordb.h"
 
 #include <iostream>
diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp
index 8dba566d..32908dee 100644
--- a/src/net/ea/buysellhandler.cpp
+++ b/src/net/ea/buysellhandler.cpp
@@ -21,10 +21,6 @@
 
 #include "net/ea/buysellhandler.h"
 
-#include "net/ea/protocol.h"
-
-#include "net/messagein.h"
-
 #include "beingmanager.h"
 #include "inventory.h"
 #include "item.h"
@@ -37,6 +33,10 @@
 
 #include "gui/widgets/chattab.h"
 
+#include "net/messagein.h"
+
+#include "net/ea/protocol.h"
+
 #include "utils/gettext.h"
 
 namespace EAthena {
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index cda839bb..b671db23 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -21,15 +21,6 @@
 
 #include "net/ea/charserverhandler.h"
 
-#include "net/ea/loginhandler.h"
-#include "net/ea/network.h"
-#include "net/ea/protocol.h"
-
-#include "net/logindata.h"
-#include "net/messagein.h"
-#include "net/messageout.h"
-#include "net/net.h"
-
 #include "game.h"
 #include "log.h"
 #include "main.h"
@@ -37,6 +28,15 @@
 #include "gui/charcreatedialog.h"
 #include "gui/okdialog.h"
 
+#include "net/logindata.h"
+#include "net/messagein.h"
+#include "net/messageout.h"
+#include "net/net.h"
+
+#include "net/ea/loginhandler.h"
+#include "net/ea/network.h"
+#include "net/ea/protocol.h"
+
 #include "resources/colordb.h"
 
 #include "utils/gettext.h"
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index dd4d18a1..9fb124c5 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -21,11 +21,6 @@
 
 #include "net/ea/chathandler.h"
 
-#include "net/ea/protocol.h"
-
-#include "net/messagein.h"
-#include "net/messageout.h"
-
 #include "being.h"
 #include "beingmanager.h"
 #include "game.h"
@@ -34,6 +29,11 @@
 
 #include "gui/widgets/chattab.h"
 
+#include "net/messagein.h"
+#include "net/messageout.h"
+
+#include "net/ea/protocol.h"
+
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp
index 41c86d4d..4c732070 100644
--- a/src/net/ea/gamehandler.cpp
+++ b/src/net/ea/gamehandler.cpp
@@ -21,13 +21,6 @@
 
 #include "net/ea/gamehandler.h"
 
-#include "net/ea/loginhandler.h"
-#include "net/ea/network.h"
-#include "net/ea/protocol.h"
-
-#include "net/messagein.h"
-#include "net/messageout.h"
-
 #include "game.h"
 #include "localplayer.h"
 #include "log.h"
@@ -37,6 +30,13 @@
 
 #include "gui/okdialog.h"
 
+#include "net/messagein.h"
+#include "net/messageout.h"
+
+#include "net/ea/loginhandler.h"
+#include "net/ea/network.h"
+#include "net/ea/protocol.h"
+
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
diff --git a/src/net/ea/generalhandler.cpp b/src/net/ea/generalhandler.cpp
index 5c7c5036..677b2aa5 100644
--- a/src/net/ea/generalhandler.cpp
+++ b/src/net/ea/generalhandler.cpp
@@ -21,15 +21,16 @@
 
 #include "net/ea/generalhandler.h"
 
+#include "configuration.h"
+#include "log.h"
+#include "main.h"
+
 #include "gui/charselectdialog.h"
 #include "gui/inventorywindow.h"
 #include "gui/register.h"
 #include "gui/skilldialog.h"
 #include "gui/statuswindow.h"
 
-#include "net/ea/network.h"
-#include "net/ea/protocol.h"
-
 #include "net/ea/adminhandler.h"
 #include "net/ea/beinghandler.h"
 #include "net/ea/buysellhandler.h"
@@ -39,9 +40,11 @@
 #include "net/ea/inventoryhandler.h"
 #include "net/ea/itemhandler.h"
 #include "net/ea/loginhandler.h"
+#include "net/ea/network.h"
 #include "net/ea/npchandler.h"
-#include "net/ea/playerhandler.h"
 #include "net/ea/partyhandler.h"
+#include "net/ea/playerhandler.h"
+#include "net/ea/protocol.h"
 #include "net/ea/tradehandler.h"
 #include "net/ea/specialhandler.h"
 
@@ -52,10 +55,6 @@
 
 #include "resources/itemdb.h"
 
-#include "configuration.h"
-#include "log.h"
-#include "main.h"
-
 #include "utils/gettext.h"
 
 #include <assert.h>
diff --git a/src/net/ea/gui/partytab.h b/src/net/ea/gui/partytab.h
index 9ef481e2..afbc8fd9 100644
--- a/src/net/ea/gui/partytab.h
+++ b/src/net/ea/gui/partytab.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef CHANNELTAB_H
-#define CHANNELTAB_H
+#ifndef EA_PARTYTAB_H
+#define EA_PARTYTAB_H
 
 #include "gui/widgets/chattab.h"
 
@@ -45,4 +45,4 @@ class PartyTab : public ChatTab
 
 extern PartyTab *partyTab;
 
-#endif // CHANNELTAB_H
+#endif // EA_PARTYTAB_H
diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp
index c61e88ac..d96aef0d 100644
--- a/src/net/ea/guildhandler.cpp
+++ b/src/net/ea/guildhandler.cpp
@@ -21,12 +21,12 @@
 
 #include "net/ea/guildhandler.h"
 
-#include "net/ea/messagein.h"
-#include "net/ea/protocol.h"
-
 #include "localplayer.h"
 #include "log.h"
 
+#include "net/ea/messagein.h"
+#include "net/ea/protocol.h"
+
 extern Net::GuildHandler *guildHandler;
 
 namespace EAthena {
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index c7080c2d..34f3f6d7 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -21,11 +21,6 @@
 
 #include "net/ea/inventoryhandler.h"
 
-#include "net/ea/protocol.h"
-
-#include "net/messagein.h"
-#include "net/messageout.h"
-
 #include "configuration.h"
 #include "equipment.h"
 #include "inventory.h"
@@ -38,6 +33,11 @@
 
 #include "gui/widgets/chattab.h"
 
+#include "net/messagein.h"
+#include "net/messageout.h"
+
+#include "net/ea/protocol.h"
+
 #include "resources/iteminfo.h"
 
 #include "utils/gettext.h"
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index 65f48f6a..15bdfb76 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -22,15 +22,15 @@
 #ifndef NET_EA_INVENTORYHANDLER_H
 #define NET_EA_INVENTORYHANDLER_H
 
+#include "equipment.h"
+#include "inventory.h"
+#include "localplayer.h"
+
 #include "net/inventoryhandler.h"
 #include "net/net.h"
 
 #include "net/ea/messagehandler.h"
 
-#include "equipment.h"
-#include "inventory.h"
-#include "localplayer.h"
-
 namespace EAthena {
 
 class EquipBackend : public Equipment::Backend {
diff --git a/src/net/ea/itemhandler.cpp b/src/net/ea/itemhandler.cpp
index f926f8e8..2f65c064 100644
--- a/src/net/ea/itemhandler.cpp
+++ b/src/net/ea/itemhandler.cpp
@@ -21,12 +21,12 @@
 
 #include "net/ea/itemhandler.h"
 
-#include "net/ea/protocol.h"
+#include "engine.h"
+#include "flooritemmanager.h"
 
 #include "net/messagein.h"
 
-#include "engine.h"
-#include "flooritemmanager.h"
+#include "net/ea/protocol.h"
 
 namespace EAthena {
 
diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp
index 07caa325..94a8ca6d 100644
--- a/src/net/ea/loginhandler.cpp
+++ b/src/net/ea/loginhandler.cpp
@@ -21,15 +21,15 @@
 
 #include "net/ea/loginhandler.h"
 
-#include "net/ea/network.h"
-#include "net/ea/protocol.h"
+#include "log.h"
+#include "main.h"
 
 #include "net/logindata.h"
 #include "net/messagein.h"
 #include "net/messageout.h"
 
-#include "log.h"
-#include "main.h"
+#include "net/ea/network.h"
+#include "net/ea/protocol.h"
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
diff --git a/src/net/ea/network.cpp b/src/net/ea/network.cpp
index a93d6cfd..d00006b0 100644
--- a/src/net/ea/network.cpp
+++ b/src/net/ea/network.cpp
@@ -21,16 +21,16 @@
 
 #include "net/ea/network.h"
 
-#include "net/ea/protocol.h"
+#include "log.h"
 
 #include "net/messagehandler.h"
 #include "net/messagein.h"
 
+#include "net/ea/protocol.h"
+
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
-#include "log.h"
-
 #include <assert.h>
 #include <sstream>
 
diff --git a/src/net/ea/npchandler.cpp b/src/net/ea/npchandler.cpp
index 5800504c..40e9daf8 100644
--- a/src/net/ea/npchandler.cpp
+++ b/src/net/ea/npchandler.cpp
@@ -21,18 +21,18 @@
 
 #include "net/ea/npchandler.h"
 
-#include "net/ea/protocol.h"
+#include "beingmanager.h"
+#include "localplayer.h"
+#include "npc.h"
+
+#include "gui/npcdialog.h"
 
 #include "net/messagein.h"
 #include "net/messageout.h"
 #include "net/net.h"
 #include "net/npchandler.h"
 
-#include "beingmanager.h"
-#include "localplayer.h"
-#include "npc.h"
-
-#include "gui/npcdialog.h"
+#include "net/ea/protocol.h"
 
 #include <SDL_types.h>
 
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index af842c11..bd69fa05 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -32,6 +32,7 @@
 #include "net/messageout.h"
 
 #include "net/ea/protocol.h"
+
 #include "net/ea/gui/partytab.h"
 
 #include "utils/gettext.h"
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 14907300..d7b8594e 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -21,11 +21,6 @@
 
 #include "net/ea/playerhandler.h"
 
-#include "net/ea/protocol.h"
-
-#include "net/messagein.h"
-#include "net/messageout.h"
-
 #include "engine.h"
 #include "localplayer.h"
 #include "log.h"
@@ -43,6 +38,11 @@
 
 #include "gui/widgets/chattab.h"
 
+#include "net/messagein.h"
+#include "net/messageout.h"
+
+#include "net/ea/protocol.h"
+
 #include "utils/stringutils.h"
 #include "utils/gettext.h"
 
diff --git a/src/net/ea/specialhandler.cpp b/src/net/ea/specialhandler.cpp
index b9335553..0ac2f106 100644
--- a/src/net/ea/specialhandler.cpp
+++ b/src/net/ea/specialhandler.cpp
@@ -21,11 +21,6 @@
 
 #include "net/ea/specialhandler.h"
 
-#include "net/ea/protocol.h"
-
-#include "net/messagein.h"
-#include "net/messageout.h"
-
 #include "localplayer.h"
 #include "log.h"
 
@@ -33,6 +28,11 @@
 
 #include "gui/widgets/chattab.h"
 
+#include "net/messagein.h"
+#include "net/messageout.h"
+
+#include "net/ea/protocol.h"
+
 #include "utils/gettext.h"
 
 /** job dependend identifiers (?)  */
diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp
index b02bb900..80600dc7 100644
--- a/src/net/ea/tradehandler.cpp
+++ b/src/net/ea/tradehandler.cpp
@@ -21,12 +21,6 @@
 
 #include "net/ea/tradehandler.h"
 
-#include "net/ea/protocol.h"
-
-#include "net/inventoryhandler.h"
-#include "net/messagein.h"
-#include "net/messageout.h"
-
 #include "inventory.h"
 #include "item.h"
 #include "localplayer.h"
@@ -37,6 +31,12 @@
 
 #include "gui/widgets/chattab.h"
 
+#include "net/inventoryhandler.h"
+#include "net/messagein.h"
+#include "net/messageout.h"
+
+#include "net/ea/protocol.h"
+
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
diff --git a/src/net/logindata.h b/src/net/logindata.h
index 8df06171..a09d8fb3 100644
--- a/src/net/logindata.h
+++ b/src/net/logindata.h
@@ -22,11 +22,12 @@
 #ifndef LOGINDATA_H
 #define LOGINDATA_H
 
-#include <string>
-
 #include "player.h"
+
 #include "net/serverinfo.h"
 
+#include <string>
+
 struct LoginData
 {
     std::string username;
diff --git a/src/net/manaserv/beinghandler.cpp b/src/net/manaserv/beinghandler.cpp
index d7cb40c0..585f0823 100644
--- a/src/net/manaserv/beinghandler.cpp
+++ b/src/net/manaserv/beinghandler.cpp
@@ -21,11 +21,6 @@
 
 #include "net/manaserv/beinghandler.h"
 
-#include "net/manaserv/playerhandler.h"
-#include "net/manaserv/protocol.h"
-
-#include "net/messagein.h"
-
 #include "being.h"
 #include "beingmanager.h"
 #include "game.h"
@@ -38,6 +33,11 @@
 
 #include "gui/okdialog.h"
 
+#include "net/messagein.h"
+
+#include "net/manaserv/playerhandler.h"
+#include "net/manaserv/protocol.h"
+
 #include "resources/colordb.h"
 
 #include "utils/gettext.h"
diff --git a/src/net/manaserv/buysellhandler.cpp b/src/net/manaserv/buysellhandler.cpp
index 9f3e65ad..9c8cb129 100644
--- a/src/net/manaserv/buysellhandler.cpp
+++ b/src/net/manaserv/buysellhandler.cpp
@@ -21,15 +21,15 @@
 
 #include "net/manaserv/buysellhandler.h"
 
-#include "net/manaserv/protocol.h"
-
-#include "net/messagein.h"
-
 #include "beingmanager.h"
 #include "item.h"
 #include "localplayer.h"
 #include "npc.h"
 
+#include "net/messagein.h"
+
+#include "net/manaserv/protocol.h"
+
 #include "gui/buy.h"
 #include "gui/chat.h"
 #include "gui/sell.h"
diff --git a/src/net/manaserv/charhandler.cpp b/src/net/manaserv/charhandler.cpp
index ee32c5ae..06c81c9e 100644
--- a/src/net/manaserv/charhandler.cpp
+++ b/src/net/manaserv/charhandler.cpp
@@ -21,16 +21,6 @@
 
 #include "net/manaserv/charhandler.h"
 
-#include "net/manaserv/connection.h"
-#include "net/manaserv/gamehandler.h"
-#include "net/manaserv/messagein.h"
-#include "net/manaserv/messageout.h"
-#include "net/manaserv/protocol.h"
-
-#include "net/logindata.h"
-#include "net/loginhandler.h"
-#include "net/net.h"
-
 #include "game.h"
 #include "localplayer.h"
 #include "log.h"
@@ -39,6 +29,16 @@
 #include "gui/charcreatedialog.h"
 #include "gui/okdialog.h"
 
+#include "net/logindata.h"
+#include "net/loginhandler.h"
+#include "net/net.h"
+
+#include "net/manaserv/connection.h"
+#include "net/manaserv/gamehandler.h"
+#include "net/manaserv/messagein.h"
+#include "net/manaserv/messageout.h"
+#include "net/manaserv/protocol.h"
+
 #include "resources/colordb.h"
 
 #include "utils/gettext.h"
diff --git a/src/net/manaserv/charhandler.h b/src/net/manaserv/charhandler.h
index 6131412b..fca2b30a 100644
--- a/src/net/manaserv/charhandler.h
+++ b/src/net/manaserv/charhandler.h
@@ -22,10 +22,10 @@
 #ifndef NET_MANASERV_CHARSERVERHANDLER_H
 #define NET_MANASERV_CHARSERVERHANDLER_H
 
-#include "net/charhandler.h"
-
 #include "gui/charselectdialog.h"
 
+#include "net/charhandler.h"
+
 #include "net/manaserv/messagehandler.h"
 
 class LoginData;
diff --git a/src/net/manaserv/chathandler.cpp b/src/net/manaserv/chathandler.cpp
index 36e57278..70e148b1 100644
--- a/src/net/manaserv/chathandler.cpp
+++ b/src/net/manaserv/chathandler.cpp
@@ -21,11 +21,6 @@
 
 #include "net/manaserv/chathandler.h"
 
-#include "net/manaserv/connection.h"
-#include "net/manaserv/messagein.h"
-#include "net/manaserv/messageout.h"
-#include "net/manaserv/protocol.h"
-
 #include "being.h"
 #include "beingmanager.h"
 #include "channel.h"
@@ -33,10 +28,16 @@
 #include "game.h"
 #include "main.h"
 
-#include "gui/widgets/channeltab.h"
 #include "gui/chat.h"
 #include "gui/guildwindow.h"
 
+#include "gui/widgets/channeltab.h"
+
+#include "net/manaserv/connection.h"
+#include "net/manaserv/messagein.h"
+#include "net/manaserv/messageout.h"
+#include "net/manaserv/protocol.h"
+
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
diff --git a/src/net/manaserv/connection.cpp b/src/net/manaserv/connection.cpp
index 6ddcf186..af2816fb 100644
--- a/src/net/manaserv/connection.cpp
+++ b/src/net/manaserv/connection.cpp
@@ -21,11 +21,11 @@
 
 #include "net/manaserv/connection.h"
 
+#include "log.h"
+
 #include "net/manaserv/internal.h"
 #include "net/manaserv/messageout.h"
 
-#include "log.h"
-
 #include <string>
 
 namespace ManaServ
diff --git a/src/net/manaserv/connection.h b/src/net/manaserv/connection.h
index e5db8c8e..daab8b69 100644
--- a/src/net/manaserv/connection.h
+++ b/src/net/manaserv/connection.h
@@ -22,10 +22,10 @@
 #ifndef NET_MANASERV_CONNECTION_H
 #define NET_MANASERV_CONNECTION_H
 
-#include <iosfwd>
-
 #include <enet/enet.h>
 
+#include <iosfwd>
+
 namespace ManaServ
 {
     class MessageOut;
diff --git a/src/net/manaserv/effecthandler.cpp b/src/net/manaserv/effecthandler.cpp
index 39bc9cba..ca484b30 100644
--- a/src/net/manaserv/effecthandler.cpp
+++ b/src/net/manaserv/effecthandler.cpp
@@ -21,14 +21,14 @@
 
 #include "net/manaserv/effecthandler.h"
 
-#include "net/manaserv/protocol.h"
-
-#include "net/messagein.h"
-
 #include "beingmanager.h"
 #include "effectmanager.h"
 #include "log.h"
 
+#include "net/messagein.h"
+
+#include "net/manaserv/protocol.h"
+
 namespace ManaServ {
 
 EffectHandler::EffectHandler()
diff --git a/src/net/manaserv/gamehandler.cpp b/src/net/manaserv/gamehandler.cpp
index 700d2d6c..2e310cc7 100644
--- a/src/net/manaserv/gamehandler.cpp
+++ b/src/net/manaserv/gamehandler.cpp
@@ -21,14 +21,14 @@
 
 #include "net/manaserv/gamehandler.h"
 
+#include "localplayer.h"
+#include "main.h"
+
 #include "net/manaserv/chathandler.h"
 #include "net/manaserv/connection.h"
 #include "net/manaserv/messageout.h"
 #include "net/manaserv/protocol.h"
 
-#include "localplayer.h"
-#include "main.h"
-
 extern Net::GameHandler *gameHandler;
 
 extern ManaServ::ChatHandler *chatHandler;
diff --git a/src/net/manaserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp
index 96a6750d..79eb59ef 100644
--- a/src/net/manaserv/generalhandler.cpp
+++ b/src/net/manaserv/generalhandler.cpp
@@ -21,6 +21,8 @@
 
 #include "net/manaserv/generalhandler.h"
 
+#include "main.h"
+
 #include "gui/changeemaildialog.h"
 #include "gui/charselectdialog.h"
 #include "gui/inventorywindow.h"
@@ -30,19 +32,18 @@
 #include "gui/specialswindow.h"
 #include "gui/statuswindow.h"
 
-#include "net/manaserv/network.h"
-#include "net/manaserv/connection.h"
-
 #include "net/manaserv/beinghandler.h"
 #include "net/manaserv/buysellhandler.h"
 #include "net/manaserv/charhandler.h"
 #include "net/manaserv/chathandler.h"
+#include "net/manaserv/connection.h"
 #include "net/manaserv/effecthandler.h"
 #include "net/manaserv/gamehandler.h"
 #include "net/manaserv/guildhandler.h"
 #include "net/manaserv/inventoryhandler.h"
 #include "net/manaserv/itemhandler.h"
 #include "net/manaserv/loginhandler.h"
+#include "net/manaserv/network.h"
 #include "net/manaserv/npchandler.h"
 #include "net/manaserv/partyhandler.h"
 #include "net/manaserv/playerhandler.h"
@@ -51,8 +52,6 @@
 
 #include "utils/gettext.h"
 
-#include "main.h"
-
 #include <list>
 
 extern Net::GeneralHandler *generalHandler;
diff --git a/src/net/manaserv/guildhandler.cpp b/src/net/manaserv/guildhandler.cpp
index 79f76320..c2160332 100644
--- a/src/net/manaserv/guildhandler.cpp
+++ b/src/net/manaserv/guildhandler.cpp
@@ -21,13 +21,6 @@
 
 #include "net/manaserv/guildhandler.h"
 
-#include "net/messagein.h"
-
-#include "net/manaserv/connection.h"
-#include "net/manaserv/messagein.h"
-#include "net/manaserv/messageout.h"
-#include "net/manaserv/protocol.h"
-
 #include "gui/widgets/channeltab.h"
 #include "gui/chat.h"
 #include "gui/guildwindow.h"
@@ -38,6 +31,13 @@
 #include "channel.h"
 #include "channelmanager.h"
 
+#include "net/messagein.h"
+
+#include "net/manaserv/connection.h"
+#include "net/manaserv/messagein.h"
+#include "net/manaserv/messageout.h"
+#include "net/manaserv/protocol.h"
+
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
diff --git a/src/net/manaserv/inventoryhandler.cpp b/src/net/manaserv/inventoryhandler.cpp
index f62da41c..163ff305 100644
--- a/src/net/manaserv/inventoryhandler.cpp
+++ b/src/net/manaserv/inventoryhandler.cpp
@@ -21,11 +21,6 @@
 
 #include "net/manaserv/inventoryhandler.h"
 
-#include "net/manaserv/connection.h"
-#include "net/manaserv/messagein.h"
-#include "net/manaserv/messageout.h"
-#include "net/manaserv/protocol.h"
-
 #include "equipment.h"
 #include "inventory.h"
 #include "item.h"
@@ -34,6 +29,11 @@
 
 #include "gui/chat.h"
 
+#include "net/manaserv/connection.h"
+#include "net/manaserv/messagein.h"
+#include "net/manaserv/messageout.h"
+#include "net/manaserv/protocol.h"
+
 #include "resources/iteminfo.h"
 
 #include "log.h" // <<< REMOVE ME!
diff --git a/src/net/manaserv/inventoryhandler.h b/src/net/manaserv/inventoryhandler.h
index fd28738c..65b51e3b 100644
--- a/src/net/manaserv/inventoryhandler.h
+++ b/src/net/manaserv/inventoryhandler.h
@@ -22,12 +22,12 @@
 #ifndef NET_MANASERV_INVENTORYHANDLER_H
 #define NET_MANASERV_INVENTORYHANDLER_H
 
+#include "equipment.h"
+
 #include "net/inventoryhandler.h"
 
 #include "net/manaserv/messagehandler.h"
 
-#include "equipment.h"
-
 namespace ManaServ {
 
 class EquipBackend : public Equipment::Backend {
diff --git a/src/net/manaserv/itemhandler.cpp b/src/net/manaserv/itemhandler.cpp
index c63eb5bd..3d89487c 100644
--- a/src/net/manaserv/itemhandler.cpp
+++ b/src/net/manaserv/itemhandler.cpp
@@ -21,13 +21,13 @@
 
 #include "net/manaserv/itemhandler.h"
 
+#include "engine.h"
+#include "flooritemmanager.h"
+
 #include "net/manaserv/protocol.h"
 
 #include "net/manaserv/messagein.h"
 
-#include "engine.h"
-#include "flooritemmanager.h"
-
 namespace ManaServ {
 
 ItemHandler::ItemHandler()
diff --git a/src/net/manaserv/loginhandler.cpp b/src/net/manaserv/loginhandler.cpp
index 91d9171b..704d600b 100644
--- a/src/net/manaserv/loginhandler.cpp
+++ b/src/net/manaserv/loginhandler.cpp
@@ -21,15 +21,15 @@
 
 #include "net/manaserv/loginhandler.h"
 
+#include "main.h"
+
+#include "net/logindata.h"
+
 #include "net/manaserv/connection.h"
 #include "net/manaserv/messagein.h"
 #include "net/manaserv/messageout.h"
 #include "net/manaserv/protocol.h"
 
-#include "net/logindata.h"
-
-#include "main.h"
-
 #include "utils/gettext.h"
 #include "utils/sha256.h"
 
diff --git a/src/net/manaserv/network.cpp b/src/net/manaserv/network.cpp
index 83d78e06..5bf411cb 100644
--- a/src/net/manaserv/network.cpp
+++ b/src/net/manaserv/network.cpp
@@ -21,13 +21,13 @@
 
 #include "net/manaserv/network.h"
 
+#include "log.h"
+
 #include "net/manaserv/connection.h"
 #include "net/manaserv/internal.h"
 #include "net/manaserv/messagehandler.h"
 #include "net/manaserv/messagein.h"
 
-#include "log.h"
-
 #include <enet/enet.h>
 
 #include <map>
diff --git a/src/net/manaserv/npchandler.cpp b/src/net/manaserv/npchandler.cpp
index 9856daeb..5d9b62de 100644
--- a/src/net/manaserv/npchandler.cpp
+++ b/src/net/manaserv/npchandler.cpp
@@ -21,16 +21,16 @@
 
 #include "net/manaserv/npchandler.h"
 
-#include "net/manaserv/connection.h"
-#include "net/manaserv/messagein.h"
-#include "net/manaserv/messageout.h"
-#include "net/manaserv/protocol.h"
-
 #include "beingmanager.h"
 #include "npc.h"
 
-#include "gui/npcpostdialog.h"
 #include "gui/npcdialog.h"
+#include "gui/npcpostdialog.h"
+
+#include "net/manaserv/connection.h"
+#include "net/manaserv/messagein.h"
+#include "net/manaserv/messageout.h"
+#include "net/manaserv/protocol.h"
 
 extern Net::NpcHandler *npcHandler;
 
diff --git a/src/net/manaserv/partyhandler.cpp b/src/net/manaserv/partyhandler.cpp
index ae33ead6..a013ae29 100644
--- a/src/net/manaserv/partyhandler.cpp
+++ b/src/net/manaserv/partyhandler.cpp
@@ -21,11 +21,6 @@
 
 #include "net/manaserv/partyhandler.h"
 
-#include "net/manaserv/connection.h"
-#include "net/manaserv/messagein.h"
-#include "net/manaserv/messageout.h"
-#include "net/manaserv/protocol.h"
-
 #include "gui/partywindow.h"
 
 #include "gui/widgets/chattab.h"
@@ -33,6 +28,11 @@
 #include "log.h"
 #include "localplayer.h"
 
+#include "net/manaserv/connection.h"
+#include "net/manaserv/messagein.h"
+#include "net/manaserv/messageout.h"
+#include "net/manaserv/protocol.h"
+
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp
index 62110f8f..60274288 100644
--- a/src/net/manaserv/playerhandler.cpp
+++ b/src/net/manaserv/playerhandler.cpp
@@ -21,13 +21,6 @@
 
 #include "net/manaserv/playerhandler.h"
 
-#include "net/manaserv/connection.h"
-#include "net/manaserv/messagein.h"
-#include "net/manaserv/messageout.h"
-#include "net/manaserv/protocol.h"
-
-#include "net/net.h"
-
 #include "effectmanager.h"
 #include "engine.h"
 #include "localplayer.h"
@@ -42,6 +35,13 @@
 #include "gui/sell.h"
 #include "gui/viewport.h"
 
+#include "net/net.h"
+
+#include "net/manaserv/connection.h"
+#include "net/manaserv/messagein.h"
+#include "net/manaserv/messageout.h"
+#include "net/manaserv/protocol.h"
+
 // TODO Move somewhere else
 OkDialog *weightNotice = NULL;
 OkDialog *deathNotice = NULL;
diff --git a/src/net/manaserv/tradehandler.cpp b/src/net/manaserv/tradehandler.cpp
index 08fc354c..5eedbec8 100644
--- a/src/net/manaserv/tradehandler.cpp
+++ b/src/net/manaserv/tradehandler.cpp
@@ -21,13 +21,6 @@
 
 #include "net/manaserv/tradehandler.h"
 
-#include "net/manaserv/connection.h"
-#include "net/manaserv/messagein.h"
-#include "net/manaserv/messageout.h"
-#include "net/manaserv/protocol.h"
-
-#include "net/net.h"
-
 #include "beingmanager.h"
 #include "item.h"
 #include "localplayer.h"
@@ -37,6 +30,13 @@
 
 #include "gui/widgets/chattab.h"
 
+#include "net/net.h"
+
+#include "net/manaserv/connection.h"
+#include "net/manaserv/messagein.h"
+#include "net/manaserv/messageout.h"
+#include "net/manaserv/protocol.h"
+
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
diff --git a/src/net/messagein.h b/src/net/messagein.h
index 6f68c49b..fe48a455 100644
--- a/src/net/messagein.h
+++ b/src/net/messagein.h
@@ -23,6 +23,7 @@
 #define NET_MESSAGEIN_H
 
 #include <SDL_types.h>
+
 #include <string>
 
 namespace Net {
diff --git a/src/net/messageout.h b/src/net/messageout.h
index b3fd3a96..d4769335 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.h
@@ -22,9 +22,10 @@
 #ifndef NET_MESSAGEOUT_H
 #define NET_MESSAGEOUT_H
 
-#include <iosfwd>
 #include <SDL_types.h>
 
+#include <iosfwd>
+
 namespace Net {
 
 /**
diff --git a/src/net/net.cpp b/src/net/net.cpp
index ade879a3..9c05595d 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -38,6 +38,7 @@
 #include "net/tradehandler.h"
 
 #include "net/ea/generalhandler.h"
+
 #include "net/manaserv/generalhandler.h"
 
 Net::AdminHandler *adminHandler = NULL;
diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h
index 25b4e9a8..335a2115 100644
--- a/src/net/serverinfo.h
+++ b/src/net/serverinfo.h
@@ -22,11 +22,11 @@
 #ifndef SERVERINFO_H
 #define SERVERINFO_H
 
+#include "utils/stringutils.h"
+
 #include <string>
 #include <vector>
 
-#include "utils/stringutils.h"
-
 class ServerInfo
 {
 public: