11 files changed, 10 insertions, 10 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8d09c3e9..0ab2272d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -101,7 +101,7 @@ MARK_AS_ADVANCED(PHYSFS_LIBRARY)
 
 SET(SRCS
     defines.h
-    protocol.h
+    manaserv_protocol.h
     point.h
     common/configuration.h
     common/configuration.cpp
diff --git a/src/account-server/accounthandler.cpp b/src/account-server/accounthandler.cpp
index 3a61077e..ab3fad21 100644
--- a/src/account-server/accounthandler.cpp
+++ b/src/account-server/accounthandler.cpp
@@ -20,7 +20,7 @@
 
 #include "account-server/accounthandler.h"
 
-#include "protocol.h"
+#include "manaserv_protocol.h"
 #include "point.h"
 #include "account-server/account.h"
 #include "account-server/accountclient.h"
diff --git a/src/account-server/serverhandler.cpp b/src/account-server/serverhandler.cpp
index 2e471994..b41a4417 100644
--- a/src/account-server/serverhandler.cpp
+++ b/src/account-server/serverhandler.cpp
@@ -37,7 +37,7 @@
 #include "serialize/characterdata.h"
 #include "utils/logger.h"
 #include "utils/tokendispenser.h"
-#include "protocol.h"
+#include "manaserv_protocol.h"
 
 struct MapStatistics
 {
diff --git a/src/chat-server/chatchannelmanager.cpp b/src/chat-server/chatchannelmanager.cpp
index 7d10f53c..70cee8f1 100644
--- a/src/chat-server/chatchannelmanager.cpp
+++ b/src/chat-server/chatchannelmanager.cpp
@@ -22,7 +22,7 @@
 
 #include "chat-server/chatchannelmanager.h"
 
-#include "protocol.h"
+#include "manaserv_protocol.h"
 #include "account-server/storage.h"
 #include "chat-server/chatclient.h"
 #include "chat-server/chathandler.h"
diff --git a/src/chat-server/chathandler.cpp b/src/chat-server/chathandler.cpp
index 11865605..60474f92 100644
--- a/src/chat-server/chathandler.cpp
+++ b/src/chat-server/chathandler.cpp
@@ -23,7 +23,7 @@
 #include <string>
 #include <sstream>
 
-#include "protocol.h"
+#include "manaserv_protocol.h"
 #include "account-server/character.h"
 #include "account-server/storage.h"
 #include "chat-server/guildmanager.h"
diff --git a/src/chat-server/guildhandler.cpp b/src/chat-server/guildhandler.cpp
index e6970182..4f332cdd 100644
--- a/src/chat-server/guildhandler.cpp
+++ b/src/chat-server/guildhandler.cpp
@@ -31,7 +31,7 @@
 #include "net/messagein.h"
 #include "net/messageout.h"
 
-#include "protocol.h"
+#include "manaserv_protocol.h"
 
 void ChatHandler::sendGuildInvite(const std::string &invitedName,
                                   const std::string &inviterName,
diff --git a/src/chat-server/guildmanager.cpp b/src/chat-server/guildmanager.cpp
index 586878d7..49b135ce 100644
--- a/src/chat-server/guildmanager.cpp
+++ b/src/chat-server/guildmanager.cpp
@@ -20,7 +20,7 @@
 
 #include "guildmanager.h"
 #include "guild.h"
-#include "protocol.h"
+#include "manaserv_protocol.h"
 #include "defines.h"
 #include "account-server/storage.h"
 #include "chat-server/chatclient.h"
diff --git a/src/chat-server/partyhandler.cpp b/src/chat-server/partyhandler.cpp
index 3a9b845d..00190f2c 100644
--- a/src/chat-server/partyhandler.cpp
+++ b/src/chat-server/partyhandler.cpp
@@ -28,7 +28,7 @@
 #include "net/messagein.h"
 #include "net/messageout.h"
 
-#include "protocol.h"
+#include "manaserv_protocol.h"
 
 #include <algorithm>
 
diff --git a/src/game-server/character.h b/src/game-server/character.h
index dc12099b..dfbf14e4 100644
--- a/src/game-server/character.h
+++ b/src/game-server/character.h
@@ -27,7 +27,7 @@
 
 #include "common/inventorydata.h"
 #include "game-server/being.h"
-#include "protocol.h"
+#include "manaserv_protocol.h"
 #include "defines.h"
 #include "utils/logger.h"
 
diff --git a/src/game-server/thing.h b/src/game-server/thing.h
index f1f0df28..508d7529 100644
--- a/src/game-server/thing.h
+++ b/src/game-server/thing.h
@@ -21,7 +21,7 @@
 #ifndef THING_H
 #define THING_H
 
-#include "protocol.h"
+#include "manaserv_protocol.h"
 
 #include <set>
 
diff --git a/src/protocol.h b/src/manaserv_protocol.h
index b592f548..b592f548 100644
--- a/src/protocol.h
+++ b/src/manaserv_protocol.h