25 files changed, 79 insertions, 77 deletions
diff --git a/src/game-server/abilitycomponent.cpp b/src/game-server/abilitycomponent.cpp
index eb224980..b1213245 100644
--- a/src/game-server/abilitycomponent.cpp
+++ b/src/game-server/abilitycomponent.cpp
@@ -20,7 +20,7 @@
 
 #include "abilitycomponent.h"
 
-#include "game-server/being.h"
+#include "game-server/actorcomponent.h"
 #include "game-server/entity.h"
 
 #include "scripting/scriptmanager.h"
@@ -211,8 +211,8 @@ bool AbilityComponent::giveAbility(int id)
 
 bool AbilityComponent::giveAbility(const AbilityManager::AbilityInfo *info)
 {
-    bool added = mAbilities.insert(std::pair<int, AbilityValue>(info->id,
-                                   AbilityValue(info))).second;
+    bool added = mAbilities.insert(std::make_pair(info->id,
+                                                  AbilityValue(info))).second;
 
     signal_ability_changed.emit(info->id);
     return added;
diff --git a/src/game-server/accountconnection.cpp b/src/game-server/accountconnection.cpp
index 6072894e..03941778 100644
--- a/src/game-server/accountconnection.cpp
+++ b/src/game-server/accountconnection.cpp
@@ -21,9 +21,10 @@
 #include "game-server/accountconnection.h"
 
 #include "common/configuration.h"
+#include "common/defines.h"
+#include "game-server/being.h"
 #include "game-server/charactercomponent.h"
 #include "game-server/gamehandler.h"
-#include "game-server/map.h"
 #include "game-server/mapcomposite.h"
 #include "game-server/mapmanager.h"
 #include "game-server/item.h"
@@ -34,7 +35,6 @@
 #include "net/messagein.h"
 #include "utils/logger.h"
 #include "utils/tokendispenser.h"
-#include "utils/tokencollector.h"
 
 /** Maximum size of sync buffer in bytes. */
 const unsigned SYNC_BUFFER_SIZE = 1024;
diff --git a/src/game-server/attributeinfo.h b/src/game-server/attributeinfo.h
index b18e8f6d..b1cae1a6 100644
--- a/src/game-server/attributeinfo.h
+++ b/src/game-server/attributeinfo.h
@@ -22,6 +22,7 @@
 #define ATTRIBUTEINFO_H_
 
 #include <limits>
+#include <string>
 #include <vector>
 
 /**
diff --git a/src/game-server/being.cpp b/src/game-server/being.cpp
index 238d63e6..b1e6063b 100644
--- a/src/game-server/being.cpp
+++ b/src/game-server/being.cpp
@@ -18,22 +18,19 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <cassert>
-
 #include "game-server/being.h"
 
-#include "common/configuration.h"
+#include <cassert>
+
 #include "common/defines.h"
+#include "game-server/actorcomponent.h"
 #include "game-server/attributemanager.h"
-#include "game-server/charactercomponent.h"
-#include "game-server/collisiondetection.h"
 #include "game-server/mapcomposite.h"
-#include "game-server/effect.h"
 #include "game-server/statuseffect.h"
 #include "game-server/statusmanager.h"
+#include "scripting/scriptmanager.h"
 #include "utils/logger.h"
 #include "utils/speedconv.h"
-#include "scripting/scriptmanager.h"
 
 
 Script::Ref BeingComponent::mRecalculateDerivedAttributesCallback;
@@ -363,8 +360,7 @@ void BeingComponent::setAttribute(Entity &entity,
 
 void BeingComponent::createAttribute(AttributeInfo *attributeInfo)
 {
-    mAttributes.insert(std::pair<AttributeInfo *, Attribute>
-            (attributeInfo, Attribute(attributeInfo)));
+    mAttributes.insert(std::make_pair(attributeInfo, Attribute(attributeInfo)));
 }
 
 const Attribute *BeingComponent::getAttribute(AttributeInfo *attribute) const
diff --git a/src/game-server/being.h b/src/game-server/being.h
index 38fd3247..6e5933ec 100644
--- a/src/game-server/being.h
+++ b/src/game-server/being.h
@@ -27,12 +27,16 @@
 #include <string>
 #include <vector>
 
-#include "game-server/actorcomponent.h"
 #include "game-server/attribute.h"
-#include "game-server/attributemanager.h"
+#include "game-server/component.h"
+#include "game-server/map.h"
 #include "game-server/timeout.h"
-
 #include "scripting/script.h"
+#include "utils/point.h"
+
+#include <sigc++/signal.h>
+
+using namespace ManaServ;
 
 class BeingComponent;
 class MapComposite;
diff --git a/src/game-server/buysell.cpp b/src/game-server/buysell.cpp
index 86975393..61a0c14a 100644
--- a/src/game-server/buysell.cpp
+++ b/src/game-server/buysell.cpp
@@ -20,6 +20,7 @@
 
 #include "game-server/buysell.h"
 
+#include "game-server/being.h"
 #include "game-server/charactercomponent.h"
 #include "game-server/gamehandler.h"
 #include "game-server/inventory.h"
diff --git a/src/game-server/charactercomponent.cpp b/src/game-server/charactercomponent.cpp
index 68ecc792..4f2244ac 100644
--- a/src/game-server/charactercomponent.cpp
+++ b/src/game-server/charactercomponent.cpp
@@ -21,12 +21,13 @@
 #include "game-server/charactercomponent.h"
 
 #include "common/configuration.h"
+#include "game-server/abilitycomponent.h"
 #include "game-server/accountconnection.h"
+#include "game-server/actorcomponent.h"
 #include "game-server/attributemanager.h"
+#include "game-server/being.h"
 #include "game-server/buysell.h"
 #include "game-server/inventory.h"
-#include "game-server/item.h"
-#include "game-server/itemmanager.h"
 #include "game-server/gamehandler.h"
 #include "game-server/map.h"
 #include "game-server/mapcomposite.h"
@@ -207,9 +208,9 @@ void CharacterComponent::deserialize(Entity &entity, MessageIn &msg)
     poss.setEquipment(equipmentData);
 }
 
-void CharacterComponent::serialize(Entity &entity, MessageOut &msg)
+void CharacterComponent::serialize(Entity &entity, MessageOut &msg) const
 {
-    auto *beingComponent = entity.getComponent<BeingComponent>();
+    const auto *beingComponent = entity.getComponent<BeingComponent>();
 
     // general character properties
     msg.writeInt8(getAccountLevel());
@@ -268,8 +269,8 @@ void CharacterComponent::serialize(Entity &entity, MessageOut &msg)
 
     // questlog
     msg.writeInt16(mQuestlog.size());
-    for (auto questlogIt : mQuestlog) {
-        QuestInfo &quest = questlogIt.second;
+    for (const auto &questlogIt : mQuestlog) {
+        const QuestInfo &quest = questlogIt.second;
         msg.writeInt16(quest.id);
         msg.writeInt8(quest.state);
         msg.writeString(quest.title);
diff --git a/src/game-server/charactercomponent.h b/src/game-server/charactercomponent.h
index 2160e1cb..5a468dcc 100644
--- a/src/game-server/charactercomponent.h
+++ b/src/game-server/charactercomponent.h
@@ -21,25 +21,23 @@
 #ifndef CHARACTER_H
 #define CHARACTER_H
 
-#include "common/defines.h"
 #include "common/inventorydata.h"
 #include "common/manaserv_protocol.h"
 
-#include "game-server/abilitycomponent.h"
-#include "game-server/being.h"
+#include "game-server/component.h"
 #include "game-server/mapcomposite.h"
-#include "game-server/mapmanager.h"
-#include "game-server/abilitymanager.h"
-
+#include "game-server/timeout.h"
 #include "scripting/script.h"
 
-#include "utils/logger.h"
-
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
+#include <sigc++/signal.h>
+
+using namespace ManaServ;
+
 class BuySell;
 struct GameClient;
 class MessageIn;
@@ -313,7 +311,7 @@ class CharacterComponent : public Component
 
         sigc::signal<void, Entity &> signal_disconnected;
 
-        void serialize(Entity &entity, MessageOut &msg);
+        void serialize(Entity &entity, MessageOut &msg) const;
 
     private:
         void deserialize(Entity &entity, MessageIn &msg);
diff --git a/src/game-server/commandhandler.cpp b/src/game-server/commandhandler.cpp
index 4c51df4f..c9ec4e44 100644
--- a/src/game-server/commandhandler.cpp
+++ b/src/game-server/commandhandler.cpp
@@ -20,6 +20,8 @@
 
 #include <sstream>
 
+#include "game-server/abilitycomponent.h"
+#include "game-server/being.h"
 #include "game-server/commandhandler.h"
 #include "game-server/accountconnection.h"
 #include "game-server/charactercomponent.h"
diff --git a/src/game-server/effect.cpp b/src/game-server/effect.cpp
index a1af5288..f4cd87b8 100644
--- a/src/game-server/effect.cpp
+++ b/src/game-server/effect.cpp
@@ -21,6 +21,7 @@
 
 #include "game-server/effect.h"
 
+#include "game-server/actorcomponent.h"
 #include "game-server/being.h"
 #include "game-server/entity.h"
 #include "game-server/state.h"
diff --git a/src/game-server/effect.h b/src/game-server/effect.h
index 2517f50f..8146044b 100644
--- a/src/game-server/effect.h
+++ b/src/game-server/effect.h
@@ -23,7 +23,6 @@
 #define EFFECT_H
 
 #include "game-server/component.h"
-#include "game-server/state.h"
 
 class Entity;
 class MapComposite;
diff --git a/src/game-server/gamehandler.cpp b/src/game-server/gamehandler.cpp
index 01653f2a..2ed4b1b7 100644
--- a/src/game-server/gamehandler.cpp
+++ b/src/game-server/gamehandler.cpp
@@ -18,21 +18,22 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "game-server/gamehandler.h"
+
 #include <cassert>
 #include <map>
 
-#include "game-server/gamehandler.h"
-
 #include "common/configuration.h"
 #include "common/transaction.h"
+#include "game-server/abilitycomponent.h"
 #include "game-server/accountconnection.h"
+#include "game-server/being.h"
 #include "game-server/buysell.h"
 #include "game-server/commandhandler.h"
 #include "game-server/emotemanager.h"
 #include "game-server/inventory.h"
 #include "game-server/item.h"
 #include "game-server/itemmanager.h"
-#include "game-server/map.h"
 #include "game-server/mapcomposite.h"
 #include "game-server/npc.h"
 #include "game-server/postman.h"
diff --git a/src/game-server/inventory.cpp b/src/game-server/inventory.cpp
index 9468001e..221bffc1 100644
--- a/src/game-server/inventory.cpp
+++ b/src/game-server/inventory.cpp
@@ -18,14 +18,16 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "game-server/inventory.h"
+
 #include <algorithm>
 #include <cassert>
 
+#include "game-server/being.h"
+#include "game-server/charactercomponent.h"
 #include "game-server/gamehandler.h"
-#include "game-server/inventory.h"
 #include "game-server/item.h"
 #include "game-server/itemmanager.h"
-#include "game-server/state.h"
 #include "net/messageout.h"
 #include "utils/logger.h"
 
diff --git a/src/game-server/inventory.h b/src/game-server/inventory.h
index 627d0c97..6b222a87 100644
--- a/src/game-server/inventory.h
+++ b/src/game-server/inventory.h
@@ -21,8 +21,8 @@
 #ifndef INVENTORY_H
 #define INVENTORY_H
 
-#include "game-server/charactercomponent.h"
-#include "net/messageout.h"
+#include "common/inventorydata.h"
+#include "game-server/entity.h"
 
 class ItemClass;
 
diff --git a/src/game-server/mapcomposite.cpp b/src/game-server/mapcomposite.cpp
index d9df83cd..2d169a05 100644
--- a/src/game-server/mapcomposite.cpp
+++ b/src/game-server/mapcomposite.cpp
@@ -24,8 +24,8 @@
 
 #include "accountconnection.h"
 #include "common/configuration.h"
-#include "common/resourcemanager.h"
-#include "game-server/charactercomponent.h"
+#include "game-server/actorcomponent.h"
+#include "game-server/being.h"
 #include "game-server/mapcomposite.h"
 #include "game-server/map.h"
 #include "game-server/mapmanager.h"
diff --git a/src/game-server/monster.cpp b/src/game-server/monster.cpp
index 0688abf7..fbc2b4a1 100644
--- a/src/game-server/monster.cpp
+++ b/src/game-server/monster.cpp
@@ -20,18 +20,16 @@
 
 #include "game-server/monster.h"
 
-#include "common/configuration.h"
-#include "common/resourcemanager.h"
+#include "game-server/abilitycomponent.h"
+#include "game-server/actorcomponent.h"
 #include "game-server/attributemanager.h"
-#include "game-server/charactercomponent.h"
-#include "game-server/collisiondetection.h"
-#include "game-server/item.h"
+#include "game-server/being.h"
+#include "game-server/entity.h"
 #include "game-server/map.h"
 #include "game-server/mapcomposite.h"
 #include "game-server/state.h"
 #include "scripting/scriptmanager.h"
 #include "utils/logger.h"
-#include "utils/speedconv.h"
 
 #include <cmath>
 
@@ -115,4 +113,3 @@ void MonsterComponent::monsterDied(Entity *monster)
 {
     mDecayTimeout.set(DECAY_TIME);
 }
-
diff --git a/src/game-server/monster.h b/src/game-server/monster.h
index a6b17369..8c1da777 100644
--- a/src/game-server/monster.h
+++ b/src/game-server/monster.h
@@ -21,15 +21,12 @@
 #ifndef MONSTER_H
 #define MONSTER_H
 
-#include "game-server/abilitymanager.h"
-#include "game-server/being.h"
-
 #include "common/defines.h"
-
+#include "game-server/abilitymanager.h"
+#include "game-server/component.h"
+#include "game-server/timeout.h"
 #include "scripting/script.h"
 
-#include "utils/string.h"
-
 #include <map>
 #include <set>
 #include <string>
@@ -37,6 +34,8 @@
 
 #include <sigc++/connection.h>
 
+using namespace ManaServ;
+
 class CharacterComponent;
 class ItemClass;
 class Script;
diff --git a/src/game-server/npc.cpp b/src/game-server/npc.cpp
index bcc62d33..fa4901b1 100644
--- a/src/game-server/npc.cpp
+++ b/src/game-server/npc.cpp
@@ -21,10 +21,8 @@
 
 #include "game-server/npc.h"
 
+#include "game-server/actorcomponent.h"
 #include "game-server/charactercomponent.h"
-#include "game-server/gamehandler.h"
-#include "game-server/map.h"
-#include "net/messageout.h"
 #include "scripting/script.h"
 #include "scripting/scriptmanager.h"
 
diff --git a/src/game-server/postman.h b/src/game-server/postman.h
index a8d82770..03443e2b 100644
--- a/src/game-server/postman.h
+++ b/src/game-server/postman.h
@@ -24,6 +24,7 @@
 #include <map>
 #include <string>
 
+#include "game-server/accountconnection.h"
 #include "game-server/charactercomponent.h"
 #include "game-server/entity.h"
 
@@ -57,13 +58,13 @@ public:
         std::map<int, Entity*>::iterator itr = mCharacters.find(dataBaseId);
         if (itr == mCharacters.end())
         {
-            mCharacters.insert(std::pair<int, Entity*>(dataBaseId, player));
+            mCharacters.insert(std::make_pair(dataBaseId, player));
         }
     }
 
     void getPost(Entity *player, PostCallback &f)
     {
-        mCallbacks.insert(std::pair<Entity*, PostCallback>(player, f));
+        mCallbacks.insert(std::make_pair(player, f));
         accountHandler->getPost(player);
     }
 
diff --git a/src/game-server/quest.cpp b/src/game-server/quest.cpp
index 444c8140..f7b97d34 100644
--- a/src/game-server/quest.cpp
+++ b/src/game-server/quest.cpp
@@ -22,6 +22,8 @@
 
 #include "game-server/accountconnection.h"
 #include "game-server/charactercomponent.h"
+#include "game-server/entity.h"
+#include "scripting/scriptmanager.h"
 #include "utils/logger.h"
 
 #include <cassert>
diff --git a/src/game-server/quest.h b/src/game-server/quest.h
index 4344f1c9..aa4f8bfc 100644
--- a/src/game-server/quest.h
+++ b/src/game-server/quest.h
@@ -21,13 +21,7 @@
 #ifndef GAMESERVER_QUEST_H
 #define GAMESERVER_QUEST_H
 
-#include <string>
-
-#include "scripting/scriptmanager.h"
-
-class Entity;
-class Script;
-
+#include "scripting/script.h"
 
 class QuestCallback
 {
diff --git a/src/game-server/settingsmanager.cpp b/src/game-server/settingsmanager.cpp
index d6e5e564..b9b5c3bb 100644
--- a/src/game-server/settingsmanager.cpp
+++ b/src/game-server/settingsmanager.cpp
@@ -19,19 +19,18 @@
  */
 
 #include "game-server/settingsmanager.h"
-#include "common/defines.h"
-#include "utils/logger.h"
-#include "utils/xml.h"
 
+#include "common/defines.h"
 #include "common/resourcemanager.h"
-
 #include "game-server/abilitymanager.h"
 #include "game-server/attributemanager.h"
+#include "game-server/emotemanager.h"
 #include "game-server/itemmanager.h"
 #include "game-server/mapmanager.h"
 #include "game-server/monstermanager.h"
-#include "game-server/emotemanager.h"
 #include "game-server/statusmanager.h"
+#include "utils/logger.h"
+#include "utils/xml.h"
 
 /**
  * Initialize all managers and load configuration into them.
diff --git a/src/game-server/spawnareacomponent.cpp b/src/game-server/spawnareacomponent.cpp
index 15e24b3a..c532a172 100644
--- a/src/game-server/spawnareacomponent.cpp
+++ b/src/game-server/spawnareacomponent.cpp
@@ -20,6 +20,9 @@
 
 #include "game-server/spawnareacomponent.h"
 
+#include "game-server/actorcomponent.h"
+#include "game-server/being.h"
+#include "game-server/entity.h"
 #include "game-server/mapcomposite.h"
 #include "game-server/monster.h"
 #include "game-server/state.h"
diff --git a/src/game-server/state.cpp b/src/game-server/state.cpp
index 6fa84901..47fe9053 100644
--- a/src/game-server/state.cpp
+++ b/src/game-server/state.cpp
@@ -21,10 +21,12 @@
 #include "game-server/state.h"
 
 #include "common/configuration.h"
+#include "game-server/abilitycomponent.h"
 #include "game-server/accountconnection.h"
+#include "game-server/being.h"
+#include "game-server/charactercomponent.h"
 #include "game-server/effect.h"
 #include "game-server/gamehandler.h"
-#include "game-server/inventory.h"
 #include "game-server/item.h"
 #include "game-server/itemmanager.h"
 #include "game-server/map.h"
@@ -32,12 +34,10 @@
 #include "game-server/mapmanager.h"
 #include "game-server/monster.h"
 #include "game-server/npc.h"
-#include "game-server/trade.h"
 #include "net/messageout.h"
 #include "scripting/script.h"
 #include "scripting/scriptmanager.h"
 #include "utils/logger.h"
-#include "utils/speedconv.h"
 
 #include <cassert>
 
diff --git a/src/game-server/trade.cpp b/src/game-server/trade.cpp
index a7cf7153..a6114f80 100644
--- a/src/game-server/trade.cpp
+++ b/src/game-server/trade.cpp
@@ -18,11 +18,14 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "game-server/trade.h"
+
 #include <algorithm>
 #include <cassert>
 
-#include "game-server/trade.h"
-
+#include "common/defines.h"
+#include "game-server/actorcomponent.h"
+#include "game-server/being.h"
 #include "game-server/charactercomponent.h"
 #include "game-server/gamehandler.h"
 #include "game-server/inventory.h"