From fe189f61b6385a30c689b46667ccc18c7117056a Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 28 May 2013 14:53:28 +0300
Subject: fix guard header part2.

---
 src/net/adminhandler.h           | 6 +++---
 src/net/beinghandler.h           | 6 +++---
 src/net/buysellhandler.h         | 6 +++---
 src/net/charserverhandler.h      | 6 +++---
 src/net/chathandler.h            | 6 +++---
 src/net/ea/eaprotocol.h          | 6 +++---
 src/net/ea/gui/guildtab.h        | 6 +++---
 src/net/ea/gui/partytab.h        | 6 +++---
 src/net/ea/loginhandler.h        | 2 +-
 src/net/eathena/gamehandler.h    | 6 +++---
 src/net/eathena/gui/guildtab.h   | 6 +++---
 src/net/eathena/gui/partytab.h   | 6 +++---
 src/net/eathena/guildhandler.h   | 2 +-
 src/net/eathena/loginhandler.h   | 4 ++--
 src/net/eathena/messagehandler.h | 2 +-
 src/net/eathena/messagein.h      | 2 +-
 src/net/eathena/messageout.h     | 2 +-
 src/net/eathena/protocol.h       | 6 +++---
 src/net/gamehandler.h            | 6 +++---
 src/net/generalhandler.h         | 6 +++---
 src/net/guildhandler.h           | 6 +++---
 src/net/inventoryhandler.h       | 6 +++---
 src/net/logindata.h              | 6 +++---
 src/net/loginhandler.h           | 6 +++---
 src/net/net.h                    | 6 +++---
 src/net/npchandler.h             | 6 +++---
 src/net/packetcounters.h         | 6 +++---
 src/net/partyhandler.h           | 6 +++---
 src/net/playerhandler.h          | 6 +++---
 src/net/sdltcpnet.h              | 2 +-
 src/net/serverinfo.h             | 6 +++---
 src/net/skillhandler.h           | 6 +++---
 src/net/tmwa/adminhandler.h      | 6 +++---
 src/net/tmwa/beinghandler.h      | 6 +++---
 src/net/tmwa/buysellhandler.h    | 6 +++---
 src/net/tmwa/charserverhandler.h | 6 +++---
 src/net/tmwa/chathandler.h       | 6 +++---
 src/net/tmwa/gamehandler.h       | 6 +++---
 src/net/tmwa/generalhandler.h    | 2 +-
 src/net/tmwa/gui/guildtab.h      | 6 +++---
 src/net/tmwa/gui/partytab.h      | 6 +++---
 src/net/tmwa/guildhandler.h      | 6 +++---
 src/net/tmwa/inventoryhandler.h  | 6 +++---
 src/net/tmwa/itemhandler.h       | 6 +++---
 src/net/tmwa/loginhandler.h      | 2 +-
 src/net/tmwa/messagehandler.h    | 6 +++---
 src/net/tmwa/messagein.h         | 6 +++---
 src/net/tmwa/messageout.h        | 6 +++---
 src/net/tmwa/network.h           | 6 +++---
 src/net/tmwa/npchandler.h        | 6 +++---
 src/net/tmwa/partyhandler.h      | 6 +++---
 src/net/tmwa/playerhandler.h     | 6 +++---
 src/net/tmwa/protocol.h          | 6 +++---
 src/net/tmwa/questhandler.h      | 6 +++---
 src/net/tmwa/skillhandler.h      | 6 +++---
 src/net/tmwa/tradehandler.h      | 6 +++---
 src/net/tradehandler.h           | 6 +++---
 src/net/worldinfo.h              | 6 +++---
 58 files changed, 157 insertions(+), 157 deletions(-)

diff --git a/src/net/adminhandler.h b/src/net/adminhandler.h
index dc249c137..eca8ef4d0 100644
--- a/src/net/adminhandler.h
+++ b/src/net/adminhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ADMINHANDLER_H
-#define ADMINHANDLER_H
+#ifndef NET_ADMINHANDLER_H
+#define NET_ADMINHANDLER_H
 
 #include <iosfwd>
 #include <string>
@@ -62,4 +62,4 @@ class AdminHandler
 
 }  // namespace Net
 
-#endif  // ADMINHANDLER_H
+#endif  // NET_ADMINHANDLER_H
diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h
index 332d2e81c..31a31fcc2 100644
--- a/src/net/beinghandler.h
+++ b/src/net/beinghandler.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef BEINGHANDLER_H
-#define BEINGHANDLER_H
+#ifndef NET_BEINGHANDLER_H
+#define NET_BEINGHANDLER_H
 
 #include "being.h"
 #include "net/messagein.h"
@@ -43,4 +43,4 @@ class BeingHandler
 
 }  // namespace Net
 
-#endif  // BEINGHANDLER_H
+#endif  // NET_BEINGHANDLER_H
diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h
index 1b9984647..62167f439 100644
--- a/src/net/buysellhandler.h
+++ b/src/net/buysellhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef BUYSELLHANDLER_H
-#define BUYSELLHANDLER_H
+#ifndef NET_BUYSELLHANDLER_H
+#define NET_BUYSELLHANDLER_H
 
 #include "net/messagein.h"
 
@@ -53,4 +53,4 @@ class BuySellHandler
 
 }  // namespace Net
 
-#endif  // BUYSELLHANDLER_H
+#endif  // NET_BUYSELLHANDLER_H
diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h
index de5973897..2722d833a 100644
--- a/src/net/charserverhandler.h
+++ b/src/net/charserverhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CHARSERVERHANDLER_H
-#define CHARSERVERHANDLER_H
+#ifndef NET_CHARSERVERHANDLER_H
+#define NET_CHARSERVERHANDLER_H
 
 #include "localplayer.h"
 #include "playerinfo.h"
@@ -120,4 +120,4 @@ class CharServerHandler
 
 }  // namespace Net
 
-#endif  // CHARSERVERHANDLER_H
+#endif  // NET_CHARSERVERHANDLER_H
diff --git a/src/net/chathandler.h b/src/net/chathandler.h
index dd60fbbe6..9fe65499c 100644
--- a/src/net/chathandler.h
+++ b/src/net/chathandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CHATHANDLER_H
-#define CHATHANDLER_H
+#ifndef NET_CHATHANDLER_H
+#define NET_CHATHANDLER_H
 
 #include <iosfwd>
 #include <string>
@@ -56,4 +56,4 @@ class ChatHandler
 
 }  // namespace Net
 
-#endif  // CHATHANDLER_H
+#endif  // NET_CHATHANDLER_H
diff --git a/src/net/ea/eaprotocol.h b/src/net/ea/eaprotocol.h
index 014928b66..e448a19db 100644
--- a/src/net/ea/eaprotocol.h
+++ b/src/net/ea/eaprotocol.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef EA_EA_PROTOCOL_H
-#define EA_EA_PROTOCOL_H
+#ifndef NET_EA_EAPROTOCOL_H
+#define NET_EA_EAPROTOCOL_H
 
 enum
 {
@@ -68,4 +68,4 @@ enum
 static const int INVENTORY_OFFSET = 2;
 static const int STORAGE_OFFSET = 1;
 
-#endif
+#endif  // NET_EA_EAPROTOCOL_H
diff --git a/src/net/ea/gui/guildtab.h b/src/net/ea/gui/guildtab.h
index fdfd2fea4..28b689f79 100644
--- a/src/net/ea/gui/guildtab.h
+++ b/src/net/ea/gui/guildtab.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef EA_GUILDTAB_H
-#define EA_GUILDTAB_H
+#ifndef NET_EA_GUI_GUILDTAB_H
+#define NET_EA_GUI_GUILDTAB_H
 
 #include "gui/widgets/chattab.h"
 
@@ -62,4 +62,4 @@ class GuildTab : public ChatTab, public ConfigListener
 
 }  // namespace Ea
 
-#endif  // EA_GUILDTAB_H
+#endif  // NET_EA_GUI_GUILDTAB_H
diff --git a/src/net/ea/gui/partytab.h b/src/net/ea/gui/partytab.h
index a2c782248..983e6efb2 100644
--- a/src/net/ea/gui/partytab.h
+++ b/src/net/ea/gui/partytab.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef EA_PARTYTAB_H
-#define EA_PARTYTAB_H
+#ifndef NET_EA_GUI_PARTYTAB_H
+#define NET_EA_GUI_PARTYTAB_H
 
 #include "gui/widgets/chattab.h"
 
@@ -62,4 +62,4 @@ extern PartyTab *partyTab;
 
 }  // namespace Ea
 
-#endif  // EA_PARTYTAB_H
+#endif  // NET_EA_GUI_PARTYTAB_H
diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h
index 38defc09d..0d60a7622 100644
--- a/src/net/ea/loginhandler.h
+++ b/src/net/ea/loginhandler.h
@@ -106,4 +106,4 @@ class LoginHandler : public Net::LoginHandler
 
 }  // namespace Ea
 
-#endif  // NET_TA_LOGINHANDLER_H
+#endif  // NET_EA_LOGINHANDLER_H
diff --git a/src/net/eathena/gamehandler.h b/src/net/eathena/gamehandler.h
index 61959ecd1..49a21baf4 100644
--- a/src/net/eathena/gamehandler.h
+++ b/src/net/eathena/gamehandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_EATHENA_MAPHANDLER_H
-#define NET_EATHENA_MAPHANDLER_H
+#ifndef NET_EATHENA_GAMEHANDLER_H
+#define NET_EATHENA_GAMEHANDLER_H
 
 #include "net/gamehandler.h"
 #include "net/net.h"
@@ -64,4 +64,4 @@ class GameHandler final : public MessageHandler, public Ea::GameHandler
 
 }  // namespace EAthena
 
-#endif  // NET_EATHENA_MAPHANDLER_H
+#endif  // NET_EATHENA_GAMEHANDLER_H
diff --git a/src/net/eathena/gui/guildtab.h b/src/net/eathena/gui/guildtab.h
index 50d96427a..154d5d74c 100644
--- a/src/net/eathena/gui/guildtab.h
+++ b/src/net/eathena/gui/guildtab.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef EATHENA_GUILDTAB_H
-#define EATHENA_GUILDTAB_H
+#ifndef NET_EATHENA_GUI_GUILDTAB_H
+#define NET_EATHENA_GUI_GUILDTAB_H
 
 #include "net/ea/gui/guildtab.h"
 
@@ -43,4 +43,4 @@ class GuildTab : public Ea::GuildTab
 
 }  // namespace EAthena
 
-#endif  // EATHENA_GUILDTAB_H
+#endif  // NET_EATHENA_GUI_GUILDTAB_H
diff --git a/src/net/eathena/gui/partytab.h b/src/net/eathena/gui/partytab.h
index 00828891e..0dd9bc8b9 100644
--- a/src/net/eathena/gui/partytab.h
+++ b/src/net/eathena/gui/partytab.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef EATHENA_PARTYTAB_H
-#define EATHENA_PARTYTAB_H
+#ifndef NET_EATHENA_GUI_PARTYTAB_H
+#define NET_EATHENA_GUI_PARTYTAB_H
 
 #include "net/ea/gui/partytab.h"
 
@@ -43,4 +43,4 @@ class PartyTab : public Ea::PartyTab
 
 }  // namespace EAthena
 
-#endif  // EATHENA_PARTYTAB_H
+#endif  // NET_EATHENA_GUI_PARTYTAB_H
diff --git a/src/net/eathena/guildhandler.h b/src/net/eathena/guildhandler.h
index 9d612c474..4f3c3fa14 100644
--- a/src/net/eathena/guildhandler.h
+++ b/src/net/eathena/guildhandler.h
@@ -74,4 +74,4 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler
     extern Guild *taGuild;
 }  // namespace EAthena
 
-#endif
+#endif  // NET_EATHENA_GUILDHANDLER_H
diff --git a/src/net/eathena/loginhandler.h b/src/net/eathena/loginhandler.h
index 00eee5949..506b5b0a0 100644
--- a/src/net/eathena/loginhandler.h
+++ b/src/net/eathena/loginhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TMWA_LOGINHANDLER_H
-#define NET_TMWA_LOGINHANDLER_H
+#ifndef NET_EATHENA_LOGINHANDLER_H
+#define NET_EATHENA_LOGINHANDLER_H
 
 #include "net/loginhandler.h"
 
diff --git a/src/net/eathena/messagehandler.h b/src/net/eathena/messagehandler.h
index 33216dca7..aafac96ea 100644
--- a/src/net/eathena/messagehandler.h
+++ b/src/net/eathena/messagehandler.h
@@ -58,4 +58,4 @@ typedef const std::auto_ptr<MessageHandler> MessageHandlerPtr;
 
 }  // namespace EAthena
 
-#endif
+#endif  // NET_EATHENA_MESSAGEHANDLER_H
diff --git a/src/net/eathena/messagein.h b/src/net/eathena/messagein.h
index 8c465a90b..49f8a36f1 100644
--- a/src/net/eathena/messagein.h
+++ b/src/net/eathena/messagein.h
@@ -54,4 +54,4 @@ class MessageIn final : public Net::MessageIn
 
 }  // namespace EAthena
 
-#endif
+#endif  // NET_EATHENA_MESSAGEIN_H
diff --git a/src/net/eathena/messageout.h b/src/net/eathena/messageout.h
index c76eae4c1..0e8364131 100644
--- a/src/net/eathena/messageout.h
+++ b/src/net/eathena/messageout.h
@@ -72,4 +72,4 @@ class MessageOut final : public Net::MessageOut
 
 }  // namespace EAthena
 
-#endif
+#endif  // NET_EATHENA_MESSAGEOUT_H
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index 8ac5dd011..3fbab016f 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef EATHENA_PROTOCOL_H
-#define EATHENA_PROTOCOL_H
+#ifndef NET_EATHENA_PROTOCOL_H
+#define NET_EATHENA_PROTOCOL_H
 
 namespace EAthena
 {
@@ -350,4 +350,4 @@ enum
 #define SMSG_NPC_CUTIN               0x01b3
 #define SMSG_NPC_VIEWPOINT           0x0144
 
-#endif
+#endif  // NET_EATHENA_PROTOCOL_H
diff --git a/src/net/gamehandler.h b/src/net/gamehandler.h
index cd32b5420..4639e5eae 100644
--- a/src/net/gamehandler.h
+++ b/src/net/gamehandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MAPHANDLER_H
-#define MAPHANDLER_H
+#ifndef NET_GAMEHANDLER_H
+#define NET_GAMEHANDLER_H
 
 #include "net/logindata.h"
 
@@ -65,4 +65,4 @@ class GameHandler
 
 }  // namespace Net
 
-#endif  // MAPHANDLER_H
+#endif  // NET_GAMEHANDLER_H
diff --git a/src/net/generalhandler.h b/src/net/generalhandler.h
index 3860267aa..371be3afb 100644
--- a/src/net/generalhandler.h
+++ b/src/net/generalhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GENERALHANDLER_H
-#define GENERALHANDLER_H
+#ifndef NET_GENERALHANDLER_H
+#define NET_GENERALHANDLER_H
 
 namespace Net
 {
@@ -51,4 +51,4 @@ class GeneralHandler
 
 }  // namespace Net
 
-#endif  // GENERALHANDLER_H
+#endif  // NET_GENERALHANDLER_H
diff --git a/src/net/guildhandler.h b/src/net/guildhandler.h
index 113b0d869..1f06a4dc9 100644
--- a/src/net/guildhandler.h
+++ b/src/net/guildhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUILDHANDLER_H
-#define GUILDHANDLER_H
+#ifndef NET_GUILDHANDLER_H
+#define NET_GUILDHANDLER_H
 
 #include "guild.h"
 
@@ -86,4 +86,4 @@ class GuildHandler
 
 }  // namespace Net
 
-#endif  // GUILDHANDLER_H
+#endif  // NET_GUILDHANDLER_H
diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h
index d751676e6..39e7bf8ba 100644
--- a/src/net/inventoryhandler.h
+++ b/src/net/inventoryhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef INVENTORYHANDLER_H
-#define INVENTORYHANDLER_H
+#ifndef NET_INVENTORYHANDLER_H
+#define NET_INVENTORYHANDLER_H
 
 #include "item.h"
 
@@ -68,4 +68,4 @@ class InventoryHandler
 
 }  // namespace Net
 
-#endif  // INVENTORYHANDLER_H
+#endif  // NET_INVENTORYHANDLER_H
diff --git a/src/net/logindata.h b/src/net/logindata.h
index 5611a9bc8..abe6b6ee7 100644
--- a/src/net/logindata.h
+++ b/src/net/logindata.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LOGINDATA_H
-#define LOGINDATA_H
+#ifndef NET_LOGINDATA_H
+#define NET_LOGINDATA_H
 
 #include "being.h"
 
@@ -108,4 +108,4 @@ class LoginData final
         }
 };
 
-#endif  // LOGINDATA_H
+#endif  // NET_LOGINDATA_H
diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h
index cc10a8ae1..d3bbdddb7 100644
--- a/src/net/loginhandler.h
+++ b/src/net/loginhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LOGINHANDLER_H
-#define LOGINHANDLER_H
+#ifndef NET_LOGINHANDLER_H
+#define NET_LOGINHANDLER_H
 
 #include "net/logindata.h"
 #include "net/serverinfo.h"
@@ -117,4 +117,4 @@ class LoginHandler
 
 }  // namespace Net
 
-#endif  // LOGINHANDLER_H
+#endif  // NET_LOGINHANDLER_H
diff --git a/src/net/net.h b/src/net/net.h
index 2d3c9995a..7d25df5e3 100644
--- a/src/net/net.h
+++ b/src/net/net.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_H
-#define NET_H
+#ifndef NET_NET_H
+#define NET_NET_H
 
 /**
  * \namespace Net
@@ -79,4 +79,4 @@ void unload();
 
 }  // namespace Net
 
-#endif  // NET_H
+#endif  // NET_NET_H
diff --git a/src/net/npchandler.h b/src/net/npchandler.h
index b1e954a26..ae53e8d0e 100644
--- a/src/net/npchandler.h
+++ b/src/net/npchandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NPCHANDLER_H
-#define NPCHANDLER_H
+#ifndef NET_NPCHANDLER_H
+#define NET_NPCHANDLER_H
 
 #include <iosfwd>
 
@@ -71,4 +71,4 @@ class NpcHandler
 
 }  // namespace Net
 
-#endif  // NPCHANDLER_H
+#endif  // NET_NPCHANDLER_H
diff --git a/src/net/packetcounters.h b/src/net/packetcounters.h
index 95a13ee06..afb5dab90 100644
--- a/src/net/packetcounters.h
+++ b/src/net/packetcounters.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PACKETCOUNTERS_H
-#define PACKETCOUNTERS_H
+#ifndef NET_PACKETCOUNTERS_H
+#define NET_PACKETCOUNTERS_H
 
 #include "localconsts.h"
 
@@ -61,4 +61,4 @@ private:
     static void updateCounter(int &currentSec, int &calc, int &counter);
 };
 
-#endif
+#endif  // NET_PACKETCOUNTERS_H
diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h
index 54b30c106..3425f01b8 100644
--- a/src/net/partyhandler.h
+++ b/src/net/partyhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PARTYHANDLER_H
-#define PARTYHANDLER_H
+#ifndef NET_PARTYHANDLER_H
+#define NET_PARTYHANDLER_H
 
 #include "localconsts.h"
 
@@ -82,4 +82,4 @@ class PartyHandler
 
 }  // namespace Net
 
-#endif  // PARTYHANDLER_H
+#endif  // NET_PARTYHANDLER_H
diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h
index 152855d4c..7c20224ac 100644
--- a/src/net/playerhandler.h
+++ b/src/net/playerhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PLAYERHANDLER_H
-#define PLAYERHANDLER_H
+#ifndef NET_PLAYERHANDLER_H
+#define NET_PLAYERHANDLER_H
 
 #include "being.h"
 #include "flooritem.h"
@@ -81,4 +81,4 @@ class PlayerHandler
 
 }  // namespace Net
 
-#endif  // PLAYERHANDLER_H
+#endif  // NET_PLAYERHANDLER_H
diff --git a/src/net/sdltcpnet.h b/src/net/sdltcpnet.h
index 449a41116..1d83b04fc 100644
--- a/src/net/sdltcpnet.h
+++ b/src/net/sdltcpnet.h
@@ -60,4 +60,4 @@ namespace TcpNet
     void freeSocketSet(TcpNet::SocketSet set);
 }  // namespace TcpNet
 
-#endif
+#endif  // NET_SDLTCPNET_H
diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h
index 7fa9a0640..df7a854e7 100644
--- a/src/net/serverinfo.h
+++ b/src/net/serverinfo.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SERVERINFO_H
-#define SERVERINFO_H
+#ifndef NET_SERVERINFO_H
+#define NET_SERVERINFO_H
 
 #include "utils/stringutils.h"
 
@@ -141,4 +141,4 @@ public:
 
 typedef std::vector<ServerInfo> ServerInfos;
 
-#endif  // SERVERINFO_H
+#endif  // NET_SERVERINFO_H
diff --git a/src/net/skillhandler.h b/src/net/skillhandler.h
index 1ecefad15..9a13cb97c 100644
--- a/src/net/skillhandler.h
+++ b/src/net/skillhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SKILLHANDLER_H
-#define SKILLHANDLER_H
+#ifndef NET_SKILLHANDLER_H
+#define NET_SKILLHANDLER_H
 
 #include <iosfwd>
 
@@ -44,4 +44,4 @@ class SkillHandler
 
 }  // namespace Net
 
-#endif  // SKILLHANDLER_H
+#endif  // NET_SKILLHANDLER_H
diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h
index d3bb2ed0e..18185225f 100644
--- a/src/net/tmwa/adminhandler.h
+++ b/src/net/tmwa/adminhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_ADMINHANDLER_H
-#define NET_TA_ADMINHANDLER_H
+#ifndef NET_TMWA_ADMINHANDLER_H
+#define NET_TMWA_ADMINHANDLER_H
 
 #include "net/adminhandler.h"
 #include "net/net.h"
@@ -53,4 +53,4 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_ADMINHANDLER_H
+#endif  // NET_TMWA_ADMINHANDLER_H
diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h
index 6cb6b447e..c008d12be 100644
--- a/src/net/tmwa/beinghandler.h
+++ b/src/net/tmwa/beinghandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_BEINGHANDLER_H
-#define NET_TA_BEINGHANDLER_H
+#ifndef NET_TMWA_BEINGHANDLER_H
+#define NET_TMWA_BEINGHANDLER_H
 
 #include "net/beinghandler.h"
 #include "net/net.h"
@@ -58,4 +58,4 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_BEINGHANDLER_H
+#endif  // NET_TMWA_BEINGHANDLER_H
diff --git a/src/net/tmwa/buysellhandler.h b/src/net/tmwa/buysellhandler.h
index f3f36e5b3..8571e9d8a 100644
--- a/src/net/tmwa/buysellhandler.h
+++ b/src/net/tmwa/buysellhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_BUYSELLHANDLER_H
-#define NET_TA_BUYSELLHANDLER_H
+#ifndef NET_TMWA_BUYSELLHANDLER_H
+#define NET_TMWA_BUYSELLHANDLER_H
 
 #include "net/buysellhandler.h"
 
@@ -48,4 +48,4 @@ class BuySellHandler final : public MessageHandler, public Ea::BuySellHandler
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_BUYSELLHANDLER_H
+#endif  // NET_TMWA_BUYSELLHANDLER_H
diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h
index ab2a9e587..156302c80 100644
--- a/src/net/tmwa/charserverhandler.h
+++ b/src/net/tmwa/charserverhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_CHARSERVERHANDLER_H
-#define NET_TA_CHARSERVERHANDLER_H
+#ifndef NET_TMWA_CHARSERVERHANDLER_H
+#define NET_TMWA_CHARSERVERHANDLER_H
 
 #include "net/charserverhandler.h"
 
@@ -72,4 +72,4 @@ class CharServerHandler final : public MessageHandler,
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_CHARSERVERHANDLER_H
+#endif  // NET_TMWA_CHARSERVERHANDLER_H
diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h
index 2e1c16d93..4a0429416 100644
--- a/src/net/tmwa/chathandler.h
+++ b/src/net/tmwa/chathandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_CHATHANDLER_H
-#define NET_TA_CHATHANDLER_H
+#ifndef NET_TMWA_CHATHANDLER_H
+#define NET_TMWA_CHATHANDLER_H
 
 #include "net/chathandler.h"
 #include "net/net.h"
@@ -63,4 +63,4 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_CHATHANDLER_H
+#endif  // NET_TMWA_CHATHANDLER_H
diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h
index 142c644ea..755bd69dc 100644
--- a/src/net/tmwa/gamehandler.h
+++ b/src/net/tmwa/gamehandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_MAPHANDLER_H
-#define NET_TA_MAPHANDLER_H
+#ifndef NET_TMWA_GAMEHANDLER_H
+#define NET_TMWA_GAMEHANDLER_H
 
 #include "net/gamehandler.h"
 #include "net/net.h"
@@ -62,4 +62,4 @@ class GameHandler final : public MessageHandler, public Ea::GameHandler
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_MAPHANDLER_H
+#endif  // NET_TMWA_GAMEHANDLER_H
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index 2290dbe38..0b471e93f 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -80,4 +80,4 @@ class GeneralHandler final : public MessageHandler,
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_GENERALHANDLER_H
+#endif  // NET_TMWA_GENERALHANDLER_H
diff --git a/src/net/tmwa/gui/guildtab.h b/src/net/tmwa/gui/guildtab.h
index b3729fc5a..3a685b8f7 100644
--- a/src/net/tmwa/gui/guildtab.h
+++ b/src/net/tmwa/gui/guildtab.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TA_GUILDTAB_H
-#define TA_GUILDTAB_H
+#ifndef NET_TMWA_GUI_GUILDTAB_H
+#define NET_TMWA_GUI_GUILDTAB_H
 
 #include "net/ea/gui/guildtab.h"
 
@@ -43,4 +43,4 @@ class GuildTab : public Ea::GuildTab
 
 }  // namespace TmwAthena
 
-#endif  // TA_GUILDTAB_H
+#endif  // NET_TMWA_GUI_GUILDTAB_H
diff --git a/src/net/tmwa/gui/partytab.h b/src/net/tmwa/gui/partytab.h
index af6e63338..7fa1e55fc 100644
--- a/src/net/tmwa/gui/partytab.h
+++ b/src/net/tmwa/gui/partytab.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TA_PARTYTAB_H
-#define TA_PARTYTAB_H
+#ifndef NET_TMWA_GUI_PARTYTAB_H
+#define NET_TMWA_GUI_PARTYTAB_H
 
 #include "net/ea/gui/partytab.h"
 
@@ -43,4 +43,4 @@ class PartyTab : public Ea::PartyTab
 
 }  // namespace TmwAthena
 
-#endif  // TA_PARTYTAB_H
+#endif  // NET_TMWA_GUI_PARTYTAB_H
diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h
index 98dcff784..2a0c8d7db 100644
--- a/src/net/tmwa/guildhandler.h
+++ b/src/net/tmwa/guildhandler.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_GUILDHANDLER_H
-#define NET_TA_GUILDHANDLER_H
+#ifndef NET_TMWA_GUILDHANDLER_H
+#define NET_TMWA_GUILDHANDLER_H
 
 #include "net/guildhandler.h"
 
@@ -74,4 +74,4 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler
     extern Guild *taGuild;
 }  // namespace TmwAthena
 
-#endif
+#endif  // NET_TMWA_GUILDHANDLER_H
diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h
index 365951d08..a02be49ee 100644
--- a/src/net/tmwa/inventoryhandler.h
+++ b/src/net/tmwa/inventoryhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_INVENTORYHANDLER_H
-#define NET_TA_INVENTORYHANDLER_H
+#ifndef NET_TMWA_INVENTORYHANDLER_H
+#define NET_TMWA_INVENTORYHANDLER_H
 
 #include "logger.h"
 
@@ -62,4 +62,4 @@ class InventoryHandler final : public MessageHandler,
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_INVENTORYHANDLER_H
+#endif  // NET_TMWA_INVENTORYHANDLER_H
diff --git a/src/net/tmwa/itemhandler.h b/src/net/tmwa/itemhandler.h
index 00c825588..5b712bc2a 100644
--- a/src/net/tmwa/itemhandler.h
+++ b/src/net/tmwa/itemhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_ITEMHANDLER_H
-#define NET_TA_ITEMHANDLER_H
+#ifndef NET_TMWA_ITEMHANDLER_H
+#define NET_TMWA_ITEMHANDLER_H
 
 #include "net/tmwa/messagehandler.h"
 
@@ -42,4 +42,4 @@ class ItemHandler final : public MessageHandler, public Ea::ItemHandler
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_ITEMHANDLER_H
+#endif  // NET_TMWA_ITEMHANDLER_H
diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h
index c1326f274..d05d0a747 100644
--- a/src/net/tmwa/loginhandler.h
+++ b/src/net/tmwa/loginhandler.h
@@ -78,4 +78,4 @@ class LoginHandler final : public MessageHandler, public Ea::LoginHandler
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_LOGINHANDLER_H
+#endif  // NET_TMWA_LOGINHANDLER_H
diff --git a/src/net/tmwa/messagehandler.h b/src/net/tmwa/messagehandler.h
index 70d8dc3f7..5afe28bff 100644
--- a/src/net/tmwa/messagehandler.h
+++ b/src/net/tmwa/messagehandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_MESSAGEHANDLER_H
-#define NET_TA_MESSAGEHANDLER_H
+#ifndef NET_TMWA_MESSAGEHANDLER_H
+#define NET_TMWA_MESSAGEHANDLER_H
 
 #include "net/messagehandler.h"
 
@@ -58,4 +58,4 @@ typedef const std::auto_ptr<MessageHandler> MessageHandlerPtr;
 
 }  // namespace TmwAthena
 
-#endif
+#endif  // NET_TMWA_MESSAGEHANDLER_H
diff --git a/src/net/tmwa/messagein.h b/src/net/tmwa/messagein.h
index 8178e8aa0..75e85b044 100644
--- a/src/net/tmwa/messagein.h
+++ b/src/net/tmwa/messagein.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_MESSAGEIN_H
-#define NET_TA_MESSAGEIN_H
+#ifndef NET_TMWA_MESSAGEIN_H
+#define NET_TMWA_MESSAGEIN_H
 
 #include "net/messagein.h"
 
@@ -54,4 +54,4 @@ class MessageIn final : public Net::MessageIn
 
 }  // namespace TmwAthena
 
-#endif
+#endif  // NET_TMWA_MESSAGEIN_H
diff --git a/src/net/tmwa/messageout.h b/src/net/tmwa/messageout.h
index 119425257..1d7b76800 100644
--- a/src/net/tmwa/messageout.h
+++ b/src/net/tmwa/messageout.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_MESSAGEOUT_H
-#define NET_TA_MESSAGEOUT_H
+#ifndef NET_TMWA_MESSAGEOUT_H
+#define NET_TMWA_MESSAGEOUT_H
 
 #include "net/messageout.h"
 
@@ -72,4 +72,4 @@ class MessageOut final : public Net::MessageOut
 
 }  // namespace TmwAthena
 
-#endif
+#endif  // NET_TMWA_MESSAGEOUT_H
diff --git a/src/net/tmwa/network.h b/src/net/tmwa/network.h
index 521a532a2..0dfd067a8 100644
--- a/src/net/tmwa/network.h
+++ b/src/net/tmwa/network.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_NETWORK_H
-#define NET_TA_NETWORK_H
+#ifndef NET_TMWA_NETWORK_H
+#define NET_TMWA_NETWORK_H
 
 #include "net/ea/network.h"
 
@@ -69,4 +69,4 @@ class Network final : public Ea::Network
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_NETWORK_H
+#endif  // NET_TMWA_NETWORK_H
diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index 53008f615..8b5adfcac 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_NPCHANDLER_H
-#define NET_TA_NPCHANDLER_H
+#ifndef NET_TMWA_NPCHANDLER_H
+#define NET_TMWA_NPCHANDLER_H
 
 #include "net/net.h"
 #include "net/npchandler.h"
@@ -84,4 +84,4 @@ class NpcHandler final : public MessageHandler, public Ea::NpcHandler
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_NPCHANDLER_H
+#endif  // NET_TMWA_NPCHANDLER_H
diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h
index bdc945e7e..892dfd70d 100644
--- a/src/net/tmwa/partyhandler.h
+++ b/src/net/tmwa/partyhandler.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_PARTYHANDLER_H
-#define NET_TA_PARTYHANDLER_H
+#ifndef NET_TMWA_PARTYHANDLER_H
+#define NET_TMWA_PARTYHANDLER_H
 
 #include "net/net.h"
 #include "net/partyhandler.h"
@@ -67,4 +67,4 @@ class PartyHandler final : public MessageHandler, public Ea::PartyHandler
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_PARTYHANDLER_H
+#endif  // NET_TMWA_PARTYHANDLER_H
diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h
index ebfc66874..94f993377 100644
--- a/src/net/tmwa/playerhandler.h
+++ b/src/net/tmwa/playerhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_PLAYERHANDLER_H
-#define NET_TA_PLAYERHANDLER_H
+#ifndef NET_TMWA_PLAYERHANDLER_H
+#define NET_TMWA_PLAYERHANDLER_H
 
 #include "net/net.h"
 #include "net/playerhandler.h"
@@ -63,4 +63,4 @@ class PlayerHandler final : public MessageHandler, public Ea::PlayerHandler
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_PLAYERHANDLER_H
+#endif  // NET_TMWA_PLAYERHANDLER_H
diff --git a/src/net/tmwa/protocol.h b/src/net/tmwa/protocol.h
index 86f78c45d..a2d68da7d 100644
--- a/src/net/tmwa/protocol.h
+++ b/src/net/tmwa/protocol.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TA_PROTOCOL_H
-#define TA_PROTOCOL_H
+#ifndef NET_TMWA_PROTOCOL_H
+#define NET_TMWA_PROTOCOL_H
 
 namespace TmwAthena
 {
@@ -353,4 +353,4 @@ enum
 #define CMSG_SEND_CLIENT_INFO        0x7533
 #define SMSG_UPDATE_HOST2            0x7534
 
-#endif
+#endif  // NET_TMWA_PROTOCOL_H
diff --git a/src/net/tmwa/questhandler.h b/src/net/tmwa/questhandler.h
index e24a48f53..ef6e79c13 100644
--- a/src/net/tmwa/questhandler.h
+++ b/src/net/tmwa/questhandler.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_QUESTHANDLER_H
-#define NET_TA_QUESTHANDLER_H
+#ifndef NET_TMWA_QUESTHANDLER_H
+#define NET_TMWA_QUESTHANDLER_H
 
 #include "net/net.h"
 #include "net/npchandler.h"
@@ -49,4 +49,4 @@ class QuestHandler final : public MessageHandler
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_QUESTHANDLER_H
+#endif  // NET_TMWA_QUESTHANDLER_H
diff --git a/src/net/tmwa/skillhandler.h b/src/net/tmwa/skillhandler.h
index b410aff04..d472faaff 100644
--- a/src/net/tmwa/skillhandler.h
+++ b/src/net/tmwa/skillhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_SKILLHANDLER_H
-#define NET_TA_SKILLHANDLER_H
+#ifndef NET_TMWA_SKILLHANDLER_H
+#define NET_TMWA_SKILLHANDLER_H
 
 #include "net/net.h"
 #include "net/skillhandler.h"
@@ -53,4 +53,4 @@ class SkillHandler final : public MessageHandler, public Ea::SkillHandler
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_SKILLHANDLER_H
+#endif  // NET_TMWA_SKILLHANDLER_H
diff --git a/src/net/tmwa/tradehandler.h b/src/net/tmwa/tradehandler.h
index 491139369..707384d85 100644
--- a/src/net/tmwa/tradehandler.h
+++ b/src/net/tmwa/tradehandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_TRADEHANDLER_H
-#define NET_TA_TRADEHANDLER_H
+#ifndef NET_TMWA_TRADEHANDLER_H
+#define NET_TMWA_TRADEHANDLER_H
 
 #include "net/net.h"
 #include "net/tradehandler.h"
@@ -59,4 +59,4 @@ class TradeHandler final : public MessageHandler, public Ea::TradeHandler
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_TRADEHANDLER_H
+#endif  // NET_TMWA_TRADEHANDLER_H
diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h
index 90708de45..f896e190c 100644
--- a/src/net/tradehandler.h
+++ b/src/net/tradehandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TRADEHANDLER_H
-#define TRADEHANDLER_H
+#ifndef NET_TRADEHANDLER_H
+#define NET_TRADEHANDLER_H
 
 #include "being.h"
 
@@ -66,4 +66,4 @@ class TradeHandler
 
 }  // namespace Net
 
-#endif  // TRADEHANDLER_H
+#endif  // NET_TRADEHANDLER_H
diff --git a/src/net/worldinfo.h b/src/net/worldinfo.h
index a9a8c6b4a..25bc089ca 100644
--- a/src/net/worldinfo.h
+++ b/src/net/worldinfo.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef WORLD_INFO_H
-#define WORLD_INFO_H
+#ifndef NET_WORLDINFO_H
+#define NET_WORLDINFO_H
 
 #include <string>
 #include <vector>
@@ -46,4 +46,4 @@ struct WorldInfo final
 
 typedef std::vector<WorldInfo*> Worlds;
 
-#endif  // WORLD_INFO_H
+#endif  // NET_WORLDINFO_H
-- 
cgit v1.2.3-60-g2f50