diff --git a/src/common/Collision/Management/MMapManager.cpp b/src/common/Collision/Management/MMapManager.cpp
index 07ea227dff..59957ca673 100644
--- a/src/common/Collision/Management/MMapManager.cpp
+++ b/src/common/Collision/Management/MMapManager.cpp
@@ -19,7 +19,7 @@
 #include "Errors.h"
 #include "Log.h"
 #include "MMapFactory.h"
-#include "MapDefines.h"
+#include "MMapDefines.h"
 
 namespace MMAP
 {
diff --git a/src/common/Collision/Maps/MapDefines.h b/src/common/Collision/Maps/MMapDefines.h
similarity index 96%
rename from src/common/Collision/Maps/MapDefines.h
rename to src/common/Collision/Maps/MMapDefines.h
index 004f83f2eb..d5435e5484 100644
--- a/src/common/Collision/Maps/MapDefines.h
+++ b/src/common/Collision/Maps/MMapDefines.h
@@ -1,5 +1,5 @@
-#ifndef _MAPDEFINES_H
-#define _MAPDEFINES_H
+#ifndef MMapDefines_h__
+#define MMapDefines_h__
 
 #include "Define.h"
 #include "DetourNavMesh.h"
@@ -52,4 +52,4 @@ enum NavTerrainFlag
     NAV_MAGMA_SLIME  = 1 << (NAV_AREA_MAX_VALUE - NAV_AREA_MAGMA_SLIME)
 };
 
-#endif /* _MAPDEFINES_H */
+#endif // MMapDefines_h__
diff --git a/src/server/game/Movement/PathGenerator.h b/src/server/game/Movement/PathGenerator.h
index 7f012417b1..cb6da39535 100644
--- a/src/server/game/Movement/PathGenerator.h
+++ b/src/server/game/Movement/PathGenerator.h
@@ -18,9 +18,9 @@
 #ifndef _PATH_GENERATOR_H
 #define _PATH_GENERATOR_H
 
-#include "MapDefines.h"
 #include "DetourNavMesh.h"
 #include "DetourNavMeshQuery.h"
+#include "MMapDefines.h"
 #include "MoveSplineInitArgs.h"
 #include <G3D/Vector3.h>
 
diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp
index 881df9021c..8f6f46568e 100644
--- a/src/tools/mmaps_generator/MapBuilder.cpp
+++ b/src/tools/mmaps_generator/MapBuilder.cpp
@@ -16,8 +16,8 @@
  */
 
 #include "MapBuilder.h"
-#include "MapDefines.h"
 #include "MapTree.h"
+#include "MMapDefines.h"
 #include "ModelInstance.h"
 #include "PathCommon.h"
 #include "IntermediateValues.h"
diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp
index 059fbaf2fd..d3f7900faa 100644
--- a/src/tools/mmaps_generator/TerrainBuilder.cpp
+++ b/src/tools/mmaps_generator/TerrainBuilder.cpp
@@ -17,8 +17,8 @@
 
 #include "TerrainBuilder.h"
 #include "MapBuilder.h"
-#include "MapDefines.h"
 #include "MapTree.h"
+#include "MMapDefines.h"
 #include "ModelInstance.h"
 #include "VMapManager2.h"
 #include <map>