Include statement cleanup for net/ea/ directory.

38 files changed, 290 insertions, 267 deletions

diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 2fc59aec..6df2ae25 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -31,6 +31,7 @@
 #include "gui/widgets/layout.h"
 
 #include "npc.h"
+#include "shopitem.h"
 #include "units.h"
 
 #ifdef TMWSERV_SUPPORT
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index be352a66..e7671110 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -31,6 +31,7 @@
 #include "gui/widgets/layout.h"
 
 #include "npc.h"
+#include "shopitem.h"
 #include "units.h"
 
 #include "net/messageout.h"
diff --git a/src/gui/shop.cpp b/src/gui/shop.cpp
index 300c91b8..4799ea42 100644
--- a/src/gui/shop.cpp
+++ b/src/gui/shop.cpp
@@ -19,9 +19,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "shop.h"
+#include "gui/shop.h"
 
-#include "../utils/dtor.h"
+#include "shopitem.h"
+
+#include "utils/dtor.h"
 
 ShopItems::ShopItems(bool mergeDuplicates) :
     mMergeDuplicates(mergeDuplicates)
diff --git a/src/gui/shop.h b/src/gui/shop.h
index 6c3031af..190ef655 100644
--- a/src/gui/shop.h
+++ b/src/gui/shop.h
@@ -19,15 +19,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _SHOP_H
-#define _SHOP_H
-
-#include <string>
-#include <vector>
+#ifndef SHOP_H
+#define SHOP_H
 
 #include <guichan/listmodel.hpp>
 
-#include "../shopitem.h"
+#include <string>
+#include <vector>
 
 class ShopItem;
 
@@ -44,16 +42,13 @@ class ShopItems : public gcn::ListModel
 {
     public:
         /**
-         * Constructor. Creates a new ShopItems instance.
+         * Constructor.
          *
          * @param mergeDuplicates lets the Shop look for duplicate entries and
          *                        merges them to one item.
          */
         ShopItems(bool mergeDuplicates = false);
 
-        /**
-         * Destructor.
-         */
         ~ShopItems();
 
         /**
@@ -76,8 +71,6 @@ class ShopItems : public gcn::ListModel
 
         /**
          * Returns the number of items in the shop.
-         *
-         * @return the number of items in the shop
          */
         int getNumberOfElements();
 
@@ -91,7 +84,7 @@ class ShopItems : public gcn::ListModel
         /**
          * Returns the item number i in the shop.
          */
-        ShopItem* at(int i) const;
+        ShopItem *at(int i) const;
 
         /**
          * Removes an element from the shop.
@@ -101,7 +94,7 @@ class ShopItems : public gcn::ListModel
         void erase(int i);
 
         /**
-         * Clear the vector.
+         * Clears the list of items in the shop.
          */
         void clear();
 
@@ -112,13 +105,13 @@ class ShopItems : public gcn::ListModel
          * 
          * @return the item found or 0
          */
-        ShopItem* findItem(int id);
+        ShopItem *findItem(int id);
 
-        /** the shop storage */
+        /** The list of items in the shop. */
         std::vector<ShopItem*> mShopItems;
 
-        /** Look for duplicate entries on addition */
+        /** Look for duplicate entries on addition. */
         bool mMergeDuplicates;
 };
 
-#endif
+#endif // SHOP_H
diff --git a/src/gui/shoplistbox.cpp b/src/gui/shoplistbox.cpp
index aa42c294..db39e82d 100644
--- a/src/gui/shoplistbox.cpp
+++ b/src/gui/shoplistbox.cpp
@@ -19,15 +19,16 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/font.hpp>
-#include <guichan/listmodel.hpp>
+#include "gui/palette.h"
+#include "gui/shop.h"
+#include "gui/shoplistbox.h"
 
-#include "palette.h"
-#include "shop.h"
-#include "shoplistbox.h"
+#include "configuration.h"
+#include "graphics.h"
+#include "shopitem.h"
 
-#include "../configuration.h"
-#include "../graphics.h"
+#include <guichan/font.hpp>
+#include <guichan/listmodel.hpp>
 
 const int ITEM_ICON_SIZE = 32;
 
diff --git a/src/gui/shoplistbox.h b/src/gui/shoplistbox.h
index 5d3378b1..0b28b2f1 100644
--- a/src/gui/shoplistbox.h
+++ b/src/gui/shoplistbox.h
@@ -88,4 +88,4 @@ class ShopListBox : public ListBox
         bool mPriceCheck;
 };
 
-#endif
+#endif // SHOPLISTBOX_H
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 3629b075..237c9f1f 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -19,23 +19,25 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <iostream>
-#include <SDL_types.h>
+#include "net/ea/beinghandler.h"
+
+#include "net/ea/protocol.h"
 
-#include "beinghandler.h"
-#include "../messagein.h"
-#include "protocol.h"
+#include "net/messagein.h"
 
-#include "../../being.h"
-#include "../../beingmanager.h"
-#include "../../effectmanager.h"
-#include "../../game.h"
-#include "../../localplayer.h"
-#include "../../log.h"
-#include "../../npc.h"
-#include "../../player_relations.h"
+#include "being.h"
+#include "beingmanager.h"
+#include "effectmanager.h"
+#include "game.h"
+#include "localplayer.h"
+#include "log.h"
+#include "npc.h"
+#include "player_relations.h"
 
-#include "../../gui/npc_text.h"
+#include "gui/npc_text.h"
+
+#include <iostream>
+#include <SDL_types.h>
 
 extern NpcTextDialog *npcTextDialog;
 
diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h
index 16a7c8d6..1246f1c1 100644
--- a/src/net/ea/beinghandler.h
+++ b/src/net/ea/beinghandler.h
@@ -19,10 +19,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_BEINGHANDLER_H
-#define NET_BEINGHANDLER_H
+#ifndef NET_EA_BEINGHANDLER_H
+#define NET_EA_BEINGHANDLER_H
 
-#include "../messagehandler.h"
+#include "net/messagehandler.h"
 
 class BeingHandler : public MessageHandler
 {
@@ -36,4 +36,4 @@ class BeingHandler : public MessageHandler
         bool mSync;
 };
 
-#endif
+#endif // NET_EA_BEINGHANDLER_H
diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp
index d60cb0e2..b99db6a4 100644
--- a/src/net/ea/buysellhandler.cpp
+++ b/src/net/ea/buysellhandler.cpp
@@ -19,24 +19,26 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <SDL_types.h>
+#include "net/ea/buysellhandler.h"
+
+#include "net/ea/protocol.h"
 
-#include "buysellhandler.h"
-#include "../messagein.h"
-#include "protocol.h"
+#include "net/messagein.h"
 
-#include "../../beingmanager.h"
-#include "../../inventory.h"
-#include "../../item.h"
-#include "../../localplayer.h"
-#include "../../npc.h"
+#include "beingmanager.h"
+#include "inventory.h"
+#include "item.h"
+#include "localplayer.h"
+#include "npc.h"
 
-#include "../../gui/buy.h"
-#include "../../gui/buysell.h"
-#include "../../gui/chat.h"
-#include "../../gui/sell.h"
+#include "gui/buy.h"
+#include "gui/buysell.h"
+#include "gui/chat.h"
+#include "gui/sell.h"
 
-#include "../../utils/gettext.h"
+#include "utils/gettext.h"
+
+#include <SDL_types.h>
 
 BuySellHandler::BuySellHandler()
 {
diff --git a/src/net/ea/buysellhandler.h b/src/net/ea/buysellhandler.h
index 5bf58d8e..7b85b65d 100644
--- a/src/net/ea/buysellhandler.h
+++ b/src/net/ea/buysellhandler.h
@@ -19,10 +19,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_BUYSELLHANDLER_H
-#define NET_BUYSELLHANDLER_H
+#ifndef NET_EA_BUYSELLHANDLER_H
+#define NET_EA_BUYSELLHANDLER_H
 
-#include "../messagehandler.h"
+#include "net/messagehandler.h"
 
 class BuySellHandler : public MessageHandler
 {
@@ -32,4 +32,4 @@ class BuySellHandler : public MessageHandler
         void handleMessage(MessageIn &msg);
 };
 
-#endif
+#endif // NET_EA_BUYSELLHANDLER_H
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index 0fef3de7..d212ebfe 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -19,21 +19,23 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "charserverhandler.h"
-#include "../messagein.h"
-#include "protocol.h"
+#include "net/ea/charserverhandler.h"
 
-#include "../../game.h"
-#include "../../localplayer.h"
-#include "../../log.h"
-#include "../../logindata.h"
-#include "../../main.h"
+#include "net/ea/protocol.h"
 
-#include "../../gui/char_select.h"
-#include "../../gui/ok_dialog.h"
+#include "net/messagein.h"
 
-#include "../../utils/gettext.h"
-#include "../../utils/stringutils.h"
+#include "game.h"
+#include "localplayer.h"
+#include "log.h"
+#include "logindata.h"
+#include "main.h"
+
+#include "gui/char_select.h"
+#include "gui/ok_dialog.h"
+
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
 
 CharServerHandler::CharServerHandler():
     mCharCreateDialog(0)
diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h
index 237f5e49..3b5a4cd8 100644
--- a/src/net/ea/charserverhandler.h
+++ b/src/net/ea/charserverhandler.h
@@ -19,12 +19,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_CHARSERVERHANDLER_H
-#define NET_CHARSERVERHANDLER_H
+#ifndef NET_EA_CHARSERVERHANDLER_H
+#define NET_EA_CHARSERVERHANDLER_H
 
-#include "../messagehandler.h"
+#include "net/messagehandler.h"
 
-#include "../../lockedarray.h"
+#include "lockedarray.h"
 
 class CharCreateDialog;
 class LocalPlayer;
@@ -59,7 +59,7 @@ class CharServerHandler : public MessageHandler
         LockedArray<LocalPlayer*> *mCharInfo;
         CharCreateDialog *mCharCreateDialog;
 
-        LocalPlayer* readPlayerData(MessageIn &msg, int &slot);
+        LocalPlayer *readPlayerData(MessageIn &msg, int &slot);
 };
 
-#endif
+#endif // NET_EA_CHARSERVERHANDLER_H
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index c4743ff2..2e7be21f 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -19,22 +19,24 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <SDL_types.h>
-#include <string>
+#include "net/ea/chathandler.h"
+
+#include "net/ea/protocol.h"
 
-#include "chathandler.h"
-#include "../messagein.h"
-#include "protocol.h"
+#include "net/messagein.h"
 
-#include "../../being.h"
-#include "../../beingmanager.h"
-#include "../../game.h"
-#include "../../player_relations.h"
+#include "being.h"
+#include "beingmanager.h"
+#include "game.h"
+#include "player_relations.h"
 
-#include "../../gui/chat.h"
+#include "gui/chat.h"
 
-#include "../../utils/gettext.h"
-#include "../../utils/stringutils.h"
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
+
+#include <SDL_types.h>
+#include <string>
 
 extern Being *player_node;
 
diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h
index 8207b1d5..62a8c663 100644
--- a/src/net/ea/chathandler.h
+++ b/src/net/ea/chathandler.h
@@ -19,10 +19,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_CHATHANDLER_H
-#define NET_CHATHANDLER_H
+#ifndef NET_EA_CHATHANDLER_H
+#define NET_EA_CHATHANDLER_H
 
-#include "../messagehandler.h"
+#include "net/messagehandler.h"
 
 class ChatHandler : public MessageHandler
 {
@@ -32,4 +32,4 @@ class ChatHandler : public MessageHandler
         void handleMessage(MessageIn &msg);
 };
 
-#endif
+#endif // NET_EA_CHATHANDLER_H
diff --git a/src/net/ea/equipmenthandler.cpp b/src/net/ea/equipmenthandler.cpp
index d1e51900..7a287bea 100644
--- a/src/net/ea/equipmenthandler.cpp
+++ b/src/net/ea/equipmenthandler.cpp
@@ -19,19 +19,21 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "equipmenthandler.h"
-#include "../messagein.h"
-#include "protocol.h"
+#include "net/ea/equipmenthandler.h"
 
-#include "../../equipment.h"
-#include "../../inventory.h"
-#include "../../item.h"
-#include "../../localplayer.h"
-#include "../../log.h"
+#include "net/ea/protocol.h"
 
-#include "../../gui/chat.h"
+#include "net/messagein.h"
 
-#include "../../utils/gettext.h"
+#include "equipment.h"
+#include "inventory.h"
+#include "item.h"
+#include "localplayer.h"
+#include "log.h"
+
+#include "gui/chat.h"
+
+#include "utils/gettext.h"
 
 EquipmentHandler::EquipmentHandler()
 {
diff --git a/src/net/ea/equipmenthandler.h b/src/net/ea/equipmenthandler.h
index fe4a7ecc..2bb73c97 100644
--- a/src/net/ea/equipmenthandler.h
+++ b/src/net/ea/equipmenthandler.h
@@ -19,10 +19,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_EQUIPMENTHANDLER_H
-#define NET_EQUIPMENTHANDLER_H
+#ifndef NET_EA_EQUIPMENTHANDLER_H
+#define NET_EA_EQUIPMENTHANDLER_H
 
-#include "../messagehandler.h"
+#include "net/messagehandler.h"
 
 class EquipmentHandler : public MessageHandler
 {
@@ -32,4 +32,4 @@ class EquipmentHandler : public MessageHandler
         void handleMessage(MessageIn &msg);
 };
 
-#endif
+#endif // NET_EA_EQUIPMENTHANDLER_H
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index ce2e22e7..21ae6dcb 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -19,27 +19,29 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <SDL_types.h>
+#include "net/ea/inventoryhandler.h"
+
+#include "net/ea/protocol.h"
 
-#include "inventoryhandler.h"
-#include "../messagein.h"
-#include "protocol.h"
+#include "net/messagein.h"
 
-#include "../../configuration.h"
-#include "../../inventory.h"
-#include "../../item.h"
-#include "../../itemshortcut.h"
-#include "../../localplayer.h"
-#include "../../log.h"
+#include "configuration.h"
+#include "inventory.h"
+#include "item.h"
+#include "itemshortcut.h"
+#include "localplayer.h"
+#include "log.h"
 
-#include "../../gui/chat.h"
-#include "../../gui/storagewindow.h"
+#include "gui/chat.h"
+#include "gui/storagewindow.h"
 
-#include "../../resources/iteminfo.h"
+#include "resources/iteminfo.h"
 
-#include "../../utils/gettext.h"
-#include "../../utils/strprintf.h"
-#include "../../utils/stringutils.h"
+#include "utils/gettext.h"
+#include "utils/strprintf.h"
+#include "utils/stringutils.h"
+
+#include <SDL_types.h>
 
 InventoryHandler::InventoryHandler()
 {
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index b2e469fa..7374fed9 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -19,10 +19,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_INVENTORYHANDLER_H
-#define NET_INVENTORYHANDLER_H
+#ifndef NET_EA_INVENTORYHANDLER_H
+#define NET_EA_INVENTORYHANDLER_H
 
-#include "../messagehandler.h"
+#include "net/messagehandler.h"
 
 class InventoryHandler : public MessageHandler
 {
@@ -32,4 +32,4 @@ class InventoryHandler : public MessageHandler
         void handleMessage(MessageIn &msg);
 };
 
-#endif
+#endif // NET_EA_INVENTORYHANDLER_H
diff --git a/src/net/ea/itemhandler.cpp b/src/net/ea/itemhandler.cpp
index 73268554..427b29bd 100644
--- a/src/net/ea/itemhandler.cpp
+++ b/src/net/ea/itemhandler.cpp
@@ -19,12 +19,14 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "itemhandler.h"
-#include "../messagein.h"
-#include "protocol.h"
+#include "net/ea/itemhandler.h"
 
-#include "../../engine.h"
-#include "../../flooritemmanager.h"
+#include "net/ea/protocol.h"
+
+#include "net/messagein.h"
+
+#include "engine.h"
+#include "flooritemmanager.h"
 
 ItemHandler::ItemHandler()
 {
diff --git a/src/net/ea/itemhandler.h b/src/net/ea/itemhandler.h
index da93f6b4..42a9e4e7 100644
--- a/src/net/ea/itemhandler.h
+++ b/src/net/ea/itemhandler.h
@@ -19,10 +19,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_ITEMHANDLER_H
-#define NET_ITEMHANDLER_H
+#ifndef NET_EA_ITEMHANDLER_H
+#define NET_EA_ITEMHANDLER_H
 
-#include "../messagehandler.h"
+#include "net/messagehandler.h"
 
 class ItemHandler : public MessageHandler
 {
@@ -32,4 +32,4 @@ class ItemHandler : public MessageHandler
         void handleMessage(MessageIn &msg);
 };
 
-#endif
+#endif // NET_EA_ITEMHANDLER_H
diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp
index 3f58f2c0..06bdb4bc 100644
--- a/src/net/ea/loginhandler.cpp
+++ b/src/net/ea/loginhandler.cpp
@@ -19,18 +19,20 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "loginhandler.h"
-#include "../messagein.h"
-#include "protocol.h"
-
-#include "../../log.h"
-#include "../../logindata.h"
-#include "../../main.h"
-#include "../../serverinfo.h"
-
-#include "../../utils/gettext.h"
-#include "../../utils/strprintf.h"
-#include "../../utils/stringutils.h"
+#include "net/ea/loginhandler.h"
+
+#include "net/ea/protocol.h"
+
+#include "net/messagein.h"
+
+#include "log.h"
+#include "logindata.h"
+#include "main.h"
+#include "serverinfo.h"
+
+#include "utils/gettext.h"
+#include "utils/strprintf.h"
+#include "utils/stringutils.h"
 
 extern SERVER_INFO **server_info;
 
diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h
index c2ba5083..074bc9e2 100644
--- a/src/net/ea/loginhandler.h
+++ b/src/net/ea/loginhandler.h
@@ -19,12 +19,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_LOGINHANDLER_H
-#define NET_LOGINHANDLER_H
+#ifndef NET_EA_LOGINHANDLER_H
+#define NET_EA_LOGINHANDLER_H
 
-#include <string>
+#include "net/messagehandler.h"
 
-#include "../messagehandler.h"
+#include <string>
 
 struct LoginData;
 
@@ -35,11 +35,11 @@ class LoginHandler : public MessageHandler
 
         void handleMessage(MessageIn &msg);
 
-        void setLoginData(LoginData *loginData) { mLoginData = loginData; };
+        void setLoginData(LoginData *loginData) { mLoginData = loginData; }
 
     private:
         LoginData *mLoginData;
         std::string mUpdateHost;
 };
 
-#endif
+#endif // NET_EA_LOGINHANDLER_H
diff --git a/src/net/ea/maploginhandler.cpp b/src/net/ea/maploginhandler.cpp
index 6931024e..78f021b0 100644
--- a/src/net/ea/maploginhandler.cpp
+++ b/src/net/ea/maploginhandler.cpp
@@ -19,15 +19,17 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "maploginhandler.h"
-#include "../messagein.h"
-#include "protocol.h"
+#include "net/ea/maploginhandler.h"
 
-#include "../../localplayer.h"
-#include "../../log.h"
-#include "../../main.h"
+#include "net/ea/protocol.h"
 
-#include "../../utils/gettext.h"
+#include "net/messagein.h"
+
+#include "localplayer.h"
+#include "log.h"
+#include "main.h"
+
+#include "utils/gettext.h"
 
 MapLoginHandler::MapLoginHandler()
 {
diff --git a/src/net/ea/maploginhandler.h b/src/net/ea/maploginhandler.h
index 1ce5ee79..40f8e7bc 100644
--- a/src/net/ea/maploginhandler.h
+++ b/src/net/ea/maploginhandler.h
@@ -19,10 +19,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_MAPLOGINHANDLER_H
-#define NET_MAPLOGINHANDLER_H
+#ifndef NET_EA_MAPLOGINHANDLER_H
+#define NET_EA_MAPLOGINHANDLER_H
 
-#include "../messagehandler.h"
+#include "net/messagehandler.h"
 
 class MapLoginHandler : public MessageHandler
 {
@@ -32,4 +32,4 @@ class MapLoginHandler : public MessageHandler
         void handleMessage(MessageIn &msg);
 };
 
-#endif
+#endif // NET_EA_MAPLOGINHANDLER_H
diff --git a/src/net/ea/network.cpp b/src/net/ea/network.cpp
index c6ea1074..e17b8f3b 100644
--- a/src/net/ea/network.cpp
+++ b/src/net/ea/network.cpp
@@ -19,14 +19,15 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <sstream>
+#include "net/ea/network.h"
+
+#include "net/messagehandler.h"
+#include "net/messagein.h"
 
-#include "../messagehandler.h"
-#include "../messagein.h"
-#include "network.h"
+#include "log.h"
+#include "utils/stringutils.h"
 
-#include "../../log.h"
-#include "../../utils/stringutils.h"
+#include <sstream>
 
 /** Warning: buffers and other variables are shared,
     so there can be only one connection active at a time */
diff --git a/src/net/ea/network.h b/src/net/ea/network.h
index 039006f8..651b1182 100644
--- a/src/net/ea/network.h
+++ b/src/net/ea/network.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NETWORK_
-#define NETWORK_
+#ifndef EA_NETWORK_H
+#define EA_NETWORK_H
 
 #include <map>
 #include <SDL_net.h>
diff --git a/src/net/ea/npchandler.cpp b/src/net/ea/npchandler.cpp
index 7bd23135..165cc2d3 100644
--- a/src/net/ea/npchandler.cpp
+++ b/src/net/ea/npchandler.cpp
@@ -19,20 +19,22 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <SDL_types.h>
+#include "net/ea/npchandler.h"
+
+#include "net/ea/protocol.h"
 
-#include "../messagein.h"
-#include "npchandler.h"
-#include "protocol.h"
+#include "net/messagein.h"
 
-#include "../../beingmanager.h"
-#include "../../localplayer.h"
-#include "../../npc.h"
+#include "beingmanager.h"
+#include "localplayer.h"
+#include "npc.h"
 
-#include "../../gui/npc_text.h"
-#include "../../gui/npcintegerdialog.h"
-#include "../../gui/npclistdialog.h"
-#include "../../gui/npcstringdialog.h"
+#include "gui/npc_text.h"
+#include "gui/npcintegerdialog.h"
+#include "gui/npclistdialog.h"
+#include "gui/npcstringdialog.h"
+
+#include <SDL_types.h>
 
 NPCHandler::NPCHandler()
 {
diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h
index 49df20c3..8c252175 100644
--- a/src/net/ea/npchandler.h
+++ b/src/net/ea/npchandler.h
@@ -19,10 +19,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_NPCHANDLER_H
-#define NET_NPCHANDLER_H
+#ifndef NET_EA_NPCHANDLER_H
+#define NET_EA_NPCHANDLER_H
 
-#include "../messagehandler.h"
+#include "net/messagehandler.h"
 
 class NPCHandler : public MessageHandler
 {
@@ -32,4 +32,4 @@ class NPCHandler : public MessageHandler
         void handleMessage(MessageIn &msg);
 };
 
-#endif
+#endif // NET_EA_NPCHANDLER_H
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index d1d3b55e..d903976e 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -19,17 +19,16 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/actionlistener.hpp>
+#include "net/ea/partyhandler.h"
 
-#include "partyhandler.h"
-#include "protocol.h"
-#include "../messagein.h"
+#include "net/ea/protocol.h"
 
-#include "../../gui/chat.h"
-#include "../../gui/confirm_dialog.h"
+#include "net/messagein.h"
 
-#include "../../beingmanager.h"
-#include "../../party.h"
+#include "gui/chat.h"
+
+#include "beingmanager.h"
+#include "party.h"
 
 PartyHandler::PartyHandler(Party *party) : mParty(party)
 {
diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h
index 5c10eb21..851c4ae3 100644
--- a/src/net/ea/partyhandler.h
+++ b/src/net/ea/partyhandler.h
@@ -19,10 +19,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef PARTYHANDLER_H
-#define PARTYHANDLER_H
+#ifndef NET_EA_PARTYHANDLER_H
+#define NET_EA_PARTYHANDLER_H
 
-#include "../messagehandler.h"
+#include "net/messagehandler.h"
 
 class Party;
 
@@ -32,8 +32,9 @@ class PartyHandler : public MessageHandler
         PartyHandler(Party *party);
 
         void handleMessage(MessageIn &msg);
+
     private:
         Party *mParty;
 };
 
-#endif
+#endif // NET_EA_PARTYHANDLER_H
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 60f0de79..54cfde9b 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -19,32 +19,34 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "../messagein.h"
-#include "playerhandler.h"
-#include "protocol.h"
-
-#include "../../engine.h"
-#include "../../localplayer.h"
-#include "../../log.h"
-#include "../../npc.h"
-#include "../../units.h"
-
-#include "../../gui/buy.h"
-#include "../../gui/buysell.h"
-#include "../../gui/chat.h"
-#include "../../gui/gui.h"
-#include "../../gui/npc_text.h"
-#include "../../gui/npcintegerdialog.h"
-#include "../../gui/npclistdialog.h"
-#include "../../gui/npcstringdialog.h"
-#include "../../gui/ok_dialog.h"
-#include "../../gui/sell.h"
-#include "../../gui/skill.h"
-#include "../../gui/storagewindow.h"
-#include "../../gui/viewport.h"
-
-#include "../../utils/stringutils.h"
-#include "../../utils/gettext.h"
+#include "net/ea/playerhandler.h"
+
+#include "net/ea/protocol.h"
+
+#include "net/messagein.h"
+
+#include "engine.h"
+#include "localplayer.h"
+#include "log.h"
+#include "npc.h"
+#include "units.h"
+
+#include "gui/buy.h"
+#include "gui/buysell.h"
+#include "gui/chat.h"
+#include "gui/gui.h"
+#include "gui/npc_text.h"
+#include "gui/npcintegerdialog.h"
+#include "gui/npclistdialog.h"
+#include "gui/npcstringdialog.h"
+#include "gui/ok_dialog.h"
+#include "gui/sell.h"
+#include "gui/skill.h"
+#include "gui/storagewindow.h"
+#include "gui/viewport.h"
+
+#include "utils/stringutils.h"
+#include "utils/gettext.h"
 
 // TODO Move somewhere else
 OkDialog *weightNotice = NULL;
diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h
index f3352289..9fb2c982 100644
--- a/src/net/ea/playerhandler.h
+++ b/src/net/ea/playerhandler.h
@@ -19,10 +19,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_PLAYERHANDLER_H
-#define NET_PLAYERHANDLER_H
+#ifndef NET_EA_PLAYERHANDLER_H
+#define NET_EA_PLAYERHANDLER_H
 
-#include "../messagehandler.h"
+#include "net/messagehandler.h"
 
 class PlayerHandler : public MessageHandler
 {
@@ -32,4 +32,4 @@ class PlayerHandler : public MessageHandler
         void handleMessage(MessageIn &msg);
 };
 
-#endif
+#endif // NET_EA_PLAYERHANDLER_H
diff --git a/src/net/ea/protocol.cpp b/src/net/ea/protocol.cpp
index 69d69901..9d9db56f 100644
--- a/src/net/ea/protocol.cpp
+++ b/src/net/ea/protocol.cpp
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "protocol.h"
+#include "net/ea/protocol.h"
 
 #define LOBYTE(w)  ((unsigned char)(w))
 #define HIBYTE(w)  ((unsigned char)(((unsigned short)(w)) >> 8))
diff --git a/src/net/ea/protocol.h b/src/net/ea/protocol.h
index b806b13b..c96ff7b6 100644
--- a/src/net/ea/protocol.h
+++ b/src/net/ea/protocol.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef PROTOCOL_H
-#define PROTOCOL_H
+#ifndef EA_PROTOCOL_H
+#define EA_PROTOCOL_H
 
 /*********************************
  * Packets from server to client *
diff --git a/src/net/ea/skillhandler.cpp b/src/net/ea/skillhandler.cpp
index ac474adc..fcc0f4b2 100644
--- a/src/net/ea/skillhandler.cpp
+++ b/src/net/ea/skillhandler.cpp
@@ -19,16 +19,18 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "../messagein.h"
-#include "protocol.h"
-#include "skillhandler.h"
+#include "net/ea/skillhandler.h"
 
-#include "../../log.h"
+#include "net/ea/protocol.h"
 
-#include "../../gui/chat.h"
-#include "../../gui/skill.h"
+#include "net/messagein.h"
 
-#include "../../utils/gettext.h"
+#include "log.h"
+
+#include "gui/chat.h"
+#include "gui/skill.h"
+
+#include "utils/gettext.h"
 
 /** job dependend identifiers (?)  */
 #define SKILL_BASIC       0x0001
diff --git a/src/net/ea/skillhandler.h b/src/net/ea/skillhandler.h
index 57d68f47..f2c950c9 100644
--- a/src/net/ea/skillhandler.h
+++ b/src/net/ea/skillhandler.h
@@ -19,10 +19,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_SKILLHANDLER_H
-#define NET_SKILLHANDLER_H
+#ifndef NET_EA_SKILLHANDLER_H
+#define NET_EA_SKILLHANDLER_H
 
-#include "../messagehandler.h"
+#include "net/messagehandler.h"
 
 class SkillHandler : public MessageHandler
 {
@@ -32,4 +32,4 @@ class SkillHandler : public MessageHandler
         void handleMessage(MessageIn &msg);
 };
 
-#endif
+#endif // NET_EA_SKILLHANDLER_H
diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp
index 0a44d995..ea41ed70 100644
--- a/src/net/ea/tradehandler.cpp
+++ b/src/net/ea/tradehandler.cpp
@@ -19,20 +19,22 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "../messagein.h"
-#include "protocol.h"
-#include "tradehandler.h"
+#include "net/ea/tradehandler.h"
 
-#include "../../inventory.h"
-#include "../../item.h"
-#include "../../localplayer.h"
-#include "../../player_relations.h"
+#include "net/ea/protocol.h"
 
-#include "../../gui/chat.h"
-#include "../../gui/confirm_dialog.h"
-#include "../../gui/trade.h"
+#include "net/messagein.h"
 
-#include "../../utils/gettext.h"
+#include "inventory.h"
+#include "item.h"
+#include "localplayer.h"
+#include "player_relations.h"
+
+#include "gui/chat.h"
+#include "gui/confirm_dialog.h"
+#include "gui/trade.h"
+
+#include "utils/gettext.h"
 
 std::string tradePartnerName;
 
@@ -45,7 +47,7 @@ namespace {
         void action(const gcn::ActionEvent &event)
         {
             player_node->tradeReply(event.getId() == "yes");
-        };
+        }
     } listener;
 }
 
diff --git a/src/net/ea/tradehandler.h b/src/net/ea/tradehandler.h
index 04335069..e141f6b5 100644
--- a/src/net/ea/tradehandler.h
+++ b/src/net/ea/tradehandler.h
@@ -19,12 +19,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_TRADEHANDLER_H
-#define NET_TRADEHANDLER_H
+#ifndef NET_EA_TRADEHANDLER_H
+#define NET_EA_TRADEHANDLER_H
 
-#include "../messagehandler.h"
-
-class Network;
+#include "net/messagehandler.h"
 
 class TradeHandler : public MessageHandler
 {
@@ -34,4 +32,4 @@ class TradeHandler : public MessageHandler
         void handleMessage(MessageIn &msg);
 };
 
-#endif
+#endif // NET_EA_TRADEHANDLER_H