6 files changed, 38 insertions, 6 deletions
diff --git a/src/common/HPMi.h b/src/common/HPMi.h
index b33ad955c..95037fd14 100644
--- a/src/common/HPMi.h
+++ b/src/common/HPMi.h
@@ -1,8 +1,8 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 
-#ifndef	_COMMON_HPMi_H_
-#define _COMMON_HPMi_H_
+#ifndef	_COMMON_HPMI_H_
+#define _COMMON_HPMI_H_
 
 #include "../common/cbasetypes.h"
 #include "../common/core.h"
@@ -196,4 +196,4 @@ HPExport struct HPMi_interface {
 HPExport struct HPMi_interface *HPMi;
 #endif
 
-#endif /* _COMMON_HPMi_H_ */
+#endif /* _COMMON_HPMI_H_ */
diff --git a/src/common/showmsg.h b/src/common/showmsg.h
index b59214ab0..49fbc34fb 100644
--- a/src/common/showmsg.h
+++ b/src/common/showmsg.h
@@ -5,7 +5,7 @@
 #ifndef _COMMON_SHOWMSG_H_
 #define _COMMON_SHOWMSG_H_
 
-#ifndef _HPMi_H_
+#ifndef _COMMON_HPMI_H_
 	#include "../../3rdparty/libconfig/libconfig.h"
 #endif
 
@@ -90,7 +90,7 @@ enum msg_type {
 };
 
 extern void ClearScreen(void);
-#ifndef _HPMi_H_
+#ifndef _COMMON_HPMI_H_
 	extern void ShowMessage(const char *, ...);
 	extern void ShowStatus(const char *, ...);
 	extern void ShowSQL(const char *, ...);
diff --git a/src/map/HPMmap.c b/src/map/HPMmap.c
index a67acfd16..061479d87 100644
--- a/src/map/HPMmap.c
+++ b/src/map/HPMmap.c
@@ -5,6 +5,15 @@
 #include "../common/malloc.h"
 #include "../common/showmsg.h"
 #include "../common/HPM.h"
+#include "../common/conf.h"
+#include "../common/db.h"
+#include "../common/des.h"
+#include "../common/ers.h"
+#include "../common/mapindex.h"
+#include "../common/mmo.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+
 
 #include "HPMmap.h"
 #include "pc.h"
@@ -12,29 +21,46 @@
 
 //
 #include "atcommand.h"
+#include "battle.h"
+#include "battleground.h"
 #include "chat.h"
 #include "chrif.h"
+#include "clif.h"
+#include "date.h"
 #include "duel.h"
 #include "elemental.h"
+#include "guild.h"
 #include "homunculus.h"
 #include "instance.h"
 #include "intif.h"
 #include "irc-bot.h"
+#include "itemdb.h"
+#include "log.h"
 #include "mail.h"
 #include "mapreg.h"
 #include "mercenary.h"
+#include "mob.h"
+#include "npc.h"
 #include "party.h"
+#include "path.h"
+#include "pc_groups.h"
 #include "pet.h"
 #include "quest.h"
+#include "script.h"
+#include "searchstore.h"
+#include "skill.h"
+#include "status.h"
 #include "storage.h"
 #include "trade.h"
+#include "unit.h"
+#include "vending.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
-#include "../plugins/HPMDataCheck.h"
+#include "../common/HPMDataCheck.h"
 
 struct HPM_atcommand_list {
 	//tracking currently not enabled
diff --git a/src/plugins/HPMHooking.c b/src/plugins/HPMHooking.c
index 1ca5b5f3c..e6e698383 100644
--- a/src/plugins/HPMHooking.c
+++ b/src/plugins/HPMHooking.c
@@ -46,6 +46,8 @@
 #include "../map/mail.h"
 #include "../map/irc-bot.h"
 
+#include "../common/HPMDataCheck.h"
+
 HPExport struct hplugin_info pinfo = {
 	"HPMHooking",   // Plugin name
 	SERVER_TYPE_MAP,// Which server types this plugin works with?
diff --git a/src/plugins/db2sql.c b/src/plugins/db2sql.c
index e72d47b80..46d654e0d 100644
--- a/src/plugins/db2sql.c
+++ b/src/plugins/db2sql.c
@@ -16,6 +16,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "../common/HPMDataCheck.h"
+
 HPExport struct hplugin_info pinfo = {
 	"DB2SQL",        // Plugin name
 	SERVER_TYPE_MAP, // Which server types this plugin works with?
diff --git a/src/plugins/sample.c b/src/plugins/sample.c
index b3e2b570f..750ab31f9 100644
--- a/src/plugins/sample.c
+++ b/src/plugins/sample.c
@@ -14,6 +14,8 @@
 #include "../map/pc.h"
 #include "../map/clif.h"
 
+#include "../common/HPMDataCheck.h" /* should always be the last file included! (if you don't make it last, it'll intentionally break compile time) */
+
 HPExport struct hplugin_info pinfo = {
 	"Sample",		// Plugin name
 	SERVER_TYPE_MAP,// Which server types this plugin works with?