diff --git a/src/map/roe.cpp b/src/map/roe.cpp
index c016d68b35a..718518c0ff1 100644
--- a/src/map/roe.cpp
+++ b/src/map/roe.cpp
@@ -18,14 +18,17 @@
 
 ===========================================================================
 */
+
+#include "roe.h"
+
+#include "common/vana_time.h"
+
 #include <ctime>
 
 #include "lua/luautils.h"
 #include "packets/chat_message.h"
-#include "roe.h"
 #include "utils/charutils.h"
 #include "utils/zoneutils.h"
-#include "vana_time.h"
 
 #include "packets/char_spells.h"
 #include "packets/roe_questlog.h"
diff --git a/src/map/timetriggers.cpp b/src/map/timetriggers.cpp
index 048f3d9c1a2..e3bb446ce2b 100644
--- a/src/map/timetriggers.cpp
+++ b/src/map/timetriggers.cpp
@@ -20,8 +20,10 @@
 */
 
 #include "timetriggers.h"
+
+#include "common/vana_time.h"
+
 #include "lua/luautils.h"
-#include "vana_time.h"
 
 std::unique_ptr<CTriggerHandler> CTriggerHandler::_instance;
 
diff --git a/src/map/transport.cpp b/src/map/transport.cpp
index 7df7353784b..b94802a7ab6 100644
--- a/src/map/transport.cpp
+++ b/src/map/transport.cpp
@@ -21,15 +21,17 @@
 
 #include "transport.h"
 
-#include "../common/timer.h"
+#include "common/timer.h"
+#include "common/vana_time.h"
+
+#include <cstdlib>
+
 #include "entities/charentity.h"
 #include "map.h"
 #include "packets/entity_update.h"
 #include "packets/event.h"
 #include "utils/zoneutils.h"
-#include "vana_time.h"
 #include "zone.h"
-#include <cstdlib>
 
 std::unique_ptr<CTransportHandler> CTransportHandler::_instance;
 
diff --git a/src/map/utils/gardenutils.cpp b/src/map/utils/gardenutils.cpp
index be9be308e04..d3e67ba97ec 100644
--- a/src/map/utils/gardenutils.cpp
+++ b/src/map/utils/gardenutils.cpp
@@ -23,14 +23,15 @@
 
 #include "gardenutils.h"
 
+#include "common/vana_time.h"
+
 #include <cmath>
 
-#include "../entities/charentity.h"
-#include "../item_container.h"
-#include "../items/item_flowerpot.h"
-#include "../map.h"
-#include "../packets/inventory_item.h"
-#include "../vana_time.h"
+#include "entities/charentity.h"
+#include "item_container.h"
+#include "items/item_flowerpot.h"
+#include "map.h"
+#include "packets/inventory_item.h"
 
 #define MAX_RESULTID 2500
 
diff --git a/src/map/utils/guildutils.cpp b/src/map/utils/guildutils.cpp
index 648317ad56b..b2c586133d9 100644
--- a/src/map/utils/guildutils.cpp
+++ b/src/map/utils/guildutils.cpp
@@ -19,17 +19,19 @@
 ===========================================================================
 */
 
+#include "guildutils.h"
+
+#include "common/vana_time.h"
+
 #include <vector>
 
-#include "../items/item_shop.h"
+#include "items/item_shop.h"
 
-#include "../guild.h"
-#include "../item_container.h"
-#include "../map.h"
-#include "../vana_time.h"
 #include "charutils.h"
-#include "guildutils.h"
+#include "guild.h"
+#include "item_container.h"
 #include "itemutils.h"
+#include "map.h"
 #include "serverutils.h"
 
 // TODO: During the closure of the guild, all viewing products of the goods are sent 0x86 with information about the closure of the guild