3 files changed, 50 insertions, 42 deletions
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index 3f98fed26..e20ad0dbb 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -23,28 +23,31 @@
 #ifndef EATHENA_PROTOCOL_H
 #define EATHENA_PROTOCOL_H
 
-enum
+namespace EAthena
 {
-    JOB = 0xa,
-
-    STR = 0xd,
-    AGI,
-    VIT,
-    INT,
-    DEX,
-    LUK,
-
-    ATK,
-    DEF,
-    MATK,
-    MDEF,
-    HIT,
-    FLEE,
-    CRIT
-
-//    KARMA,
-//    MANNER
-};
+    enum
+    {
+        JOB = 0xa,
+
+        STR = 0xd,
+        AGI,
+        VIT,
+        INT,
+        DEX,
+        LUK,
+
+        ATK,
+        DEF,
+        MATK,
+        MDEF,
+        HIT,
+        FLEE,
+        CRIT
+
+//        KARMA,
+//        MANNER
+    };
+}
 
 enum
 {
diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h
index 232ab532a..b4665946c 100644
--- a/src/net/serverinfo.h
+++ b/src/net/serverinfo.h
@@ -28,6 +28,8 @@
 #include <string>
 #include <vector>
 
+#include "localconsts.h"
+
 class ServerInfo
 {
 public:
diff --git a/src/net/tmwa/protocol.h b/src/net/tmwa/protocol.h
index 72952cdd0..72540c54b 100644
--- a/src/net/tmwa/protocol.h
+++ b/src/net/tmwa/protocol.h
@@ -23,28 +23,31 @@
 #ifndef TA_PROTOCOL_H
 #define TA_PROTOCOL_H
 
-enum
+namespace TmwAthena
 {
-    JOB = 0xa,
-
-    STR = 0xd,
-    AGI,
-    VIT,
-    INT,
-    DEX,
-    LUK,
-
-    ATK,
-    DEF,
-    MATK,
-    MDEF,
-    HIT,
-    FLEE,
-    CRIT
-
-//    KARMA,
-//    MANNER
-};
+    enum
+    {
+        JOB = 0xa,
+
+        STR = 0xd,
+        AGI,
+        VIT,
+        INT,
+        DEX,
+        LUK,
+
+        ATK,
+        DEF,
+        MATK,
+        MDEF,
+        HIT,
+        FLEE,
+        CRIT
+
+//        KARMA,
+//        MANNER
+    };
+}
 
 enum
 {