diff --git a/src/map/charcommand.c b/src/map/charcommand.c
index 940e51876a..3b9979e426 100644
--- a/src/map/charcommand.c
+++ b/src/map/charcommand.c
@@ -11,6 +11,7 @@
 #include "../common/socket.h"
 #include "../common/timer.h"
 #include "../common/nullpo.h"
+#include "../common/showmsg.h"
 
 #include "log.h"
 #include "clif.h"
@@ -26,7 +27,6 @@
 #include "battle.h"
 #include "charcommand.h"
 #include "atcommand.h"
-#include "showmsg.h"
 
 static char command_symbol = '#';
 
diff --git a/src/map/chrif.c b/src/map/chrif.c
index abc7d5b096..f46fe1beb3 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -17,8 +17,11 @@
 #include <limits.h>
 
 #include "../common/malloc.h"
-#include "socket.h"
-#include "timer.h"
+#include "../common/socket.h"
+#include "../common/timer.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+
 #include "map.h"
 #include "battle.h"
 #include "chrif.h"
@@ -27,8 +30,6 @@
 #include "npc.h"
 #include "pc.h"
 #include "status.h"
-#include "nullpo.h"
-#include "showmsg.h"
 #ifndef TXT_ONLY
 #include "charsave.h"
 #endif
diff --git a/src/map/irc.c b/src/map/irc.c
index 8a4d3b2e03..72b9dc8a4c 100644
--- a/src/map/irc.c
+++ b/src/map/irc.c
@@ -32,8 +32,8 @@ typedef int socklen_t;
 #include "../common/mmo.h"
 #include "../common/showmsg.h"
 #include "../common/version.h"
+#include "../common/nullpo.h"
 
-#include "nullpo.h"
 #include "map.h"
 #include "pc.h"
 #include "irc.h"
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index eaea7f1f2d..cfb3543830 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -8,8 +8,8 @@
 #include "../common/nullpo.h"
 #include "../common/malloc.h"
 #include "../common/showmsg.h"
+#include "../common/grfio.h"
 #include "map.h"
-#include "grfio.h"
 #include "battle.h"
 #include "itemdb.h"
 #include "script.h"
diff --git a/src/map/pet.c b/src/map/pet.c
index b11ee0e157..1c176750fa 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -5,11 +5,12 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "db.h"
-#include "timer.h"
-#include "socket.h"
-#include "nullpo.h"
-#include "malloc.h"
+#include "../common/db.h"
+#include "../common/timer.h"
+#include "../common/nullpo.h"
+#include "../common/malloc.h"
+#include "../common/showmsg.h"
+
 #include "pc.h"
 #include "status.h"
 #include "map.h"
@@ -23,7 +24,6 @@
 #include "npc.h"
 #include "script.h"
 #include "skill.h"
-#include "showmsg.h"
 
 #define MIN_PETTHINKTIME 100