16 files changed, 26 insertions, 26 deletions
diff --git a/src/utils/logger.cpp b/src/utils/logger.cpp
index 2053c9a8..958d2e52 100644
--- a/src/utils/logger.cpp
+++ b/src/utils/logger.cpp
@@ -20,8 +20,8 @@
  */
 
 #include "logger.h"
-#include "common/resourcemanager.hpp"
-#include "utils/string.hpp"
+#include "common/resourcemanager.h"
+#include "utils/string.h"
 
 #include <ctime>
 #include <fstream>
diff --git a/src/utils/processorutils.cpp b/src/utils/processorutils.cpp
index 37db06a2..06ef0178 100644
--- a/src/utils/processorutils.cpp
+++ b/src/utils/processorutils.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "utils/processorutils.hpp"
+#include "utils/processorutils.h"
 
 bool utils::processor::isLittleEndian;
 
diff --git a/src/utils/processorutils.hpp b/src/utils/processorutils.h
index 05bb7c8b..6fc01393 100644
--- a/src/utils/processorutils.hpp
+++ b/src/utils/processorutils.h
@@ -18,8 +18,8 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PROCESSORUTILS_HPP
-#define PROCESSORUTILS_HPP
+#ifndef PROCESSORUTILS_H
+#define PROCESSORUTILS_H
 
 namespace utils
 {
@@ -47,4 +47,4 @@ namespace utils
     } // namespace processor
 } // namespace utils
 
-#endif // TOKENDISPENSER_HPP
+#endif // PROCESSORUTILS_H
diff --git a/src/utils/speedconv.cpp b/src/utils/speedconv.cpp
index 18602abf..f6be2e7b 100644
--- a/src/utils/speedconv.cpp
+++ b/src/utils/speedconv.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "utils/speedconv.hpp"
+#include "utils/speedconv.h"
 
 double utils::tpsToSpeed(double tps)
 {
diff --git a/src/utils/speedconv.hpp b/src/utils/speedconv.h
index 6a29d0f3..33e1a944 100644
--- a/src/utils/speedconv.hpp
+++ b/src/utils/speedconv.h
@@ -18,8 +18,8 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SPEEDCONV_HPP
-#define SPEEDCONV_HPP
+#ifndef SPEEDCONV_H
+#define SPEEDCONV_H
 
 // Simple helper functions for converting between tiles per
 // second and the internal speed representation
@@ -41,4 +41,4 @@ namespace utils {
     double speedToTps(double);
 }
 
-#endif // SPEEDCONV_HPP
+#endif // SPEEDCONV_H
diff --git a/src/utils/string.cpp b/src/utils/string.cpp
index 785a0921..089a5373 100644
--- a/src/utils/string.cpp
+++ b/src/utils/string.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "utils/string.hpp"
+#include "utils/string.h"
 
 #include <cctype>
 #include <algorithm>
diff --git a/src/utils/string.hpp b/src/utils/string.h
index 6127bfed..6127bfed 100644
--- a/src/utils/string.hpp
+++ b/src/utils/string.h
diff --git a/src/utils/stringfilter.cpp b/src/utils/stringfilter.cpp
index 4a9d19cc..617da90d 100644
--- a/src/utils/stringfilter.cpp
+++ b/src/utils/stringfilter.cpp
@@ -22,7 +22,7 @@
 
 #include "utils/stringfilter.h"
 
-#include "common/configuration.hpp"
+#include "common/configuration.h"
 #include "utils/logger.h"
 
 namespace utils
diff --git a/src/utils/tokencollector.cpp b/src/utils/tokencollector.cpp
index f82dcd10..e41d228e 100644
--- a/src/utils/tokencollector.cpp
+++ b/src/utils/tokencollector.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "utils/tokencollector.hpp"
+#include "utils/tokencollector.h"
 
 /* We are optimistic and we assume that clients connect as soon as possible.
    It means that pending data are mainly outdated ones, except for the newer
diff --git a/src/utils/tokencollector.hpp b/src/utils/tokencollector.h
index 5e4c3f2f..3d2b653d 100644
--- a/src/utils/tokencollector.hpp
+++ b/src/utils/tokencollector.h
@@ -18,8 +18,8 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TOKENCOLLECTOR_HPP
-#define TOKENCOLLECTOR_HPP
+#ifndef TOKENCOLLECTOR_H
+#define TOKENCOLLECTOR_H
 
 #include <string>
 #include <list>
@@ -135,4 +135,4 @@ class TokenCollector: private TokenCollectorBase
         Handler *mHandler;
 };
 
-#endif // TOKENCOLLECTOR_HPP
+#endif // TOKENCOLLECTOR_H
diff --git a/src/utils/tokendispenser.cpp b/src/utils/tokendispenser.cpp
index 9aff9e4a..2cbf16d9 100644
--- a/src/utils/tokendispenser.cpp
+++ b/src/utils/tokendispenser.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "utils/tokendispenser.hpp"
+#include "utils/tokendispenser.h"
 
 #include <cstdlib>
 
diff --git a/src/utils/tokendispenser.hpp b/src/utils/tokendispenser.h
index dc3173c7..d04d17b7 100644
--- a/src/utils/tokendispenser.hpp
+++ b/src/utils/tokendispenser.h
@@ -18,8 +18,8 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TOKENDISPENSER_HPP
-#define TOKENDISPENSER_HPP
+#ifndef TOKENDISPENSER_H
+#define TOKENDISPENSER_H
 
 #define MAGIC_TOKEN_LENGTH 32
 
@@ -42,4 +42,4 @@ namespace utils
 
 } // namespace utils
 
-#endif // TOKENDISPENSER_HPP
+#endif // TOKENDISPENSER_H
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index 29202274..a4a5360e 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -19,11 +19,11 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "utils/xml.hpp"
+#include "utils/xml.h"
 
-#include "common/resourcemanager.hpp"
+#include "common/resourcemanager.h"
 #include "utils/logger.h"
-#include "utils/string.hpp"
+#include "utils/string.h"
 
 #include <iostream>
 #include <fstream>
diff --git a/src/utils/xml.hpp b/src/utils/xml.h
index eba88e56..eba88e56 100644
--- a/src/utils/xml.hpp
+++ b/src/utils/xml.h
diff --git a/src/utils/zlib.cpp b/src/utils/zlib.cpp
index e3d3c60a..3c5e8f3b 100644
--- a/src/utils/zlib.cpp
+++ b/src/utils/zlib.cpp
@@ -21,7 +21,7 @@
 #include <cstdlib>
 #include <zlib.h>
 
-#include "utils/zlib.hpp"
+#include "utils/zlib.h"
 
 #include "utils/logger.h"
 
diff --git a/src/utils/zlib.hpp b/src/utils/zlib.h
index 6d5347f1..f78aa26a 100644
--- a/src/utils/zlib.hpp
+++ b/src/utils/zlib.h
@@ -18,8 +18,8 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ZLIB_HPP
-#define ZLIB_HPP
+#ifndef ZLIB_H
+#define ZLIB_H
 
 /**
  * Inflates either zlib or gzip deflated memory. The inflated memory is