Cleaned up some #includes

Signed-off-by: Haru <haru@dotalux.com>

24 files changed, 41 insertions, 36 deletions

diff --git a/src/char/HPMchar.c b/src/char/HPMchar.c
index a159b0351..05429fbb8 100644
--- a/src/char/HPMchar.c
+++ b/src/char/HPMchar.c
@@ -7,24 +7,35 @@
 
 #include "common/HPM.h"
 #include "common/cbasetypes.h"
+
+#if 0 // TODO (HPMDataCheck is disabled for the time being)
+#include "char/char.h"
+#include "char/geoip.h"
+#include "char/inter.h"
+#include "char/int_auction.h"
+#include "char/int_elemental.h"
+#include "char/int_guild.h"
+#include "char/int_homun.h"
+#include "char/int_mail.h"
+#include "char/int_mercenary.h"
+#include "char/int_party.h"
+#include "char/int_pet.h"
+#include "char/int_quest.h"
+#include "char/int_storage.h"
+#include "char/loginif.h"
+#include "char/mapif.h"
+#include "char/pincode.h"
 #include "common/conf.h"
 #include "common/db.h"
 #include "common/des.h"
 #include "common/ers.h"
-#include "common/malloc.h"
 #include "common/mapindex.h"
 #include "common/mmo.h"
-#include "common/showmsg.h"
 #include "common/socket.h"
 #include "common/strlib.h"
 #include "common/sysinfo.h"
-
 #include "common/HPMDataCheck.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
+#endif
 
 bool HPM_char_grabHPData(struct HPDataOperationStorage *ret, enum HPluginDataTypes type, void *ptr) {
 	/* record address */
diff --git a/src/char/char.c b/src/char/char.c
index 3435728f3..5e3c34684 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -36,6 +36,7 @@
 #include "common/showmsg.h"
 #include "common/socket.h"
 #include "common/strlib.h"
+#include "common/sql.h"
 #include "common/timer.h"
 #include "common/utils.h"
 
@@ -43,9 +44,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/types.h>
-#include <time.h>
 #ifndef WIN32
 #	include <unistd.h>
 #endif
diff --git a/src/char/char.h b/src/char/char.h
index be04dbe21..0f351ca8c 100644
--- a/src/char/char.h
+++ b/src/char/char.h
@@ -8,6 +8,7 @@
 #include "common/cbasetypes.h"
 #include "common/core.h" // CORE_ST_LAST
 #include "common/db.h"
+#include "common/mmo.h"
 
 enum E_CHARSERVER_ST {
 	CHARSERVER_ST_RUNNING = CORE_ST_LAST,
diff --git a/src/char/geoip.h b/src/char/geoip.h
index cb980fdb7..4d39011aa 100644
--- a/src/char/geoip.h
+++ b/src/char/geoip.h
@@ -15,6 +15,7 @@ struct s_geoip {
 	bool active;
 };
 
+
 /**
  * geoip interface
  **/
diff --git a/src/char/int_auction.c b/src/char/int_auction.c
index 6b2a9fe73..8d51777fb 100644
--- a/src/char/int_auction.c
+++ b/src/char/int_auction.c
@@ -10,6 +10,7 @@
 #include "char/int_mail.h"
 #include "char/inter.h"
 #include "char/mapif.h"
+#include "common/cbasetypes.h"
 #include "common/db.h"
 #include "common/malloc.h"
 #include "common/mmo.h"
@@ -22,7 +23,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 struct inter_auction_interface inter_auction_s;
 
diff --git a/src/char/int_auction.h b/src/char/int_auction.h
index 80e5fbc8a..610042b9a 100644
--- a/src/char/int_auction.h
+++ b/src/char/int_auction.h
@@ -4,6 +4,7 @@
 #ifndef CHAR_INT_AUCTION_H
 #define CHAR_INT_AUCTION_H
 
+#include "common/db.h"
 #include "common/mmo.h"
 
 #ifdef HERCULES_CORE
diff --git a/src/char/int_elemental.c b/src/char/int_elemental.c
index e894c866d..eff84c57d 100644
--- a/src/char/int_elemental.c
+++ b/src/char/int_elemental.c
@@ -20,7 +20,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 struct inter_elemental_interface inter_elemental_s;
 
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index b61b276f1..96a78203f 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -22,7 +22,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #define GS_MEMBER_UNMODIFIED 0x00
 #define GS_MEMBER_MODIFIED 0x01
diff --git a/src/char/int_guild.h b/src/char/int_guild.h
index fe7d28ca4..eb4c930fc 100644
--- a/src/char/int_guild.h
+++ b/src/char/int_guild.h
@@ -4,6 +4,7 @@
 #ifndef CHAR_INT_GUILD_H
 #define CHAR_INT_GUILD_H
 
+#include "common/db.h"
 #include "common/mmo.h"
 
 enum {
diff --git a/src/char/int_homun.c b/src/char/int_homun.c
index aab585d4c..2ec589eaf 100644
--- a/src/char/int_homun.c
+++ b/src/char/int_homun.c
@@ -20,7 +20,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 struct inter_homunculus_interface inter_homunculus_s;
 
diff --git a/src/char/int_mail.c b/src/char/int_mail.c
index c7740d20a..0d46339e0 100644
--- a/src/char/int_mail.c
+++ b/src/char/int_mail.c
@@ -20,7 +20,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 struct inter_mail_interface inter_mail_s;
 
diff --git a/src/char/int_mercenary.c b/src/char/int_mercenary.c
index 6516c7325..02082aa13 100644
--- a/src/char/int_mercenary.c
+++ b/src/char/int_mercenary.c
@@ -9,6 +9,7 @@
 #include "char/char.h"
 #include "char/inter.h"
 #include "char/mapif.h"
+#include "common/cbasetypes.h"
 #include "common/malloc.h"
 #include "common/mmo.h"
 #include "common/nullpo.h"
@@ -20,7 +21,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 struct inter_mercenary_interface inter_mercenary_s;
 
diff --git a/src/char/int_party.c b/src/char/int_party.c
index 899ac86ef..71f2817b4 100644
--- a/src/char/int_party.c
+++ b/src/char/int_party.c
@@ -22,7 +22,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 struct inter_party_interface inter_party_s;
 
diff --git a/src/char/int_party.h b/src/char/int_party.h
index df2289982..99ee5b13e 100644
--- a/src/char/int_party.h
+++ b/src/char/int_party.h
@@ -4,6 +4,7 @@
 #ifndef CHAR_INT_PARTY_H
 #define CHAR_INT_PARTY_H
 
+#include "common/db.h"
 #include "common/mmo.h"
 
 //Party Flags on what to save/delete.
diff --git a/src/char/int_pet.c b/src/char/int_pet.c
index 169bae407..22fe2dcc2 100644
--- a/src/char/int_pet.c
+++ b/src/char/int_pet.c
@@ -20,7 +20,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 struct inter_pet_interface inter_pet_s;
 
diff --git a/src/char/int_quest.c b/src/char/int_quest.c
index 05655725a..cf9b9c172 100644
--- a/src/char/int_quest.c
+++ b/src/char/int_quest.c
@@ -9,7 +9,7 @@
 #include "char/char.h"
 #include "char/inter.h"
 #include "char/mapif.h"
-#include "common/db.h"
+#include "common/cbasetypes.h"
 #include "common/malloc.h"
 #include "common/mmo.h"
 #include "common/nullpo.h"
@@ -17,11 +17,9 @@
 #include "common/socket.h"
 #include "common/sql.h"
 #include "common/strlib.h"
-#include "common/timer.h"
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 struct inter_quest_interface inter_quest_s;
 
diff --git a/src/char/int_storage.c b/src/char/int_storage.c
index cbe7cb5d1..a12d9fe17 100644
--- a/src/char/int_storage.c
+++ b/src/char/int_storage.c
@@ -20,7 +20,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #define STORAGE_MEMINC 16
 
diff --git a/src/char/inter.c b/src/char/inter.c
index 9707ea710..ca041d581 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -31,7 +31,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #define WISDATA_TTL (60*1000) // Wis data Time To Live (60 seconds)
 #define WISDELLIST_MAX 256    // Number of elements in the list Delete data Wis
diff --git a/src/char/inter.h b/src/char/inter.h
index 2bf8d0847..2e89a685b 100644
--- a/src/char/inter.h
+++ b/src/char/inter.h
@@ -5,11 +5,12 @@
 #ifndef CHAR_INTER_H
 #define CHAR_INTER_H
 
-#include "char.h"
-
 #include "common/cbasetypes.h"
+#include "common/db.h"
 #include "common/sql.h"
 
+#include <stdarg.h>
+
 struct accreg;
 
 #ifdef HERCULES_CORE
diff --git a/src/char/loginif.c b/src/char/loginif.c
index e90c471e2..881c8f2ac 100644
--- a/src/char/loginif.c
+++ b/src/char/loginif.c
@@ -10,6 +10,7 @@
 #include "char/mapif.h"
 #include "common/cbasetypes.h"
 #include "common/core.h"
+#include "common/db.h"
 #include "common/nullpo.h"
 #include "common/showmsg.h"
 #include "common/socket.h"
diff --git a/src/char/loginif.h b/src/char/loginif.h
index 66ca046eb..548eaff02 100644
--- a/src/char/loginif.h
+++ b/src/char/loginif.h
@@ -5,7 +5,9 @@
 #ifndef CHAR_LOGINIF_H
 #define CHAR_LOGINIF_H
 
-#include "char/char.h"
+#include "common/cbasetypes.h"
+
+struct char_session_data;
 
 /**
  * loginif interface
diff --git a/src/char/mapif.h b/src/char/mapif.h
index 8a95c8233..6b015d155 100644
--- a/src/char/mapif.h
+++ b/src/char/mapif.h
@@ -5,16 +5,9 @@
 #ifndef CHAR_MAPIF_H
 #define CHAR_MAPIF_H
 
-#include "char/char.h"
+#include "common/cbasetypes.h"
+#include "common/mmo.h"
 
-struct s_elemental;
-struct s_homunculus;
-struct s_mercenary;
-struct s_pet;
-struct guild_storage;
-struct storage_data;
-struct quest;
-struct mail_message;
 struct WisData;
 
 /**
diff --git a/src/char/pincode.c b/src/char/pincode.c
index 885a3d1a1..43958af8a 100644
--- a/src/char/pincode.c
+++ b/src/char/pincode.c
@@ -8,6 +8,7 @@
 
 #include "char/char.h"
 #include "common/cbasetypes.h"
+#include "common/db.h"
 #include "common/mmo.h"
 #include "common/nullpo.h"
 #include "common/random.h"
diff --git a/src/char/pincode.h b/src/char/pincode.h
index 678448964..01f6c7bf9 100644
--- a/src/char/pincode.h
+++ b/src/char/pincode.h
@@ -5,7 +5,9 @@
 #ifndef CHAR_PINCODE_H
 #define CHAR_PINCODE_H
 
-#include "char/char.h"
+#include "common/cbasetypes.h"
+
+struct char_session_data;
 
 enum PincodeResponseCode {
 	PINCODE_OK      = 0,