1 files changed, 8 insertions, 8 deletions
diff --git a/src/map/clif.h b/src/map/clif.h
index 47249e07e..3f0d043f7 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -7,7 +7,7 @@
 
 #include "map/map.h"
 #include "map/packets_struct.h"
-#include "common/cbasetypes.h"
+#include "common/hercules.h"
 #include "common/mmo.h"
 
 #include <stdarg.h>
@@ -558,11 +558,6 @@ struct merge_item {
 };
 
 /**
- * Vars
- **/
-struct s_packet_db packet_db[MAX_PACKET_DB + 1];
-
-/**
  * Clif.c Interface
  **/
 struct clif_interface {
@@ -1324,10 +1319,15 @@ struct clif_interface {
 	void (*add_random_options) (unsigned char* buf, struct item* item);
 };
 
-struct clif_interface *clif;
-
 #ifdef HERCULES_CORE
+/**
+ * Vars
+ **/
+extern struct s_packet_db packet_db[MAX_PACKET_DB + 1];
+
 void clif_defaults(void);
 #endif // HERCULES_CORE
 
+HPShared struct clif_interface *clif;
+
 #endif /* MAP_CLIF_H */