66 files changed, 352 insertions, 312 deletions
diff --git a/src/game-server/accountconnection.cpp b/src/game-server/accountconnection.cpp
index 3c3cd88c..72546fbf 100644
--- a/src/game-server/accountconnection.cpp
+++ b/src/game-server/accountconnection.cpp
@@ -18,23 +18,23 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "game-server/accountconnection.hpp"
-
-#include "common/configuration.hpp"
-#include "game-server/character.hpp"
-#include "game-server/gamehandler.hpp"
-#include "game-server/map.hpp"
-#include "game-server/mapcomposite.hpp"
-#include "game-server/mapmanager.hpp"
-#include "game-server/itemmanager.hpp"
-#include "game-server/postman.hpp"
-#include "game-server/quest.hpp"
-#include "game-server/state.hpp"
-#include "net/messagein.hpp"
-#include "serialize/characterdata.hpp"
+#include "game-server/accountconnection.h"
+
+#include "common/configuration.h"
+#include "game-server/character.h"
+#include "game-server/gamehandler.h"
+#include "game-server/map.h"
+#include "game-server/mapcomposite.h"
+#include "game-server/mapmanager.h"
+#include "game-server/itemmanager.h"
+#include "game-server/postman.h"
+#include "game-server/quest.h"
+#include "game-server/state.h"
+#include "net/messagein.h"
+#include "serialize/characterdata.h"
 #include "utils/logger.h"
-#include "utils/tokendispenser.hpp"
-#include "utils/tokencollector.hpp"
+#include "utils/tokendispenser.h"
+#include "utils/tokencollector.h"
 
 AccountConnection::AccountConnection():
     mSyncBuffer(0)
diff --git a/src/game-server/accountconnection.hpp b/src/game-server/accountconnection.h
index 28599f82..c0bbc5cd 100644
--- a/src/game-server/accountconnection.hpp
+++ b/src/game-server/accountconnection.h
@@ -21,8 +21,8 @@
 #ifndef ACCOUNTCONNECTION_H
 #define ACCOUNTCONNECTION_H
 
-#include "net/messageout.hpp"
-#include "net/connection.hpp"
+#include "net/messageout.h"
+#include "net/connection.h"
 
 class Character;
 
diff --git a/src/game-server/actor.cpp b/src/game-server/actor.cpp
index 8c183224..b9f4504b 100644
--- a/src/game-server/actor.cpp
+++ b/src/game-server/actor.cpp
@@ -18,10 +18,10 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "game-server/actor.hpp"
+#include "game-server/actor.h"
 
-#include "game-server/map.hpp"
-#include "game-server/mapcomposite.hpp"
+#include "game-server/map.h"
+#include "game-server/mapcomposite.h"
 
 #include <cassert>
 
diff --git a/src/game-server/actor.hpp b/src/game-server/actor.h
index de1e30a1..483cb78e 100644
--- a/src/game-server/actor.hpp
+++ b/src/game-server/actor.h
@@ -22,8 +22,8 @@
 #define ACTOR_H
 
 #include "point.h"
-#include "game-server/map.hpp"
-#include "game-server/thing.hpp"
+#include "game-server/map.h"
+#include "game-server/thing.h"
 
 /**
  * Flags that are raised as necessary. They trigger messages that are sent to
diff --git a/src/game-server/attribute.cpp b/src/game-server/attribute.cpp
index c7bc43d2..e5ca1b64 100644
--- a/src/game-server/attribute.cpp
+++ b/src/game-server/attribute.cpp
@@ -18,8 +18,8 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "attribute.hpp"
-#include "game-server/being.hpp"
+#include "attribute.h"
+#include "game-server/being.h"
 #include "utils/logger.h"
 #include <cassert>
 
diff --git a/src/game-server/attribute.hpp b/src/game-server/attribute.h
index e0696a4c..c2b8bcfb 100644
--- a/src/game-server/attribute.hpp
+++ b/src/game-server/attribute.h
@@ -18,8 +18,8 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ATTRIBUTE_HPP
-#define ATTRIBUTE_HPP
+#ifndef ATTRIBUTE_H
+#define ATTRIBUTE_H
 
 #include "defines.h"
 #include <vector>
@@ -181,4 +181,4 @@ class Attribute
         std::vector< AttributeModifiersEffect * > mMods;
 };
 
-#endif // ATTRIBUTE_HPP
+#endif // ATTRIBUTE_H
diff --git a/src/game-server/attributemanager.cpp b/src/game-server/attributemanager.cpp
index 3c9fab23..d590a951 100644
--- a/src/game-server/attributemanager.cpp
+++ b/src/game-server/attributemanager.cpp
@@ -18,12 +18,12 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "game-server/attributemanager.hpp"
+#include "game-server/attributemanager.h"
 
-#include "common/resourcemanager.hpp"
-#include "utils/string.hpp"
+#include "common/resourcemanager.h"
+#include "utils/string.h"
 #include "utils/logger.h"
-#include "utils/xml.hpp"
+#include "utils/xml.h"
 #include "defines.h"
 
 void AttributeManager::initialize()
diff --git a/src/game-server/attributemanager.hpp b/src/game-server/attributemanager.h
index c5f1d870..a87ba901 100644
--- a/src/game-server/attributemanager.hpp
+++ b/src/game-server/attributemanager.h
@@ -18,8 +18,8 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ATTRIBUTEMANAGER_HPP
-#define ATTRIBUTEMANAGER_HPP
+#ifndef ATTRIBUTEMANAGER_H
+#define ATTRIBUTEMANAGER_H
 
 #include <map>
 #include <vector>
@@ -80,4 +80,4 @@ class AttributeManager
 
 extern AttributeManager *attributeManager;
 
-#endif // ATTRIBUTEMANAGER_HPP
+#endif // ATTRIBUTEMANAGER_H
diff --git a/src/game-server/autoattack.cpp b/src/game-server/autoattack.cpp
index dae6b0ff..b8c8a165 100644
--- a/src/game-server/autoattack.cpp
+++ b/src/game-server/autoattack.cpp
@@ -1,4 +1,24 @@
-#include "autoattack.hpp"
+/*
+ *  The Mana Server
+ *  Copyright (C) 2010  The Mana Development Team
+ *
+ *  This file is part of The Mana Server.
+ *
+ *  The Mana Server is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana Server is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "autoattack.h"
 
 void AutoAttacks::add(AutoAttack n)
 {
diff --git a/src/game-server/autoattack.hpp b/src/game-server/autoattack.h
index a931d924..8be5c608 100644
--- a/src/game-server/autoattack.hpp
+++ b/src/game-server/autoattack.h
@@ -1,5 +1,25 @@
-#ifndef AUTOATTACK_HPP
-#define AUTOATTACK_HPP
+/*
+ *  The Mana Server
+ *  Copyright (C) 2010  The Mana Development Team
+ *
+ *  This file is part of The Mana Server.
+ *
+ *  The Mana Server is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana Server is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef AUTOATTACK_H
+#define AUTOATTACK_H
 
 #include <list>
 #include <limits>
@@ -97,4 +117,4 @@ class AutoAttacks
 
 };
 
-#endif // AUTOATTACK_HPP
+#endif // AUTOATTACK_H
diff --git a/src/game-server/being.cpp b/src/game-server/being.cpp
index 65338696..bbd7b4c6 100644
--- a/src/game-server/being.cpp
+++ b/src/game-server/being.cpp
@@ -20,20 +20,20 @@
 
 #include <cassert>
 
-#include "game-server/being.hpp"
+#include "game-server/being.h"
 
 #include "defines.h"
-#include "common/configuration.hpp"
-#include "game-server/attributemanager.hpp"
-#include "game-server/character.hpp"
-#include "game-server/collisiondetection.hpp"
-#include "game-server/eventlistener.hpp"
-#include "game-server/mapcomposite.hpp"
-#include "game-server/effect.hpp"
-#include "game-server/statuseffect.hpp"
-#include "game-server/statusmanager.hpp"
+#include "common/configuration.h"
+#include "game-server/attributemanager.h"
+#include "game-server/character.h"
+#include "game-server/collisiondetection.h"
+#include "game-server/eventlistener.h"
+#include "game-server/mapcomposite.h"
+#include "game-server/effect.h"
+#include "game-server/statuseffect.h"
+#include "game-server/statusmanager.h"
 #include "utils/logger.h"
-#include "utils/speedconv.hpp"
+#include "utils/speedconv.h"
 
 Being::Being(ThingType type):
     Actor(type),
diff --git a/src/game-server/being.hpp b/src/game-server/being.h
index 4506cfec..375220c9 100644
--- a/src/game-server/being.hpp
+++ b/src/game-server/being.h
@@ -27,9 +27,9 @@
 #include <map>
 #include "limits.h"
 
-#include "game-server/actor.hpp"
-#include "game-server/attribute.hpp"
-#include "game-server/autoattack.hpp"
+#include "game-server/actor.h"
+#include "game-server/attribute.h"
+#include "game-server/autoattack.h"
 
 class Being;
 class MapComposite;
diff --git a/src/game-server/buysell.cpp b/src/game-server/buysell.cpp
index a6f68e1a..b3abb3e2 100644
--- a/src/game-server/buysell.cpp
+++ b/src/game-server/buysell.cpp
@@ -18,14 +18,14 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "game-server/buysell.hpp"
+#include "game-server/buysell.h"
 
-#include "game-server/character.hpp"
-#include "game-server/gamehandler.hpp"
-#include "game-server/inventory.hpp"
-#include "game-server/itemmanager.hpp"
-#include "game-server/item.hpp"
-#include "net/messageout.hpp"
+#include "game-server/character.h"
+#include "game-server/gamehandler.h"
+#include "game-server/inventory.h"
+#include "game-server/itemmanager.h"
+#include "game-server/item.h"
+#include "net/messageout.h"
 
 #include "defines.h"
 
diff --git a/src/game-server/buysell.hpp b/src/game-server/buysell.h
index a9903bc2..506dc8ad 100644
--- a/src/game-server/buysell.hpp
+++ b/src/game-server/buysell.h
@@ -18,8 +18,8 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GAMESERVER_BUYSELL_HPP
-#define GAMESERVER_BUYSELL_HPP
+#ifndef GAMESERVER_BUYSELL_H
+#define GAMESERVER_BUYSELL_H
 
 #include <vector>
 
diff --git a/src/game-server/character.cpp b/src/game-server/character.cpp
index 91fcf469..49cecebc 100644
--- a/src/game-server/character.cpp
+++ b/src/game-server/character.cpp
@@ -23,25 +23,25 @@
 #include <cmath>
 #include <limits.h>
 
-#include "game-server/character.hpp"
-
-#include "common/configuration.hpp"
-#include "game-server/accountconnection.hpp"
-#include "game-server/attributemanager.hpp"
-#include "game-server/buysell.hpp"
-#include "game-server/eventlistener.hpp"
-#include "game-server/inventory.hpp"
-#include "game-server/item.hpp"
-#include "game-server/itemmanager.hpp"
-#include "game-server/gamehandler.hpp"
-#include "game-server/mapcomposite.hpp"
-#include "game-server/mapmanager.hpp"
-#include "game-server/state.hpp"
-#include "game-server/trade.hpp"
-#include "scripting/script.hpp"
-#include "net/messagein.hpp"
-#include "net/messageout.hpp"
-#include "serialize/characterdata.hpp"
+#include "game-server/character.h"
+
+#include "common/configuration.h"
+#include "game-server/accountconnection.h"
+#include "game-server/attributemanager.h"
+#include "game-server/buysell.h"
+#include "game-server/eventlistener.h"
+#include "game-server/inventory.h"
+#include "game-server/item.h"
+#include "game-server/itemmanager.h"
+#include "game-server/gamehandler.h"
+#include "game-server/mapcomposite.h"
+#include "game-server/mapmanager.h"
+#include "game-server/state.h"
+#include "game-server/trade.h"
+#include "scripting/script.h"
+#include "net/messagein.h"
+#include "net/messageout.h"
+#include "serialize/characterdata.h"
 
 #include "utils/logger.h"
 
diff --git a/src/game-server/character.hpp b/src/game-server/character.h
index ed41c2b2..dc12099b 100644
--- a/src/game-server/character.hpp
+++ b/src/game-server/character.h
@@ -18,15 +18,15 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CHARACTER_HPP
-#define CHARACTER_HPP
+#ifndef CHARACTER_H
+#define CHARACTER_H
 
 #include <map>
 #include <string>
 #include <vector>
 
-#include "common/inventorydata.hpp"
-#include "game-server/being.hpp"
+#include "common/inventorydata.h"
+#include "game-server/being.h"
 #include "protocol.h"
 #include "defines.h"
 #include "utils/logger.h"
@@ -464,4 +464,4 @@ class Character : public Being
         friend void serializeCharacterData(const T &data, MessageOut &msg);
 };
 
-#endif // CHARACTER_HPP
+#endif // CHARACTER_H
diff --git a/src/game-server/collisiondetection.cpp b/src/game-server/collisiondetection.cpp
index 8716baa2..55e40d65 100644
--- a/src/game-server/collisiondetection.cpp
+++ b/src/game-server/collisiondetection.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "game-server/collisiondetection.hpp"
+#include "game-server/collisiondetection.h"
 
 #include <cmath>
 
diff --git a/src/game-server/collisiondetection.hpp b/src/game-server/collisiondetection.h
index 36a5bc24..36a5bc24 100644
--- a/src/game-server/collisiondetection.hpp
+++ b/src/game-server/collisiondetection.h
diff --git a/src/game-server/command.cpp b/src/game-server/command.cpp
index b421c67d..d47bb889 100644
--- a/src/game-server/command.cpp
+++ b/src/game-server/command.cpp
@@ -20,16 +20,16 @@
 
 #include <cstddef>
 
-#include "game-server/accountconnection.hpp"
-#include "game-server/character.hpp"
-#include "game-server/gamehandler.hpp"
-#include "game-server/inventory.hpp"
-#include "game-server/item.hpp"
-#include "game-server/itemmanager.hpp"
-#include "game-server/mapmanager.hpp"
-#include "game-server/monster.hpp"
-#include "game-server/monstermanager.hpp"
-#include "game-server/state.hpp"
+#include "game-server/accountconnection.h"
+#include "game-server/character.h"
+#include "game-server/gamehandler.h"
+#include "game-server/inventory.h"
+#include "game-server/item.h"
+#include "game-server/itemmanager.h"
+#include "game-server/mapmanager.h"
+#include "game-server/monster.h"
+#include "game-server/monstermanager.h"
+#include "game-server/state.h"
 
 template< typename T >
 static T proxy_cast(intptr_t v)
diff --git a/src/game-server/commandhandler.cpp b/src/game-server/commandhandler.cpp
index 0e6dad6b..b1d965be 100644
--- a/src/game-server/commandhandler.cpp
+++ b/src/game-server/commandhandler.cpp
@@ -20,23 +20,23 @@
 
 #include <sstream>
 
-#include "game-server/commandhandler.hpp"
-#include "game-server/accountconnection.hpp"
-#include "game-server/character.hpp"
-#include "game-server/gamehandler.hpp"
-#include "game-server/inventory.hpp"
-#include "game-server/item.hpp"
-#include "game-server/itemmanager.hpp"
-#include "game-server/mapmanager.hpp"
-#include "game-server/monster.hpp"
-#include "game-server/monstermanager.hpp"
-#include "game-server/state.hpp"
-
-#include "common/configuration.hpp"
-#include "common/permissionmanager.hpp"
-#include "common/transaction.hpp"
-
-#include "utils/string.hpp"
+#include "game-server/commandhandler.h"
+#include "game-server/accountconnection.h"
+#include "game-server/character.h"
+#include "game-server/gamehandler.h"
+#include "game-server/inventory.h"
+#include "game-server/item.h"
+#include "game-server/itemmanager.h"
+#include "game-server/mapmanager.h"
+#include "game-server/monster.h"
+#include "game-server/monstermanager.h"
+#include "game-server/state.h"
+
+#include "common/configuration.h"
+#include "common/permissionmanager.h"
+#include "common/transaction.h"
+
+#include "utils/string.h"
 
 struct CmdRef
 {
diff --git a/src/game-server/commandhandler.hpp b/src/game-server/commandhandler.h
index 156cec13..5327dda7 100644
--- a/src/game-server/commandhandler.hpp
+++ b/src/game-server/commandhandler.h
@@ -18,8 +18,8 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SERVER_COMMANDHANDLER_HPP
-#define SERVER_COMMANDHANDLER_HPP
+#ifndef SERVER_COMMANDHANDLER_H
+#define SERVER_COMMANDHANDLER_H
 
 #include <string>
 
diff --git a/src/game-server/effect.cpp b/src/game-server/effect.cpp
index d00ae5b2..b7c6c643 100644
--- a/src/game-server/effect.cpp
+++ b/src/game-server/effect.cpp
@@ -18,10 +18,10 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "game-server/effect.hpp"
+#include "game-server/effect.h"
 
-#include "game-server/mapcomposite.hpp"
-#include "game-server/state.hpp"
+#include "game-server/mapcomposite.h"
+#include "game-server/state.h"
 
 void Effect::update()
 {
diff --git a/src/game-server/effect.hpp b/src/game-server/effect.h
index b1341ffc..2e22d46e 100644
--- a/src/game-server/effect.hpp
+++ b/src/game-server/effect.h
@@ -21,8 +21,8 @@
 #ifndef EFFECT_H
 #define EFFECT_H
 
-#include "game-server/actor.hpp"
-#include "game-server/being.hpp"
+#include "game-server/actor.h"
+#include "game-server/being.h"
 
 class Effect : public Actor
 {
diff --git a/src/game-server/eventlistener.hpp b/src/game-server/eventlistener.h
index b66021f4..87dac1dc 100644
--- a/src/game-server/eventlistener.hpp
+++ b/src/game-server/eventlistener.h
@@ -18,8 +18,8 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GAMESERVER_EVENTLISTENER_HPP
-#define GAMESERVER_EVENTLISTENER_HPP
+#ifndef GAMESERVER_EVENTLISTENER_H
+#define GAMESERVER_EVENTLISTENER_H
 
 class Thing;
 class Being;
diff --git a/src/game-server/gamehandler.cpp b/src/game-server/gamehandler.cpp
index 5c7ba34e..f761abca 100644
--- a/src/game-server/gamehandler.cpp
+++ b/src/game-server/gamehandler.cpp
@@ -21,26 +21,26 @@
 #include <cassert>
 #include <map>
 
-#include "game-server/gamehandler.hpp"
-
-#include "common/transaction.hpp"
-#include "game-server/accountconnection.hpp"
-#include "game-server/buysell.hpp"
-#include "game-server/commandhandler.hpp"
-#include "game-server/inventory.hpp"
-#include "game-server/item.hpp"
-#include "game-server/itemmanager.hpp"
-#include "game-server/map.hpp"
-#include "game-server/mapcomposite.hpp"
-#include "game-server/npc.hpp"
-#include "game-server/postman.hpp"
-#include "game-server/state.hpp"
-#include "game-server/trade.hpp"
-#include "net/messagein.hpp"
-#include "net/messageout.hpp"
-#include "net/netcomputer.hpp"
+#include "game-server/gamehandler.h"
+
+#include "common/transaction.h"
+#include "game-server/accountconnection.h"
+#include "game-server/buysell.h"
+#include "game-server/commandhandler.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"
+#include "game-server/state.h"
+#include "game-server/trade.h"
+#include "net/messagein.h"
+#include "net/messageout.h"
+#include "net/netcomputer.h"
 #include "utils/logger.h"
-#include "utils/tokendispenser.hpp"
+#include "utils/tokendispenser.h"
 
 const unsigned int TILES_TO_BE_NEAR = 7;
 
@@ -135,7 +135,7 @@ static Actor *findActorNear(Actor *p, int id)
 {
     MapComposite *map = p->getMap();
     const Point &ppos = p->getPosition();
-    // See map.hpp for tiles constants
+    // See map.h for tiles constants
     const int pixelDist = DEFAULT_TILE_WIDTH * TILES_TO_BE_NEAR;
     for (ActorIterator i(map->getAroundPointIterator(ppos, pixelDist)); i; ++i)
     {
@@ -151,7 +151,7 @@ static Character *findCharacterNear(Actor *p, int id)
 {
     MapComposite *map = p->getMap();
     const Point &ppos = p->getPosition();
-    // See map.hpp for tiles constants
+    // See map.h for tiles constants
     const int pixelDist = DEFAULT_TILE_WIDTH * TILES_TO_BE_NEAR;
     for (CharacterIterator i(map->getAroundPointIterator(ppos,
                                                          pixelDist)); i; ++i)
diff --git a/src/game-server/gamehandler.hpp b/src/game-server/gamehandler.h
index 00e29122..5a2630dc 100644
--- a/src/game-server/gamehandler.hpp
+++ b/src/game-server/gamehandler.h
@@ -18,13 +18,13 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SERVER_GAMEHANDLER_HPP
-#define SERVER_GAMEHANDLER_HPP
+#ifndef SERVER_GAMEHANDLER_H
+#define SERVER_GAMEHANDLER_H
 
-#include "game-server/character.hpp"
-#include "net/connectionhandler.hpp"
-#include "net/netcomputer.hpp"
-#include "utils/tokencollector.hpp"
+#include "game-server/character.h"
+#include "net/connectionhandler.h"
+#include "net/netcomputer.h"
+#include "utils/tokencollector.h"
 
 enum
 {
diff --git a/src/game-server/inventory.cpp b/src/game-server/inventory.cpp
index b29f08de..b74c727b 100644
--- a/src/game-server/inventory.cpp
+++ b/src/game-server/inventory.cpp
@@ -21,11 +21,11 @@
 #include <algorithm>
 #include <cassert>
 
-#include "game-server/gamehandler.hpp"
-#include "game-server/inventory.hpp"
-#include "game-server/item.hpp"
-#include "game-server/itemmanager.hpp"
-#include "net/messageout.hpp"
+#include "game-server/gamehandler.h"
+#include "game-server/inventory.h"
+#include "game-server/item.h"
+#include "game-server/itemmanager.h"
+#include "net/messageout.h"
 #include "utils/logger.h"
 
 // TODO:
diff --git a/src/game-server/inventory.hpp b/src/game-server/inventory.h
index f2168c2b..bd9da5c3 100644
--- a/src/game-server/inventory.hpp
+++ b/src/game-server/inventory.h
@@ -21,8 +21,8 @@
 #ifndef INVENTORY_H
 #define INVENTORY_H
 
-#include "game-server/character.hpp"
-#include "net/messageout.hpp"
+#include "game-server/character.h"
+#include "net/messageout.h"
 
 /*enum
 {
diff --git a/src/game-server/item.cpp b/src/game-server/item.cpp
index a2b481d5..02c6a513 100644
--- a/src/game-server/item.cpp
+++ b/src/game-server/item.cpp
@@ -22,14 +22,14 @@
 #include <string>
 #include <map>
 
-#include "game-server/item.hpp"
-
-#include "common/configuration.hpp"
-#include "game-server/autoattack.hpp"
-#include "game-server/attributemanager.hpp"
-#include "game-server/being.hpp"
-#include "game-server/state.hpp"
-#include "scripting/script.hpp"
+#include "game-server/item.h"
+
+#include "common/configuration.h"
+#include "game-server/autoattack.h"
+#include "game-server/attributemanager.h"
+#include "game-server/being.h"
+#include "game-server/state.h"
+#include "scripting/script.h"
 
 bool ItemEffectInfo::apply(Being *itemUser)
 {
diff --git a/src/game-server/item.hpp b/src/game-server/item.h
index 2c3f9224..215b738f 100644
--- a/src/game-server/item.hpp
+++ b/src/game-server/item.h
@@ -18,12 +18,12 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ITEM_HPP
-#define ITEM_HPP
+#ifndef ITEM_H
+#define ITEM_H
 
 #include <vector>
 
-#include "game-server/actor.hpp"
+#include "game-server/actor.h"
 
 class Being;
 
diff --git a/src/game-server/itemmanager.cpp b/src/game-server/itemmanager.cpp
index 34a6170a..72f8acfe 100644
--- a/src/game-server/itemmanager.cpp
+++ b/src/game-server/itemmanager.cpp
@@ -18,16 +18,16 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "game-server/itemmanager.hpp"
+#include "game-server/itemmanager.h"
 
 #include "defines.h"
-#include "common/resourcemanager.hpp"
-#include "game-server/attributemanager.hpp"
-#include "game-server/item.hpp"
-#include "game-server/skillmanager.hpp"
-#include "scripting/script.hpp"
+#include "common/resourcemanager.h"
+#include "game-server/attributemanager.h"
+#include "game-server/item.h"
+#include "game-server/skillmanager.h"
+#include "scripting/script.h"
 #include "utils/logger.h"
-#include "utils/xml.hpp"
+#include "utils/xml.h"
 
 #include <map>
 #include <set>
diff --git a/src/game-server/itemmanager.hpp b/src/game-server/itemmanager.h
index ea0641c7..ea0641c7 100644
--- a/src/game-server/itemmanager.hpp
+++ b/src/game-server/itemmanager.h
diff --git a/src/game-server/main-game.cpp b/src/game-server/main-game.cpp
index cc968c13..084415b0 100644
--- a/src/game-server/main-game.cpp
+++ b/src/game-server/main-game.cpp
@@ -36,25 +36,25 @@
 #include "../config.h"
 #endif
 
-#include "common/configuration.hpp"
-#include "common/permissionmanager.hpp"
-#include "common/resourcemanager.hpp"
-#include "game-server/accountconnection.hpp"
-#include "game-server/attributemanager.hpp"
-#include "game-server/gamehandler.hpp"
-#include "game-server/skillmanager.hpp"
-#include "game-server/itemmanager.hpp"
-#include "game-server/mapmanager.hpp"
-#include "game-server/monstermanager.hpp"
-#include "game-server/statusmanager.hpp"
-#include "game-server/postman.hpp"
-#include "game-server/state.hpp"
-#include "net/bandwidth.hpp"
-#include "net/connectionhandler.hpp"
-#include "net/messageout.hpp"
-#include "scripting/luascript.hpp"
+#include "common/configuration.h"
+#include "common/permissionmanager.h"
+#include "common/resourcemanager.h"
+#include "game-server/accountconnection.h"
+#include "game-server/attributemanager.h"
+#include "game-server/gamehandler.h"
+#include "game-server/skillmanager.h"
+#include "game-server/itemmanager.h"
+#include "game-server/mapmanager.h"
+#include "game-server/monstermanager.h"
+#include "game-server/statusmanager.h"
+#include "game-server/postman.h"
+#include "game-server/state.h"
+#include "net/bandwidth.h"
+#include "net/connectionhandler.h"
+#include "net/messageout.h"
+#include "scripting/luascript.h"
 #include "utils/logger.h"
-#include "utils/processorutils.hpp"
+#include "utils/processorutils.h"
 #include "utils/stringfilter.h"
 #include "utils/timer.h"
 #include "utils/mathutils.h"
diff --git a/src/game-server/map.cpp b/src/game-server/map.cpp
index e5af1c32..14644026 100644
--- a/src/game-server/map.cpp
+++ b/src/game-server/map.cpp
@@ -23,7 +23,7 @@
 #include <cassert>
 #include <cstring>
 
-#include "game-server/map.hpp"
+#include "game-server/map.h"
 
 // Basic cost for moving from one tile to another.
 // Used in findPath() function when computing the A* path algorithm.
diff --git a/src/game-server/map.hpp b/src/game-server/map.h
index fab5baaf..fab5baaf 100644
--- a/src/game-server/map.hpp
+++ b/src/game-server/map.h
diff --git a/src/game-server/mapcomposite.cpp b/src/game-server/mapcomposite.cpp
index 30d31bc7..b5a950b1 100644
--- a/src/game-server/mapcomposite.cpp
+++ b/src/game-server/mapcomposite.cpp
@@ -22,11 +22,11 @@
 #include <cassert>
 
 #include "point.h"
-#include "common/configuration.hpp"
-#include "game-server/map.hpp"
-#include "game-server/mapcomposite.hpp"
-#include "game-server/character.hpp"
-#include "scripting/script.hpp"
+#include "common/configuration.h"
+#include "game-server/map.h"
+#include "game-server/mapcomposite.h"
+#include "game-server/character.h"
+#include "scripting/script.h"
 #include "utils/logger.h"
 
 /* TODO: Implement overlapping map zones instead of strict partitioning.
diff --git a/src/game-server/mapcomposite.hpp b/src/game-server/mapcomposite.h
index 0f45d8a4..3de83c77 100644
--- a/src/game-server/mapcomposite.hpp
+++ b/src/game-server/mapcomposite.h
@@ -18,8 +18,8 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SERVER_MAPCOMPOSITE_HPP
-#define SERVER_MAPCOMPOSITE_HPP
+#ifndef SERVER_MAPCOMPOSITE_H
+#define SERVER_MAPCOMPOSITE_H
 
 #include <string>
 #include <vector>
diff --git a/src/game-server/mapmanager.cpp b/src/game-server/mapmanager.cpp
index ab9b2dc5..fce5cc5a 100644
--- a/src/game-server/mapmanager.cpp
+++ b/src/game-server/mapmanager.cpp
@@ -18,14 +18,14 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "game-server/mapmanager.hpp"
+#include "game-server/mapmanager.h"
 
-#include "common/resourcemanager.hpp"
-#include "game-server/map.hpp"
-#include "game-server/mapcomposite.hpp"
-#include "game-server/mapreader.hpp"
+#include "common/resourcemanager.h"
+#include "game-server/map.h"
+#include "game-server/mapcomposite.h"
+#include "game-server/mapreader.h"
 #include "utils/logger.h"
-#include "utils/xml.hpp"
+#include "utils/xml.h"
 
 #include <cassert>
 
diff --git a/src/game-server/mapmanager.hpp b/src/game-server/mapmanager.h
index d21bd419..d21bd419 100644
--- a/src/game-server/mapmanager.hpp
+++ b/src/game-server/mapmanager.h
diff --git a/src/game-server/mapreader.cpp b/src/game-server/mapreader.cpp
index 52dd08bf..a950d448 100644
--- a/src/game-server/mapreader.cpp
+++ b/src/game-server/mapreader.cpp
@@ -18,21 +18,21 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "game-server/mapreader.hpp"
-
-#include "common/resourcemanager.hpp"
-#include "game-server/map.hpp"
-#include "game-server/mapcomposite.hpp"
-#include "game-server/mapmanager.hpp"
-#include "game-server/monstermanager.hpp"
-#include "game-server/spawnarea.hpp"
-#include "game-server/trigger.hpp"
-#include "scripting/script.hpp"
+#include "game-server/mapreader.h"
+
+#include "common/resourcemanager.h"
+#include "game-server/map.h"
+#include "game-server/mapcomposite.h"
+#include "game-server/mapmanager.h"
+#include "game-server/monstermanager.h"
+#include "game-server/spawnarea.h"
+#include "game-server/trigger.h"
+#include "scripting/script.h"
 #include "utils/base64.h"
 #include "utils/logger.h"
-#include "utils/xml.hpp"
-#include "utils/zlib.hpp"
-#include "utils/string.hpp"
+#include "utils/xml.h"
+#include "utils/zlib.h"
+#include "utils/string.h"
 
 #include <cstring>
 
diff --git a/src/game-server/mapreader.hpp b/src/game-server/mapreader.h
index f4a0e5f8..f4a0e5f8 100644
--- a/src/game-server/mapreader.hpp
+++ b/src/game-server/mapreader.h
diff --git a/src/game-server/monster.cpp b/src/game-server/monster.cpp
index 56391aa5..611fcea0 100644
--- a/src/game-server/monster.cpp
+++ b/src/game-server/monster.cpp
@@ -18,19 +18,19 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "game-server/monster.hpp"
-
-#include "common/configuration.hpp"
-#include "common/resourcemanager.hpp"
-#include "game-server/attributemanager.hpp"
-#include "game-server/character.hpp"
-#include "game-server/collisiondetection.hpp"
-#include "game-server/item.hpp"
-#include "game-server/mapcomposite.hpp"
-#include "game-server/state.hpp"
-#include "scripting/script.hpp"
+#include "game-server/monster.h"
+
+#include "common/configuration.h"
+#include "common/resourcemanager.h"
+#include "game-server/attributemanager.h"
+#include "game-server/character.h"
+#include "game-server/collisiondetection.h"
+#include "game-server/item.h"
+#include "game-server/mapcomposite.h"
+#include "game-server/state.h"
+#include "scripting/script.h"
 #include "utils/logger.h"
-#include "utils/speedconv.hpp"
+#include "utils/speedconv.h"
 
 #include <cmath>
 
diff --git a/src/game-server/monster.hpp b/src/game-server/monster.h
index 2c4d59e2..0028920a 100644
--- a/src/game-server/monster.hpp
+++ b/src/game-server/monster.h
@@ -25,8 +25,8 @@
 #include <vector>
 #include <string>
 
-#include "game-server/being.hpp"
-#include "game-server/eventlistener.hpp"
+#include "game-server/being.h"
+#include "game-server/eventlistener.h"
 #include "defines.h"
 
 class ItemClass;
diff --git a/src/game-server/monstermanager.cpp b/src/game-server/monstermanager.cpp
index 1444e17b..0ad48f7f 100644
--- a/src/game-server/monstermanager.cpp
+++ b/src/game-server/monstermanager.cpp
@@ -18,14 +18,14 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "game-server/monstermanager.hpp"
+#include "game-server/monstermanager.h"
 
-#include "common/resourcemanager.hpp"
-#include "game-server/attributemanager.hpp"
-#include "game-server/itemmanager.hpp"
-#include "game-server/monster.hpp"
+#include "common/resourcemanager.h"
+#include "game-server/attributemanager.h"
+#include "game-server/itemmanager.h"
+#include "game-server/monster.h"
 #include "utils/logger.h"
-#include "utils/xml.hpp"
+#include "utils/xml.h"
 
 Element elementFromString (const std::string &name)
 {
diff --git a/src/game-server/monstermanager.hpp b/src/game-server/monstermanager.h
index 6337b816..36d11e35 100644
--- a/src/game-server/monstermanager.hpp
+++ b/src/game-server/monstermanager.h
@@ -18,8 +18,8 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MONSTERMANAGER_HPP
-#define MONSTERMANAGER_HPP
+#ifndef MONSTERMANAGER_H
+#define MONSTERMANAGER_H
 
 #include <string>
 #include <map>
@@ -59,4 +59,4 @@ class MonsterManager
 
 extern MonsterManager *monsterManager;
 
-#endif // MONSTERMANAGER_HPP
+#endif // MONSTERMANAGER_H
diff --git a/src/game-server/npc.cpp b/src/game-server/npc.cpp
index e22f7f23..c1b91d66 100644
--- a/src/game-server/npc.cpp
+++ b/src/game-server/npc.cpp
@@ -18,9 +18,9 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "game-server/character.hpp"
-#include "game-server/npc.hpp"
-#include "scripting/script.hpp"
+#include "game-server/character.h"
+#include "game-server/npc.h"
+#include "scripting/script.h"
 
 NPC::NPC(const std::string &name, int id, Script *s):
     Being(OBJECT_NPC),
diff --git a/src/game-server/npc.hpp b/src/game-server/npc.h
index f8dd2c33..02b26a72 100644
--- a/src/game-server/npc.hpp
+++ b/src/game-server/npc.h
@@ -18,10 +18,10 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GAMESERVER_NPC_HPP
-#define GAMESERVER_NPC_HPP
+#ifndef GAMESERVER_NPC_H
+#define GAMESERVER_NPC_H
 
-#include "game-server/being.hpp"
+#include "game-server/being.h"
 
 class Script;
 class Character;
diff --git a/src/game-server/postman.hpp b/src/game-server/postman.h
index 82b7a5a7..82b7a5a7 100644
--- a/src/game-server/postman.hpp
+++ b/src/game-server/postman.h
diff --git a/src/game-server/quest.cpp b/src/game-server/quest.cpp
index d1e1b524..0a7b02f9 100644
--- a/src/game-server/quest.cpp
+++ b/src/game-server/quest.cpp
@@ -23,11 +23,11 @@
 #include <map>
 #include <string>
 
-#include "game-server/quest.hpp"
+#include "game-server/quest.h"
 
-#include "game-server/accountconnection.hpp"
-#include "game-server/character.hpp"
-#include "game-server/eventlistener.hpp"
+#include "game-server/accountconnection.h"
+#include "game-server/character.h"
+#include "game-server/eventlistener.h"
 #include "utils/logger.h"
 
 typedef std::list< QuestCallback > QuestCallbacks;
diff --git a/src/game-server/quest.hpp b/src/game-server/quest.h
index e3a9f34b..56fa5c2a 100644
--- a/src/game-server/quest.hpp
+++ b/src/game-server/quest.h
@@ -18,8 +18,8 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GAMESERVER_QUEST_HPP
-#define GAMESERVER_QUEST_HPP
+#ifndef GAMESERVER_QUEST_H
+#define GAMESERVER_QUEST_H
 
 #include <string>
 
diff --git a/src/game-server/skillmanager.cpp b/src/game-server/skillmanager.cpp
index 2cfcba58..d15219a4 100644
--- a/src/game-server/skillmanager.cpp
+++ b/src/game-server/skillmanager.cpp
@@ -18,12 +18,12 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "game-server/skillmanager.hpp"
+#include "game-server/skillmanager.h"
 
-#include "common/resourcemanager.hpp"
-#include "utils/string.hpp"   // for the toUpper function
+#include "common/resourcemanager.h"
+#include "utils/string.h"   // for the toUpper function
 #include "utils/logger.h"
-#include "utils/xml.hpp"
+#include "utils/xml.h"
 
 #include <map>
 
diff --git a/src/game-server/skillmanager.hpp b/src/game-server/skillmanager.h
index c6a73a5c..c6a73a5c 100644
--- a/src/game-server/skillmanager.hpp
+++ b/src/game-server/skillmanager.h
diff --git a/src/game-server/spawnarea.cpp b/src/game-server/spawnarea.cpp
index 105523cf..43e3a937 100644
--- a/src/game-server/spawnarea.cpp
+++ b/src/game-server/spawnarea.cpp
@@ -18,11 +18,11 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "game-server/spawnarea.hpp"
+#include "game-server/spawnarea.h"
 
-#include "game-server/mapcomposite.hpp"
-#include "game-server/monster.hpp"
-#include "game-server/state.hpp"
+#include "game-server/mapcomposite.h"
+#include "game-server/monster.h"
+#include "game-server/state.h"
 #include "utils/logger.h"
 
 struct SpawnAreaEventDispatch : EventDispatch
diff --git a/src/game-server/spawnarea.hpp b/src/game-server/spawnarea.h
index e04d69e2..d3b2fd08 100644
--- a/src/game-server/spawnarea.hpp
+++ b/src/game-server/spawnarea.h
@@ -18,12 +18,12 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SPAWNAREA_HPP
-#define SPAWNAREA_HPP
+#ifndef SPAWNAREA_H
+#define SPAWNAREA_H
 
 #include "point.h"
-#include "game-server/eventlistener.hpp"
-#include "game-server/thing.hpp"
+#include "game-server/eventlistener.h"
+#include "game-server/thing.h"
 
 class Being;
 class MonsterClass;
diff --git a/src/game-server/state.cpp b/src/game-server/state.cpp
index 0c3121ca..c652549b 100644
--- a/src/game-server/state.cpp
+++ b/src/game-server/state.cpp
@@ -20,26 +20,26 @@
 
 #include <cassert>
 
-#include "game-server/state.hpp"
+#include "game-server/state.h"
 
 #include "point.h"
-#include "common/configuration.hpp"
-#include "game-server/accountconnection.hpp"
-#include "game-server/gamehandler.hpp"
-#include "game-server/inventory.hpp"
-#include "game-server/item.hpp"
-#include "game-server/itemmanager.hpp"
-#include "game-server/effect.hpp"
-#include "game-server/map.hpp"
-#include "game-server/mapcomposite.hpp"
-#include "game-server/mapmanager.hpp"
-#include "game-server/monster.hpp"
-#include "game-server/npc.hpp"
-#include "game-server/trade.hpp"
-#include "net/messageout.hpp"
-#include "scripting/script.hpp"
+#include "common/configuration.h"
+#include "game-server/accountconnection.h"
+#include "game-server/gamehandler.h"
+#include "game-server/inventory.h"
+#include "game-server/item.h"
+#include "game-server/itemmanager.h"
+#include "game-server/effect.h"
+#include "game-server/map.h"
+#include "game-server/mapcomposite.h"
+#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 "utils/logger.h"
-#include "utils/speedconv.hpp"
+#include "utils/speedconv.h"
 
 enum
 {
diff --git a/src/game-server/state.hpp b/src/game-server/state.h
index c0ddc028..f58ab038 100644
--- a/src/game-server/state.hpp
+++ b/src/game-server/state.h
@@ -18,8 +18,8 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SERVER_STATE_HPP
-#define SERVER_STATE_HPP
+#ifndef SERVER_STATE_H
+#define SERVER_STATE_H
 
 #include <string>
 
diff --git a/src/game-server/statuseffect.cpp b/src/game-server/statuseffect.cpp
index f201927e..9f917110 100644
--- a/src/game-server/statuseffect.cpp
+++ b/src/game-server/statuseffect.cpp
@@ -18,10 +18,10 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "game-server/statuseffect.hpp"
+#include "game-server/statuseffect.h"
 
-#include "scripting/script.hpp"
-#include "game-server/being.hpp"
+#include "scripting/script.h"
+#include "game-server/being.h"
 
 StatusEffect::StatusEffect(int id):
     mId(id),
diff --git a/src/game-server/statuseffect.hpp b/src/game-server/statuseffect.h
index 3aa4d843..3aa4d843 100644
--- a/src/game-server/statuseffect.hpp
+++ b/src/game-server/statuseffect.h
diff --git a/src/game-server/statusmanager.cpp b/src/game-server/statusmanager.cpp
index 008e9827..5e9bfcb6 100644
--- a/src/game-server/statusmanager.cpp
+++ b/src/game-server/statusmanager.cpp
@@ -18,13 +18,13 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "game-server/statusmanager.hpp"
+#include "game-server/statusmanager.h"
 
-#include "common/resourcemanager.hpp"
-#include "game-server/statuseffect.hpp"
-#include "scripting/script.hpp"
+#include "common/resourcemanager.h"
+#include "game-server/statuseffect.h"
+#include "scripting/script.h"
 #include "utils/logger.h"
-#include "utils/xml.hpp"
+#include "utils/xml.h"
 
 #include <map>
 #include <set>
diff --git a/src/game-server/statusmanager.hpp b/src/game-server/statusmanager.h
index fc09adb5..fc09adb5 100644
--- a/src/game-server/statusmanager.hpp
+++ b/src/game-server/statusmanager.h
diff --git a/src/game-server/thing.cpp b/src/game-server/thing.cpp
index 70d2c4c4..5fe94249 100644
--- a/src/game-server/thing.cpp
+++ b/src/game-server/thing.cpp
@@ -20,9 +20,9 @@
 
 #include <cassert>
 
-#include "game-server/thing.hpp"
+#include "game-server/thing.h"
 
-#include "game-server/eventlistener.hpp"
+#include "game-server/eventlistener.h"
 
 Thing::~Thing()
 {
diff --git a/src/game-server/thing.hpp b/src/game-server/thing.h
index f1f0df28..f1f0df28 100644
--- a/src/game-server/thing.hpp
+++ b/src/game-server/thing.h
diff --git a/src/game-server/trade.cpp b/src/game-server/trade.cpp
index 1c197c77..51509307 100644
--- a/src/game-server/trade.cpp
+++ b/src/game-server/trade.cpp
@@ -21,12 +21,12 @@
 #include <algorithm>
 #include <cassert>
 
-#include "game-server/trade.hpp"
+#include "game-server/trade.h"
 
-#include "game-server/character.hpp"
-#include "game-server/gamehandler.hpp"
-#include "game-server/inventory.hpp"
-#include "net/messageout.hpp"
+#include "game-server/character.h"
+#include "game-server/gamehandler.h"
+#include "game-server/inventory.h"
+#include "net/messageout.h"
 
 /*
  * States :
diff --git a/src/game-server/trade.hpp b/src/game-server/trade.h
index a95e89c1..d425767a 100644
--- a/src/game-server/trade.hpp
+++ b/src/game-server/trade.h
@@ -18,8 +18,8 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GAMESERVER_TRADE_HPP
-#define GAMESERVER_TRADE_HPP
+#ifndef GAMESERVER_TRADE_H
+#define GAMESERVER_TRADE_H
 
 #include <vector>
 
diff --git a/src/game-server/trigger.cpp b/src/game-server/trigger.cpp
index ce5cd33e..f25b00b8 100644
--- a/src/game-server/trigger.cpp
+++ b/src/game-server/trigger.cpp
@@ -18,12 +18,12 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "game-server/trigger.hpp"
+#include "game-server/trigger.h"
 
-#include "game-server/character.hpp"
-#include "game-server/mapcomposite.hpp"
-#include "game-server/actor.hpp"
-#include "game-server/state.hpp"
+#include "game-server/character.h"
+#include "game-server/mapcomposite.h"
+#include "game-server/actor.h"
+#include "game-server/state.h"
 
 #include "utils/logger.h"
 
diff --git a/src/game-server/trigger.hpp b/src/game-server/trigger.h
index 0b5cb976..f6649f1b 100644
--- a/src/game-server/trigger.hpp
+++ b/src/game-server/trigger.h
@@ -18,12 +18,12 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TRIGGER_HPP
-#define TRIGGER_HPP
+#ifndef TRIGGER_H
+#define TRIGGER_H
 
 #include "point.h"
-#include "game-server/thing.hpp"
-#include "scripting/script.hpp"
+#include "game-server/thing.h"
+#include "scripting/script.h"
 
 class Actor;