Move all TMWServ-specific code to net/tmwserv

Also fix several instances where the same net handler was being used for
both servers, and a few other related oddities.

72 files changed, 234 insertions, 225 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 17059a72..dc03e66a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -163,8 +163,6 @@ tmw_SOURCES = gui/widgets/avatar.cpp \
 	      gui/window.h \
 	      gui/windowcontainer.cpp \
 	      gui/windowcontainer.h \
-	      net/itemhandler.h \
-	      net/itemhandler.cpp \
 	      net/messagehandler.cpp \
 	      net/messagehandler.h \
 	      net/messagein.cpp \
@@ -239,8 +237,8 @@ tmw_SOURCES = gui/widgets/avatar.cpp \
 	      channel.h \
 	      channelmanager.cpp \
 	      channelmanager.h \
-          commandhandler.cpp \
-          commandhandler.h \
+	      commandhandler.cpp \
+	      commandhandler.h \
 	      configlistener.h \
 	      configuration.cpp \
 	      configuration.h \
@@ -356,59 +354,61 @@ tmw_SOURCES += \
 	      gui/statuswindow.h \
 	      gui/unregisterdialog.cpp \
 	      gui/unregisterdialog.h \
-	      net/accountserver/account.cpp \
-	      net/accountserver/account.h \
-	      net/accountserver/accountserver.cpp \
-	      net/accountserver/accountserver.h \
-	      net/accountserver/internal.cpp \
-	      net/accountserver/internal.h \
-	      net/chatserver/chatserver.cpp \
-	      net/chatserver/chatserver.h \
-	      net/chatserver/guild.cpp \
-	      net/chatserver/guild.h \
-	      net/chatserver/internal.cpp \
-	      net/chatserver/internal.h \
-	      net/chatserver/party.cpp \
-	      net/chatserver/party.h \
-	      net/gameserver/gameserver.cpp \
-	      net/gameserver/gameserver.h \
-	      net/gameserver/internal.cpp \
-	      net/gameserver/internal.h \
-	      net/gameserver/player.cpp \
-	      net/gameserver/player.h \
-	      net/beinghandler.cpp \
-	      net/beinghandler.h \
-	      net/buysellhandler.cpp \
-	      net/buysellhandler.h \
-	      net/charserverhandler.cpp \
-	      net/charserverhandler.h \
-	      net/chathandler.cpp \
-	      net/chathandler.h \
-	      net/connection.cpp \
-	      net/connection.h \
-	      net/effecthandler.cpp \
-	      net/effecthandler.h \
-	      net/guildhandler.cpp \
-	      net/guildhandler.h \
-	      net/internal.cpp \
-	      net/internal.h \
-	      net/inventoryhandler.cpp \
-	      net/inventoryhandler.h \
-	      net/loginhandler.cpp \
-	      net/loginhandler.h \
-	      net/logouthandler.cpp \
-	      net/logouthandler.h \
-	      net/network.cpp \
-	      net/network.h \
-	      net/npchandler.cpp \
-	      net/npchandler.h \
-	      net/partyhandler.cpp \
-	      net/partyhandler.h \
-	      net/playerhandler.cpp \
-	      net/playerhandler.h \
-	      net/protocol.h \
-	      net/tradehandler.cpp \
-	      net/tradehandler.h \
+	      net/tmwserv/accountserver/account.cpp \
+	      net/tmwserv/accountserver/account.h \
+	      net/tmwserv/accountserver/accountserver.cpp \
+	      net/tmwserv/accountserver/accountserver.h \
+	      net/tmwserv/accountserver/internal.cpp \
+	      net/tmwserv/accountserver/internal.h \
+	      net/tmwserv/chatserver/chatserver.cpp \
+	      net/tmwserv/chatserver/chatserver.h \
+	      net/tmwserv/chatserver/guild.cpp \
+	      net/tmwserv/chatserver/guild.h \
+	      net/tmwserv/chatserver/internal.cpp \
+	      net/tmwserv/chatserver/internal.h \
+	      net/tmwserv/chatserver/party.cpp \
+	      net/tmwserv/chatserver/party.h \
+	      net/tmwserv/gameserver/gameserver.cpp \
+	      net/tmwserv/gameserver/gameserver.h \
+	      net/tmwserv/gameserver/internal.cpp \
+	      net/tmwserv/gameserver/internal.h \
+	      net/tmwserv/gameserver/player.cpp \
+	      net/tmwserv/gameserver/player.h \
+	      net/tmwserv/beinghandler.cpp \
+	      net/tmwserv/beinghandler.h \
+	      net/tmwserv/buysellhandler.cpp \
+	      net/tmwserv/buysellhandler.h \
+	      net/tmwserv/charserverhandler.cpp \
+	      net/tmwserv/charserverhandler.h \
+	      net/tmwserv/chathandler.cpp \
+	      net/tmwserv/chathandler.h \
+	      net/tmwserv/connection.cpp \
+	      net/tmwserv/connection.h \
+	      net/tmwserv/effecthandler.cpp \
+	      net/tmwserv/effecthandler.h \
+	      net/tmwserv/guildhandler.cpp \
+	      net/tmwserv/guildhandler.h \
+	      net/tmwserv/internal.cpp \
+	      net/tmwserv/internal.h \
+	      net/tmwserv/inventoryhandler.cpp \
+	      net/tmwserv/inventoryhandler.h \
+	      net/tmwserv/itemhandler.h \
+	      net/tmwserv/itemhandler.cpp \
+	      net/tmwserv/loginhandler.cpp \
+	      net/tmwserv/loginhandler.h \
+	      net/tmwserv/logouthandler.cpp \
+	      net/tmwserv/logouthandler.h \
+	      net/tmwserv/network.cpp \
+	      net/tmwserv/network.h \
+	      net/tmwserv/npchandler.cpp \
+	      net/tmwserv/npchandler.h \
+	      net/tmwserv/partyhandler.cpp \
+	      net/tmwserv/partyhandler.h \
+	      net/tmwserv/playerhandler.cpp \
+	      net/tmwserv/playerhandler.h \
+	      net/tmwserv/protocol.h \
+	      net/tmwserv/tradehandler.cpp \
+	      net/tmwserv/tradehandler.h \
 	      resources/buddylist.cpp \
 	      resources/buddylist.h \
 	      guild.cpp \
@@ -436,6 +436,8 @@ tmw_SOURCES += \
 	      net/ea/equipmenthandler.h \
 	      net/ea/inventoryhandler.cpp \
 	      net/ea/inventoryhandler.h \
+	      net/ea/itemhandler.cpp \
+	      net/ea/itemhandler.h \
 	      net/ea/loginhandler.cpp \
 	      net/ea/loginhandler.h \
 	      net/ea/maploginhandler.cpp \
diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index e9d598c7..d2cac6ad 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.cpp
@@ -30,7 +30,7 @@
 #include "net/messageout.h"
 #include "net/ea/protocol.h"
 #else
-#include "net/protocol.h"
+#include "net/tmwserv/protocol.h"
 #endif
 
 #include "utils/dtor.h"
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index ae544295..fa5fbb67 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -29,8 +29,8 @@
 #include "gui/chat.h"
 
 #ifdef TMWSERV_SUPPORT
-#include "net/chatserver/chatserver.h"
-#include "net/gameserver/player.h"
+#include "net/tmwserv/chatserver/chatserver.h"
+#include "net/tmwserv/gameserver/player.h"
 #else
 #include "party.h"
 #include "net/messageout.h"
diff --git a/src/game.cpp b/src/game.cpp
index aefefd29..79eaf9c5 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -85,25 +85,30 @@
 #include "gui/quitdialog.h"
 #endif
 
-#include "net/chathandler.h"
-#include "net/itemhandler.h"
-#include "net/npchandler.h"
-#include "net/playerhandler.h"
-#include "net/tradehandler.h"
 #ifdef TMWSERV_SUPPORT
-#include "net/network.h"
-#include "net/beinghandler.h"
-#include "net/buysellhandler.h"
-#include "net/effecthandler.h"
-#include "net/guildhandler.h"
-#include "net/inventoryhandler.h"
-#include "net/partyhandler.h"
+#include "net/tmwserv/chathandler.h"
+#include "net/tmwserv/itemhandler.h"
+#include "net/tmwserv/npchandler.h"
+#include "net/tmwserv/playerhandler.h"
+#include "net/tmwserv/tradehandler.h"
+#include "net/tmwserv/network.h"
+#include "net/tmwserv/beinghandler.h"
+#include "net/tmwserv/buysellhandler.h"
+#include "net/tmwserv/effecthandler.h"
+#include "net/tmwserv/guildhandler.h"
+#include "net/tmwserv/inventoryhandler.h"
+#include "net/tmwserv/partyhandler.h"
 #else
 #include "net/ea/network.h"
+#include "net/ea/chathandler.h"
 #include "net/ea/beinghandler.h"
 #include "net/ea/buysellhandler.h"
 #include "net/ea/equipmenthandler.h"
 #include "net/ea/inventoryhandler.h"
+#include "net/ea/itemhandler.h"
+#include "net/ea/npchandler.h"
+#include "net/ea/playerhandler.h"
+#include "net/ea/tradehandler.h"
 #include "net/ea/protocol.h"
 #include "net/ea/skillhandler.h"
 #include "net/messageout.h"
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 15a558a3..53a586c3 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -34,7 +34,7 @@
 #include "../units.h"
 
 #ifdef TMWSERV_SUPPORT
-#include "../net/gameserver/player.h"
+#include "../net/tmwserv/gameserver/player.h"
 #else
 #include "../net/messageout.h"
 #include "../net/ea/protocol.h"
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 84270d10..e4f560ce 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -42,7 +42,10 @@
 
 #include "../logindata.h"
 
-#include "../net/accountserver/account.h"
+#include "../net/tmwserv/accountserver/account.h"
+#include "../net/tmwserv/charserverhandler.h"
+#else
+#include "../net/ea/charserverhandler.h"
 #endif
 
 #include "widgets/layout.h"
@@ -52,7 +55,6 @@
 #include "../main.h"
 #include "../units.h"
 
-#include "../net/charserverhandler.h"
 #include "../net/messageout.h"
 
 #include "../resources/colordb.h"
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index f2651a02..a072704b 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -43,8 +43,8 @@
 #include "../localplayer.h"
 
 #ifdef TMWSERV_SUPPORT
-#include "../net/chatserver/chatserver.h"
-#include "../net/gameserver/player.h"
+#include "../net/tmwserv/chatserver/chatserver.h"
+#include "../net/tmwserv/gameserver/player.h"
 #else
 #include "../party.h"
 #include "../net/messageout.h"
diff --git a/src/gui/guildwindow.cpp b/src/gui/guildwindow.cpp
index 0596c75e..37d739e4 100644
--- a/src/gui/guildwindow.cpp
+++ b/src/gui/guildwindow.cpp
@@ -37,7 +37,7 @@
 #include "../log.h"
 #include "../localplayer.h"
 
-#include "../net/chatserver/guild.h"
+#include "../net/tmwserv/chatserver/guild.h"
 #include "../utils/dtor.h"
 #include "../utils/gettext.h"
 
diff --git a/src/gui/npcpostdialog.cpp b/src/gui/npcpostdialog.cpp
index 3a72b21b..f8c0f4b2 100644
--- a/src/gui/npcpostdialog.cpp
+++ b/src/gui/npcpostdialog.cpp
@@ -26,7 +26,7 @@
 #include "scrollarea.h"
 #include "chat.h"
 
-#include "../net/gameserver/player.h"
+#include "../net/tmwserv/gameserver/player.h"
 #include "../utils/gettext.h"
 
 #include <guichan/widgets/label.hpp>
diff --git a/src/gui/partywindow.cpp b/src/gui/partywindow.cpp
index c4a1c780..d60974a8 100644
--- a/src/gui/partywindow.cpp
+++ b/src/gui/partywindow.cpp
@@ -25,7 +25,7 @@
 #include "widgets/avatar.h"
 
 #include "../utils/gettext.h"
-#include "../net/chatserver/party.h"
+#include "../net/tmwserv/chatserver/party.h"
 
 PartyWindow::PartyWindow() : Window(_("Party"))
 {
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 957ff861..cab88560 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -35,7 +35,7 @@
 
 #include "../net/messageout.h"
 #ifdef TMWSERV_SUPPORT
-#include "../net/gameserver/player.h"
+#include "../net/tmwserv/gameserver/player.h"
 #else
 #include "../net/ea/protocol.h"
 #endif
diff --git a/src/gui/serverdialog.h b/src/gui/serverdialog.h
index 268b1baf..16965571 100644
--- a/src/gui/serverdialog.h
+++ b/src/gui/serverdialog.h
@@ -34,7 +34,7 @@
 
 #include "../guichanfwd.h"
 
-#include "../net/network.h"
+#include "../net/tmwserv/network.h"
 
 class LoginData;
 
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index 98214a79..9910f4ce 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -41,7 +41,7 @@
 #include "../units.h"
 
 #ifdef TMWSERV_SUPPORT
-#include "../net/gameserver/player.h"
+#include "../net/tmwserv/gameserver/player.h"
 #else
 #include "../net/messageout.h"
 #include "../net/ea/protocol.h"
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 21ee3a22..c0da92ac 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -43,9 +43,9 @@
 #include "effectmanager.h"
 #include "guild.h"
 
-#include "net/gameserver/player.h"
-#include "net/chatserver/guild.h"
-#include "net/chatserver/party.h"
+#include "net/tmwserv/gameserver/player.h"
+#include "net/tmwserv/chatserver/guild.h"
+#include "net/tmwserv/chatserver/party.h"
 #endif
 
 #ifdef EATHENA_SUPPORT
diff --git a/src/main.cpp b/src/main.cpp
index b9919a2c..f108b9cf 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -73,10 +73,11 @@
 #include "gui/updatewindow.h"
 
 #ifdef TMWSERV_SUPPORT
-#include "net/charserverhandler.h"
-#include "net/connection.h"
-#include "net/loginhandler.h"
-#include "net/network.h"
+#include "net/tmwserv/charserverhandler.h"
+#include "net/tmwserv/connection.h"
+#include "net/tmwserv/loginhandler.h"
+#include "net/tmwserv/logouthandler.h"
+#include "net/tmwserv/network.h"
 #else
 #include "net/ea/charserverhandler.h"
 #include "net/ea/loginhandler.h"
@@ -84,15 +85,14 @@
 #include "net/ea/maploginhandler.h"
 #include "net/messageout.h"
 #endif
-#include "net/logouthandler.h"
 
 #ifdef TMWSERV_SUPPORT
-#include "net/accountserver/accountserver.h"
-#include "net/accountserver/account.h"
+#include "net/tmwserv/accountserver/accountserver.h"
+#include "net/tmwserv/accountserver/account.h"
 
-#include "net/chatserver/chatserver.h"
+#include "net/tmwserv/chatserver/chatserver.h"
 
-#include "net/gameserver/gameserver.h"
+#include "net/tmwserv/gameserver/gameserver.h"
 #endif
 
 #include "resources/colordb.h"
diff --git a/src/net/messagehandler.cpp b/src/net/messagehandler.cpp
index a765d0e8..85f10090 100644
--- a/src/net/messagehandler.cpp
+++ b/src/net/messagehandler.cpp
@@ -23,7 +23,7 @@
 
 #include "messagehandler.h"
 #ifdef TMWSERV_SUPPORT
-#include "network.h"
+#include "tmwserv/network.h"
 #else
 #include "ea/network.h"
 #endif
diff --git a/src/net/accountserver/account.cpp b/src/net/tmwserv/accountserver/account.cpp
index f734c4eb..a679e233 100644
--- a/src/net/accountserver/account.cpp
+++ b/src/net/tmwserv/accountserver/account.cpp
@@ -26,10 +26,10 @@
 #include "internal.h"
 
 #include "../connection.h"
-#include "../messageout.h"
+#include "../../messageout.h"
 #include "../protocol.h"
 
-#include "../../utils/sha256.h"
+#include "../../../utils/sha256.h"
 
 void Net::AccountServer::Account::createCharacter(
         const std::string &name, char hairStyle, char hairColor, char gender,
diff --git a/src/net/accountserver/account.h b/src/net/tmwserv/accountserver/account.h
index 581bcb42..581bcb42 100644
--- a/src/net/accountserver/account.h
+++ b/src/net/tmwserv/accountserver/account.h
diff --git a/src/net/accountserver/accountserver.cpp b/src/net/tmwserv/accountserver/accountserver.cpp
index b1ce590c..8093468c 100644
--- a/src/net/accountserver/accountserver.cpp
+++ b/src/net/tmwserv/accountserver/accountserver.cpp
@@ -26,10 +26,10 @@
 #include "internal.h"
 
 #include "../connection.h"
-#include "../messageout.h"
+#include "../../messageout.h"
 #include "../protocol.h"
 
-#include "../../utils/sha256.h"
+#include "../../../utils/sha256.h"
 
 void Net::AccountServer::login(Net::Connection *connection, int version,
         const std::string &username, const std::string &password)
diff --git a/src/net/accountserver/accountserver.h b/src/net/tmwserv/accountserver/accountserver.h
index 8e0573fc..8e0573fc 100644
--- a/src/net/accountserver/accountserver.h
+++ b/src/net/tmwserv/accountserver/accountserver.h
diff --git a/src/net/accountserver/internal.cpp b/src/net/tmwserv/accountserver/internal.cpp
index a3be76a1..a3be76a1 100644
--- a/src/net/accountserver/internal.cpp
+++ b/src/net/tmwserv/accountserver/internal.cpp
diff --git a/src/net/accountserver/internal.h b/src/net/tmwserv/accountserver/internal.h
index b3d64582..b3d64582 100644
--- a/src/net/accountserver/internal.h
+++ b/src/net/tmwserv/accountserver/internal.h
diff --git a/src/net/beinghandler.cpp b/src/net/tmwserv/beinghandler.cpp
index 8f1fb8fd..ac33b6fe 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/tmwserv/beinghandler.cpp
@@ -23,22 +23,22 @@
 
 #include <SDL_types.h>
 
-#include "messagein.h"
+#include "../messagein.h"
 #include "protocol.h"
 
-#include "../being.h"
-#include "../beingmanager.h"
-#include "../game.h"
-#include "../localplayer.h"
-#include "../log.h"
-#include "../main.h"
-#include "../npc.h"
-#include "../particle.h"
-#include "../sound.h"
+#include "../../being.h"
+#include "../../beingmanager.h"
+#include "../../game.h"
+#include "../../localplayer.h"
+#include "../../log.h"
+#include "../../main.h"
+#include "../../npc.h"
+#include "../../particle.h"
+#include "../../sound.h"
 
-#include "../gui/ok_dialog.h"
+#include "../../gui/ok_dialog.h"
 
-#include "../utils/gettext.h"
+#include "../../utils/gettext.h"
 
 #include "gameserver/player.h"
 
diff --git a/src/net/beinghandler.h b/src/net/tmwserv/beinghandler.h
index b02728b4..759a0ba3 100644
--- a/src/net/beinghandler.h
+++ b/src/net/tmwserv/beinghandler.h
@@ -22,7 +22,7 @@
 #ifndef _TMW_NET_BEINGHANDLER_H
 #define _TMW_NET_BEINGHANDLER_H
 
-#include "messagehandler.h"
+#include "../messagehandler.h"
 
 class BeingHandler : public MessageHandler
 {
diff --git a/src/net/buysellhandler.cpp b/src/net/tmwserv/buysellhandler.cpp
index a551f213..54750cbb 100644
--- a/src/net/buysellhandler.cpp
+++ b/src/net/tmwserv/buysellhandler.cpp
@@ -23,17 +23,17 @@
 
 #include <SDL_types.h>
 
-#include "messagein.h"
+#include "../messagein.h"
 #include "protocol.h"
 
-#include "../beingmanager.h"
-#include "../item.h"
-#include "../localplayer.h"
-#include "../npc.h"
+#include "../../beingmanager.h"
+#include "../../item.h"
+#include "../../localplayer.h"
+#include "../../npc.h"
 
-#include "../gui/buy.h"
-#include "../gui/chat.h"
-#include "../gui/sell.h"
+#include "../../gui/buy.h"
+#include "../../gui/chat.h"
+#include "../../gui/sell.h"
 
 extern BuyDialog *buyDialog;
 extern SellDialog *sellDialog;
diff --git a/src/net/buysellhandler.h b/src/net/tmwserv/buysellhandler.h
index 719b76d9..5bf58d8e 100644
--- a/src/net/buysellhandler.h
+++ b/src/net/tmwserv/buysellhandler.h
@@ -22,7 +22,7 @@
 #ifndef NET_BUYSELLHANDLER_H
 #define NET_BUYSELLHANDLER_H
 
-#include "messagehandler.h"
+#include "../messagehandler.h"
 
 class BuySellHandler : public MessageHandler
 {
diff --git a/src/net/charserverhandler.cpp b/src/net/tmwserv/charserverhandler.cpp
index 5905dba0..50b0e739 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/tmwserv/charserverhandler.cpp
@@ -22,17 +22,17 @@
 #include "charserverhandler.h"
 
 #include "connection.h"
-#include "messagein.h"
+#include "../messagein.h"
 #include "protocol.h"
 
-#include "../game.h"
-#include "../localplayer.h"
-#include "../log.h"
-#include "../logindata.h"
-#include "../main.h"
+#include "../../game.h"
+#include "../../localplayer.h"
+#include "../../log.h"
+#include "../../logindata.h"
+#include "../../main.h"
 
-#include "../gui/ok_dialog.h"
-#include "../gui/char_select.h"
+#include "../../gui/ok_dialog.h"
+#include "../../gui/char_select.h"
 
 extern Net::Connection *gameServerConnection;
 extern Net::Connection *chatServerConnection;
diff --git a/src/net/charserverhandler.h b/src/net/tmwserv/charserverhandler.h
index 08ba5102..41afa321 100644
--- a/src/net/charserverhandler.h
+++ b/src/net/tmwserv/charserverhandler.h
@@ -22,9 +22,9 @@
 #ifndef _TMW_NET_CHARSERVERHANDLER_H
 #define _TMW_NET_CHARSERVERHANDLER_H
 
-#include "messagehandler.h"
+#include "../messagehandler.h"
 
-#include "../lockedarray.h"
+#include "../../lockedarray.h"
 
 class CharCreateDialog;
 class LocalPlayer;
diff --git a/src/net/chathandler.cpp b/src/net/tmwserv/chathandler.cpp
index 90af899a..0d66d8aa 100644
--- a/src/net/chathandler.cpp
+++ b/src/net/tmwserv/chathandler.cpp
@@ -25,17 +25,17 @@
 #include <string>
 #include <iostream>
 
-#include "messagein.h"
+#include "../messagein.h"
 #include "protocol.h"
 
-#include "../being.h"
-#include "../beingmanager.h"
-#include "../game.h"
-#include "../channel.h"
-#include "../channelmanager.h"
+#include "../../being.h"
+#include "../../beingmanager.h"
+#include "../../game.h"
+#include "../../channel.h"
+#include "../../channelmanager.h"
 
-#include "../gui/chat.h"
-#include "../gui/guildwindow.h"
+#include "../../gui/chat.h"
+#include "../../gui/guildwindow.h"
 
 extern Being *player_node;
 
diff --git a/src/net/chathandler.h b/src/net/tmwserv/chathandler.h
index a9e9bd99..013b955d 100644
--- a/src/net/chathandler.h
+++ b/src/net/tmwserv/chathandler.h
@@ -22,7 +22,7 @@
 #ifndef NET_CHATHANDLER_H
 #define NET_CHATHANDLER_H
 
-#include "messagehandler.h"
+#include "../messagehandler.h"
 
 class ChatHandler : public MessageHandler
 {
diff --git a/src/net/chatserver/chatserver.cpp b/src/net/tmwserv/chatserver/chatserver.cpp
index 94e36b94..39ffef4a 100644
--- a/src/net/chatserver/chatserver.cpp
+++ b/src/net/tmwserv/chatserver/chatserver.cpp
@@ -24,7 +24,7 @@
 #include "internal.h"
 
 #include "../connection.h"
-#include "../messageout.h"
+#include "../../messageout.h"
 #include "../protocol.h"
 
 using Net::ChatServer::connection;
diff --git a/src/net/chatserver/chatserver.h b/src/net/tmwserv/chatserver/chatserver.h
index 1129239a..1129239a 100644
--- a/src/net/chatserver/chatserver.h
+++ b/src/net/tmwserv/chatserver/chatserver.h
diff --git a/src/net/chatserver/guild.cpp b/src/net/tmwserv/chatserver/guild.cpp
index 042ff013..649eccdf 100644
--- a/src/net/chatserver/guild.cpp
+++ b/src/net/tmwserv/chatserver/guild.cpp
@@ -25,10 +25,10 @@
 #include "internal.h"
 
 #include "../connection.h"
-#include "../messageout.h"
+#include "../../messageout.h"
 #include "../protocol.h"
 
-#include "../../log.h"
+#include "../../../log.h"
 
 void Net::ChatServer::Guild::createGuild(const std::string &name)
 {
diff --git a/src/net/chatserver/guild.h b/src/net/tmwserv/chatserver/guild.h
index 6c35be9f..6c35be9f 100644
--- a/src/net/chatserver/guild.h
+++ b/src/net/tmwserv/chatserver/guild.h
diff --git a/src/net/chatserver/internal.cpp b/src/net/tmwserv/chatserver/internal.cpp
index 0822d93d..0822d93d 100644
--- a/src/net/chatserver/internal.cpp
+++ b/src/net/tmwserv/chatserver/internal.cpp
diff --git a/src/net/chatserver/internal.h b/src/net/tmwserv/chatserver/internal.h
index b0f137c5..b0f137c5 100644
--- a/src/net/chatserver/internal.h
+++ b/src/net/tmwserv/chatserver/internal.h
diff --git a/src/net/chatserver/party.cpp b/src/net/tmwserv/chatserver/party.cpp
index 56eb57d2..c2c0b00a 100644
--- a/src/net/chatserver/party.cpp
+++ b/src/net/tmwserv/chatserver/party.cpp
@@ -25,10 +25,10 @@
 #include "internal.h"
 
 #include "../connection.h"
-#include "../messageout.h"
+#include "../../messageout.h"
 #include "../protocol.h"
 
-#include "../../log.h"
+#include "../../../log.h"
 
 void Net::ChatServer::Party::invitePlayer(const std::string &name)
 {
diff --git a/src/net/chatserver/party.h b/src/net/tmwserv/chatserver/party.h
index c1febd66..c1febd66 100644
--- a/src/net/chatserver/party.h
+++ b/src/net/tmwserv/chatserver/party.h
diff --git a/src/net/connection.cpp b/src/net/tmwserv/connection.cpp
index 7d3c2328..5e61ba61 100644
--- a/src/net/connection.cpp
+++ b/src/net/tmwserv/connection.cpp
@@ -24,9 +24,9 @@
 #include <string>
 
 #include "internal.h"
-#include "messageout.h"
+#include "../messageout.h"
 
-#include "../log.h"
+#include "../../log.h"
 
 Net::Connection::Connection(ENetHost *client):
     mConnection(0), mClient(client)
diff --git a/src/net/connection.h b/src/net/tmwserv/connection.h
index 4ab3d24d..4ab3d24d 100644
--- a/src/net/connection.h
+++ b/src/net/tmwserv/connection.h
diff --git a/src/net/effecthandler.cpp b/src/net/tmwserv/effecthandler.cpp
index 8411b9e7..ef8d63fb 100644
--- a/src/net/effecthandler.cpp
+++ b/src/net/tmwserv/effecthandler.cpp
@@ -21,10 +21,10 @@
 
 #include "effecthandler.h"
 
-#include "messagein.h"
+#include "../messagein.h"
 #include "protocol.h"
 
-#include "../effectmanager.h"
+#include "../../effectmanager.h"
 
 
 EffectHandler::EffectHandler()
diff --git a/src/net/effecthandler.h b/src/net/tmwserv/effecthandler.h
index 283c7c10..a19f13c3 100644
--- a/src/net/effecthandler.h
+++ b/src/net/tmwserv/effecthandler.h
@@ -22,7 +22,7 @@
 #ifndef _TMW_NET_EFFECTSHANDLER_H
 #define _TMW_NET_EFFECTSHANDLER_H
 
-#include "messagehandler.h"
+#include "../messagehandler.h"
 
 class EffectHandler : public MessageHandler
 {
diff --git a/src/net/gameserver/gameserver.cpp b/src/net/tmwserv/gameserver/gameserver.cpp
index 1bdaef26..013356d8 100644
--- a/src/net/gameserver/gameserver.cpp
+++ b/src/net/tmwserv/gameserver/gameserver.cpp
@@ -24,7 +24,7 @@
 #include "internal.h"
 
 #include "../connection.h"
-#include "../messageout.h"
+#include "../../messageout.h"
 #include "../protocol.h"
 
 void Net::GameServer::connect(Net::Connection *connection,
diff --git a/src/net/gameserver/gameserver.h b/src/net/tmwserv/gameserver/gameserver.h
index 5ea2c718..5ea2c718 100644
--- a/src/net/gameserver/gameserver.h
+++ b/src/net/tmwserv/gameserver/gameserver.h
diff --git a/src/net/gameserver/internal.cpp b/src/net/tmwserv/gameserver/internal.cpp
index 6b6ba081..6b6ba081 100644
--- a/src/net/gameserver/internal.cpp
+++ b/src/net/tmwserv/gameserver/internal.cpp
diff --git a/src/net/gameserver/internal.h b/src/net/tmwserv/gameserver/internal.h
index df9787fe..df9787fe 100644
--- a/src/net/gameserver/internal.h
+++ b/src/net/tmwserv/gameserver/internal.h
diff --git a/src/net/gameserver/player.cpp b/src/net/tmwserv/gameserver/player.cpp
index 95c13ec2..4eccdceb 100644
--- a/src/net/gameserver/player.cpp
+++ b/src/net/tmwserv/gameserver/player.cpp
@@ -24,7 +24,7 @@
 #include "internal.h"
 
 #include "../connection.h"
-#include "../messageout.h"
+#include "../../messageout.h"
 #include "../protocol.h"
 
 void RespawnRequestListener::action(const gcn::ActionEvent &event)
diff --git a/src/net/gameserver/player.h b/src/net/tmwserv/gameserver/player.h
index 9e68ced9..496e3a70 100644
--- a/src/net/gameserver/player.h
+++ b/src/net/tmwserv/gameserver/player.h
@@ -22,7 +22,7 @@
 #ifndef _TMW_NET_GAMESERVER_PLAYER_H
 #define _TMW_NET_GAMESERVER_PLAYER_H
 
-#include "../../being.h"
+#include "../../../being.h"
 
 #include <guichan/actionlistener.hpp>
 
diff --git a/src/net/guildhandler.cpp b/src/net/tmwserv/guildhandler.cpp
index cf886ab3..1699ffac 100644
--- a/src/net/guildhandler.cpp
+++ b/src/net/tmwserv/guildhandler.cpp
@@ -23,18 +23,18 @@
 #include "guildhandler.h"
 
 #include "protocol.h"
-#include "messagein.h"
+#include "../messagein.h"
 
 #include "chatserver/chatserver.h"
 #include "chatserver/guild.h"
 
-#include "../gui/guildwindow.h"
-#include "../gui/chat.h"
-#include "../guild.h"
-#include "../log.h"
-#include "../localplayer.h"
-#include "../channel.h"
-#include "../channelmanager.h"
+#include "../../gui/guildwindow.h"
+#include "../../gui/chat.h"
+#include "../../guild.h"
+#include "../../log.h"
+#include "../../localplayer.h"
+#include "../../channel.h"
+#include "../../channelmanager.h"
 
 GuildHandler::GuildHandler()
 {
diff --git a/src/net/guildhandler.h b/src/net/tmwserv/guildhandler.h
index 4eb2da0b..a962a577 100644
--- a/src/net/guildhandler.h
+++ b/src/net/tmwserv/guildhandler.h
@@ -22,7 +22,7 @@
 #ifndef _TMW_NET_GUILDHANDLER_H
 #define _TMW_NET_GUILDHANDLER_H
 
-#include "messagehandler.h"
+#include "../messagehandler.h"
 
 #include <string>
 
diff --git a/src/net/internal.cpp b/src/net/tmwserv/internal.cpp
index 4cb88a4e..4cb88a4e 100644
--- a/src/net/internal.cpp
+++ b/src/net/tmwserv/internal.cpp
diff --git a/src/net/internal.h b/src/net/tmwserv/internal.h
index 1e411605..1e411605 100644
--- a/src/net/internal.h
+++ b/src/net/tmwserv/internal.h
diff --git a/src/net/inventoryhandler.cpp b/src/net/tmwserv/inventoryhandler.cpp
index 41032f13..c6e82410 100644
--- a/src/net/inventoryhandler.cpp
+++ b/src/net/tmwserv/inventoryhandler.cpp
@@ -23,17 +23,17 @@
 
 #include <SDL_types.h>
 
-#include "messagein.h"
+#include "../messagein.h"
 #include "protocol.h"
 
-#include "../equipment.h"
-#include "../inventory.h"
-#include "../item.h"
-#include "../itemshortcut.h"
-#include "../localplayer.h"
+#include "../../equipment.h"
+#include "../../inventory.h"
+#include "../../item.h"
+#include "../../itemshortcut.h"
+#include "../../localplayer.h"
 
-#include "../gui/chat.h"
-#include "../resources/iteminfo.h"
+#include "../../gui/chat.h"
+#include "../../resources/iteminfo.h"
 
 InventoryHandler::InventoryHandler()
 {
diff --git a/src/net/inventoryhandler.h b/src/net/tmwserv/inventoryhandler.h
index 9b457abe..b2e469fa 100644
--- a/src/net/inventoryhandler.h
+++ b/src/net/tmwserv/inventoryhandler.h
@@ -22,7 +22,7 @@
 #ifndef NET_INVENTORYHANDLER_H
 #define NET_INVENTORYHANDLER_H
 
-#include "messagehandler.h"
+#include "../messagehandler.h"
 
 class InventoryHandler : public MessageHandler
 {
diff --git a/src/net/itemhandler.cpp b/src/net/tmwserv/itemhandler.cpp
index 189c6eb9..23d210cf 100644
--- a/src/net/itemhandler.cpp
+++ b/src/net/tmwserv/itemhandler.cpp
@@ -20,11 +20,11 @@
  */
 
 #include "itemhandler.h"
-#include "messagein.h"
+#include "../messagein.h"
 #include "protocol.h"
 
-#include "../engine.h"
-#include "../flooritemmanager.h"
+#include "../../engine.h"
+#include "../../flooritemmanager.h"
 
 ItemHandler::ItemHandler()
 {
diff --git a/src/net/itemhandler.h b/src/net/tmwserv/itemhandler.h
index 12057bb1..da93f6b4 100644
--- a/src/net/itemhandler.h
+++ b/src/net/tmwserv/itemhandler.h
@@ -22,7 +22,7 @@
 #ifndef NET_ITEMHANDLER_H
 #define NET_ITEMHANDLER_H
 
-#include "messagehandler.h"
+#include "../messagehandler.h"
 
 class ItemHandler : public MessageHandler
 {
diff --git a/src/net/loginhandler.cpp b/src/net/tmwserv/loginhandler.cpp
index 37c3608a..c49d6e47 100644
--- a/src/net/loginhandler.cpp
+++ b/src/net/tmwserv/loginhandler.cpp
@@ -21,11 +21,11 @@
 
 #include "loginhandler.h"
 
-#include "messagein.h"
+#include "../messagein.h"
 #include "protocol.h"
 
-#include "../logindata.h"
-#include "../main.h"
+#include "../../logindata.h"
+#include "../../main.h"
 
 LoginHandler::LoginHandler()
 {
diff --git a/src/net/loginhandler.h b/src/net/tmwserv/loginhandler.h
index 015d6383..a7310407 100644
--- a/src/net/loginhandler.h
+++ b/src/net/tmwserv/loginhandler.h
@@ -22,7 +22,7 @@
 #ifndef _TMW_NET_LOGINHANDLER_H
 #define _TMW_NET_LOGINHANDLER_H
 
-#include "messagehandler.h"
+#include "../messagehandler.h"
 
 class LoginData;
 
diff --git a/src/net/logouthandler.cpp b/src/net/tmwserv/logouthandler.cpp
index 6dea4c83..a7a1eb2e 100644
--- a/src/net/logouthandler.cpp
+++ b/src/net/tmwserv/logouthandler.cpp
@@ -21,10 +21,10 @@
 
 #include "logouthandler.h"
 
-#include "messagein.h"
+#include "../messagein.h"
 #include "protocol.h"
 
-#include "../main.h"
+#include "../../main.h"
 
 LogoutHandler::LogoutHandler():
 mPassToken(NULL), mScenario(LOGOUT_EXIT),
diff --git a/src/net/logouthandler.h b/src/net/tmwserv/logouthandler.h
index 369eaa80..3b4f9738 100644
--- a/src/net/logouthandler.h
+++ b/src/net/tmwserv/logouthandler.h
@@ -24,7 +24,7 @@
 
 #include <string>
 
-#include "messagehandler.h"
+#include "../messagehandler.h"
 
 /**
  * The different scenarios for which LogoutHandler can be used
diff --git a/src/net/network.cpp b/src/net/tmwserv/network.cpp
index 57e368e2..d3bc88fa 100644
--- a/src/net/network.cpp
+++ b/src/net/tmwserv/network.cpp
@@ -27,10 +27,10 @@
 
 #include "connection.h"
 #include "internal.h"
-#include "messagehandler.h"
-#include "messagein.h"
+#include "../messagehandler.h"
+#include "../messagein.h"
 
-#include "../log.h"
+#include "../../log.h"
 
 /**
  * The local host which is shared for all outgoing connections.
diff --git a/src/net/network.h b/src/net/tmwserv/network.h
index 13576e79..13576e79 100644
--- a/src/net/network.h
+++ b/src/net/tmwserv/network.h
diff --git a/src/net/npchandler.cpp b/src/net/tmwserv/npchandler.cpp
index 30507537..53f3c7b2 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/tmwserv/npchandler.cpp
@@ -21,15 +21,15 @@
 
 #include "npchandler.h"
 
-#include "messagein.h"
+#include "../messagein.h"
 #include "protocol.h"
 
-#include "../beingmanager.h"
-#include "../npc.h"
+#include "../../beingmanager.h"
+#include "../../npc.h"
 
-#include "../gui/npclistdialog.h"
-#include "../gui/npcpostdialog.h"
-#include "../gui/npc_text.h"
+#include "../../gui/npclistdialog.h"
+#include "../../gui/npcpostdialog.h"
+#include "../../gui/npc_text.h"
 
 extern NpcListDialog *npcListDialog;
 extern NpcTextDialog *npcTextDialog;
diff --git a/src/net/npchandler.h b/src/net/tmwserv/npchandler.h
index 18ab0a05..49df20c3 100644
--- a/src/net/npchandler.h
+++ b/src/net/tmwserv/npchandler.h
@@ -22,7 +22,7 @@
 #ifndef NET_NPCHANDLER_H
 #define NET_NPCHANDLER_H
 
-#include "messagehandler.h"
+#include "../messagehandler.h"
 
 class NPCHandler : public MessageHandler
 {
diff --git a/src/net/partyhandler.cpp b/src/net/tmwserv/partyhandler.cpp
index 60c51821..eb331bac 100644
--- a/src/net/partyhandler.cpp
+++ b/src/net/tmwserv/partyhandler.cpp
@@ -23,14 +23,14 @@
 #include "partyhandler.h"
 
 #include "protocol.h"
-#include "messagein.h"
+#include "../messagein.h"
 
 #include "chatserver/chatserver.h"
 
-#include "../gui/chat.h"
-#include "../gui/partywindow.h"
-#include "../log.h"
-#include "../localplayer.h"
+#include "../../gui/chat.h"
+#include "../../gui/partywindow.h"
+#include "../../log.h"
+#include "../../localplayer.h"
 
 PartyHandler::PartyHandler()
 {
diff --git a/src/net/partyhandler.h b/src/net/tmwserv/partyhandler.h
index b4257c34..c1ec6eda 100644
--- a/src/net/partyhandler.h
+++ b/src/net/tmwserv/partyhandler.h
@@ -22,7 +22,7 @@
 #ifndef _TMW_NET_PARTYHANDLER_H
 #define _TMW_NET_PARTYHANDLER_H
 
-#include "messagehandler.h"
+#include "../messagehandler.h"
 
 #include <string>
 
diff --git a/src/net/playerhandler.cpp b/src/net/tmwserv/playerhandler.cpp
index b4e2f328..d4850f43 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/tmwserv/playerhandler.cpp
@@ -21,24 +21,24 @@
 
 #include "playerhandler.h"
 
-#include "messagein.h"
+#include "../messagein.h"
 #include "protocol.h"
 
-#include "../engine.h"
-#include "../localplayer.h"
-#include "../log.h"
-#include "../particle.h"
-#include "../npc.h"
-
-#include "../gui/buy.h"
-#include "../gui/chat.h"
-#include "../gui/gui.h"
-#include "../gui/npclistdialog.h"
-#include "../gui/npc_text.h"
-#include "../gui/ok_dialog.h"
-#include "../gui/sell.h"
-#include "../gui/skill.h"
-#include "../gui/viewport.h"
+#include "../../engine.h"
+#include "../../localplayer.h"
+#include "../../log.h"
+#include "../../particle.h"
+#include "../../npc.h"
+
+#include "../../gui/buy.h"
+#include "../../gui/chat.h"
+#include "../../gui/gui.h"
+#include "../../gui/npclistdialog.h"
+#include "../../gui/npc_text.h"
+#include "../../gui/ok_dialog.h"
+#include "../../gui/sell.h"
+#include "../../gui/skill.h"
+#include "../../gui/viewport.h"
 
 // TODO Move somewhere else
 OkDialog *weightNotice = NULL;
diff --git a/src/net/playerhandler.h b/src/net/tmwserv/playerhandler.h
index fef767da..a11109c6 100644
--- a/src/net/playerhandler.h
+++ b/src/net/tmwserv/playerhandler.h
@@ -22,7 +22,7 @@
 #ifndef NET_PLAYERHANDLER_H
 #define NET_PLAYERHANDLER_H
 
-#include "messagehandler.h"
+#include "../messagehandler.h"
 
 class PlayerHandler : public MessageHandler
 {
diff --git a/src/net/protocol.h b/src/net/tmwserv/protocol.h
index 73dd65e0..73dd65e0 100644
--- a/src/net/protocol.h
+++ b/src/net/tmwserv/protocol.h
diff --git a/src/net/tradehandler.cpp b/src/net/tmwserv/tradehandler.cpp
index 5d93016f..12d47745 100644
--- a/src/net/tradehandler.cpp
+++ b/src/net/tmwserv/tradehandler.cpp
@@ -21,18 +21,18 @@
 
 #include "tradehandler.h"
 
-#include "messagein.h"
+#include "../messagein.h"
 #include "protocol.h"
 
 #include "gameserver/player.h"
 
-#include "../beingmanager.h"
-#include "../item.h"
-#include "../localplayer.h"
+#include "../../beingmanager.h"
+#include "../../item.h"
+#include "../../localplayer.h"
 
-#include "../gui/chat.h"
-#include "../gui/confirm_dialog.h"
-#include "../gui/trade.h"
+#include "../../gui/chat.h"
+#include "../../gui/confirm_dialog.h"
+#include "../../gui/trade.h"
 
 std::string tradePartnerName;
 int tradePartnerID;
diff --git a/src/net/tradehandler.h b/src/net/tmwserv/tradehandler.h
index 6ffe17b5..0b634b66 100644
--- a/src/net/tradehandler.h
+++ b/src/net/tmwserv/tradehandler.h
@@ -22,7 +22,7 @@
 #ifndef NET_TRADEHANDLER_H
 #define NET_TRADEHANDLER_H
 
-#include "messagehandler.h"
+#include "../messagehandler.h"
 
 class TradeHandler : public MessageHandler
 {
diff --git a/src/npc.cpp b/src/npc.cpp
index bc25fa5d..792d1aa4 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -27,7 +27,7 @@
 #include "gui/npc_text.h"
 
 #ifdef TMWSERV_SUPPORT
-#include "net/gameserver/player.h"
+#include "net/tmwserv/gameserver/player.h"
 #else
 #include "net/messageout.h"
 #include "net/ea/protocol.h"