3 files changed, 4 insertions, 2 deletions
diff --git a/src/common/HPM.c b/src/common/HPM.c
index 7a875d1c4..003f2d935 100644
--- a/src/common/HPM.c
+++ b/src/common/HPM.c
@@ -30,6 +30,7 @@
 
 struct malloc_interface iMalloc_HPM;
 struct malloc_interface *HPMiMalloc;
+struct HPM_interface HPM_s;
 
 /**
  * (char*) data name -> (unsigned int) HPMDataCheck[] index
diff --git a/src/common/HPM.h b/src/common/HPM.h
index a4ea504e6..4e1aa5beb 100644
--- a/src/common/HPM.h
+++ b/src/common/HPM.h
@@ -154,7 +154,7 @@ struct HPM_interface {
 	bool (*DataCheck) (struct s_HPMDataCheck *src, unsigned int size, int version, char *name);
 	void (*datacheck_init) (const struct s_HPMDataCheck *src, unsigned int length, int version);
 	void (*datacheck_final) (void);
-} HPM_s;
+};
 
 struct HPM_interface *HPM;
 
diff --git a/src/common/HPMi.h b/src/common/HPMi.h
index 0f2bed10d..1022a1ec2 100644
--- a/src/common/HPMi.h
+++ b/src/common/HPMi.h
@@ -204,8 +204,9 @@ HPExport struct HPMi_interface {
 	bool (*addConf) (unsigned int pluginID, enum HPluginConfType type, char *name, void (*func) (const char *val));
 	/* pc group permission */
 	void (*addPCGPermission) (unsigned int pluginID, char *name, unsigned int *mask);
-} HPMi_s;
+};
 #ifndef HERCULES_CORE
+HPExport struct HPMi_interface HPMi_s;
 HPExport struct HPMi_interface *HPMi;
 #endif