From 0118a097c9626b3f8342dd29897392f3da4c1187 Mon Sep 17 00:00:00 2001
From: shennetsind <ind@henn.et>
Date: Fri, 5 Jul 2013 19:19:40 -0300
Subject: HCache | Item Packages Update

http://hercules.ws/board/topic/1389-hcache-item-packages-update/
Signed-off-by: shennetsind <ind@henn.et>
---
 src/common/utils.h | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'src/common/utils.h')

diff --git a/src/common/utils.h b/src/common/utils.h
index 8e39f2655..7953d93e8 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -1,5 +1,6 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+// Portions Copyright (c) Athena Dev Teams
 
 #ifndef _UTILS_H_
 #define _UTILS_H_
@@ -29,4 +30,19 @@ extern uint16 GetWord(uint32 val, int idx);
 extern uint16 MakeWord(uint8 byte0, uint8 byte1);
 extern uint32 MakeDWord(uint16 word0, uint16 word1);
 
+/* [Ind/Hercules] Caching */
+struct HCache_interface {
+	void (*init) (void);
+	/* */
+	bool (*check) (const char *file);
+	FILE *(*open) (const char *file, const char *opt);
+	/* */
+	size_t recompile_time;
+	bool enabled;
+};
+
+struct HCache_interface *HCache;
+
+void HCache_defaults(void);
+
 #endif /* _UTILS_H_ */
-- 
cgit v1.2.3-70-g09d2


From b08910e828bd6f2029f2434572d8f84b30eb7d9c Mon Sep 17 00:00:00 2001
From: shennetsind <ind@henn.et>
Date: Tue, 9 Jul 2013 20:19:32 -0300
Subject: Travis Report Fixes

warn_unused_result shielding, dropped unused variables and fixed battle_calc_return_damage delay behavior (pointer was unchaged; resulting in the var afterwards always as 0)
Special Thanks to Xgear.

Signed-off-by: shennetsind <ind@henn.et>
---
 src/common/core.c  |  6 -----
 src/common/utils.c | 15 ++++++++++---
 src/common/utils.h |  3 +++
 src/map/battle.c   | 55 +++++++++++++++++++++++-----------------------
 src/map/itemdb.c   | 64 +++++++++++++++++++++++++++---------------------------
 src/map/script.c   |  8 +++----
 6 files changed, 79 insertions(+), 72 deletions(-)

(limited to 'src/common/utils.h')

diff --git a/src/common/core.c b/src/common/core.c
index d2f662551..1e5179448 100644
--- a/src/common/core.c
+++ b/src/common/core.c
@@ -150,11 +150,6 @@ void signals_init (void) {
 }
 #endif
 
-#ifdef SVNVERSION
-const char *get_svn_revision(void) {
-	return EXPAND_AND_QUOTE(SVNVERSION);
-}
-#else// not SVNVERSION
 const char* get_svn_revision(void) {
 	static char svn_version_buffer[16] = "";
 	FILE *fp;
@@ -241,7 +236,6 @@ const char* get_svn_revision(void) {
 	svn_version_buffer[0] = HERC_UNKNOWN_VER;
 	return svn_version_buffer;
 }
-#endif
 /* whats our origin */
 #define GIT_ORIGIN "refs/remotes/origin/master"
 /* Grabs the hash from the last time the user updated his working copy (last pull)  */
diff --git a/src/common/utils.c b/src/common/utils.c
index 4d6d35c5c..30649e2f5 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -344,8 +344,8 @@ FILE *HCache_open(const char *file, const char *opt) {
 	
 	if( opt[0] != 'r' ) {
 		char dT[1] = "k";/* 1-byte key to ensure our method is the latest, we can modify to ensure the method matches */
-		fwrite(dT,sizeof(dT),1,first);
-		fwrite(&HCache->recompile_time,sizeof(HCache->recompile_time),1,first);
+		hwrite(dT,sizeof(dT),1,first);
+		hwrite(&HCache->recompile_time,sizeof(HCache->recompile_time),1,first);
 	}
 	fseek(first, 20, SEEK_SET);/* skip first 20, might wanna store something else later */
 	
@@ -365,10 +365,19 @@ void HCache_init(void) {
 	} else
 		ShowWarning("Unable to open '%s', caching capabilities have been disabled!\n",SERVER_NAME);
 }
+/* transit to fread, shields vs warn_unused_result */
+size_t hread(void * ptr, size_t size, size_t count, FILE * stream) {
+	return fread(ptr, size, count, stream);
+}
+/* transit to fwrite, shields vs warn_unused_result */
+size_t hwrite(const void * ptr, size_t size, size_t count, FILE * stream) {
+	return fwrite(ptr, size, count, stream);
+}
+
 void HCache_defaults(void) {
 	
 	HCache = &HCache_s;
-	
+
 	HCache->init = HCache_init;
 	
 	HCache->check = HCache_check;
diff --git a/src/common/utils.h b/src/common/utils.h
index d245f94e2..b1fb4e3a0 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -31,6 +31,9 @@ extern uint16 GetWord(uint32 val, int idx);
 extern uint16 MakeWord(uint8 byte0, uint8 byte1);
 extern uint32 MakeDWord(uint16 word0, uint16 word1);
 
+size_t hread(void * ptr, size_t size, size_t count, FILE * stream);
+size_t hwrite(const void * ptr, size_t size, size_t count, FILE * stream);
+
 /* [Ind/Hercules] Caching */
 struct HCache_interface {
 	void (*init) (void);
diff --git a/src/map/battle.c b/src/map/battle.c
index 0530510c4..135247734 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -838,21 +838,17 @@ int battle_calc_masteryfix(struct block_list *src, struct block_list *target, ui
  * Elemental attribute fix.
  *------------------------------------------*/
 int battle_calc_elefix(struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int damage, int nk, int n_ele, int s_ele, int s_ele_, bool left, int flag){
-	struct status_data *sstatus, *tstatus;
-	struct status_change *sc;
-
+	struct status_data *tstatus;
+	
 	nullpo_ret(src);
 	nullpo_ret(target);
 
-	sstatus = iStatus->get_status_data(src);
 	tstatus = iStatus->get_status_data(target);
-	sc = iStatus->get_sc(src);
-
+	
 	if( (nk&NK_NO_ELEFIX) || n_ele )
 		return damage;
 
-	if( damage > 0 )
-	{
+	if( damage > 0 ) {
 		if( left )
 			damage = battle->attr_fix(src, target, damage, s_ele_, tstatus->def_ele, tstatus->ele_lv);
 		else{
@@ -863,14 +859,22 @@ int battle_calc_elefix(struct block_list *src, struct block_list *target, uint16
 				damage += battle_attr_fix(src,target,50*skill_lv,ELE_NEUTRAL,tstatus->def_ele, tstatus->ele_lv);
 		}
 	}
+	
 #ifndef RENEWAL
-	if( sc && sc->data[SC_SUB_WEAPONPROPERTY] )
-	{ // Descriptions indicate this means adding a percent of a normal attack in another element. [Skotlex]
-		int temp = battle->calc_base_damage(sstatus, &sstatus->rhw, sc, tstatus->size, BL_CAST(BL_PC, src), (flag?2:0)) * sc->data[SC_SUB_WEAPONPROPERTY]->val2 / 100;
-		damage += battle->attr_fix(src, target, temp, sc->data[SC_SUB_WEAPONPROPERTY]->val1, tstatus->def_ele, tstatus->ele_lv);
-		if( left ){
-			temp = battle->calc_base_damage(sstatus, &sstatus->lhw, sc, tstatus->size, BL_CAST(BL_PC, src), (flag?2:0)) * sc->data[SC_SUB_WEAPONPROPERTY]->val2 / 100;
+	{
+		struct status_data *sstatus;
+		struct status_change *sc;
+		
+		sstatus = iStatus->get_status_data(src);
+		sc = iStatus->get_sc(src);
+
+		if( sc && sc->data[SC_SUB_WEAPONPROPERTY] ) { // Descriptions indicate this means adding a percent of a normal attack in another element. [Skotlex]
+			int temp = battle->calc_base_damage(sstatus, &sstatus->rhw, sc, tstatus->size, BL_CAST(BL_PC, src), (flag?2:0)) * sc->data[SC_SUB_WEAPONPROPERTY]->val2 / 100;
 			damage += battle->attr_fix(src, target, temp, sc->data[SC_SUB_WEAPONPROPERTY]->val1, tstatus->def_ele, tstatus->ele_lv);
+			if( left ) {
+				temp = battle->calc_base_damage(sstatus, &sstatus->lhw, sc, tstatus->size, BL_CAST(BL_PC, src), (flag?2:0)) * sc->data[SC_SUB_WEAPONPROPERTY]->val2 / 100;
+				damage += battle->attr_fix(src, target, temp, sc->data[SC_SUB_WEAPONPROPERTY]->val1, tstatus->def_ele, tstatus->ele_lv);
+			}
 		}
 	}
 #endif
@@ -3210,8 +3214,7 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
 	unsigned int skillratio = 100;	//Skill dmg modifiers.
 
     TBL_PC *sd;
-//    TBL_PC *tsd;
-	struct status_change *sc, *tsc;
+	struct status_change *sc;
 	struct Damage ad;
 	struct status_data *sstatus = iStatus->get_status_data(src);
 	struct status_data *tstatus = iStatus->get_status_data(target);
@@ -3240,9 +3243,8 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
 	flag.imdef = nk&NK_IGNORE_DEF?1:0;
 
 	sd = BL_CAST(BL_PC, src);
-//    tsd = BL_CAST(BL_PC, target);
+
 	sc = iStatus->get_sc(src);
-	tsc = iStatus->get_sc(target);
 
 	//Initialize variables that will be used afterwards
 	s_ele = skill->get_ele(skill_id, skill_lv);
@@ -3929,7 +3931,7 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
 {
 	unsigned int skillratio = 100;	//Skill dmg modifiers.
 	short temp=0;
-	short s_ele, s_ele_, t_class;
+	short s_ele, s_ele_;
 	int i, nk;
 	bool n_ele = false; // non-elemental
 
@@ -4095,7 +4097,6 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
 		return wd;
 	}
 
-	t_class = iStatus->get_class(target);
 	s_ele = s_ele_ = skill->get_ele(skill_id, skill_lv);
 	if( !skill_id || s_ele == -1 )
 	{ //Take weapon's element
@@ -5167,7 +5168,7 @@ struct Damage battle_calc_attack(int attack_type,struct block_list *bl,struct bl
 
 //Calculates BF_WEAPON returned damage.
 int battle_calc_return_damage(struct block_list* bl, struct block_list *src, int *dmg, int flag, uint16 skill_id, int *delay){
-	int rdamage = 0, damage = *dmg, rdelay = *delay, trdamage = 0;
+	int rdamage = 0, damage = *dmg, trdamage = 0;
 	struct map_session_data* sd;
 	struct status_change* sc;
 	int max_reflect_damage;
@@ -5194,18 +5195,18 @@ int battle_calc_return_damage(struct block_list* bl, struct block_list *src, int
 	if( flag & BF_SHORT) {//Bounces back part of the damage.
 		if ( sd && sd->bonus.short_weapon_damage_return ){
 			NORMALIZE_RDAMAGE(damage * sd->bonus.short_weapon_damage_return / 100);
-			rdelay = clif->damage(src, src, iTimer->gettick(), status_get_amotion(src), status_get_dmotion(src), rdamage, 1, 4, 0);
+			*delay = clif->damage(src, src, iTimer->gettick(), status_get_amotion(src), status_get_dmotion(src), rdamage, 1, 4, 0);
 		}
 		if( sc && sc->count ) {
 			if( sc->data[SC_REFLECTSHIELD] && skill_id != WS_CARTTERMINATION ){
 				NORMALIZE_RDAMAGE(damage * sc->data[SC_REFLECTSHIELD]->val2 / 100);
-				rdelay = clif->skill_damage(src, src, iTimer->gettick(), status_get_amotion(src), status_get_dmotion(src), rdamage, 1, CR_REFLECTSHIELD, 1, 4);
+				*delay = clif->skill_damage(src, src, iTimer->gettick(), status_get_amotion(src), status_get_dmotion(src), rdamage, 1, CR_REFLECTSHIELD, 1, 4);
 			}
 			if( sc->data[SC_LG_REFLECTDAMAGE] && rand()%100 < (30 + 10*sc->data[SC_LG_REFLECTDAMAGE]->val1) ) {
 				if( skill_id != HT_LANDMINE && skill_id  != HT_CLAYMORETRAP
 					&& skill_id  != RA_CLUSTERBOMB && (skill_id <= RA_VERDURETRAP || skill_id  > RA_ICEBOUNDTRAP) && skill_id != MA_LANDMINE ){
 					NORMALIZE_RDAMAGE((*dmg) * sc->data[SC_LG_REFLECTDAMAGE]->val2 / 100);
-					rdelay = clif->damage(src, src, iTimer->gettick(), status_get_amotion(src), status_get_dmotion(src), rdamage, 1, 4, 0);
+					*delay = clif->damage(src, src, iTimer->gettick(), status_get_amotion(src), status_get_dmotion(src), rdamage, 1, 4, 0);
 				}
 			}
 			if( sc->data[SC_DEATHBOUND] && skill_id != WS_CARTTERMINATION && !is_boss(src) ) {
@@ -5219,18 +5220,18 @@ int battle_calc_return_damage(struct block_list* bl, struct block_list *src, int
 					skill->blown(bl, src, skill->get_blewcount(RK_DEATHBOUND, sc->data[SC_DEATHBOUND]->val1), unit_getdir(src), 0);
 					if( skill_id )
 						status_change_end(bl, SC_DEATHBOUND, INVALID_TIMER);
-					rdelay = clif->damage(src, src, iTimer->gettick(), status_get_amotion(src), status_get_dmotion(src), rdamage, 1, 4, 0);
+					*delay = clif->damage(src, src, iTimer->gettick(), status_get_amotion(src), status_get_dmotion(src), rdamage, 1, 4, 0);
 				}
 			}
 			if( sc->data[SC_SHIELDSPELL_DEF] && sc->data[SC_SHIELDSPELL_DEF]->val1 == 2 && !is_boss(src) ){
 				NORMALIZE_RDAMAGE(damage * sc->data[SC_SHIELDSPELL_DEF]->val2 / 100);
-				rdelay = clif->damage(src, src, iTimer->gettick(), status_get_amotion(src), status_get_dmotion(src), rdamage, 1, 4, 0);
+				*delay = clif->damage(src, src, iTimer->gettick(), status_get_amotion(src), status_get_dmotion(src), rdamage, 1, 4, 0);
 			}
 		}
 	} else {
 		if (sd && sd->bonus.long_weapon_damage_return){ 
 			NORMALIZE_RDAMAGE(damage * sd->bonus.long_weapon_damage_return / 100);
-			rdelay = clif->damage(src, src, iTimer->gettick(), status_get_amotion(src), status_get_dmotion(src), rdamage, 1, 4, 0);
+			*delay = clif->damage(src, src, iTimer->gettick(), status_get_amotion(src), status_get_dmotion(src), rdamage, 1, 4, 0);
 		}
 	}
 		
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index 5dee2bb00..e703ead68 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -720,31 +720,31 @@ void itemdb_write_cached_packages(const char *config_filename) {
 	}
 	
 	// first 2 bytes = package count
-	fwrite(&pcount,sizeof(pcount),1,file);
+	hwrite(&pcount,sizeof(pcount),1,file);
 
 	for(i = 0; i < pcount; i++) {
 		unsigned short id = itemdb->packages[i].id, random_qty = itemdb->packages[i].random_qty, must_qty = itemdb->packages[i].must_qty;
 		unsigned short c;
 		//into a package, first 2 bytes = id.
-		fwrite(&id,sizeof(id),1,file);
+		hwrite(&id,sizeof(id),1,file);
 		//next 2 bytes = must count
-		fwrite(&must_qty,sizeof(must_qty),1,file);
+		hwrite(&must_qty,sizeof(must_qty),1,file);
 		//next 2 bytes = random count
-		fwrite(&random_qty,sizeof(random_qty),1,file);
+		hwrite(&random_qty,sizeof(random_qty),1,file);
 		//now we loop into must
 		for(c = 0; c < must_qty; c++) {
 			struct item_package_must_entry *entry = &itemdb->packages[i].must_items[c];
 			unsigned char announce = entry->announce == 1 ? 1 : 0, named = entry->named == 1 ? 1 : 0;
 			//first 2 byte = item id
-			fwrite(&entry->id,sizeof(entry->id),1,file);
+			hwrite(&entry->id,sizeof(entry->id),1,file);
 			//next 2 byte = qty
-			fwrite(&entry->qty,sizeof(entry->qty),1,file);
+			hwrite(&entry->qty,sizeof(entry->qty),1,file);
 			//next 2 byte = hours
-			fwrite(&entry->hours,sizeof(entry->hours),1,file);
+			hwrite(&entry->hours,sizeof(entry->hours),1,file);
 			//next 1 byte = announce (1:0)
-			fwrite(&announce,sizeof(announce),1,file);
+			hwrite(&announce,sizeof(announce),1,file);
 			//next 1 byte = named (1:0)
-			fwrite(&named,sizeof(announce),1,file);
+			hwrite(&named,sizeof(announce),1,file);
 		}
 		//now we loop into random groups
 		for(c = 0; c < random_qty; c++) {
@@ -752,23 +752,23 @@ void itemdb_write_cached_packages(const char *config_filename) {
 			unsigned short group_qty = group->random_qty, h;
 			
 			//next 2 bytes = how many entries in this group
-			fwrite(&group_qty,sizeof(group_qty),1,file);
+			hwrite(&group_qty,sizeof(group_qty),1,file);
 			//now we loop into the group's list
 			for(h = 0; h < group_qty; h++) {
 				struct item_package_rand_entry *entry = &itemdb->packages[i].random_groups[c].random_list[h];
 				unsigned char announce = entry->announce == 1 ? 1 : 0, named = entry->named == 1 ? 1 : 0;
 				//first 2 byte = item id
-				fwrite(&entry->id,sizeof(entry->id),1,file);
+				hwrite(&entry->id,sizeof(entry->id),1,file);
 				//next 2 byte = qty
-				fwrite(&entry->qty,sizeof(entry->qty),1,file);
+				hwrite(&entry->qty,sizeof(entry->qty),1,file);
 				//next 2 byte = rate
-				fwrite(&entry->rate,sizeof(entry->rate),1,file);
+				hwrite(&entry->rate,sizeof(entry->rate),1,file);
 				//next 2 byte = hours
-				fwrite(&entry->hours,sizeof(entry->hours),1,file);
+				hwrite(&entry->hours,sizeof(entry->hours),1,file);
 				//next 1 byte = announce (1:0)
-				fwrite(&announce,sizeof(announce),1,file);
+				hwrite(&announce,sizeof(announce),1,file);
 				//next 1 byte = named (1:0)
-				fwrite(&named,sizeof(announce),1,file);
+				hwrite(&named,sizeof(announce),1,file);
 			}
 		}
 	}
@@ -787,7 +787,7 @@ bool itemdb_read_cached_packages(const char *config_filename) {
 	}
 	
 	// first 2 bytes = package count
-	fread(&pcount,sizeof(pcount),1,file);
+	hread(&pcount,sizeof(pcount),1,file);
 
 	CREATE(itemdb->packages, struct item_package, pcount);
 	itemdb->package_count = pcount;
@@ -799,11 +799,11 @@ bool itemdb_read_cached_packages(const char *config_filename) {
 		unsigned short c;
 		
 		//into a package, first 2 bytes = id.
-		fread(&id,sizeof(id),1,file);
+		hread(&id,sizeof(id),1,file);
 		//next 2 bytes = must count
-		fread(&must_qty,sizeof(must_qty),1,file);
+		hread(&must_qty,sizeof(must_qty),1,file);
 		//next 2 bytes = random count
-		fread(&random_qty,sizeof(random_qty),1,file);
+		hread(&random_qty,sizeof(random_qty),1,file);
 		
 		if( !(data = itemdb->exists(id)) )
 			ShowWarning("itemdb_read_packages: unknown package item '%d', skipping..\n",id);
@@ -825,15 +825,15 @@ bool itemdb_read_cached_packages(const char *config_filename) {
 				unsigned char announce = 0, named = 0;
 				struct item_data *data;
 				//first 2 byte = item id
-				fread(&mid,sizeof(mid),1,file);
+				hread(&mid,sizeof(mid),1,file);
 				//next 2 byte = qty
-				fread(&qty,sizeof(qty),1,file);
+				hread(&qty,sizeof(qty),1,file);
 				//next 2 byte = hours
-				fread(&hours,sizeof(hours),1,file);
+				hread(&hours,sizeof(hours),1,file);
 				//next 1 byte = announce (1:0)
-				fread(&announce,sizeof(announce),1,file);
+				hread(&announce,sizeof(announce),1,file);
 				//next 1 byte = named (1:0)
-				fread(&named,sizeof(announce),1,file);
+				hread(&named,sizeof(announce),1,file);
 				
 				if( !(data = itemdb->exists(mid)) )
 					ShowWarning("itemdb_read_packages: unknown item '%d' in package '%s'!\n",mid,itemdb_name(package->id));
@@ -853,7 +853,7 @@ bool itemdb_read_cached_packages(const char *config_filename) {
 				struct item_package_rand_entry *prev = NULL;
 				
 				//next 2 bytes = how many entries in this group
-				fread(&group_qty,sizeof(group_qty),1,file);
+				hread(&group_qty,sizeof(group_qty),1,file);
 				
 				package->random_groups[c].random_qty = group_qty;
 				CREATE(package->random_groups[c].random_list, struct item_package_rand_entry, package->random_groups[c].random_qty);
@@ -868,17 +868,17 @@ bool itemdb_read_cached_packages(const char *config_filename) {
 					if( prev ) prev->next = entry;
 					
 					//first 2 byte = item id
-					fread(&mid,sizeof(mid),1,file);
+					hread(&mid,sizeof(mid),1,file);
 					//next 2 byte = qty
-					fread(&qty,sizeof(qty),1,file);
+					hread(&qty,sizeof(qty),1,file);
 					//next 2 byte = rate
-					fread(&rate,sizeof(rate),1,file);
+					hread(&rate,sizeof(rate),1,file);
 					//next 2 byte = hours
-					fread(&hours,sizeof(hours),1,file);
+					hread(&hours,sizeof(hours),1,file);
 					//next 1 byte = announce (1:0)
-					fread(&announce,sizeof(announce),1,file);
+					hread(&announce,sizeof(announce),1,file);
 					//next 1 byte = named (1:0)
-					fread(&named,sizeof(announce),1,file);
+					hread(&named,sizeof(announce),1,file);
 					
 					if( !(data = itemdb->exists(mid)) )
 						ShowWarning("itemdb_read_packages: unknown item '%d' in package '%s'!\n",mid,itemdb_name(package->id));
diff --git a/src/map/script.c b/src/map/script.c
index b5edec220..3cb31b726 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -10486,13 +10486,13 @@ BUILDIN(removemapflag)
 {
 	int16 m,i;
 	const char *str;
-	int val=0;
+	//int val=0;//warning: variable ‘val’ set but not used" - deprecated?
 	
 	str=script_getstr(st,2);
 	i=script_getnum(st,3);
-	if(script_hasdata(st,4)){
-		val=script_getnum(st,4);
-	}
+	//if(script_hasdata(st,4)){
+	//	val=script_getnum(st,4);
+	//}
 	m = iMap->mapname2mapid(str);
 	if(m >= 0) {
 		switch(i) {
-- 
cgit v1.2.3-70-g09d2


From 080f28595faba163657f2143e4098b80189f9b6d Mon Sep 17 00:00:00 2001
From: shennetsind <ind@henn.et>
Date: Fri, 6 Sep 2013 23:18:11 -0300
Subject: Added HCache key #define

As Proposed by Gepard
Closes #63

Signed-off-by: shennetsind <ind@henn.et>
---
 src/common/utils.c | 5 +++--
 src/common/utils.h | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/common/utils.h')

diff --git a/src/common/utils.c b/src/common/utils.c
index 30649e2f5..9e3dbac47 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -309,7 +309,7 @@ bool HCache_check(const char *file) {
 		return false;
 	}
 
-	if( fread(dT,sizeof(dT),1,second) != 1 || fread(&rtime,sizeof(rtime),1,second) != 1 || dT[0] != 'k' || HCache->recompile_time > rtime ) {
+	if( fread(dT,sizeof(dT),1,second) != 1 || fread(&rtime,sizeof(rtime),1,second) != 1 || dT[0] != HCACHE_KEY || HCache->recompile_time > rtime ) {
 		fclose(first);
 		fclose(second);
 		return false;
@@ -343,7 +343,8 @@ FILE *HCache_open(const char *file, const char *opt) {
 	}
 	
 	if( opt[0] != 'r' ) {
-		char dT[1] = "k";/* 1-byte key to ensure our method is the latest, we can modify to ensure the method matches */
+		char dT[1];/* 1-byte key to ensure our method is the latest, we can modify to ensure the method matches */
+		dT[0] = HCACHE_KEY;
 		hwrite(dT,sizeof(dT),1,first);
 		hwrite(&HCache->recompile_time,sizeof(HCache->recompile_time),1,first);
 	}
diff --git a/src/common/utils.h b/src/common/utils.h
index b1fb4e3a0..32087d78f 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -9,6 +9,9 @@
 #include <stdio.h> // FILE*
 #include <time.h>
 
+/* [HCache] 1-byte key to ensure our method is the latest, we can modify to ensure the method matches */
+#define HCACHE_KEY 'k'
+
 // generate a hex dump of the first 'length' bytes of 'buffer'
 void WriteDump(FILE* fp, const void* buffer, size_t length);
 void ShowDump(const void* buffer, size_t length);
-- 
cgit v1.2.3-70-g09d2


From aee2f6317e1c927847993801b5973d7e2e27a418 Mon Sep 17 00:00:00 2001
From: shennetsind <ind@henn.et>
Date: Sat, 16 Nov 2013 16:30:11 -0200
Subject: Introducing Character Ban Support.

@charban/@charunban, can temporarily block any accounts as opposed to the usual account-wide block.
Special Thanks to Haruna, Yommy!

Signed-off-by: shennetsind <ind@henn.et>
---
 conf/messages.conf                       |   3 +-
 sql-files/main.sql                       |   2 +
 sql-files/upgrades/2013-11-16--07-49.sql |   3 +
 sql-files/upgrades/index.txt             |   3 +-
 src/char/char.c                          | 215 +++++++++++++++++++++++--------
 src/char/char.h                          |   1 +
 src/common/showmsg.h                     |   1 +
 src/common/utils.c                       |  11 ++
 src/common/utils.h                       |   2 +
 src/login/login.c                        |  13 +-
 src/map/atcommand.c                      |   8 +-
 src/map/chrif.c                          |  24 +++-
 src/map/clif.c                           |  32 +++++
 src/map/clif.h                           |   2 +
 14 files changed, 241 insertions(+), 79 deletions(-)
 create mode 100644 sql-files/upgrades/2013-11-16--07-49.sql

(limited to 'src/common/utils.h')

diff --git a/conf/messages.conf b/conf/messages.conf
index 2d429d79e..f98a91083 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -452,7 +452,8 @@
 430: unblock
 431: unban
 432: change the sex of
-
+433: This character has been banned until 
+434: Char-server has been asked to %s the character '%.*s'.
 // Homunculus messages
 450: You already have a homunculus
 
diff --git a/sql-files/main.sql b/sql-files/main.sql
index cd50c10fa..60b21285d 100644
--- a/sql-files/main.sql
+++ b/sql-files/main.sql
@@ -110,6 +110,7 @@ CREATE TABLE IF NOT EXISTS `char` (
   `slotchange` SMALLINT(3) unsigned NOT NULL default '0',
   `char_opt` INT( 11 ) unsigned NOT NULL default '0',
   `font` TINYINT( 3 ) UNSIGNED NOT NULL DEFAULT  '0',
+  `unban_time` int(11) unsigned NOT NULL default '0',
   PRIMARY KEY  (`char_id`),
   UNIQUE KEY `name_key` (`name`),
   KEY `account_id` (`account_id`),
@@ -669,6 +670,7 @@ INSERT INTO `sql_updates` (`timestamp`) VALUES (1383167577);
 INSERT INTO `sql_updates` (`timestamp`) VALUES (1383205740);
 INSERT INTO `sql_updates` (`timestamp`) VALUES (1383955424);
 INSERT INTO `sql_updates` (`timestamp`) VALUES (1384545461);
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1384588175);
 
 --
 -- Table structure for table `sstatus`
diff --git a/sql-files/upgrades/2013-11-16--07-49.sql b/sql-files/upgrades/2013-11-16--07-49.sql
new file mode 100644
index 000000000..9f4b80452
--- /dev/null
+++ b/sql-files/upgrades/2013-11-16--07-49.sql
@@ -0,0 +1,3 @@
+#1384588175
+ALTER TABLE `char` ADD COLUMN `unban_time` int(11) unsigned NOT NULL default '0';
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1384588175);
\ No newline at end of file
diff --git a/sql-files/upgrades/index.txt b/sql-files/upgrades/index.txt
index 4fed9ff9b..1e76ee41b 100644
--- a/sql-files/upgrades/index.txt
+++ b/sql-files/upgrades/index.txt
@@ -12,4 +12,5 @@
 2013-10-31--07-49.sql
 2013-11-09--00-03.sql
 2013-11-15--00-06.sql
-2013-11-15--19-57.sql
\ No newline at end of file
+2013-11-15--19-57.sql
+2013-11-16--07-49.sql
\ No newline at end of file
diff --git a/src/char/char.c b/src/char/char.c
index 112bbe0ae..ce05f32f4 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -1004,6 +1004,7 @@ int mmo_chars_fromsql(struct char_session_data* sd, uint8* buf)
 	struct mmo_charstatus p;
 	int j = 0, i;
 	char last_map[MAP_NAME_LENGTH_EXT];
+	size_t unban_time;
 
 	stmt = SQL->StmtMalloc(sql_handle);
 	if( stmt == NULL ) {
@@ -1012,8 +1013,10 @@ int mmo_chars_fromsql(struct char_session_data* sd, uint8* buf)
 	}
 	memset(&p, 0, sizeof(p));
 
-	for(i = 0 ; i < MAX_CHARS; i++ )
+	for(i = 0 ; i < MAX_CHARS; i++ ) {
 		sd->found_char[i] = -1;
+		sd->unban_time[i] = 0;
+	}
 	
 	// read char data
 	if( SQL_ERROR == SQL->StmtPrepare(stmt, "SELECT "
@@ -1021,7 +1024,7 @@ int mmo_chars_fromsql(struct char_session_data* sd, uint8* buf)
 		"`str`,`agi`,`vit`,`int`,`dex`,`luk`,`max_hp`,`hp`,`max_sp`,`sp`,"
 		"`status_point`,`skill_point`,`option`,`karma`,`manner`,`hair`,`hair_color`,"
 		"`clothes_color`,`weapon`,`shield`,`head_top`,`head_mid`,`head_bottom`,`last_map`,`rename`,`delete_date`,"
-		"`robe`,`slotchange`"
+		"`robe`,`slotchange`,`unban_time`"
 		" FROM `%s` WHERE `account_id`='%d' AND `char_num` < '%d'", char_db, sd->account_id, MAX_CHARS)
 	||	SQL_ERROR == SQL->StmtExecute(stmt)
 	||	SQL_ERROR == SQL->StmtBindColumn(stmt, 0,  SQLDT_INT,    &p.char_id, 0, NULL, NULL)
@@ -1061,6 +1064,7 @@ int mmo_chars_fromsql(struct char_session_data* sd, uint8* buf)
 	||	SQL_ERROR == SQL->StmtBindColumn(stmt, 34, SQLDT_UINT32, &p.delete_date, 0, NULL, NULL)
 	||	SQL_ERROR == SQL->StmtBindColumn(stmt, 35, SQLDT_SHORT,  &p.robe, 0, NULL, NULL)
 	||	SQL_ERROR == SQL->StmtBindColumn(stmt, 36, SQLDT_USHORT, &p.slotchange, 0, NULL, NULL)
+	||	SQL_ERROR == SQL->StmtBindColumn(stmt, 37, SQLDT_LONG,   &unban_time, 0, NULL, NULL)
 	)
 	{
 		SqlStmt_ShowDebug(stmt);
@@ -1071,6 +1075,7 @@ int mmo_chars_fromsql(struct char_session_data* sd, uint8* buf)
 	for( i = 0; i < MAX_CHARS && SQL_SUCCESS == SQL->StmtNextRow(stmt); i++ ) {
 		p.last_point.map = mapindex_name2id(last_map);
 		sd->found_char[p.slot] = p.char_id;
+		sd->unban_time[p.slot] = unban_time;
 		j += mmo_char_tobuf(WBUFP(buf, j), &p);
 	}
 	
@@ -1931,6 +1936,7 @@ int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p) {
 
 	return 106+offset;
 }
+	
 /* Made Possible by Yommy~! <3 */
 void mmo_char_send099d(int fd, struct char_session_data *sd) {
 	WFIFOHEAD(fd,4 + (MAX_CHARS*MAX_CHAR_BUF));
@@ -1938,6 +1944,34 @@ void mmo_char_send099d(int fd, struct char_session_data *sd) {
 	WFIFOW(fd,2) = mmo_chars_fromsql(sd, WFIFOP(fd,4)) + 4;
 	WFIFOSET(fd,WFIFOW(fd,2));
 }
+/* Sends character ban list */
+/* Made Possible by Yommy~! <3 */
+void mmo_char_send020d(int fd, struct char_session_data *sd) {
+	int i;
+	time_t now = time(NULL);
+	
+	ARR_FIND(0, MAX_CHARS, i, sd->unban_time[i] > now);
+	
+	if( i != MAX_CHARS ) {
+		int c;
+		
+		WFIFOHEAD(fd, 4 + (MAX_CHARS*24));
+
+		WFIFOW(fd, 0) = 0x20d;
+		
+		for(i = 0, c = 0; i < MAX_CHARS; i++) {
+			if( sd->unban_time[i] > now ) {
+				WFIFOL(fd, 4 + (24*c)) = sd->found_char[i];
+				timestamp2string((char*)WFIFOP(fd,8 + (28*c)), 20, sd->unban_time[i], "%Y-%m-%d %H:%M:%S");
+				c++;
+			}
+		}
+		
+		WFIFOW(fd, 2) = 4 + (24*c);
+		
+		WFIFOSET(fd, WFIFOW(fd, 2));
+	}
+}
 int mmo_char_send006b(int fd, struct char_session_data* sd);
 //----------------------------------------
 // [Ind/Hercules] notify client about charselect window data
@@ -2304,6 +2338,9 @@ int parse_fromlogin(int fd) {
 	#else
 						mmo_char_send006b(i, sd);
 	#endif
+	#if PACKETVER >= 20080000
+						mmo_char_send020d(i, sd);
+	#endif
 	#if PACKETVER >= 20110309
 						pincode->handle(i, sd);
 	#endif
@@ -3141,7 +3178,7 @@ int parse_frommap(int fd)
 				RFIFOSKIP(fd, 86);
 			break;
 
-			case 0x2b0e: // Request from map-server to change an account's status (will just be forwarded to login server)
+			case 0x2b0e: // Request from map-server to change an account's or character's status (accounts will just be forwarded to login server)
 				if (RFIFOREST(fd) < 44)
 					return 0;
 			{
@@ -3150,7 +3187,7 @@ int parse_frommap(int fd)
 
 				int acc = RFIFOL(fd,2); // account_id of who ask (-1 if server itself made this request)
 				const char* name = (char*)RFIFOP(fd,6); // name of the target character
-				int type = RFIFOW(fd,30); // type of operation: 1-block, 2-ban, 3-unblock, 4-unban
+				int type = RFIFOW(fd,30); // type of operation: 1-block, 2-ban, 3-unblock, 4-unban, 5 changesex, 6 charban, 7 charunban
 				short year = RFIFOW(fd,32);
 				short month = RFIFOW(fd,34);
 				short day = RFIFOW(fd,36);
@@ -3160,25 +3197,24 @@ int parse_frommap(int fd)
 				RFIFOSKIP(fd,44);
 
 				SQL->EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
-				if( SQL_ERROR == SQL->Query(sql_handle, "SELECT `account_id`,`name` FROM `%s` WHERE `name` = '%s'", char_db, esc_name) )
+				
+				if( SQL_ERROR == SQL->Query(sql_handle, "SELECT `account_id`,`name`,`char_id`,`unban_time` FROM `%s` WHERE `name` = '%s'", char_db, esc_name) )
 					Sql_ShowDebug(sql_handle);
-				else
-				if( SQL->NumRows(sql_handle) == 0 )
-				{
+				else if( SQL->NumRows(sql_handle) == 0 ) {
 					result = 1; // 1-player not found
-				}
-				else
-				if( SQL_SUCCESS != SQL->NextRow(sql_handle) )
+				} else if( SQL_SUCCESS != SQL->NextRow(sql_handle) ) {
 					Sql_ShowDebug(sql_handle);
-					//FIXME: set proper result value?
-				else
-				{
+					result = 1; // 1-player not found
+				} else {
 					char name[NAME_LENGTH];
-					int account_id;
+					int account_id, char_id;
 					char* data;
+					time_t unban_time;
 
 					SQL->GetData(sql_handle, 0, &data, NULL); account_id = atoi(data);
 					SQL->GetData(sql_handle, 1, &data, NULL); safestrncpy(name, data, sizeof(name));
+					SQL->GetData(sql_handle, 2, &data, NULL); char_id = atoi(data);
+					SQL->GetData(sql_handle, 3, &data, NULL); unban_time = atol(data);
 
 					if( login_fd <= 0 )
 						result = 3; // 3-login-server offline
@@ -3186,53 +3222,111 @@ int parse_frommap(int fd)
 	//				else
 	//				if( acc != -1 && isGM(acc) < isGM(account_id) )
 	//					result = 2; // 2-gm level too low
-					else
-					switch( type ) {
-					case 1: // block
-							WFIFOHEAD(login_fd,10);
-							WFIFOW(login_fd,0) = 0x2724;
-							WFIFOL(login_fd,2) = account_id;
-							WFIFOL(login_fd,6) = 5; // new account status
-							WFIFOSET(login_fd,10);
-					break;
-					case 2: // ban
-							WFIFOHEAD(login_fd,18);
-							WFIFOW(login_fd, 0) = 0x2725;
-							WFIFOL(login_fd, 2) = account_id;
-							WFIFOW(login_fd, 6) = year;
-							WFIFOW(login_fd, 8) = month;
-							WFIFOW(login_fd,10) = day;
-							WFIFOW(login_fd,12) = hour;
-							WFIFOW(login_fd,14) = minute;
-							WFIFOW(login_fd,16) = second;
-							WFIFOSET(login_fd,18);
-					break;
-					case 3: // unblock
-							WFIFOHEAD(login_fd,10);
-							WFIFOW(login_fd,0) = 0x2724;
-							WFIFOL(login_fd,2) = account_id;
-							WFIFOL(login_fd,6) = 0; // new account status
-							WFIFOSET(login_fd,10);
-					break;
-					case 4: // unban
-							WFIFOHEAD(login_fd,6);
-							WFIFOW(login_fd,0) = 0x272a;
-							WFIFOL(login_fd,2) = account_id;
-							WFIFOSET(login_fd,6);
-					break;
-					case 5: // changesex
-							WFIFOHEAD(login_fd,6);
-							WFIFOW(login_fd,0) = 0x2727;
-							WFIFOL(login_fd,2) = account_id;
-							WFIFOSET(login_fd,6);
-					break;
+					else {
+						switch( type ) {
+							case 1: // block
+									WFIFOHEAD(login_fd,10);
+									WFIFOW(login_fd,0) = 0x2724;
+									WFIFOL(login_fd,2) = account_id;
+									WFIFOL(login_fd,6) = 5; // new account status
+									WFIFOSET(login_fd,10);
+							break;
+							case 2: // ban
+									WFIFOHEAD(login_fd,18);
+									WFIFOW(login_fd, 0) = 0x2725;
+									WFIFOL(login_fd, 2) = account_id;
+									WFIFOW(login_fd, 6) = year;
+									WFIFOW(login_fd, 8) = month;
+									WFIFOW(login_fd,10) = day;
+									WFIFOW(login_fd,12) = hour;
+									WFIFOW(login_fd,14) = minute;
+									WFIFOW(login_fd,16) = second;
+									WFIFOSET(login_fd,18);
+							break;
+							case 3: // unblock
+									WFIFOHEAD(login_fd,10);
+									WFIFOW(login_fd,0) = 0x2724;
+									WFIFOL(login_fd,2) = account_id;
+									WFIFOL(login_fd,6) = 0; // new account status
+									WFIFOSET(login_fd,10);
+							break;
+							case 4: // unban
+									WFIFOHEAD(login_fd,6);
+									WFIFOW(login_fd,0) = 0x272a;
+									WFIFOL(login_fd,2) = account_id;
+									WFIFOSET(login_fd,6);
+							break;
+							case 5: // changesex
+									WFIFOHEAD(login_fd,6);
+									WFIFOW(login_fd,0) = 0x2727;
+									WFIFOL(login_fd,2) = account_id;
+									WFIFOSET(login_fd,6);
+							break;
+							case 6: //char ban
+							/* handled by char server, so no redirection */
+							{
+								time_t timestamp;
+								struct tm *tmtime;
+								SqlStmt* stmt = SQL->StmtMalloc(sql_handle);
+
+								if (unban_time == 0 || unban_time < time(NULL))
+									timestamp = time(NULL); // new ban
+								else
+									timestamp = unban_time; // add to existing ban
+								
+								tmtime = localtime(&timestamp);
+								tmtime->tm_year = tmtime->tm_year + year;
+								tmtime->tm_mon  = tmtime->tm_mon + month;
+								tmtime->tm_mday = tmtime->tm_mday + day;
+								tmtime->tm_hour = tmtime->tm_hour + hour;
+								tmtime->tm_min  = tmtime->tm_min + minute;
+								tmtime->tm_sec  = tmtime->tm_sec + second;
+								timestamp = mktime(tmtime);
+																
+								if( SQL_SUCCESS != SQL->StmtPrepare(stmt,
+																	"UPDATE `%s` SET `unban_time` = ? WHERE `char_id` = ? LIMIT 1",
+																	char_db)
+								   || SQL_SUCCESS != SQL->StmtBindParam(stmt,  0, SQLDT_LONG,   (void*)&timestamp,   sizeof(timestamp))
+								   || SQL_SUCCESS != SQL->StmtBindParam(stmt,  1, SQLDT_INT,    (void*)&char_id,     sizeof(char_id))
+								   || SQL_SUCCESS != SQL->StmtExecute(stmt)
+
+								   ) {
+									SqlStmt_ShowDebug(stmt);
+								}
+								
+								SQL->StmtFree(stmt);
+								
+								// condition applies; send to all map-servers to disconnect the player
+								if( timestamp > time(NULL) ) {
+									unsigned char buf[11];
+									
+									WBUFW(buf,0) = 0x2b14;
+									WBUFL(buf,2) = account_id;
+									WBUFB(buf,6) = 2;
+									WBUFL(buf,7) = (unsigned int)timestamp;
+									mapif_sendall(buf, 11);
+									
+									// disconnect player if online on char-server
+									disconnect_player(account_id);
+								}
+							}
+							break;
+						case 7: //char unban
+							/* handled by char server, so no redirection */
+							if( SQL_ERROR == SQL->Query(sql_handle, "UPDATE `%s` SET `unban_time` = '0' WHERE `char_id` = '%d' LIMIT 1", char_db, char_id) ) {
+								Sql_ShowDebug(sql_handle);
+								result = 1;
+							}
+							break;
+
+						}
 					}
 				}
 
 				SQL->FreeResult(sql_handle);
 
 				// send answer if a player ask, not if the server ask
-				if( acc != -1 && type != 5) { // Don't send answer for changesex
+				if( acc != -1 && type != 5 ) { // Don't send answer for changesex
 					WFIFOHEAD(fd,34);
 					WFIFOW(fd, 0) = 0x2b0f;
 					WFIFOL(fd, 2) = acc;
@@ -3984,6 +4078,15 @@ int parse_char(int fd)
 				char_id = atoi(data);
 				SQL->FreeResult(sql_handle);
 				
+				/* client doesn't let it get to this point if you're banned, so its a forged packet */
+				if( sd->found_char[slot] == char_id && sd->unban_time[slot] > time(NULL) ) {
+					WFIFOHEAD(fd,3);
+					WFIFOW(fd,0) = 0x6c;
+					WFIFOB(fd,2) = 0; // rejected from server
+					WFIFOSET(fd,3);
+					break;
+				}
+				
 				/* set char as online prior to loading its data so 3rd party applications will realise the sql data is not reliable */
 				set_char_online(-2,char_id,sd->account_id);
 				if( !mmo_char_fromsql(char_id, &char_dat, true) ) { /* failed? set it back offline */
diff --git a/src/char/char.h b/src/char/char.h
index a3bbdd904..c7a387645 100644
--- a/src/char/char.h
+++ b/src/char/char.h
@@ -20,6 +20,7 @@ struct char_session_data {
 	bool auth; // whether the session is authed or not
 	int account_id, login_id1, login_id2, sex;
 	int found_char[MAX_CHARS]; // ids of chars on this account
+	time_t unban_time[MAX_CHARS]; // char unban time array
 	char email[40]; // e-mail (default: a@a.com) by [Yor]
 	time_t expiration_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited)
 	int group_id; // permission
diff --git a/src/common/showmsg.h b/src/common/showmsg.h
index 59a0d9538..43d38973f 100644
--- a/src/common/showmsg.h
+++ b/src/common/showmsg.h
@@ -99,5 +99,6 @@ extern void ClearScreen(void);
 	extern void ShowFatalError(const char *, ...);
 	extern void ShowConfigWarning(config_setting_t *config, const char *string, ...);
 #endif
+extern int _vShowMessage(enum msg_type flag, const char *string, va_list ap);
 
 #endif /* _SHOWMSG_H_ */
diff --git a/src/common/utils.c b/src/common/utils.c
index 9e3dbac47..9a7d4971b 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -287,6 +287,17 @@ unsigned int get_percentage(const unsigned int A, const unsigned int B)
 	return (unsigned int)floor(result);
 }
 
+//-----------------------------------------------------
+// custom timestamp formatting (from eApp)
+//-----------------------------------------------------
+const char* timestamp2string(char* str, size_t size, time_t timestamp, const char* format)
+{
+	size_t len = strftime(str, size, format, localtime(&timestamp));
+	memset(str + len, '\0', size - len);
+	return str;
+}
+
+
 /* [Ind/Hercules] Caching */
 bool HCache_check(const char *file) {
 	struct stat bufa, bufb;
diff --git a/src/common/utils.h b/src/common/utils.h
index 32087d78f..3e1463d6b 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -25,6 +25,8 @@ bool exists(const char* filename);
 /// calculates the value of A / B, in percent (rounded down)
 unsigned int get_percentage(const unsigned int A, const unsigned int B);
 
+const char* timestamp2string(char* str, size_t size, time_t timestamp, const char* format);
+
 //////////////////////////////////////////////////////////////////////////
 // byte word dword access [Shinomori]
 //////////////////////////////////////////////////////////////////////////
diff --git a/src/login/login.c b/src/login/login.c
index 3da592ebc..75247845d 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -11,6 +11,7 @@
 #include "../common/socket.h"
 #include "../common/strlib.h"
 #include "../common/timer.h"
+#include "../common/utils.h"
 #include "../common/HPM.h"
 #include "account.h"
 #include "ipban.h"
@@ -271,18 +272,6 @@ bool check_password(const char* md5key, int passwdenc, const char* passwd, const
 	}
 }
 
-
-//-----------------------------------------------------
-// custom timestamp formatting (from eApp)
-//-----------------------------------------------------
-const char* timestamp2string(char* str, size_t size, time_t timestamp, const char* format)
-{
-	size_t len = strftime(str, size, format, localtime(&timestamp));
-	memset(str + len, '\0', size - len);
-	return str;
-}
-
-
 //--------------------------------------------
 // Test to know if an IP come from LAN or WAN.
 //--------------------------------------------
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 902d179db..a2bea32a8 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -2798,7 +2798,7 @@ ACMD(char_ban)
 		return false;
 	}
 	
-	chrif->char_ask_name(sd->status.account_id, atcmd_player_name, 2, year, month, day, hour, minute, second); // type: 2 - ban
+	chrif->char_ask_name(sd->status.account_id, atcmd_player_name, !strcmpi(info->command,"charban") ? 6 : 2, year, month, day, hour, minute, second); // type: 2 - ban; 6 - charban
 	clif->message(fd, msg_txt(88)); // Character name sent to char-server to ask it.
 	
 	return true;
@@ -2838,7 +2838,7 @@ ACMD(char_unban)
 	}
 	
 	// send answer to login server via char-server
-	chrif->char_ask_name(sd->status.account_id, atcmd_player_name, 4, 0, 0, 0, 0, 0, 0); // type: 4 - unban
+	chrif->char_ask_name(sd->status.account_id, atcmd_player_name, !strcmpi(info->command,"charunban") ? 7 : 4, 0, 0, 0, 0, 0, 0); // type: 4 - unban account; type 7 - unban character
 	clif->message(fd, msg_txt(88)); // Character name sent to char-server to ask it.
 	
 	return true;
@@ -3138,7 +3138,7 @@ ACMD(spiritball)
 	if( !message || !*message || (number = atoi(message)) < 0 || number > max_spiritballs )
 	{
 		char msg[CHAT_SIZE_MAX];
-		safesnprintf(msg, sizeof(msg), msg_txt(1028), max_spiritballs); // Please enter a party name (usage: @party <party_name>).
+		safesnprintf(msg, sizeof(msg), msg_txt(1028), max_spiritballs); // Please enter an amount (usage: @spiritball <number: 0-%d>).
 		clif->message(fd, msg);
 		return false;
 	}
@@ -9448,7 +9448,9 @@ void atcommand_basecommands(void) {
 		ACMD_DEF2("allstats", stat_all),
 		ACMD_DEF2("block", char_block),
 		ACMD_DEF2("ban", char_ban),
+		ACMD_DEF2("charban", char_ban),/* char-specific ban time */
 		ACMD_DEF2("unblock", char_unblock),
+		ACMD_DEF2("charunban", char_unban),/* char-specific ban time */
 		ACMD_DEF2("unban", char_unban),
 		ACMD_DEF2("mount", mount_peco),
 		ACMD_DEF(guildspy),
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 87ec71ec5..56572d492 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -752,7 +752,7 @@ int chrif_changeemail(int id, const char *actual_email, const char *new_email) {
  * S 2b0e <accid>.l <name>.24B <type>.w { <year>.w <month>.w <day>.w <hour>.w <minute>.w <second>.w }
  * Send an account modification request to the login server (via char server).
  * type of operation:
- *   1: block, 2: ban, 3: unblock, 4: unban, 5: changesex (use next function for 5)
+ *   1: block, 2: ban, 3: unblock, 4: unban, 5: changesex (use next function for 5), 6: charban
  *------------------------------------------*/
 int chrif_char_ask_name(int acc, const char* character_name, unsigned short operation_type, int year, int month, int day, int hour, int minute, int second) {
 	
@@ -764,7 +764,7 @@ int chrif_char_ask_name(int acc, const char* character_name, unsigned short oper
 	safestrncpy((char*)WFIFOP(chrif->fd,6), character_name, NAME_LENGTH);
 	WFIFOW(chrif->fd,30) = operation_type;
 	
-	if ( operation_type == 2 ) {
+	if ( operation_type == 2 || operation_type == 6 ) {
 		WFIFOW(chrif->fd,32) = year;
 		WFIFOW(chrif->fd,34) = month;
 		WFIFOW(chrif->fd,36) = day;
@@ -800,7 +800,7 @@ int chrif_changesex(struct map_session_data *sd) {
  * R 2b0f <accid>.l <name>.24B <type>.w <answer>.w
  * Processing a reply to chrif->char_ask_name() (request to modify an account).
  * type of operation:
- *   1: block, 2: ban, 3: unblock, 4: unban, 5: changesex
+ *   1: block, 2: ban, 3: unblock, 4: unban, 5: changesex, 6: charban, 7: charunban
  * type of answer:
  *   0: login-server request done
  *   1: player not found
@@ -811,6 +811,7 @@ void chrif_char_ask_name_answer(int acc, const char* player_name, uint16 type, u
 	struct map_session_data* sd;
 	char action[25];
 	char output[256];
+	bool charsrv = ( type == 6 || type == 7 ) ? true : false;
 	
 	sd = map->id2sd(acc);
 	
@@ -819,13 +820,17 @@ void chrif_char_ask_name_answer(int acc, const char* player_name, uint16 type, u
 		return;
 	}
 
+	/* re-use previous msg_txt */
+	if( type == 6 ) type = 2;
+	if( type == 7 ) type = 4;
+	
 	if( type > 0 && type <= 5 )
 		snprintf(action,25,"%s",msg_txt(427+type)); //block|ban|unblock|unban|change the sex of
 	else
 		snprintf(action,25,"???");
 
 	switch( answer ) {
-		case 0 : sprintf(output, msg_txt(424), action, NAME_LENGTH, player_name); break;
+		case 0 : sprintf(output, msg_txt(charsrv?434:424), action, NAME_LENGTH, player_name); break;
 		case 1 : sprintf(output, msg_txt(425), NAME_LENGTH, player_name); break;
 		case 2 : sprintf(output, msg_txt(426), action, NAME_LENGTH, player_name); break;
 		case 3 : sprintf(output, msg_txt(427), action, NAME_LENGTH, player_name); break;
@@ -980,7 +985,7 @@ int chrif_accountban(int fd) {
 	}
 
 	sd->login_id1++; // change identify, because if player come back in char within the 5 seconds, he can change its characters
-	if (RFIFOB(fd,6) == 0) { // 0: change of statut, 1: ban
+	if (RFIFOB(fd,6) == 0) { // 0: change of statut
 		int ret_status = RFIFOL(fd,7); // status or final date of a banishment
 		if(0<ret_status && ret_status<=9)
 			clif->message(sd->fd, msg_txt(411+ret_status));
@@ -988,13 +993,20 @@ int chrif_accountban(int fd) {
 			clif->message(sd->fd, msg_txt(421));
 		else
 			clif->message(sd->fd, msg_txt(420)); //"Your account has not more authorised."
-	} else if (RFIFOB(fd,6) == 1) { // 0: change of statut, 1: ban
+	} else if (RFIFOB(fd,6) == 1) { // 1: ban
 		time_t timestamp;
 		char tmpstr[2048];
 		timestamp = (time_t)RFIFOL(fd,7); // status or final date of a banishment
 		strcpy(tmpstr, msg_txt(423)); //"Your account has been banished until "
 		strftime(tmpstr + strlen(tmpstr), 24, "%d-%m-%Y %H:%M:%S", localtime(&timestamp));
 		clif->message(sd->fd, tmpstr);
+	} else if (RFIFOB(fd,6) == 2) { // 2: change of status for character
+		time_t timestamp;
+		char tmpstr[2048];
+		timestamp = (time_t)RFIFOL(fd,7); // status or final date of a banishment
+		strcpy(tmpstr, msg_txt(433)); //"This character has been banned until  "
+		strftime(tmpstr + strlen(tmpstr), 24, "%d-%m-%Y %H:%M:%S", localtime(&timestamp));
+		clif->message(sd->fd, tmpstr);
 	}
 
 	set_eof(sd->fd); // forced to disconnect for the change
diff --git a/src/map/clif.c b/src/map/clif.c
index d84a0dea8..6740c7a74 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -5634,7 +5634,38 @@ void clif_displaymessage2(const int fd, const char* mes) {
 		aFree(message);		
 	}
 }
+/* oh noo! another version of 0x8e! */
+void clif_displaymessage_sprintf(const int fd, const char* mes, ...) {
+	va_list ap;
 
+	if( fd == -2 ) {
+		ShowInfo("HCP: ");
+		va_start(ap,mes);
+		_vShowMessage(MSG_NONE,mes,ap);
+		va_end(ap);
+		ShowMessage("\n");
+	} else if ( fd > 0 ) {
+		int len = 1;
+		char *ptr;
+		
+		WFIFOHEAD(fd, 5 + 255);/* ensure the maximum */
+
+		/* process */
+		va_start(ap,mes);
+		len += vsnprintf((char *)WFIFOP(fd,4), 255, mes, ap);
+		va_end(ap);
+
+		/* adjusting */
+		ptr = (char *)WFIFOP(fd,4);
+		ptr[len - 1] = '\0';
+		
+		/* */
+		WFIFOW(fd,0) = 0x8e;
+		WFIFOW(fd,2) = 5 + len; // 4 + len + NULL teminate
+		
+		WFIFOSET(fd, 5 + len);
+	}
+}
 /// Send broadcast message in yellow or blue without font formatting (ZC_BROADCAST).
 /// 009a <packet len>.W <message>.?B
 void clif_broadcast(struct block_list* bl, const char* mes, int len, int type, enum send_target target)
@@ -18407,6 +18438,7 @@ void clif_defaults(void) {
 	clif->msgtable_num = clif_msgtable_num;
 	clif->message = clif_displaymessage;
 	clif->messageln = clif_displaymessage2;
+	clif->messages = clif_displaymessage_sprintf;
 	clif->colormes = clif_colormes;
 	clif->process_message = clif_process_message;
 	clif->wisexin = clif_wisexin;
diff --git a/src/map/clif.h b/src/map/clif.h
index e50af7432..043f7dd3a 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -787,6 +787,8 @@ struct clif_interface {
 	void (*msgtable_num) (int fd, int line, int num);
 	void (*message) (const int fd, const char* mes);
 	void (*messageln) (const int fd, const char* mes);
+	/* message+s(printf) */
+	void (*messages) (const int fd, const char* mes, ...);
 	int (*colormes) (int fd, enum clif_colors color, const char* msg);
 	bool (*process_message) (struct map_session_data* sd, int format, char** name_, int* namelen_, char** message_, int* messagelen_);
 	void (*wisexin) (struct map_session_data *sd,int type,int flag);
-- 
cgit v1.2.3-70-g09d2


From 12dce46d611d6ea7c772174ebbd555fa10fead99 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Mon, 18 Nov 2013 08:53:22 +0100
Subject: Sanitized and improved several macros through the code

- Sanitized all potentially unsafe macros (related eA:15259)
- Improved some function-like macros to evaluate their argument only
  once and keep it in a temporary variable.  This improves performance
  in the damage calculation related code.

Signed-off-by: Haru <haru@dotalux.com>
---
 src/char/char.c         |   2 +-
 src/char/char.h         |   2 +-
 src/char/inter.h        |   9 ++--
 src/common/HPM.c        |   1 +
 src/common/HPM.h        |  24 +++++------
 src/common/HPMi.h       |  32 +++++++-------
 src/common/cbasetypes.h |  10 +++--
 src/common/console.c    |   4 ++
 src/common/core.c       |   2 +-
 src/common/db.c         |   2 +-
 src/common/db.h         |  12 +++---
 src/common/ers.h        |  10 ++---
 src/common/grfio.h      |   2 +-
 src/common/malloc.c     |  64 ++++++++++++++--------------
 src/common/malloc.h     |  16 +++----
 src/common/mapindex.h   |   2 +-
 src/common/mempool.c    |  10 ++---
 src/common/mmo.h        |   2 +-
 src/common/netbuffer.h  |  10 ++---
 src/common/network.c    |   2 +-
 src/common/raconf.c     |  29 ++++++-------
 src/common/showmsg.c    | 111 +++++++++++++++++++-----------------------------
 src/common/socket.c     |  26 ++++++------
 src/common/socket.h     |  21 ++++-----
 src/common/spinlock.h   |   4 +-
 src/common/sql.h        |  14 ++----
 src/common/strlib.h     |  32 +++++++-------
 src/common/timer.h      |   2 +-
 src/common/utils.h      |   2 +-
 src/config/const.h      |   7 ---
 src/login/login.h       |   4 +-
 src/map/atcommand.c     |  69 ++++++++++++++----------------
 src/map/battle.c        |  50 ++++++++++++++--------
 src/map/battle.h        |  14 +++---
 src/map/chrif.c         |   2 +-
 src/map/clif.c          |   4 +-
 src/map/clif.h          |   2 +-
 src/map/elemental.h     |   4 +-
 src/map/homunculus.h    |   2 +-
 src/map/intif.c         |   2 +-
 src/map/intif.h         |   6 +--
 src/map/itemdb.h        |  75 ++++++++++++++++----------------
 src/map/map.c           |   4 +-
 src/map/map.h           |  18 ++++----
 src/map/mob.c           |   2 +-
 src/map/mob.h           |   7 +--
 src/map/path.h          |  12 +++---
 src/map/pc.h            |  30 ++++++-------
 src/map/pet.h           |   4 +-
 src/map/script.c        |  15 ++++---
 src/map/script.h        |  37 ++++++++--------
 src/map/skill.c         |  36 ++++++++--------
 src/map/status.c        |  32 ++++++++------
 src/map/status.h        | 106 ++++++++++++++++++++++-----------------------
 54 files changed, 495 insertions(+), 508 deletions(-)

(limited to 'src/common/utils.h')

diff --git a/src/char/char.c b/src/char/char.c
index f1b95474e..a1c6f73b1 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -3933,7 +3933,7 @@ int parse_char(int fd)
 
 	while( RFIFOREST(fd) >= 2 ) {
 		//For use in packets that depend on an sd being present [Skotlex]
-		#define FIFOSD_CHECK(rest) { if(RFIFOREST(fd) < rest) return 0; if (sd==NULL || !sd->auth) { RFIFOSKIP(fd,rest); return 0; } }
+		#define FIFOSD_CHECK(rest) do { if(RFIFOREST(fd) < (rest)) return 0; if (sd==NULL || !sd->auth) { RFIFOSKIP(fd,(rest)); return 0; } } while (0)
 
 		if( HPM->packetsc[hpParse_Char] ) {
 			if( (i = HPM->parse_packets(fd,hpParse_Char)) ) {
diff --git a/src/char/char.h b/src/char/char.h
index c7a387645..c6aa1b66d 100644
--- a/src/char/char.h
+++ b/src/char/char.h
@@ -48,7 +48,7 @@ DBMap* online_char_db; // int account_id -> struct online_char_data*
 
 #define MAX_MAP_SERVERS 2
 
-#define DEFAULT_AUTOSAVE_INTERVAL 300*1000
+#define DEFAULT_AUTOSAVE_INTERVAL (300*1000)
 
 enum {
 	TABLE_INVENTORY,
diff --git a/src/char/inter.h b/src/char/inter.h
index 88501c9a0..9b958dc72 100644
--- a/src/char/inter.h
+++ b/src/char/inter.h
@@ -30,13 +30,12 @@ int inter_accreg_tosql(int account_id, int char_id, struct accreg *reg, int type
 
 uint64 inter_chk_lastuid(int8 flag, uint64 value);
 #ifdef NSI_UNIQUE_ID
-	#define updateLastUid(val_) inter_chk_lastuid(1, val_)
-	#define dbUpdateUid(handler_)\
-	{ \
+	#define updateLastUid(val_) inter_chk_lastuid(1, (val_))
+	#define dbUpdateUid(handler_) do { \
 		uint64 unique_id_ = inter_chk_lastuid(0, 0); \
-		if (unique_id_ && SQL_ERROR == SQL->Query(handler_, "UPDATE `%s` SET `value`='%"PRIu64"' WHERE `varname`='unique_id'", interreg_db, unique_id_)) \
+		if (unique_id_ && SQL_ERROR == SQL->Query((handler_), "UPDATE `%s` SET `value`='%"PRIu64"' WHERE `varname`='unique_id'", interreg_db, unique_id_)) \
 				Sql_ShowDebug(handler_);\
-	}
+	} while(0)
 #else
 	#define dbUpdateUid(handler_)
 	#define updateLastUid(val_)
diff --git a/src/common/HPM.c b/src/common/HPM.c
index 1f4d4d532..641ffe2e6 100644
--- a/src/common/HPM.c
+++ b/src/common/HPM.c
@@ -108,6 +108,7 @@ bool hplugin_populate(struct hplugin *plugin, const char *filename) {
 	
 	return true;
 }
+#undef HPM_POP
 struct hplugin *hplugin_load(const char* filename) {
 	struct hplugin *plugin;
 	struct hplugin_info *info;
diff --git a/src/common/HPM.h b/src/common/HPM.h
index 9a6bda713..5466693ab 100644
--- a/src/common/HPM.h
+++ b/src/common/HPM.h
@@ -12,29 +12,29 @@
 		#define WIN32_LEAN_AND_MEAN
 	#endif
 	#include <windows.h>
-	#define plugin_open(x)		LoadLibraryA(x)
-	#define plugin_import(x,y,z)	(z)GetProcAddress(x,y)
-	#define plugin_close(x)	FreeLibrary(x)
+	#define plugin_open(x)        LoadLibraryA(x)
+	#define plugin_import(x,y,z)  (z)GetProcAddress((x),(y))
+	#define plugin_close(x)       FreeLibrary(x)
 
-	#define DLL_EXT			".dll"
-	#define DLL				HINSTANCE
+	#define DLL_EXT               ".dll"
+	#define DLL                   HINSTANCE
 #else // ! WIN32
 	#include <dlfcn.h>
 	#ifdef RTLD_DEEPBIND // Certain linux ditributions require this, but it's not available everywhere
-		#define plugin_open(x)		dlopen(x,RTLD_NOW|RTLD_DEEPBIND)
+		#define plugin_open(x) dlopen((x),RTLD_NOW|RTLD_DEEPBIND)
 	#else // ! RTLD_DEEPBIND
-		#define plugin_open(x)		dlopen(x,RTLD_NOW)
+		#define plugin_open(x) dlopen((x),RTLD_NOW)
 	#endif // RTLD_DEEPBIND
-	#define plugin_import(x,y,z)	(z)dlsym(x,y)
-	#define plugin_close(x)	dlclose(x)
+	#define plugin_import(x,y,z)   (z)dlsym((x),(y))
+	#define plugin_close(x)        dlclose(x)
 
 	#ifdef CYGWIN
-		#define DLL_EXT		".dll"
+		#define DLL_EXT        ".dll"
 	#else
-		#define DLL_EXT		".so"
+		#define DLL_EXT        ".so"
 	#endif
 
-	#define DLL				void *
+	#define DLL                    void *
 
 	#include <string.h> // size_t
 
diff --git a/src/common/HPMi.h b/src/common/HPMi.h
index 940782dce..7637dc832 100644
--- a/src/common/HPMi.h
+++ b/src/common/HPMi.h
@@ -47,9 +47,9 @@ struct hplugin_info {
 HPExport void *(*import_symbol) (char *name, unsigned int pID);
 HPExport Sql *mysql_handle;
 
-#define GET_SYMBOL(n) import_symbol(n,HPMi->pid)
+#define GET_SYMBOL(n) import_symbol((n),HPMi->pid)
 
-#define SERVER_TYPE_ALL SERVER_TYPE_LOGIN|SERVER_TYPE_CHAR|SERVER_TYPE_MAP
+#define SERVER_TYPE_ALL (SERVER_TYPE_LOGIN|SERVER_TYPE_CHAR|SERVER_TYPE_MAP)
 
 enum hp_event_types {
 	HPET_INIT,/* server starts */
@@ -83,27 +83,27 @@ enum HPluginDataTypes {
 	HPDT_NPCD,
 };
 
-#define addHookPre(tname,hook) HPMi->AddHook(HOOK_TYPE_PRE,tname,hook,HPMi->pid)
-#define addHookPost(tname,hook) HPMi->AddHook(HOOK_TYPE_POST,tname,hook,HPMi->pid)
+#define addHookPre(tname,hook) (HPMi->AddHook(HOOK_TYPE_PRE,(tname),(hook),HPMi->pid))
+#define addHookPost(tname,hook) (HPMi->AddHook(HOOK_TYPE_POST,(tname),(hook),HPMi->pid))
 /* need better names ;/ */
 /* will not run the original function after pre-hook processing is complete (other hooks will run) */
-#define hookStop() HPMi->HookStop(__func__,HPMi->pid)
-#define hookStopped() HPMi->HookStopped()
+#define hookStop() (HPMi->HookStop(__func__,HPMi->pid))
+#define hookStopped() (HPMi->HookStopped())
 
-#define addArg(name,param,func,help) HPMi->addArg(HPMi->pid,name,param,func,help)
+#define addArg(name,param,func,help) (HPMi->addArg(HPMi->pid,(name),(param),(func),(help)))
 /* HPData handy redirects */
 /* session[] */
-#define addToSession(ptr,data,index,autofree) HPMi->addToHPData(HPDT_SESSION,HPMi->pid,ptr,data,index,autofree)
-#define getFromSession(ptr,index) HPMi->getFromHPData(HPDT_SESSION,HPMi->pid,ptr,index)
-#define removeFromSession(ptr,index) HPMi->removeFromHPData(HPDT_SESSION,HPMi->pid,ptr,index)
+#define addToSession(ptr,data,index,autofree) (HPMi->addToHPData(HPDT_SESSION,HPMi->pid,(ptr),(data),(index),(autofree)))
+#define getFromSession(ptr,index) (HPMi->getFromHPData(HPDT_SESSION,HPMi->pid,(ptr),(index)))
+#define removeFromSession(ptr,index) (HPMi->removeFromHPData(HPDT_SESSION,HPMi->pid,(ptr),(index)))
 /* map_session_data */
-#define addToMSD(ptr,data,index,autofree) HPMi->addToHPData(HPDT_MSD,HPMi->pid,ptr,data,index,autofree)
-#define getFromMSD(ptr,index) HPMi->getFromHPData(HPDT_MSD,HPMi->pid,ptr,index)
-#define removeFromMSD(ptr,index) HPMi->removeFromHPData(HPDT_MSD,HPMi->pid,ptr,index)
+#define addToMSD(ptr,data,index,autofree) (HPMi->addToHPData(HPDT_MSD,HPMi->pid,(ptr),(data),(index),(autofree)))
+#define getFromMSD(ptr,index) (HPMi->getFromHPData(HPDT_MSD,HPMi->pid,(ptr),(index)))
+#define removeFromMSD(ptr,index) (HPMi->removeFromHPData(HPDT_MSD,HPMi->pid,(ptr),(index)))
 /* npc_data */
-#define addToNPCD(ptr,data,index,autofree) HPMi->addToHPData(HPDT_NPCD,HPMi->pid,ptr,data,index,autofree)
-#define getFromNPCD(ptr,index) HPMi->getFromHPData(HPDT_NPCD,HPMi->pid,ptr,index)
-#define removeFromNPCD(ptr,index) HPMi->removeFromHPData(HPDT_NPCD,HPMi->pid,ptr,index)
+#define addToNPCD(ptr,data,index,autofree) (HPMi->addToHPData(HPDT_NPCD,HPMi->pid,(ptr),(data),(index),(autofree)))
+#define getFromNPCD(ptr,index) (HPMi->getFromHPData(HPDT_NPCD,HPMi->pid,(ptr),(index)))
+#define removeFromNPCD(ptr,index) (HPMi->removeFromHPData(HPDT_NPCD,HPMi->pid,(ptr),(index)))
 
 /* Hercules Plugin Mananger Include Interface */
 HPExport struct HPMi_interface {
diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h
index d2a0a5dd9..6de2ace01 100644
--- a/src/common/cbasetypes.h
+++ b/src/common/cbasetypes.h
@@ -293,7 +293,9 @@ typedef char bool;
 // if using macros then something that is type independent
 //#define swap(a,b) ((a == b) || ((a ^= b), (b ^= a), (a ^= b)))
 // Avoid "value computed is not used" warning and generates the same assembly code
-#define swap(a,b) if (a != b) ((a ^= b), (b ^= a), (a ^= b))
+//#define swap(a,b) if (a != b) ((a ^= b), (b ^= a), (a ^= b))
+// but is vulnerable to 'if (foo) swap(bar, baz); else quux();', causing the else to nest incorrectly.
+#define swap(a,b) do { if ((a) != (b)) { (a) ^= (b); (b) ^= (a); (a) ^= (b); } } while(0)
 #if 0 //to be activated soon, more tests needed on how VS works with the macro above
 #ifdef WIN32
 #undef swap
@@ -313,7 +315,7 @@ typedef char bool;
 #endif
 #endif
 
-#define swap_ptr(a,b) if ((a) != (b)) ((a) = (void*)((intptr_t)(a) ^ (intptr_t)(b)), (b) = (void*)((intptr_t)(a) ^ (intptr_t)(b)), (a) = (void*)((intptr_t)(a) ^ (intptr_t)(b)))
+#define swap_ptr(a,b) do { if ((a) != (b)) (a) = (void*)((intptr_t)(a) ^ (intptr_t)(b)); (b) = (void*)((intptr_t)(a) ^ (intptr_t)(b)); (a) = (void*)((intptr_t)(a) ^ (intptr_t)(b)); } while(0)
 
 #ifndef max
 #define max(a,b) (((a) > (b)) ? (a) : (b))
@@ -429,8 +431,8 @@ void SET_FUNCPOINTER(T1& var, T2 p)
 	var = tmp.out;
 }
 #else
-#define SET_POINTER(var,p) (var) = (p)
-#define SET_FUNCPOINTER(var,p) (var) = (p)
+#define SET_POINTER(var,p) ((var) = (p))
+#define SET_FUNCPOINTER(var,p) ((var) = (p))
 #endif
 
 
diff --git a/src/common/console.c b/src/common/console.c
index cb8ed5917..94824dc25 100644
--- a/src/common/console.c
+++ b/src/common/console.c
@@ -175,6 +175,10 @@ void console_load_defaults(void) {
 		}
 	}
 }
+#undef CP_DEF_C
+#undef CP_DEF_C2
+#undef CP_DEF_S
+#undef CP_DEF
 void console_parse_create(char *name, CParseFunc func) {
 	unsigned int i;
 	char *tok;
diff --git a/src/common/core.c b/src/common/core.c
index a414a5d0b..dd839b372 100644
--- a/src/common/core.c
+++ b/src/common/core.c
@@ -53,7 +53,7 @@ char *SERVER_NAME = NULL;
 #endif
 
 #ifndef POSIX
-#define compat_signal(signo, func) signal(signo, func)
+#define compat_signal(signo, func) signal((signo), (func))
 #else
 sigfunc *compat_signal(int signo, sigfunc *func) {
 	struct sigaction sact, oact;
diff --git a/src/common/db.c b/src/common/db.c
index b3a58e0a4..c3ca7e0a4 100644
--- a/src/common/db.c
+++ b/src/common/db.c
@@ -315,7 +315,7 @@ static struct db_stats {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0
 };
-#define DB_COUNTSTAT(token) if (stats. ## token != UINT32_MAX) ++stats. ## token
+#define DB_COUNTSTAT(token) do { if (stats. ## token != UINT32_MAX) ++stats. ## token ; } while(0)
 #else /* !defined(DB_ENABLE_STATS) */
 #define DB_COUNTSTAT(token)
 #endif /* !defined(DB_ENABLE_STATS) */
diff --git a/src/common/db.h b/src/common/db.h
index dffd2356d..b9d6af382 100644
--- a/src/common/db.h
+++ b/src/common/db.h
@@ -659,14 +659,14 @@ struct DBMap {
 #define stridb_alloc(opt,maxlen)  DB->alloc(__FILE__,__func__,__LINE__,DB_ISTRING,(opt),(maxlen))
 #define db_destroy(db)            ( (db)->destroy((db),NULL) )
 // Other macros
-#define db_clear(db)        ( (db)->clear(db,NULL) )
+#define db_clear(db)        ( (db)->clear((db),NULL) )
 #define db_size(db)         ( (db)->size(db) )
 #define db_iterator(db)     ( (db)->iterator(db) )
-#define dbi_first(dbi)      ( DB->data2ptr((dbi)->first(dbi,NULL)) )
-#define dbi_last(dbi)       ( DB->data2ptr((dbi)->last(dbi,NULL)) )
-#define dbi_next(dbi)       ( DB->data2ptr((dbi)->next(dbi,NULL)) )
-#define dbi_prev(dbi)       ( DB->data2ptr((dbi)->prev(dbi,NULL)) )
-#define dbi_remove(dbi)     ( (dbi)->remove(dbi,NULL) )
+#define dbi_first(dbi)      ( DB->data2ptr((dbi)->first((dbi),NULL)) )
+#define dbi_last(dbi)       ( DB->data2ptr((dbi)->last((dbi),NULL)) )
+#define dbi_next(dbi)       ( DB->data2ptr((dbi)->next((dbi),NULL)) )
+#define dbi_prev(dbi)       ( DB->data2ptr((dbi)->prev((dbi),NULL)) )
+#define dbi_remove(dbi)     ( (dbi)->remove((dbi),NULL) )
 #define dbi_exists(dbi)     ( (dbi)->exists(dbi) )
 #define dbi_destroy(dbi)    ( (dbi)->destroy(dbi) )
 
diff --git a/src/common/ers.h b/src/common/ers.h
index 51701d778..4ff2a6230 100644
--- a/src/common/ers.h
+++ b/src/common/ers.h
@@ -137,11 +137,11 @@ typedef struct eri {
 #else /* not DISABLE_ERS */
 // These defines should be used to allow the code to keep working whenever 
 // the system is disabled
-#	define ers_alloc(obj,type) (type *)(obj)->alloc(obj)
-#	define ers_free(obj,entry) (obj)->free((obj),(entry))
-#	define ers_entry_size(obj) (obj)->entry_size(obj)
-#	define ers_destroy(obj)    (obj)->destroy(obj)
-#	define ers_chunk_size(obj,size) (obj)->chunk_size(obj,size)
+#	define ers_alloc(obj,type) ((type *)(obj)->alloc(obj))
+#	define ers_free(obj,entry) ((obj)->free((obj),(entry)))
+#	define ers_entry_size(obj) ((obj)->entry_size(obj))
+#	define ers_destroy(obj)    ((obj)->destroy(obj))
+#	define ers_chunk_size(obj,size) ((obj)->chunk_size((obj),(size)))
 
 /**
  * Get a new instance of the manager that handles the specified entry size.
diff --git a/src/common/grfio.h b/src/common/grfio.h
index c5a56a14e..a88b20393 100644
--- a/src/common/grfio.h
+++ b/src/common/grfio.h
@@ -8,7 +8,7 @@ void grfio_init(const char* fname);
 void grfio_final(void);
 void* grfio_reads(const char* fname, int* size);
 char* grfio_find_file(const char* fname);
-#define grfio_read(fn) grfio_reads(fn, NULL)
+#define grfio_read(fn) grfio_reads((fn), NULL)
 
 unsigned long grfio_crc32(const unsigned char *buf, unsigned int len);
 int decode_zip(void* dest, unsigned long* destLen, const void* source, unsigned long sourceLen);
diff --git a/src/common/malloc.c b/src/common/malloc.c
index 4d2c93b77..1cb7836ab 100644
--- a/src/common/malloc.c
+++ b/src/common/malloc.c
@@ -19,28 +19,28 @@ struct malloc_interface iMalloc_s;
 
 #	include <string.h> 
 #	include "memwatch.h"
-#	define MALLOC(n,file,line,func)	mwMalloc((n),(file),(line))
-#	define CALLOC(m,n,file,line,func)	mwCalloc((m),(n),(file),(line))
-#	define REALLOC(p,n,file,line,func)	mwRealloc((p),(n),(file),(line))
-#	define STRDUP(p,file,line,func)	mwStrdup((p),(file),(line))
-#	define FREE(p,file,line,func)		mwFree((p),(file),(line))
-#	define MEMORY_USAGE()	0
-#	define MEMORY_VERIFY(ptr)	mwIsSafeAddr(ptr, 1)
-#	define MEMORY_CHECK() CHECK()
+#	define MALLOC(n,file,line,func)    mwMalloc((n),(file),(line))
+#	define CALLOC(m,n,file,line,func)  mwCalloc((m),(n),(file),(line))
+#	define REALLOC(p,n,file,line,func) mwRealloc((p),(n),(file),(line))
+#	define STRDUP(p,file,line,func)    mwStrdup((p),(file),(line))
+#	define FREE(p,file,line,func)      mwFree((p),(file),(line))
+#	define MEMORY_USAGE()              (size_t)0
+#	define MEMORY_VERIFY(ptr)          mwIsSafeAddr((ptr), 1)
+#	define MEMORY_CHECK()              CHECK()
 
 #elif defined(DMALLOC)
 
 #	include <string.h>
 #	include <stdlib.h>
 #	include "dmalloc.h"
-#	define MALLOC(n,file,line,func)	dmalloc_malloc((file),(line),(n),DMALLOC_FUNC_MALLOC,0,0)
-#	define CALLOC(m,n,file,line,func)	dmalloc_malloc((file),(line),(m)*(n),DMALLOC_FUNC_CALLOC,0,0)
-#	define REALLOC(p,n,file,line,func)	dmalloc_realloc((file),(line),(p),(n),DMALLOC_FUNC_REALLOC,0)
-#	define STRDUP(p,file,line,func)	strdup(p)
-#	define FREE(p,file,line,func)		free(p)
-#	define MEMORY_USAGE()	dmalloc_memory_allocated()
-#	define MEMORY_VERIFY(ptr)	(dmalloc_verify(ptr) == DMALLOC_VERIFY_NOERROR)
-#	define MEMORY_CHECK()	dmalloc_log_stats(); dmalloc_log_unfreed()
+#	define MALLOC(n,file,line,func)    dmalloc_malloc((file),(line),(n),DMALLOC_FUNC_MALLOC,0,0)
+#	define CALLOC(m,n,file,line,func)  dmalloc_malloc((file),(line),(m)*(n),DMALLOC_FUNC_CALLOC,0,0)
+#	define REALLOC(p,n,file,line,func) dmalloc_realloc((file),(line),(p),(n),DMALLOC_FUNC_REALLOC,0)
+#	define STRDUP(p,file,line,func)    strdup(p)
+#	define FREE(p,file,line,func)      free(p)
+#	define MEMORY_USAGE()              dmalloc_memory_allocated()
+#	define MEMORY_VERIFY(ptr)          (dmalloc_verify(ptr) == DMALLOC_VERIFY_NOERROR)
+#	define MEMORY_CHECK()              do { dmalloc_log_stats(); dmalloc_log_unfreed() } while(0)
 
 #elif defined(GCOLLECT)
 
@@ -50,24 +50,26 @@ struct malloc_interface iMalloc_s;
 #	else
 #		define RETURN_ADDR
 #	endif
-#	define MALLOC(n,file,line,func)	GC_debug_malloc((n), RETURN_ADDR (file),(line))
-#	define CALLOC(m,n,file,line,func)	GC_debug_malloc((m)*(n), RETURN_ADDR (file),(line))
-#	define REALLOC(p,n,file,line,func)	GC_debug_realloc((p),(n), RETURN_ADDR (file),(line))
-#	define STRDUP(p,file,line,func)	GC_debug_strdup((p), RETURN_ADDR (file),(line))
-#	define FREE(p,file,line,func)		GC_debug_free(p)
-#	define MEMORY_USAGE()	GC_get_heap_size()
-#	define MEMORY_VERIFY(ptr)	(GC_base(ptr) != NULL)
-#	define MEMORY_CHECK()	GC_gcollect()
+#	define MALLOC(n,file,line,func)    GC_debug_malloc((n), RETURN_ADDR (file),(line))
+#	define CALLOC(m,n,file,line,func)  GC_debug_malloc((m)*(n), RETURN_ADDR (file),(line))
+#	define REALLOC(p,n,file,line,func) GC_debug_realloc((p),(n), RETURN_ADDR (file),(line))
+#	define STRDUP(p,file,line,func)    GC_debug_strdup((p), RETURN_ADDR (file),(line))
+#	define FREE(p,file,line,func)      GC_debug_free(p)
+#	define MEMORY_USAGE()              GC_get_heap_size()
+#	define MEMORY_VERIFY(ptr)          (GC_base(ptr) != NULL)
+#	define MEMORY_CHECK()              GC_gcollect()
+
+#	undef RETURN_ADDR
 
 #else
 
-#	define MALLOC(n,file,line,func)	malloc(n)
-#	define CALLOC(m,n,file,line,func)	calloc((m),(n))
-#	define REALLOC(p,n,file,line,func)	realloc((p),(n))
-#	define STRDUP(p,file,line,func)	strdup(p)
-#	define FREE(p,file,line,func)		free(p)
-#	define MEMORY_USAGE()	0
-#	define MEMORY_VERIFY(ptr)	true
+#	define MALLOC(n,file,line,func)    malloc(n)
+#	define CALLOC(m,n,file,line,func)  calloc((m),(n))
+#	define REALLOC(p,n,file,line,func) realloc((p),(n))
+#	define STRDUP(p,file,line,func)    strdup(p)
+#	define FREE(p,file,line,func)      free(p)
+#	define MEMORY_USAGE()              (size_t)0
+#	define MEMORY_VERIFY(ptr)          true
 #	define MEMORY_CHECK()
 
 #endif
diff --git a/src/common/malloc.h b/src/common/malloc.h
index bc8aa9a20..cd0ef238b 100644
--- a/src/common/malloc.h
+++ b/src/common/malloc.h
@@ -30,11 +30,11 @@
 	#undef LOG_MEMMGR
 #endif
 
-#	define aMalloc(n)		iMalloc->malloc (n,ALC_MARK)
-#	define aCalloc(m,n)		iMalloc->calloc (m,n,ALC_MARK)
-#	define aRealloc(p,n)	iMalloc->realloc	(p,n,ALC_MARK)
-#	define aStrdup(p)		iMalloc->astrdup (p,ALC_MARK)
-#	define aFree(p)			iMalloc->free   (p,ALC_MARK)
+#	define aMalloc(n)    (iMalloc->malloc((n),ALC_MARK))
+#	define aCalloc(m,n)  (iMalloc->calloc((m),(n),ALC_MARK))
+#	define aRealloc(p,n) (iMalloc->realloc((p),(n),ALC_MARK))
+#	define aStrdup(p)    (iMalloc->astrdup((p),ALC_MARK))
+#	define aFree(p)      (iMalloc->free((p),ALC_MARK))
 
 /////////////// Buffer Creation /////////////////
 // Full credit for this goes to Shinomori [Ajarn]
@@ -46,15 +46,15 @@
 
 #else // others don't, so we emulate them
 
-#define CREATE_BUFFER(name, type, size) type *name = (type *) aCalloc (size, sizeof(type))
+#define CREATE_BUFFER(name, type, size) type *name = (type *) aCalloc((size), sizeof(type))
 #define DELETE_BUFFER(name) aFree(name)
 
 #endif
 
 ////////////// Others //////////////////////////
 // should be merged with any of above later
-#define CREATE(result, type, number) (result) = (type *) aCalloc ((number), sizeof(type))
-#define RECREATE(result, type, number) (result) = (type *) aRealloc ((result), sizeof(type) * (number))
+#define CREATE(result, type, number) ((result) = (type *) aCalloc((number), sizeof(type)))
+#define RECREATE(result, type, number) ((result) = (type *) aRealloc((result), sizeof(type) * (number)))
 
 ////////////////////////////////////////////////
 
diff --git a/src/common/mapindex.h b/src/common/mapindex.h
index 646f73f18..cf5486808 100644
--- a/src/common/mapindex.h
+++ b/src/common/mapindex.h
@@ -60,7 +60,7 @@ bool mapindex_exists(int id);
 const char* mapindex_getmapname(const char* string, char* output);
 const char* mapindex_getmapname_ext(const char* string, char* output);
 unsigned short mapindex_name2id(const char*);
-#define mapindex_id2name(n) mapindex_id2name_sub(n,__FILE__, __LINE__, __func__)
+#define mapindex_id2name(n) mapindex_id2name_sub((n),__FILE__, __LINE__, __func__)
 const char* mapindex_id2name_sub(unsigned short,const char *file, int line, const char *func);
 int mapindex_init(void);
 void mapindex_final(void);
diff --git a/src/common/mempool.c b/src/common/mempool.c
index 5eccbf178..4559d8f2a 100644
--- a/src/common/mempool.c
+++ b/src/common/mempool.c
@@ -30,16 +30,16 @@
 #include "../common/malloc.h"
 #include "../common/mutex.h"
 
-#define ALIGN16	ra_align(16)
-#define ALIGN_TO(x, a) (x + ( a - ( x % a) ) )
-#define ALIGN_TO_16(x)	ALIGN_TO(x, 16)
+#define ALIGN16        ra_align(16)
+#define ALIGN_TO(x, a) ((x) + ( (a) - ( (x) % (a)) ) )
+#define ALIGN_TO_16(x) ALIGN_TO((x), 16)
 
 #undef MEMPOOL_DEBUG
 #define MEMPOOLASSERT
 
 
-#define NODE_TO_DATA(x) ( ((char*)x) + sizeof(struct node) )
-#define DATA_TO_NODE(x) ( (struct node*)(((char*)x) - sizeof(struct node)) )
+#define NODE_TO_DATA(x) ( ((char*)(x)) + sizeof(struct node) )
+#define DATA_TO_NODE(x) ( (struct node*)(((char*)(x)) - sizeof(struct node)) )
 struct ra_align(16) node{
 	void 	*next;
 	void 	*segment;
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 309203aa8..5816b467c 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -112,7 +112,7 @@
 #define MAX_STORAGE 600
 #define MAX_GUILD_STORAGE 600
 #define MAX_PARTY 12
-#define MAX_GUILD 16+10*6       // Increased max guild members +6 per 1 extension levels [Lupus]
+#define MAX_GUILD (16+10*6)     // Increased max guild members +6 per 1 extension levels [Lupus]
 #define MAX_GUILDPOSITION 20    // Increased max guild positions to accomodate for all members [Valaris] (removed) [PoW]
 #define MAX_GUILDEXPULSION 32
 #define MAX_GUILDALLIANCE 16
diff --git a/src/common/netbuffer.h b/src/common/netbuffer.h
index 844241226..6ddecfdd9 100644
--- a/src/common/netbuffer.h
+++ b/src/common/netbuffer.h
@@ -73,11 +73,9 @@ void netbuffer_incref( netbuf buf );
 
 
 // Some Useful macros
-#define NBUFP(netbuf,pos) (((uint8*)(netbuf->buf)) + (pos))
-#define NBUFB(netbuf,pos) (*(uint8*)((netbuf->buf) + (pos)))
-#define NBUFW(netbuf,pos) (*(uint16*)((netbuf->buf) + (pos)))
-#define NBUFL(netbuf,pos) (*(uint32*)((netbuf->buf) + (pos)))
-
-
+#define NBUFP(netbuf,pos) (((uint8*)((netbuf)->buf)) + (pos))
+#define NBUFB(netbuf,pos) (*(uint8*)(((netbuf)->buf) + (pos)))
+#define NBUFW(netbuf,pos) (*(uint16*)(((netbuf)->buf) + (pos)))
+#define NBUFL(netbuf,pos) (*(uint32*)(((netbuf)->buf) + (pos)))
 
 #endif
diff --git a/src/common/network.c b/src/common/network.c
index 1f1621363..a40cbd602 100644
--- a/src/common/network.c
+++ b/src/common/network.c
@@ -50,7 +50,7 @@ SESSION g_Session[MAXCONN];
 static bool onSend(int32 fd);
 
 
-#define _network_free_netbuf_async( buf ) add_timer( 0, _network_async_free_netbuf_proc, 0,  (intptr_t) buf)
+#define _network_free_netbuf_async( buf ) add_timer( 0, _network_async_free_netbuf_proc, 0,  (intptr_t)(buf))
 static int _network_async_free_netbuf_proc(int tid, unsigned int tick, int id, intptr_t data){
 	// netbuf is in data
 	netbuffer_put( (netbuf)data );
diff --git a/src/common/raconf.c b/src/common/raconf.c
index f7d1284b7..abeed444b 100644
--- a/src/common/raconf.c
+++ b/src/common/raconf.c
@@ -382,21 +382,20 @@ static bool configParse(raconf inst,  const char *fileName){
 }//end: configParse()
 
 
-#define MAKEKEY(dest, section, key) { size_t section_len, key_len; \
-										if(section == NULL || *section == '\0'){ \
-											strncpy(dest, "<unnamed>", 9); \
-											section_len = 9; \
-										}else{ \
-											section_len = strlen(section); \
-											strncpy(dest, section, section_len); \
-										} \
-										\
-										dest[section_len] = '.'; \
-										\
-										key_len = strlen(key); \
-										strncpy(&dest[section_len+1],  key,  key_len); \
-										dest[section_len + key_len + 1] = '\0'; \
-									}
+#define MAKEKEY(dest, section, key) do { \
+	size_t section_len_, key_len_; \
+	if((section) == NULL || *(section) == '\0'){ \
+		strncpy((dest), "<unnamed>", 9); \
+		section_len_ = 9; \
+	} else { \
+		section_len_ = strlen(section); \
+		strncpy((dest), (section), section_len_); \
+	} \
+	(dest)[section_len_] = '.'; \
+	key_len_ = strlen(key); \
+	strncpy(&(dest)[section_len_+1], (key), key_len_); \
+	(dest)[section_len_ + key_len_ + 1] = '\0'; \
+} while(0)
 										
 
 raconf  raconf_parse(const char *file_name){
diff --git a/src/common/showmsg.c b/src/common/showmsg.c
index 9e0f63003..14342fe5e 100644
--- a/src/common/showmsg.c
+++ b/src/common/showmsg.c
@@ -16,33 +16,17 @@
 #include "../../3rdparty/libconfig/libconfig.h"
 
 #ifdef WIN32
-	#include "../common/winapi.h"
-
-	#ifdef DEBUGLOGMAP
-		#define DEBUGLOGPATH "log\\map-server.log"
-	#else
-		#ifdef DEBUGLOGCHAR
-			#define DEBUGLOGPATH "log\\char-server.log"
-		#else
-			#ifdef DEBUGLOGLOGIN
-				#define DEBUGLOGPATH "log\\login-server.log"
-			#endif
-		#endif
-	#endif
-#else
-	#include <unistd.h>
-
-	#ifdef DEBUGLOGMAP
-		#define DEBUGLOGPATH "log/map-server.log"
-	#else
-		#ifdef DEBUGLOGCHAR
-			#define DEBUGLOGPATH "log/char-server.log"
-		#else
-			#ifdef DEBUGLOGLOGIN
-				#define DEBUGLOGPATH "log/login-server.log"
-			#endif
-		#endif
-	#endif
+#include "../common/winapi.h"
+#else // not WIN32
+#include <unistd.h>
+#endif // WIN32
+
+#if defined(DEBUGLOGMAP)
+#define DEBUGLOGPATH "log"PATHSEP_STR"map-server.log"
+#elif defined(DEBUGLOGCHAR)
+#define DEBUGLOGPATH "log"PATHSEP_STR"char-server.log"
+#elif defined(DEBUGLOGLOGIN)
+#define DEBUGLOGPATH "log"PATHSEP_STR"login-server.log"
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -61,41 +45,40 @@ int console_msg_log = 0;//[Ind] msg error logging
 
 #define SBUF_SIZE 2054 // never put less that what's required for the debug message
 
-#define NEWBUF(buf)				\
-	struct {					\
-		char s_[SBUF_SIZE];		\
-		StringBuf *d_;			\
-		char *v_;				\
-		int l_;					\
-	} buf ={"",NULL,NULL,0};	\
+#define NEWBUF(buf) \
+	struct { \
+		char s_[SBUF_SIZE]; \
+		StringBuf *d_; \
+		char *v_; \
+		int l_; \
+	} buf ={"",NULL,NULL,0}; \
 //define NEWBUF
 
-#define BUFVPRINTF(buf,fmt,args)						\
-	buf.l_ = vsnprintf(buf.s_, SBUF_SIZE, fmt, args);	\
-	if( buf.l_ >= 0 && buf.l_ < SBUF_SIZE )				\
-	{/* static buffer */								\
-		buf.v_ = buf.s_;								\
-	}													\
-	else												\
-	{/* dynamic buffer */								\
-		buf.d_ = StrBuf->Malloc();					\
-		buf.l_ = StrBuf->Vprintf(buf.d_, fmt, args);	\
-		buf.v_ = StrBuf->Value(buf.d_);				\
-		ShowDebug("showmsg: dynamic buffer used, increase the static buffer size to %d or more.\n", buf.l_+1);\
-	}													\
-//define BUFVPRINTF
-
-#define BUFVAL(buf) buf.v_
-#define BUFLEN(buf) buf.l_
-
-#define FREEBUF(buf)			\
-	if( buf.d_ )				\
-	{							\
-		StrBuf->Free(buf.d_);	\
-		buf.d_ = NULL;			\
-	}							\
-	buf.v_ = NULL;				\
-//define FREEBUF
+#define BUFVPRINTF(buf,fmt,args) do { \
+	(buf).l_ = vsnprintf((buf).s_, SBUF_SIZE, (fmt), args); \
+	if( (buf).l_ >= 0 && (buf).l_ < SBUF_SIZE ) \
+	{/* static buffer */ \
+		(buf).v_ = (buf).s_; \
+	} \
+	else \
+	{/* dynamic buffer */ \
+		(buf).d_ = StrBuf->Malloc(); \
+		(buf).l_ = StrBuf->Vprintf((buf).d_, (fmt), args); \
+		(buf).v_ = StrBuf->Value((buf).d_); \
+		ShowDebug("showmsg: dynamic buffer used, increase the static buffer size to %d or more.\n", (buf).l_+1); \
+	} \
+} while(0) //define BUFVPRINTF
+
+#define BUFVAL(buf) ((buf).v_)
+#define BUFLEN(buf) ((buf).l_)
+
+#define FREEBUF(buf) do {\
+	if( (buf).d_ ) { \
+		StrBuf->Free((buf).d_); \
+		(buf).d_ = NULL; \
+	} \
+	(buf).v_ = NULL; \
+} while(0) //define FREEBUF
 
 ///////////////////////////////////////////////////////////////////////////////
 #ifdef _WIN32
@@ -666,14 +649,6 @@ int	FPRINTF(FILE *file, const char *fmt, ...)
 #endif// not _WIN32
 
 
-
-
-
-
-
-
-
-
 char timestamp_format[20] = ""; //For displaying Timestamps
 
 int _vShowMessage(enum msg_type flag, const char *string, va_list ap)
diff --git a/src/common/socket.c b/src/common/socket.c
index 6e877d9be..2ae9d44b3 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -157,19 +157,19 @@ char* sErr(int code)
 	return sbuf;
 }
 
-#define sBind(fd,name,namelen) bind(fd2sock(fd),name,namelen)
-#define sConnect(fd,name,namelen) connect(fd2sock(fd),name,namelen)
-#define sIoctl(fd,cmd,argp) ioctlsocket(fd2sock(fd),cmd,argp)
-#define sListen(fd,backlog) listen(fd2sock(fd),backlog)
-#define sRecv(fd,buf,len,flags) recv(fd2sock(fd),buf,len,flags)
-#define sSelect select
-#define sSend(fd,buf,len,flags) send(fd2sock(fd),buf,len,flags)
-#define sSetsockopt(fd,level,optname,optval,optlen) setsockopt(fd2sock(fd),level,optname,optval,optlen)
-#define sShutdown(fd,how) shutdown(fd2sock(fd),how)
-#define sFD_SET(fd,set) FD_SET(fd2sock(fd),set)
-#define sFD_CLR(fd,set) FD_CLR(fd2sock(fd),set)
-#define sFD_ISSET(fd,set) FD_ISSET(fd2sock(fd),set)
-#define sFD_ZERO FD_ZERO
+#define sBind(fd,name,namelen)                      bind(fd2sock(fd),(name),(namelen))
+#define sConnect(fd,name,namelen)                   connect(fd2sock(fd),(name),(namelen))
+#define sIoctl(fd,cmd,argp)                         ioctlsocket(fd2sock(fd),(cmd),(argp))
+#define sListen(fd,backlog)                         listen(fd2sock(fd),(backlog))
+#define sRecv(fd,buf,len,flags)                     recv(fd2sock(fd),(buf),(len),(flags))
+#define sSelect                                     select
+#define sSend(fd,buf,len,flags)                     send(fd2sock(fd),(buf),(len),(flags))
+#define sSetsockopt(fd,level,optname,optval,optlen) setsockopt(fd2sock(fd),(level),(optname),(optval),(optlen))
+#define sShutdown(fd,how)                           shutdown(fd2sock(fd),(how))
+#define sFD_SET(fd,set)                             FD_SET(fd2sock(fd),(set))
+#define sFD_CLR(fd,set)                             FD_CLR(fd2sock(fd),(set))
+#define sFD_ISSET(fd,set)                           FD_ISSET(fd2sock(fd),(set))
+#define sFD_ZERO                                    FD_ZERO
 
 /////////////////////////////////////////////////////////////////////
 #else
diff --git a/src/common/socket.h b/src/common/socket.h
index 923fa2515..02817f653 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -24,18 +24,18 @@ struct HPluginData;
 
 // socket I/O macros
 #define RFIFOHEAD(fd)
-#define WFIFOHEAD(fd, size) do{ if((fd) && session[fd]->wdata_size + (size) > session[fd]->max_wdata ) realloc_writefifo(fd, size); }while(0)
+#define WFIFOHEAD(fd, size) do{ if((fd) && session[fd]->wdata_size + (size) > session[fd]->max_wdata ) realloc_writefifo((fd), (size)); }while(0)
 #define RFIFOP(fd,pos) (session[fd]->rdata + session[fd]->rdata_pos + (pos))
 #define WFIFOP(fd,pos) (session[fd]->wdata + session[fd]->wdata_size + (pos))
 
-#define RFIFOB(fd,pos) (*(uint8*)RFIFOP(fd,pos))
-#define WFIFOB(fd,pos) (*(uint8*)WFIFOP(fd,pos))
-#define RFIFOW(fd,pos) (*(uint16*)RFIFOP(fd,pos))
-#define WFIFOW(fd,pos) (*(uint16*)WFIFOP(fd,pos))
-#define RFIFOL(fd,pos) (*(uint32*)RFIFOP(fd,pos))
-#define WFIFOL(fd,pos) (*(uint32*)WFIFOP(fd,pos))
-#define RFIFOQ(fd,pos) (*(uint64*)RFIFOP(fd,pos))
-#define WFIFOQ(fd,pos) (*(uint64*)WFIFOP(fd,pos))
+#define RFIFOB(fd,pos) (*(uint8*)RFIFOP((fd),(pos)))
+#define WFIFOB(fd,pos) (*(uint8*)WFIFOP((fd),(pos)))
+#define RFIFOW(fd,pos) (*(uint16*)RFIFOP((fd),(pos)))
+#define WFIFOW(fd,pos) (*(uint16*)WFIFOP((fd),(pos)))
+#define RFIFOL(fd,pos) (*(uint32*)RFIFOP((fd),(pos)))
+#define WFIFOL(fd,pos) (*(uint32*)WFIFOP((fd),(pos)))
+#define RFIFOQ(fd,pos) (*(uint64*)RFIFOP((fd),(pos)))
+#define WFIFOQ(fd,pos) (*(uint64*)WFIFOP((fd),(pos)))
 #define RFIFOSPACE(fd) (session[fd]->max_rdata - session[fd]->rdata_size)
 #define WFIFOSPACE(fd) (session[fd]->max_wdata - session[fd]->wdata_size)
 
@@ -146,8 +146,9 @@ void set_defaultparse(ParseFunc defaultparse);
 uint32 host2ip(const char* hostname);
 const char* ip2str(uint32 ip, char ip_str[16]);
 uint32 str2ip(const char* ip_str);
+// Note: purposely returns four comma-separated arguments
 #define CONVIP(ip) ((ip)>>24)&0xFF,((ip)>>16)&0xFF,((ip)>>8)&0xFF,((ip)>>0)&0xFF
-#define MAKEIP(a,b,c,d) (uint32)( ( ( (a)&0xFF ) << 24 ) | ( ( (b)&0xFF ) << 16 ) | ( ( (c)&0xFF ) << 8 ) | ( ( (d)&0xFF ) << 0 ) )
+#define MAKEIP(a,b,c,d) ((uint32)( ( ( (a)&0xFF ) << 24 ) | ( ( (b)&0xFF ) << 16 ) | ( ( (c)&0xFF ) << 8 ) | ( ( (d)&0xFF ) << 0 ) ))
 uint16 ntows(uint16 netshort);
 
 int socket_getips(uint32* ips, int max);
diff --git a/src/common/spinlock.h b/src/common/spinlock.h
index 3419bfdd5..9b9e4ce94 100644
--- a/src/common/spinlock.h
+++ b/src/common/spinlock.h
@@ -52,8 +52,8 @@ static forceinline void FinalizeSpinLock(PSPIN_LOCK lck){
 }
 
 
-#define getsynclock(l) { while(1){ if(InterlockedCompareExchange(l, 1, 0) == 0) break; rathread_yield(); } }
-#define dropsynclock(l) { InterlockedExchange(l, 0); }
+#define getsynclock(l) do { if(InterlockedCompareExchange((l), 1, 0) == 0) break; rathread_yield(); } while(/*always*/1)
+#define dropsynclock(l) do { InterlockedExchange((l), 0); } while(0)
 
 static forceinline void EnterSpinLock(PSPIN_LOCK lck){
 		int tid = rathread_get_tid();
diff --git a/src/common/sql.h b/src/common/sql.h
index da00edf2d..1fb436853 100644
--- a/src/common/sql.h
+++ b/src/common/sql.h
@@ -11,7 +11,7 @@
 
 
 // Return codes
-#define SQL_ERROR -1
+#define SQL_ERROR (-1)
 #define SQL_SUCCESS 0
 #define SQL_NO_DATA 100
 
@@ -277,7 +277,7 @@ void sql_defaults(void);
 #if defined(SQL_REMOVE_SHOWDEBUG)
 #define Sql_ShowDebug(self) (void)0
 #else
-#define Sql_ShowDebug(self) SQL->ShowDebug_(self, __FILE__, __LINE__)
+#define Sql_ShowDebug(self) (SQL->ShowDebug_((self), __FILE__, __LINE__))
 #endif
 
 void Sql_HerculesUpdateCheck(Sql* self);
@@ -286,16 +286,10 @@ void Sql_HerculesUpdateSkip(Sql* self,const char *filename);
 #if defined(SQL_REMOVE_SHOWDEBUG)
 #define SqlStmt_ShowDebug(self) (void)0
 #else
-#define SqlStmt_ShowDebug(self) SQL->StmtShowDebug_(self, __FILE__, __LINE__)
-#endif
 /// Shows debug information (with statement).
-
-
-
-
-
+#define SqlStmt_ShowDebug(self) (SQL->StmtShowDebug_((self), __FILE__, __LINE__))
+#endif
 
 void Sql_Init(void);
 
-
 #endif /* _COMMON_SQL_H_ */
diff --git a/src/common/strlib.h b/src/common/strlib.h
index 5ef455a0e..0c3b0a486 100644
--- a/src/common/strlib.h
+++ b/src/common/strlib.h
@@ -168,28 +168,28 @@ void strlib_defaults(void);
 
 /* the purpose of these macros is simply to not make calling them be an annoyance */
 #ifndef STRLIB_C
-	#define jstrescape(pt) strlib->jstrescape(pt)
-	#define jstrescapecpy(pt,spt) strlib->jstrescapecpy(pt,spt)
-	#define jmemescapecpy(pt,spt,size) strlib->jmemescapecpy(pt,spt,size)
-	#define remove_control_chars(str) strlib->remove_control_chars(str)
-	#define trim(str) strlib->trim(str)
-	#define normalize_name(str,delims) strlib->normalize_name(str,delims)
-	#define stristr(haystack,needle) strlib->stristr(haystack,needle)
+	#define jstrescape(pt)             (strlib->jstrescape(pt))
+	#define jstrescapecpy(pt,spt)      (strlib->jstrescapecpy((pt),(spt)))
+	#define jmemescapecpy(pt,spt,size) (strlib->jmemescapecpy((pt),(spt),(size)))
+	#define remove_control_chars(str)  (strlib->remove_control_chars(str))
+	#define trim(str)                  (strlib->trim(str))
+	#define normalize_name(str,delims) (strlib->normalize_name((str),(delims)))
+	#define stristr(haystack,needle)   (strlib->stristr((haystack),(needle)))
 
 	#if !(defined(WIN32) && defined(_MSC_VER) && _MSC_VER >= 1400) && !defined(HAVE_STRNLEN)
-		#define strnln(string,maxlen) strlib->strnlen(string,maxlen)
+		#define strnln(string,maxlen) (strlib->strnlen((string),(maxlen)))
 	#endif
 
 	#if defined(WIN32) && defined(_MSC_VER) && _MSC_VER <= 1200
-		#define strtoull(str,endptr,base) strlib->strtoull(str,endptr,base)
+		#define strtoull(str,endptr,base) (strlib->strtoull((str),(endptr),(base)))
 	#endif
 
-	#define e_mail_check(email) strlib->e_mail_check(email)
-	#define config_switch(str) strlib->config_switch(str)
-	#define safestrncpy(dst,src,n) strlib->safestrncpy(dst,src,n)
-	#define safestrnlen(string,maxlen) strlib->safestrnlen(string,maxlen)
-	#define safesnprintf(buf,sz,fmt,...) strlib->safesnprintf(buf,sz,fmt,##__VA_ARGS__)
-	#define strline(str,pos) strlib->strline(str,pos)
-	#define bin2hex(output,input,count) strlib->bin2hex(output,input,count)
+	#define e_mail_check(email)          (strlib->e_mail_check(email))
+	#define config_switch(str)           (strlib->config_switch(str))
+	#define safestrncpy(dst,src,n)       (strlib->safestrncpy((dst),(src),(n)))
+	#define safestrnlen(string,maxlen)   (strlib->safestrnlen((string),(maxlen)))
+	#define safesnprintf(buf,sz,fmt,...) (strlib->safesnprintf((buf),(sz),(fmt),##__VA_ARGS__))
+	#define strline(str,pos)             (strlib->strline((str),(pos)))
+	#define bin2hex(output,input,count)  (strlib->bin2hex((output),(input),(count)))
 #endif /* STRLIB_C */
 #endif /* _STRLIB_H_ */
diff --git a/src/common/timer.h b/src/common/timer.h
index 4a2bebe7d..9aa29861e 100644
--- a/src/common/timer.h
+++ b/src/common/timer.h
@@ -8,7 +8,7 @@
 #define DIFF_TICK(a,b) ((a)-(b))
 #define DIFF_TICK32(a,b) ((int32)((a)-(b)))
 
-#define INVALID_TIMER -1
+#define INVALID_TIMER (-1)
 
 // timer flags
 enum {
diff --git a/src/common/utils.h b/src/common/utils.h
index 3e1463d6b..719e1e533 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -20,7 +20,7 @@ void findfile(const char *p, const char *pat, void (func)(const char*));
 bool exists(const char* filename);
 
 //Caps values to min/max
-#define cap_value(a, min, max) ((a >= max) ? max : (a <= min) ? min : a)
+#define cap_value(a, min, max) (((a) >= (max)) ? (max) : ((a) <= (min)) ? (min) : (a))
 
 /// calculates the value of A / B, in percent (rounded down)
 unsigned int get_percentage(const unsigned int A, const unsigned int B);
diff --git a/src/config/const.h b/src/config/const.h
index 6f0dc6311..fc82d66f9 100644
--- a/src/config/const.h
+++ b/src/config/const.h
@@ -114,13 +114,6 @@
 	#undef CONSOLE_INPUT
 #endif
 
-#ifdef RENEWAL
-	#define ITEMDB_SQL_COLUMNS 24
-#else
-	#define ITEMDB_SQL_COLUMNS 22
-#endif
-
-
 /**
  * End of File
  **/
diff --git a/src/login/login.h b/src/login/login.h
index 0a41b803f..15edb14dc 100644
--- a/src/login/login.h
+++ b/src/login/login.h
@@ -89,8 +89,8 @@ struct Login_Config {
 	struct client_hash_node *client_hash_nodes;		// linked list containg md5 hash for each gm group
 };
 
-#define sex_num2str(num) ( (num ==  SEX_FEMALE  ) ? 'F' : (num ==  SEX_MALE  ) ? 'M' : 'S' )
-#define sex_str2num(str) ( (str == 'F' ) ?  SEX_FEMALE  : (str == 'M' ) ?  SEX_MALE  :  SEX_SERVER  )
+#define sex_num2str(num) ( ((num) ==  SEX_FEMALE) ? 'F' : ((num) ==  SEX_MALE) ? 'M' : 'S' )
+#define sex_str2num(str) ( ((str) == 'F') ? SEX_FEMALE : ((str) == 'M') ? SEX_MALE : SEX_SERVER )
 
 #define MAX_SERVERS 30
 extern struct mmo_char_server server[MAX_SERVERS];
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 4a471fe5d..3b06140d4 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -164,38 +164,32 @@ ACMD(send)
 			clif->message(fd, msg_txt(i));
 		return false;
 	}
-	
-#define PARSE_ERROR(error,p) \
-{\
-clif->message(fd, (error));\
-sprintf(atcmd_output, ">%s", (p));\
-clif->message(fd, atcmd_output);\
-}
-	//define PARSE_ERROR
-	
-#define CHECK_EOS(p) \
-if(*(p) == 0){\
-clif->message(fd, "Unexpected end of string");\
-return false;\
-}
-	//define CHECK_EOS
-	
-#define SKIP_VALUE(p) \
-{\
-while(*(p) && !ISSPACE(*(p))) ++(p); /* non-space */\
-while(*(p) && ISSPACE(*(p)))  ++(p); /* space */\
-}
-	//define SKIP_VALUE
-	
-#define GET_VALUE(p,num) \
-{\
-if(sscanf((p), "x%lx", &(num)) < 1 && sscanf((p), "%ld ", &(num)) < 1){\
-PARSE_ERROR("Invalid number in:",(p));\
-return false;\
-}\
-}
-	//define GET_VALUE
-	
+
+#define PARSE_ERROR(error,p) do {\
+	clif->message(fd, (error));\
+	sprintf(atcmd_output, ">%s", (p));\
+	clif->message(fd, atcmd_output);\
+} while(0) //define PARSE_ERROR
+
+#define CHECK_EOS(p) do { \
+	if(*(p) == 0){ \
+		clif->message(fd, "Unexpected end of string");\
+		return false;\
+	} \
+} while(0) //define CHECK_EOS
+
+#define SKIP_VALUE(p) do { \
+	while(*(p) && !ISSPACE(*(p))) ++(p); /* non-space */\
+	while(*(p) && ISSPACE(*(p)))  ++(p); /* space */\
+} while(0) //define SKIP_VALUE
+
+#define GET_VALUE(p,num) do { \
+	if(sscanf((p), "x%lx", &(num)) < 1 && sscanf((p), "%ld ", &(num)) < 1){\
+		PARSE_ERROR("Invalid number in:",(p));\
+		return false;\
+	}\
+} while(0) //define GET_VALUE
+
 	if (type > 0 && type < MAX_PACKET_DB) {
 		
 		if(len)
@@ -8585,10 +8579,11 @@ ACMD(unloadnpcfile) {
 	return true;
 }
 ACMD(cart) {
-#define MC_CART_MDFY(x,idx) \
-sd->status.skill[idx].id = x?MC_PUSHCART:0; \
-sd->status.skill[idx].lv = x?1:0; \
-sd->status.skill[idx].flag = x?1:0;
+#define MC_CART_MDFY(x,idx) do { \
+	sd->status.skill[idx].id = (x)?MC_PUSHCART:0; \
+	sd->status.skill[idx].lv = (x)?1:0; \
+	sd->status.skill[idx].flag = (x)?1:0; \
+} while(0)
 	
 	int val = atoi(message);
 	bool need_skill = pc->checkskill(sd, MC_PUSHCART) ? false : true;
@@ -9616,6 +9611,8 @@ void atcommand_basecommands(void) {
 	
 	return;
 }
+#undef ACMD_DEF
+#undef ACMD_DEF2
 
 bool atcommand_add(char *name,AtCommandFunc func, bool replace) {
 	AtCommandInfo* cmd;
diff --git a/src/map/battle.c b/src/map/battle.c
index cd8c36b69..78f54733c 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3189,7 +3189,7 @@ int battle_blewcount_bonus(struct map_session_data *sd, uint16 skill_id) {
 	return 0;
 }
 //For quick div adjustment.
-#define damage_div_fix(dmg, div) { if (div > 1) (dmg)*=div; else if (div < 0) (div)*=-1; }
+#define damage_div_fix(dmg, div) do { if ((div) > 1) (dmg)*=(div); else if ((div) < 0) (div)*=-1; } while(0)
 /*==========================================
  * battle_calc_magic_attack [DracoRPG]
  *------------------------------------------*/
@@ -3305,11 +3305,11 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
 		ad.damage = 0; //reinitialize..
 #endif
 //MATK_RATE scales the damage. 100 = no change. 50 is halved, 200 is doubled, etc
-#define MATK_RATE( a ) { ad.damage= ad.damage*(a)/100; }
+#define MATK_RATE( a ) ( ad.damage= ad.damage*(a)/100 )
 //Adds dmg%. 100 = +100% (double) damage. 10 = +10% damage
-#define MATK_ADDRATE( a ) { ad.damage+= ad.damage*(a)/100; }
+#define MATK_ADDRATE( a ) ( ad.damage+= ad.damage*(a)/100 )
 //Adds an absolute value to damage. 100 = +100 damage
-#define MATK_ADD( a ) { ad.damage+= a; }
+#define MATK_ADD( a ) ( ad.damage+= (a) )
 
 		switch (skill_id)
 		{	//Calc base damage according to skill
@@ -3499,6 +3499,9 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
 	}
 
 	return ad;
+#undef MATK_RATE
+#undef MATK_ADDRATE
+#undef MATK_ADD
 }
 
 /*==========================================
@@ -4359,19 +4362,19 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
 
 //Assuming that 99% of the cases we will not need to check for the flag.rh... we don't.
 //ATK_RATE scales the damage. 100 = no change. 50 is halved, 200 is doubled, etc
-#define ATK_RATE( a ) { wd.damage= wd.damage*(a)/100 ; if(flag.lh) wd.damage2= wd.damage2*(a)/100; }
-#define ATK_RATE2( a , b ) { wd.damage= wd.damage*(a)/100 ; if(flag.lh) wd.damage2= wd.damage2*(b)/100; }
-#define ATK_RATER(a){ wd.damage = wd.damage*(a)/100;}
-#define ATK_RATEL(a){ wd.damage2 = wd.damage2*(a)/100;}
+#define ATK_RATE( a ) do { int64 temp__ = (a); wd.damage= wd.damage*temp__/100 ; if(flag.lh) wd.damage2= wd.damage2*temp__/100; } while(0)
+#define ATK_RATE2( a , b ) do { wd.damage= wd.damage*(a)/100 ; if(flag.lh) wd.damage2= wd.damage2*(b)/100; } while(0)
+#define ATK_RATER(a) ( wd.damage = wd.damage*(a)/100 )
+#define ATK_RATEL(a) ( wd.damage2 = wd.damage2*(a)/100 )
 //Adds dmg%. 100 = +100% (double) damage. 10 = +10% damage
-#define ATK_ADDRATE( a ) { wd.damage+= wd.damage*(a)/100 ; if(flag.lh) wd.damage2+= wd.damage2*(a)/100; }
-#define ATK_ADDRATE2( a , b ) { wd.damage+= wd.damage*(a)/100 ; if(flag.lh) wd.damage2+= wd.damage2*(b)/100; }
+#define ATK_ADDRATE( a ) do { int64 temp__ = (a); wd.damage+= wd.damage*temp__/100; if(flag.lh) wd.damage2+= wd.damage2*temp__/100; } while(0)
+#define ATK_ADDRATE2( a , b ) do { wd.damage+= wd.damage*(a)/100 ; if(flag.lh) wd.damage2+= wd.damage2*(b)/100; } while(0)
 //Adds an absolute value to damage. 100 = +100 damage
-#define ATK_ADD( a ) { wd.damage+= a; if (flag.lh) wd.damage2+= a; }
-#define ATK_ADD2( a , b ) { wd.damage+= a; if (flag.lh) wd.damage2+= b; }
+#define ATK_ADD( a ) do { int64 temp__ = (a); wd.damage += temp__; if (flag.lh) wd.damage2 += temp__; } while(0)
+#define ATK_ADD2( a , b ) do { wd.damage += (a); if (flag.lh) wd.damage2 += (b); } while(0)
 #ifdef RENEWAL
-#define GET_NORMAL_ATTACK( f ) { wd.damage = battle->calc_base_damage(src, target, skill_id, skill_lv, nk, n_ele, s_ele, s_ele_, EQI_HAND_R, f, wd.flag); }
-#define GET_NORMAL_ATTACK2( f ) { wd.damage2 = battle->calc_base_damage(src, target, skill_id, skill_lv, nk, n_ele, s_ele, s_ele_, EQI_HAND_L, f, wd.flag); }
+#define GET_NORMAL_ATTACK( f ) ( wd.damage = battle->calc_base_damage(src, target, skill_id, skill_lv, nk, n_ele, s_ele, s_ele_, EQI_HAND_R, (f), wd.flag) )
+#define GET_NORMAL_ATTACK2( f ) ( wd.damage2 = battle->calc_base_damage(src, target, skill_id, skill_lv, nk, n_ele, s_ele, s_ele_, EQI_HAND_L, (f), wd.flag) )
 #endif
 		switch (skill_id)
 		{	//Calc base damage according to skill
@@ -5070,7 +5073,7 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
 		)) &&
 		rnd()%100 < tsc->data[SC_SWORDREJECT]->val2
 		) {
-		ATK_RATER(50)
+		ATK_RATER(50);
 		status_fix_damage(target,src,wd.damage,clif->damage(target,src,timer->gettick(),0,0,wd.damage,0,0,0));
 		clif->skill_nodamage(target,target,ST_REJECTSWORD,tsc->data[SC_SWORDREJECT]->val1,1);
 		if( --(tsc->data[SC_SWORDREJECT]->val3) <= 0 )
@@ -5147,9 +5150,9 @@ int64 battle_calc_return_damage(struct block_list* bl, struct block_list *src, i
 	sc = status->get_sc(bl);
 
 #ifdef RENEWAL
-#define NORMALIZE_RDAMAGE(d){ trdamage += rdamage = max(1, min(max_reflect_damage, d)); }
+#define NORMALIZE_RDAMAGE(d) ( trdamage += rdamage = max(1, min(max_reflect_damage, (d))) )
 #else
-#define NORMALIZE_RDAMAGE(d){ trdamage += rdamage = max(1, d); }
+#define NORMALIZE_RDAMAGE(d) ( trdamage += rdamage = max(1, (d)) )
 #endif
 
 	 if( sc && sc->data[SC_CRESCENTELBOW] && !is_boss(src) && rnd()%100 < sc->data[SC_CRESCENTELBOW]->val2 ){
@@ -5214,6 +5217,7 @@ int64 battle_calc_return_damage(struct block_list* bl, struct block_list *src, i
 	}
 
 	return max(0, trdamage);
+#undef NORMALIZE_RDAMAGE
 }
 
 void battle_drain(TBL_PC *sd, struct block_list *tbl, int64 rdamage, int64 ldamage, int race, int boss)
@@ -5468,7 +5472,7 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t
 
 	if( sc && sc->count ) {
 		if (sc->data[SC_EXEEDBREAK]) {
-			ATK_RATER(sc->data[SC_EXEEDBREAK]->val1)
+			ATK_RATER(sc->data[SC_EXEEDBREAK]->val1);
 			status_change_end(src, SC_EXEEDBREAK, INVALID_TIMER);
 		}
 		if( sc->data[SC_SPELLFIST] ) {
@@ -5670,6 +5674,16 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t
 	map->freeblock_unlock();
 	return wd.dmg_lv;
 }
+#undef ATK_RATE
+#undef ATK_RATE2
+#undef ATK_RATER
+#undef ATK_RATEL
+#undef ATK_ADDRATE
+#undef ATK_ADDRATE2
+#undef ATK_ADD
+#undef ATK_ADD2
+#undef GET_NORMAL_ATTACK
+#undef GET_NORMAL_ATTACK2
 
 int battle_check_undead(int race,int element)
 {
diff --git a/src/map/battle.h b/src/map/battle.h
index fd6699f4d..a8b291818 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -21,14 +21,14 @@ struct status_data;
 /**
  * Defines
  **/
-#define MIN_HAIR_STYLE battle_config.min_hair_style
-#define MAX_HAIR_STYLE battle_config.max_hair_style
-#define MIN_HAIR_COLOR battle_config.min_hair_color
-#define MAX_HAIR_COLOR battle_config.max_hair_color
-#define MIN_CLOTH_COLOR battle_config.min_cloth_color
-#define MAX_CLOTH_COLOR battle_config.max_cloth_color
+#define MIN_HAIR_STYLE  (battle_config.min_hair_style)
+#define MAX_HAIR_STYLE  (battle_config.max_hair_style)
+#define MIN_HAIR_COLOR  (battle_config.min_hair_color)
+#define MAX_HAIR_COLOR  (battle_config.max_hair_color)
+#define MIN_CLOTH_COLOR (battle_config.min_cloth_color)
+#define MAX_CLOTH_COLOR (battle_config.max_cloth_color)
 
-#define	is_boss(bl)	(status_get_mode(bl)&MD_BOSS)	// Can refine later [Aru]
+#define	is_boss(bl)     (status_get_mode(bl)&MD_BOSS)	// Can refine later [Aru]
 
 /**
  * Enumerations
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 5927e31bf..e9c3bbabf 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -88,7 +88,7 @@ struct chrif_interface chrif_s;
 //2b27: Incoming, chrif_authfail -> 'client authentication failed'
 
 //This define should spare writing the check in every function. [Skotlex]
-#define chrif_check(a) { if(!chrif->isconnected()) return a; }
+#define chrif_check(a) do { if(!chrif->isconnected()) return a; } while(0)
 
 /// Resets all the data.
 void chrif_reset(void) {
diff --git a/src/map/clif.c b/src/map/clif.c
index 84976d67c..913f55784 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -18201,8 +18201,8 @@ void packetdb_loaddb(void) {
 	
 	memset(packet_db,0,sizeof(packet_db));
 	
-	#define packet(id, size, ...) packetdb_addpacket(id, size, ##__VA_ARGS__, 0xFFFF)
-	#define packetKeys(a,b,c) { clif->cryptKey[0] = a; clif->cryptKey[1] = b; clif->cryptKey[2] = c; }
+	#define packet(id, size, ...) packetdb_addpacket((id), (size), ##__VA_ARGS__, 0xFFFF)
+	#define packetKeys(a,b,c) do { clif->cryptKey[0] = (a); clif->cryptKey[1] = (b); clif->cryptKey[2] = (c); } while(0)
 	#include "packets.h" /* load structure data */
 	#undef packet
 	#undef packetKeys
diff --git a/src/map/clif.h b/src/map/clif.h
index 88f3383d1..76d52311f 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -45,7 +45,7 @@ struct skill_cd;
  **/
 #define packet_len(cmd) packet_db[cmd].len
 #define P2PTR(fd) RFIFO2PTR(fd)
-#define clif_menuskill_clear(sd) (sd)->menuskill_id = (sd)->menuskill_val = (sd)->menuskill_val2 = 0;
+#define clif_menuskill_clear(sd) ((sd)->menuskill_id = (sd)->menuskill_val = (sd)->menuskill_val2 = 0)
 #define HCHSYS_NAME_LENGTH 20
 
 /**
diff --git a/src/map/elemental.h b/src/map/elemental.h
index 8ffffa5e3..830a6a577 100644
--- a/src/map/elemental.h
+++ b/src/map/elemental.h
@@ -21,8 +21,8 @@
 #define EL_SKILLMODE_ASSIST 0x2
 #define EL_SKILLMODE_AGGRESSIVE 0x4
 
-#define elemental_stop_walking(ed, type) unit->stop_walking(&(ed)->bl, type)
-#define elemental_stop_attack(ed) unit->stop_attack(&(ed)->bl)
+#define elemental_stop_walking(ed, type) (unit->stop_walking(&(ed)->bl, (type)))
+#define elemental_stop_attack(ed)        (unit->stop_attack(&(ed)->bl))
 
 /**
  * Structures
diff --git a/src/map/homunculus.h b/src/map/homunculus.h
index b7906d4c8..117f9da8e 100644
--- a/src/map/homunculus.h
+++ b/src/map/homunculus.h
@@ -10,7 +10,7 @@
 #include "pc.h"
 
 #define MAX_HOM_SKILL_REQUIRE 5
-#define homdb_checkid(id) (id >=  HM_CLASS_BASE && id <= HM_CLASS_MAX)
+#define homdb_checkid(id) ((id) >=  HM_CLASS_BASE && (id) <= HM_CLASS_MAX)
 #define homun_alive(x) ((x) && (x)->homunculus.vaporize == HOM_ST_ACTIVE && (x)->battle_status.hp > 0)
 
 struct h_stats {
diff --git a/src/map/intif.c b/src/map/intif.c
index e6ff91af7..36ae753db 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -35,7 +35,7 @@
 
 struct intif_interface intif_s;
 
-#define inter_fd chrif->fd	// alias
+#define inter_fd (chrif->fd) // alias
 
 //-----------------------------------------------------------------
 // Send to inter server
diff --git a/src/map/intif.h b/src/map/intif.h
index 5e996b6fe..d0dfd25cd 100644
--- a/src/map/intif.h
+++ b/src/map/intif.h
@@ -22,9 +22,9 @@ struct auction_data;
 /**
  * Defines
  **/
-#define intif_rename_pc(sd, name) intif->rename(sd, 0, name)
-#define intif_rename_pet(sd, name) intif->rename(sd, 1, name)
-#define intif_rename_hom(sd, name) intif->rename(sd, 2, name)
+#define intif_rename_pc(sd, name)  (intif->rename((sd), 0, (name)))
+#define intif_rename_pet(sd, name) (intif->rename((sd), 1, (name)))
+#define intif_rename_hom(sd, name) (intif->rename((sd), 2, (name)))
 #define INTIF_PACKET_LEN_TABLE_SIZE 161
 
 
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index 3f31c79d4..4ee6637c1 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -28,7 +28,7 @@ struct item_package;
 #define CARD0_PET ((short)0xFF00)
 
 //Marks if the card0 given is "special" (non-item id used to mark pets/created items. [Skotlex]
-#define itemdb_isspecial(i) (i == CARD0_FORGE || i == CARD0_CREATE || i == CARD0_PET)
+#define itemdb_isspecial(i) ((i) == CARD0_FORGE || (i) == CARD0_CREATE || (i) == CARD0_PET)
 
 //Use apple for unknown items.
 #define UNKNOWN_ITEM_ID 512
@@ -236,44 +236,45 @@ struct item_package {
 	unsigned short must_qty;
 };
 
-#define itemdb_name(n) itemdb->search(n)->name
-#define itemdb_jname(n) itemdb->search(n)->jname
-#define itemdb_type(n) itemdb->search(n)->type
-#define itemdb_atk(n) itemdb->search(n)->atk
-#define itemdb_def(n) itemdb->search(n)->def
-#define itemdb_look(n) itemdb->search(n)->look
-#define itemdb_weight(n) itemdb->search(n)->weight
-#define itemdb_equip(n) itemdb->search(n)->equip
-#define itemdb_usescript(n) itemdb->search(n)->script
-#define itemdb_equipscript(n) itemdb->search(n)->script
-#define itemdb_wlv(n) itemdb->search(n)->wlv
-#define itemdb_range(n) itemdb->search(n)->range
-#define itemdb_slot(n) itemdb->search(n)->slot
-#define itemdb_available(n) (itemdb->search(n)->flag.available)
-#define itemdb_viewid(n) (itemdb->search(n)->view_id)
-#define itemdb_autoequip(n) (itemdb->search(n)->flag.autoequip)
-#define itemdb_is_rune(n) ((n >= ITEMID_NAUTHIZ && n <= ITEMID_HAGALAZ) || n == ITEMID_LUX_ANIMA)
-#define itemdb_is_element(n) (n >= 990 && n <= 993)
-#define itemdb_is_spellbook(n) (n >= 6188 && n <= 6205)
-#define itemdb_is_poison(n) (n >= 12717 && n <= 12724)
-#define itemid_isgemstone(id) ( (id) >= ITEMID_YELLOW_GEMSTONE && (id) <= ITEMID_BLUE_GEMSTONE )
-#define itemdb_iscashfood(id) ( (id) >= 12202 && (id) <= 12207 )
-#define itemdb_is_GNbomb(n) (n >= 13260 && n <= 13267)
-#define itemdb_is_GNthrowable(n) (n >= 13268 && n <= 13290)
+#define itemdb_name(n)        (itemdb->search(n)->name)
+#define itemdb_jname(n)       (itemdb->search(n)->jname)
+#define itemdb_type(n)        (itemdb->search(n)->type)
+#define itemdb_atk(n)         (itemdb->search(n)->atk)
+#define itemdb_def(n)         (itemdb->search(n)->def)
+#define itemdb_look(n)        (itemdb->search(n)->look)
+#define itemdb_weight(n)      (itemdb->search(n)->weight)
+#define itemdb_equip(n)       (itemdb->search(n)->equip)
+#define itemdb_usescript(n)   (itemdb->search(n)->script)
+#define itemdb_equipscript(n) (itemdb->search(n)->script)
+#define itemdb_wlv(n)         (itemdb->search(n)->wlv)
+#define itemdb_range(n)       (itemdb->search(n)->range)
+#define itemdb_slot(n)        (itemdb->search(n)->slot)
+#define itemdb_available(n)   (itemdb->search(n)->flag.available)
+#define itemdb_viewid(n)      (itemdb->search(n)->view_id)
+#define itemdb_autoequip(n)   (itemdb->search(n)->flag.autoequip)
+#define itemdb_value_buy(n)   (itemdb->search(n)->value_buy)
+#define itemdb_value_sell(n)  (itemdb->search(n)->value_sell)
+#define itemdb_canrefine(n)   (!itemdb->search(n)->flag.no_refine)
+
+#define itemdb_is_rune(n)        (((n) >= ITEMID_NAUTHIZ && (n) <= ITEMID_HAGALAZ) || (n) == ITEMID_LUX_ANIMA)
+#define itemdb_is_element(n)     ((n) >= 990 && (n) <= 993)
+#define itemdb_is_spellbook(n)   ((n) >= 6188 && (n) <= 6205)
+#define itemdb_is_poison(n)      ((n) >= 12717 && (n) <= 12724)
+#define itemid_isgemstone(n)     ((n) >= ITEMID_YELLOW_GEMSTONE && (n) <= ITEMID_BLUE_GEMSTONE)
+#define itemdb_iscashfood(n)     ((n) >= 12202 && (n) <= 12207)
+#define itemdb_is_GNbomb(n)      ((n) >= 13260 && (n) <= 13267)
+#define itemdb_is_GNthrowable(n) ((n) >= 13268 && (n) <= 13290)
 
-#define itemdb_value_buy(n) itemdb->search(n)->value_buy
-#define itemdb_value_sell(n) itemdb->search(n)->value_sell
-#define itemdb_canrefine(n) (!itemdb->search(n)->flag.no_refine)
 //Item trade restrictions [Skotlex]
-#define itemdb_isdropable(item, gmlv) itemdb->isrestricted(item, gmlv, 0, itemdb->isdropable_sub)
-#define itemdb_cantrade(item, gmlv, gmlv2) itemdb->isrestricted(item, gmlv, gmlv2, itemdb->cantrade_sub)
-#define itemdb_canpartnertrade(item, gmlv, gmlv2) itemdb->isrestricted(item, gmlv, gmlv2, itemdb->canpartnertrade_sub)
-#define itemdb_cansell(item, gmlv) itemdb->isrestricted(item, gmlv, 0, itemdb->cansell_sub)
-#define itemdb_cancartstore(item, gmlv)  itemdb->isrestricted(item, gmlv, 0, itemdb->cancartstore_sub)
-#define itemdb_canstore(item, gmlv) itemdb->isrestricted(item, gmlv, 0, itemdb->canstore_sub)
-#define itemdb_canguildstore(item, gmlv) itemdb->isrestricted(item , gmlv, 0, itemdb->canguildstore_sub)
-#define itemdb_canmail(item, gmlv) itemdb->isrestricted(item , gmlv, 0, itemdb->canmail_sub)
-#define itemdb_canauction(item, gmlv) itemdb->isrestricted(item , gmlv, 0, itemdb->canauction_sub)
+#define itemdb_isdropable(item, gmlv)             (itemdb->isrestricted((item), (gmlv), 0, itemdb->isdropable_sub))
+#define itemdb_cantrade(item, gmlv, gmlv2)        (itemdb->isrestricted((item), (gmlv), (gmlv2), itemdb->cantrade_sub))
+#define itemdb_canpartnertrade(item, gmlv, gmlv2) (itemdb->isrestricted((item), (gmlv), (gmlv2), itemdb->canpartnertrade_sub))
+#define itemdb_cansell(item, gmlv)                (itemdb->isrestricted((item), (gmlv), 0, itemdb->cansell_sub))
+#define itemdb_cancartstore(item, gmlv)           (itemdb->isrestricted((item), (gmlv), 0, itemdb->cancartstore_sub))
+#define itemdb_canstore(item, gmlv)               (itemdb->isrestricted((item), (gmlv), 0, itemdb->canstore_sub))
+#define itemdb_canguildstore(item, gmlv)          (itemdb->isrestricted((item), (gmlv), 0, itemdb->canguildstore_sub))
+#define itemdb_canmail(item, gmlv)                (itemdb->isrestricted((item), (gmlv), 0, itemdb->canmail_sub))
+#define itemdb_canauction(item, gmlv)             (itemdb->isrestricted((item), (gmlv), 0, itemdb->canauction_sub))
 
 struct itemdb_interface {
 	void (*init) (bool minimal);
diff --git a/src/map/map.c b/src/map/map.c
index 17648a661..099d2c6ea 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -2095,9 +2095,7 @@ struct s_mapiterator
 /// @param _bl_ block_list
 /// @return true if it matches
 #define MAPIT_MATCHES(_mapit_,_bl_) \
-	( \
-	( (_bl_)->type & (_mapit_)->types /* type matches */ ) \
-	)
+	( (_bl_)->type & (_mapit_)->types /* type matches */ )
 
 /// Allocates a new iterator.
 /// Returns the new iterator.
diff --git a/src/map/map.h b/src/map/map.h
index 4cb00f144..6580d7e50 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -26,7 +26,7 @@ enum E_MAPSERVER_ST {
 };
 
 #define MAX_NPC_PER_MAP 512
-#define AREA_SIZE battle_config.area_size
+#define AREA_SIZE (battle_config.area_size)
 #define DAMAGELOG_SIZE 30
 #define LOOTITEM_SIZE 10
 #define MAX_MOBSKILL 50
@@ -39,7 +39,7 @@ enum E_MAPSERVER_ST {
 #define MAX_LEVEL 150
 #define MAX_IGNORE_LIST 20 // official is 14
 #define MAX_VENDING 12
-#define MAX_MAP_SIZE 512*512 // Wasn't there something like this already? Can't find it.. [Shinryo]
+#define MAX_MAP_SIZE (512*512) // Wasn't there something like this already? Can't find it.. [Shinryo]
 
 #define BLOCK_SIZE 8
 #define block_free_max 1048576
@@ -221,7 +221,7 @@ enum {
 #define CHAT_SIZE_MAX (255 + 1)
 // 24 for npc name + 24 for label + 2 for a "::" and 1 for EOS
 #define EVENT_NAME_LENGTH ( NAME_LENGTH * 2 + 3 )
-#define DEFAULT_AUTOSAVE_INTERVAL 5*60*1000
+#define DEFAULT_AUTOSAVE_INTERVAL (5*60*1000)
 // Specifies maps where players may hit each other
 #define map_flag_vs(m) (map->list[m].flag.pvp || map->list[m].flag.gvg_dungeon || map->list[m].flag.gvg || ((map->agit_flag || map->agit2_flag) && map->list[m].flag.gvg_castle) || map->list[m].flag.battleground)
 // Specifies maps that have special GvG/WoE restrictions
@@ -724,7 +724,7 @@ struct map_data_other_server {
 	uint16 port;
 };
 
-#define map_id2index(id) map->list[(id)].index
+#define map_id2index(id) (map->list[(id)].index)
 
 /// Bitfield of flags for the iterator.
 enum e_mapitflags {
@@ -747,11 +747,11 @@ struct mapit_interface {
 
 struct mapit_interface *mapit;
 
-#define mapit_getallusers() mapit->alloc(MAPIT_NORMAL,BL_PC)
-#define mapit_geteachpc()   mapit->alloc(MAPIT_NORMAL,BL_PC)
-#define mapit_geteachmob()  mapit->alloc(MAPIT_NORMAL,BL_MOB)
-#define mapit_geteachnpc()  mapit->alloc(MAPIT_NORMAL,BL_NPC)
-#define mapit_geteachiddb() mapit->alloc(MAPIT_NORMAL,BL_ALL)
+#define mapit_getallusers() (mapit->alloc(MAPIT_NORMAL,BL_PC))
+#define mapit_geteachpc()   (mapit->alloc(MAPIT_NORMAL,BL_PC))
+#define mapit_geteachmob()  (mapit->alloc(MAPIT_NORMAL,BL_MOB))
+#define mapit_geteachnpc()  (mapit->alloc(MAPIT_NORMAL,BL_NPC))
+#define mapit_geteachiddb() (mapit->alloc(MAPIT_NORMAL,BL_ALL))
 
 //Useful typedefs from jA [Skotlex]
 typedef struct map_session_data TBL_PC;
diff --git a/src/map/mob.c b/src/map/mob.c
index 4e648b2a6..b41dedac1 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -52,7 +52,7 @@ struct mob_interface mob_s;
 #define MOB_LAZYSKILLPERC 0	// Probability for mobs far from players from doing their IDLE skill. (rate of 1000 minute)
 // Move probability for mobs away from players (rate of 1000 minute)
 // in Aegis, this is 100% for mobs that have been activated by players and none otherwise.
-#define MOB_LAZYMOVEPERC(md) (md->state.spotted?1000:0)
+#define MOB_LAZYMOVEPERC(md) ((md)->state.spotted?1000:0)
 #define MOB_MAX_DELAY (24*3600*1000)
 #define MAX_MINCHASE 30	//Max minimum chase value to use for mobs.
 #define RUDE_ATTACKED_COUNT 2	//After how many rude-attacks should the skill be used?
diff --git a/src/map/mob.h b/src/map/mob.h
index 110d027ef..48a9f078e 100644
--- a/src/map/mob.h
+++ b/src/map/mob.h
@@ -37,7 +37,7 @@
 #define MOB_CLONE_END MAX_MOB_DB
 
 //Used to determine default enemy type of mobs (for use in eachinrange calls)
-#define DEFAULT_ENEMY_TYPE(md) (md->special_state.ai?BL_CHAR:BL_MOB|BL_PC|BL_HOM|BL_MER)
+#define DEFAULT_ENEMY_TYPE(md) ((md)->special_state.ai?BL_CHAR:BL_MOB|BL_PC|BL_HOM|BL_MER)
 
 #define MAX_MOB_CHAT 250 //Max Skill's messages
 
@@ -243,8 +243,9 @@ struct item_drop_list {
 };
 
 
-#define mob_stop_walking(md, type) unit->stop_walking(&(md)->bl, type)
-#define mob_stop_attack(md) unit->stop_attack(&(md)->bl)
+#define mob_stop_walking(md, type) (unit->stop_walking(&(md)->bl, (type)))
+#define mob_stop_attack(md)        (unit->stop_attack(&(md)->bl))
+
 #define mob_is_battleground(md) ( map->list[(md)->bl.m].flag.battleground && ((md)->class_ == MOBID_BARRICADE2 || ((md)->class_ >= MOBID_FOOD_STOR && (md)->class_ <= MOBID_PINK_CRYST)) )
 #define mob_is_gvg(md) (map->list[(md)->bl.m].flag.gvg_castle && ( (md)->class_ == MOBID_EMPERIUM || (md)->class_ == MOBID_BARRICADE1 || (md)->class_ == MOBID_GUARIDAN_STONE1 || (md)->class_ == MOBID_GUARIDAN_STONE2) )
 #define mob_is_treasure(md) (((md)->class_ >= MOBID_TREAS01 && (md)->class_ <= MOBID_TREAS40) || ((md)->class_ >= MOBID_TREAS41 && (md)->class_ <= MOBID_TREAS49))
diff --git a/src/map/path.h b/src/map/path.h
index e872c8877..a889a6409 100644
--- a/src/map/path.h
+++ b/src/map/path.h
@@ -23,13 +23,13 @@ struct shootpath_data {
 	int y[MAX_WALKPATH];
 };
 
-#define check_distance_bl(bl1, bl2, distance) path->check_distance((bl1)->x - (bl2)->x, (bl1)->y - (bl2)->y, distance)
-#define check_distance_blxy(bl, x1, y1, distance) path->check_distance((bl)->x-(x1), (bl)->y-(y1), distance)
-#define check_distance_xy(x0, y0, x1, y1, distance) path->check_distance((x0)-(x1), (y0)-(y1), distance)
+#define check_distance_bl(bl1, bl2, distance)       (path->check_distance((bl1)->x - (bl2)->x, (bl1)->y - (bl2)->y, distance))
+#define check_distance_blxy(bl, x1, y1, distance)   (path->check_distance((bl)->x - (x1), (bl)->y - (y1), distance))
+#define check_distance_xy(x0, y0, x1, y1, distance) (path->check_distance((x0) - (x1), (y0) - (y1), distance))
 
-#define distance_bl(bl1, bl2) path->distance((bl1)->x - (bl2)->x, (bl1)->y - (bl2)->y)
-#define distance_blxy(bl, x1, y1) path->distance((bl)->x-(x1), (bl)->y-(y1))
-#define distance_xy(x0, y0, x1, y1) path->distance((x0)-(x1), (y0)-(y1))
+#define distance_bl(bl1, bl2)       (path->distance((bl1)->x - (bl2)->x, (bl1)->y - (bl2)->y))
+#define distance_blxy(bl, x1, y1)   (path->distance((bl)->x - (x1), (bl)->y - (y1)))
+#define distance_xy(x0, y0, x1, y1) (path->distance((x0) - (x1), (y0) - (y1)))
 
 struct path_interface {
 	// calculates destination cell for knockback
diff --git a/src/map/pc.h b/src/map/pc.h
index 71c76b643..f10bd0f59 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -615,8 +615,8 @@ enum equip_pos {
 // Rune Knight Dragon
 #define pc_isridingdragon(sd) ( (sd)->sc.option&OPTION_DRAGON )
 
-#define pc_stop_walking(sd, type) unit->stop_walking(&(sd)->bl, type)
-#define pc_stop_attack(sd) unit->stop_attack(&(sd)->bl)
+#define pc_stop_walking(sd, type) (unit->stop_walking(&(sd)->bl, (type)))
+#define pc_stop_attack(sd)        (unit->stop_attack(&(sd)->bl))
 
 //Weapon check considering dual wielding.
 #define pc_check_weapontype(sd, type) ((type)&((sd)->status.weapon < MAX_WEAPON_TYPE? \
@@ -633,7 +633,7 @@ enum equip_pos {
 ||	( (class_) >= JOB_KAGEROU        && (class_) <= JOB_OBORO          ) \
 ||	( (class_) >= JOB_REBELLION      && (class_) <  JOB_MAX            ) \
 )
-#define pcdb_checkid(class_) pcdb_checkid_sub((unsigned int)class_)
+#define pcdb_checkid(class_) pcdb_checkid_sub((unsigned int)(class_))
 
 // clientside display macros (values to the left/right of the "+")
 #ifdef RENEWAL
@@ -671,18 +671,18 @@ enum equip_pos {
 #define pc_checkoverhp(sd) ((sd)->battle_status.hp == (sd)->battle_status.max_hp)
 #define pc_checkoversp(sd) ((sd)->battle_status.sp == (sd)->battle_status.max_sp)
 
-#define pc_readglobalreg(sd,reg) pc->readregistry(sd,reg,3)
-#define pc_setglobalreg(sd,reg,val) pc->setregistry(sd,reg,val,3)
-#define pc_readglobalreg_str(sd,reg) pc->readregistry_str(sd,reg,3)
-#define pc_setglobalreg_str(sd,reg,val) pc->setregistry_str(sd,reg,val,3)
-#define pc_readaccountreg(sd,reg) pc->readregistry(sd,reg,2)
-#define pc_setaccountreg(sd,reg,val) pc->setregistry(sd,reg,val,2)
-#define pc_readaccountregstr(sd,reg) pc->readregistry_str(sd,reg,2)
-#define pc_setaccountregstr(sd,reg,val) pc->setregistry_str(sd,reg,val,2)
-#define pc_readaccountreg2(sd,reg) pc->readregistry(sd,reg,1)
-#define pc_setaccountreg2(sd,reg,val) pc->setregistry(sd,reg,val,1)
-#define pc_readaccountreg2str(sd,reg) pc->readregistry_str(sd,reg,1)
-#define pc_setaccountreg2str(sd,reg,val) pc->setregistry_str(sd,reg,val,1)
+#define pc_readglobalreg(sd,reg)         (pc->readregistry((sd),(reg),3))
+#define pc_setglobalreg(sd,reg,val)      (pc->setregistry((sd),(reg),(val),3))
+#define pc_readglobalreg_str(sd,reg)     (pc->readregistry_str((sd),(reg),3))
+#define pc_setglobalreg_str(sd,reg,val)  (pc->setregistry_str((sd),(reg),(val),3))
+#define pc_readaccountreg(sd,reg)        (pc->readregistry((sd),(reg),2))
+#define pc_setaccountreg(sd,reg,val)     (pc->setregistry((sd),(reg),(val),2))
+#define pc_readaccountregstr(sd,reg)     (pc->readregistry_str((sd),(reg),2))
+#define pc_setaccountregstr(sd,reg,val)  (pc->setregistry_str((sd),(reg),(val),2))
+#define pc_readaccountreg2(sd,reg)       (pc->readregistry((sd),(reg),1))
+#define pc_setaccountreg2(sd,reg,val)    (pc->setregistry((sd),(reg),(val),1))
+#define pc_readaccountreg2str(sd,reg)    (pc->readregistry_str((sd),(reg),1))
+#define pc_setaccountreg2str(sd,reg,val) (pc->setregistry_str((sd),(reg),(val),1))
 
 struct skill_tree_entry {
 	short id;
diff --git a/src/map/pet.h b/src/map/pet.h
index f9a756de2..f1a219700 100644
--- a/src/map/pet.h
+++ b/src/map/pet.h
@@ -98,8 +98,8 @@ struct pet_data {
 	struct map_session_data *msd;
 };
 
-#define pet_stop_walking(pd, type) unit->stop_walking(&(pd)->bl, type)
-#define pet_stop_attack(pd) unit->stop_attack(&(pd)->bl)
+#define pet_stop_walking(pd, type) (unit->stop_walking(&(pd)->bl, (type)))
+#define pet_stop_attack(pd)        (unit->stop_attack(&(pd)->bl))
 
 struct pet_interface {
 	struct s_pet_db db[MAX_PET_DB];
diff --git a/src/map/script.c b/src/map/script.c
index 0827258d7..0f2c86868 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -278,7 +278,7 @@ void disp_error_message2(const char *mes,const char *pos,int report)
 	script->error_report = report;
 	longjmp( script->error_jump, 1 );
 }
-#define disp_error_message(mes,pos) script->disp_error_message2(mes,pos,1)
+#define disp_error_message(mes,pos) (script->disp_error_message2((mes),(pos),1))
 
 void disp_warning_message(const char *mes, const char *pos) {
 	script->warning(script->parser_current_src,script->parser_current_file,script->parser_current_line,mes,pos);
@@ -3986,9 +3986,6 @@ const char *script_getfuncname(struct script_state *st) {
 // buildin functions
 //
 
-#define BUILDIN_DEF(x,args) { buildin_ ## x , #x , args }
-#define BUILDIN_DEF2(x,x2,args) { buildin_ ## x , x2 , args }
-
 /////////////////////////////////////////////////////////////////////
 // NPC interaction
 //
@@ -13016,7 +13013,7 @@ BUILDIN(isequippedcnt)
 	}
 	
 	for (i=0; id!=0; i++) {
-		script_fetch(st,i+2, id) else id = 0;
+		script_fetch(st,i+2, id);
 		if (id <= 0)
 			continue;
 		
@@ -13074,7 +13071,7 @@ BUILDIN(isequipped)
 	setitem_hash = sd->bonus.setitem_hash;
 	setitem_hash2 = sd->bonus.setitem_hash2;
 	for (i=0; id!=0; i++) {
-		script_fetch(st,i+2, id) else id = 0;
+		script_fetch(st,i+2, id);
 		if (id <= 0)
 			continue;
 		flag = 0;
@@ -13148,7 +13145,7 @@ BUILDIN(cardscnt) {
 	sd = script->rid2sd(st);
 	
 	for (i=0; id!=0; i++) {
-		script_fetch(st,i+2, id) else id = 0;
+		script_fetch(st,i+2, id);
 		if (id <= 0)
 			continue;
 		
@@ -17961,6 +17958,8 @@ bool script_hp_add(char *name, char *args, bool (*func)(struct script_state *st)
 	return true;
 }
 
+#define BUILDIN_DEF(x,args) { buildin_ ## x , #x , args }
+#define BUILDIN_DEF2(x,x2,args) { buildin_ ## x , x2 , args }
 void script_parse_builtin(void) {
 	struct script_function BUILDIN[] = {
 		// NPC interaction
@@ -18504,6 +18503,8 @@ void script_parse_builtin(void) {
 		}
 	}
 }
+#undef BUILDIN_DEF
+#undef BUILDIN_DEF2
 
 void script_label_add(int key, int pos) {
 	int idx = script->label_count;
diff --git a/src/map/script.h b/src/map/script.h
index 0bb92c433..32426e988 100644
--- a/src/map/script.h
+++ b/src/map/script.h
@@ -22,9 +22,9 @@ struct eri;
  **/
 // TODO: Remove temporary code
 #define ENABLE_CASE_CHECK
-#define DeprecationWarning(func, bad, good, file, line) ShowWarning("%s: use of deprecated keyword '%s' (use '%s' instead) in file '%s', line '%d'. This will be a critical error in a near future.\n", func, bad, good, file, line);
-#define DeprecationWarning2(func, bad, good, where) ShowWarning("%s: detected possible use of wrong case in a script. Found '%s', probably meant to be '%s' (in '%s'). If it is a local (.@) variable, and you're absolutely sure you used the correct case, please disragard this message, otherwise please correct your scripts, as this will become fatal in a near future.\n", func, bad, good, where);
-#define disp_deprecation_message(func, good, p) disp_warning_message(func": use of deprecated keyword (use '"good"' instead). This will be a critical error in a near future.", p);
+#define DeprecationWarning(func, bad, good, file, line) ShowWarning("%s: use of deprecated keyword '%s' (use '%s' instead) in file '%s', line '%d'. This will be a critical error in a near future.\n", (func), (bad), (good), (file), (line));
+#define DeprecationWarning2(func, bad, good, where) ShowWarning("%s: detected possible use of wrong case in a script. Found '%s', probably meant to be '%s' (in '%s'). This will become fatal in a near future.\n", (func), (bad), (good), (where));
+#define disp_deprecation_message(func, good, p) disp_warning_message(func": use of deprecated keyword (use '"good"' instead). This will be a critical error in a near future.", (p));
 
 #define NUM_WHISPER_VAR 10
 
@@ -71,24 +71,24 @@ struct eri;
 /// Returns the index of the last data in the stack
 #define script_lastdata(st) ( (st)->end - (st)->start - 1 )
 /// Pushes an int into the stack
-#define script_pushint(st,val) script->push_val((st)->stack, C_INT, (val),NULL)
+#define script_pushint(st,val) (script->push_val((st)->stack, C_INT, (val),NULL))
 /// Pushes a string into the stack (script engine frees it automatically)
-#define script_pushstr(st,val) script->push_str((st)->stack, C_STR, (val))
+#define script_pushstr(st,val) (script->push_str((st)->stack, C_STR, (val)))
 /// Pushes a copy of a string into the stack
-#define script_pushstrcopy(st,val) script->push_str((st)->stack, C_STR, aStrdup(val))
+#define script_pushstrcopy(st,val) (script->push_str((st)->stack, C_STR, aStrdup(val)))
 /// Pushes a constant string into the stack (must never change or be freed)
-#define script_pushconststr(st,val) script->push_str((st)->stack, C_CONSTSTR, (val))
+#define script_pushconststr(st,val) (script->push_str((st)->stack, C_CONSTSTR, (val)))
 /// Pushes a nil into the stack
-#define script_pushnil(st) script->push_val((st)->stack, C_NOP, 0,NULL)
+#define script_pushnil(st) (script->push_val((st)->stack, C_NOP, 0,NULL))
 /// Pushes a copy of the data in the target index
-#define script_pushcopy(st,i) script->push_copy((st)->stack, (st)->start + (i))
+#define script_pushcopy(st,i) (script->push_copy((st)->stack, (st)->start + (i)))
 
-#define script_isstring(st,i) data_isstring(script_getdata(st,i))
-#define script_isint(st,i) data_isint(script_getdata(st,i))
+#define script_isstring(st,i) data_isstring(script_getdata((st),(i)))
+#define script_isint(st,i) data_isint(script_getdata((st),(i)))
 
-#define script_getnum(st,val) script->conv_num(st, script_getdata(st,val))
-#define script_getstr(st,val) script->conv_str(st, script_getdata(st,val))
-#define script_getref(st,val) ( script_getdata(st,val)->ref )
+#define script_getnum(st,val) (script->conv_num((st), script_getdata((st),(val))))
+#define script_getstr(st,val) (script->conv_str((st), script_getdata((st),(val))))
+#define script_getref(st,val) ( script_getdata((st),(val))->ref )
 
 // Note: "top" functions/defines use indexes relative to the top of the stack
 //       -1 is the index of the data at the top
@@ -147,9 +147,12 @@ struct eri;
 #define BUILDIN(x) bool buildin_ ## x (struct script_state* st)
 #define BUILDIN_A(x) buildin_ ## x
 
-#define script_fetch(st, n, t) \
-	if( script_hasdata(st,n) ) \
-		(t)=script_getnum(st,n);
+#define script_fetch(st, n, t) do { \
+	if( script_hasdata((st),(n)) ) \
+		(t)=script_getnum((st),(n)); \
+	else \
+		(t) = 0; \
+} while(0)
 
 
 /**
diff --git a/src/map/skill.c b/src/map/skill.c
index fa26cdb12..c38363ef3 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -47,13 +47,13 @@
 
 // ranges reserved for mapping skill ids to skilldb offsets
 #define HM_SKILLRANGEMIN 750
-#define HM_SKILLRANGEMAX HM_SKILLRANGEMIN + MAX_HOMUNSKILL
-#define MC_SKILLRANGEMIN HM_SKILLRANGEMAX + 1
-#define MC_SKILLRANGEMAX MC_SKILLRANGEMIN + MAX_MERCSKILL
-#define EL_SKILLRANGEMIN MC_SKILLRANGEMAX + 1
-#define EL_SKILLRANGEMAX EL_SKILLRANGEMIN + MAX_ELEMENTALSKILL
-#define GD_SKILLRANGEMIN EL_SKILLRANGEMAX + 1
-#define GD_SKILLRANGEMAX GD_SKILLRANGEMIN + MAX_GUILDSKILL
+#define HM_SKILLRANGEMAX (HM_SKILLRANGEMIN + MAX_HOMUNSKILL)
+#define MC_SKILLRANGEMIN (HM_SKILLRANGEMAX + 1)
+#define MC_SKILLRANGEMAX (MC_SKILLRANGEMIN + MAX_MERCSKILL)
+#define EL_SKILLRANGEMIN (MC_SKILLRANGEMAX + 1)
+#define EL_SKILLRANGEMAX (EL_SKILLRANGEMIN + MAX_ELEMENTALSKILL)
+#define GD_SKILLRANGEMIN (EL_SKILLRANGEMAX + 1)
+#define GD_SKILLRANGEMAX (GD_SKILLRANGEMIN + MAX_GUILDSKILL)
 
 #if GD_SKILLRANGEMAX > 999
 	#error GD_SKILLRANGEMAX is greater than 999
@@ -131,17 +131,17 @@ void skill_chk(uint16* skill_id) {
 	*skill_id = skill->get_index(*skill_id); // checks/adjusts id
 }
 
-#define skill_get(var,id) { skill->chk(&id); if(!id) return 0; return var; }
-#define skill_get2(var,id,lv) { \
-	skill->chk(&id); \
-	if(!id) return 0; \
-	if( lv > MAX_SKILL_LEVEL && var > 1 ) { \
-		int lv2 = lv; lv = skill->db[id].max; \
-		return (var) + ((lv2-lv)/2);\
+#define skill_get(var,id) do { skill->chk(&(id)); if(!(id)) return 0; return (var); } while(0)
+#define skill_get2(var,id,lv) do { \
+	skill->chk(&(id)); \
+	if(!(id)) return 0; \
+	if( (lv) > MAX_SKILL_LEVEL && (var) > 1 ) { \
+		int lv2__ = (lv); (lv) = skill->db[(id)].max; \
+		return (var) + ((lv2__-(lv))/2);\
 	} \
-	return var;\
-}
-#define skill_glv(lv) min(lv,MAX_SKILL_LEVEL-1)
+	return (var);\
+} while(0)
+#define skill_glv(lv) min((lv),MAX_SKILL_LEVEL-1)
 // Skill DB
 int	skill_get_hit( uint16 skill_id )               { skill_get (skill->db[skill_id].hit, skill_id); }
 int	skill_get_inf( uint16 skill_id )               { skill_get (skill->db[skill_id].inf, skill_id); }
@@ -9523,7 +9523,7 @@ int skill_castend_map (struct map_session_data *sd, uint16 skill_id, const char
 	nullpo_ret(sd);
 
 //Simplify skill_failed code.
-#define skill_failed(sd) { sd->menuskill_id = sd->menuskill_val = 0; }
+#define skill_failed(sd) ( (sd)->menuskill_id = (sd)->menuskill_val = 0 )
 	if(skill_id != sd->menuskill_id)
 		return 0;
 
diff --git a/src/map/status.c b/src/map/status.c
index a8389691f..d64986eca 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -102,10 +102,6 @@ int status_type2relevant_bl_types(int type)
 	return status->RelevantBLTypes[type];
 }
 
-#define add_sc(skill,sc) set_sc(skill,sc,SI_BLANK,SCB_NONE)
-// indicates that the status displays a visual effect for the affected unit, and should be sent to the client for all supported units
-#define set_sc_with_vfx(skill, sc, icon, flag) set_sc((skill), (sc), (icon), (flag)); if((icon) < SI_MAX) status->RelevantBLTypes[(icon)] |= BL_SCEFFECT
-
 static void set_sc(uint16 skill_id, sc_type sc, int icon, unsigned int flag) {
 	uint16 idx;
 	if( (idx = skill->get_index(skill_id)) == 0 ) {
@@ -128,6 +124,10 @@ static void set_sc(uint16 skill_id, sc_type sc, int icon, unsigned int flag) {
 }
 
 void initChangeTables(void) {
+#define add_sc(skill,sc) set_sc((skill),(sc),SI_BLANK,SCB_NONE)
+// indicates that the status displays a visual effect for the affected unit, and should be sent to the client for all supported units
+#define set_sc_with_vfx(skill, sc, icon, flag) do { set_sc((skill), (sc), (icon), (flag)); if((icon) < SI_MAX) status->RelevantBLTypes[(icon)] |= BL_SCEFFECT; } while(0)
+
 	int i;
 
 	for (i = 0; i < SC_MAX; i++)
@@ -1034,6 +1034,8 @@ void initChangeTables(void) {
 
 	if( !battle_config.display_hallucination ) //Disable Hallucination.
 		status->IconChangeTable[SC_ILLUSION] = SI_BLANK;
+#undef add_sc
+#undef set_sc_with_vfx
 }
 
 void initDummyData(void)
@@ -8559,12 +8561,14 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
 				break;
 			case SC_GENSOU:
 
-	#define PER( a ) do { \
-		if( a <= 15 ) lv = 1; \
-		else if( a <= 30 ) lv = 2; \
-		else if( a <= 50 ) lv = 3; \
-		else if( a <= 75 ) lv = 4; \
-	} while(0)
+#define PER( a, lvl ) do { \
+	int temp__ = (a); \
+	if( temp__ <= 15 ) (lvl) = 1; \
+	else if( temp__ <= 30 ) (lvl) = 2; \
+	else if( temp__ <= 50 ) (lvl) = 3; \
+	else if( temp__ <= 75 ) (lvl) = 4; \
+	else (lvl) = 5; \
+} while(0)
 
 			{
 				int hp = status_get_hp(bl), sp = status_get_sp(bl), lv = 5;
@@ -8572,13 +8576,13 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
 				if( rand()%100 > (25 + 10 * val1) - status_get_int(bl) / 2)
 					return 0;
 
-				PER( 100 / (status_get_max_hp(bl) / hp) );
+				PER( 100 / (status_get_max_hp(bl) / hp), lv );
 				status->heal(bl, (!(hp%2) ? (6-lv) *4 / 100 : -(lv*4) / 100), 0, 1);
 
-				PER( 100 / (status_get_max_sp(bl) / sp) );
+				PER( 100 / (status_get_max_sp(bl) / sp), lv );
 				status->heal(bl, 0,(!(sp%2) ? (6-lv) *3 / 100 : -(lv*3) / 100), 1);
 			}
-	#undef PER
+#undef PER
 				break;
 			case SC_ANGRIFFS_MODUS:
 				val2 = 50 + 20 * val1; //atk bonus
@@ -10022,7 +10026,7 @@ int status_change_timer(int tid, int64 tick, int id, intptr_t data) {
 	// set the next timer of the sce (don't assume the status still exists)
 #define sc_timer_next(t,f,i,d) do { \
 	if( (sce=sc->data[type]) ) \
-		sce->timer = timer->add(t,f,i,d); \
+		sce->timer = timer->add((t),(f),(i),(d)); \
 	else \
 		ShowError("status_change_timer: Unexpected NULL status change id: %d data: %d\n", id, data); \
 } while(0)
diff --git a/src/map/status.h b/src/map/status.h
index cdd5fa481..75582e9a4 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -1764,67 +1764,67 @@ struct status_change {
 
 
 //Define for standard HP damage attacks.
-#define status_fix_damage(src, target, hp, walkdelay) status->damage(src, target, hp, 0, walkdelay, 0)
+#define status_fix_damage(src, target, hp, walkdelay) (status->damage((src), (target), (hp), 0, (walkdelay), 0))
 //Define for standard HP/SP damage triggers.
-#define status_zap(bl, hp, sp) status->damage(NULL, bl, hp, sp, 0, 1)
+#define status_zap(bl, hp, sp) (status->damage(NULL, (bl), (hp), (sp), 0, 1))
 //Easier handling of status->percent_change
-#define status_percent_heal(bl, hp_rate, sp_rate) status->percent_change(NULL, bl, -(hp_rate), -(sp_rate), 0)
-#define status_percent_damage(src, target, hp_rate, sp_rate, kill) status->percent_change(src, target, hp_rate, sp_rate, (kill)?1:2)
+#define status_percent_heal(bl, hp_rate, sp_rate) (status->percent_change(NULL, (bl), -(hp_rate), -(sp_rate), 0))
+#define status_percent_damage(src, target, hp_rate, sp_rate, kill) (status->percent_change((src), (target), (hp_rate), (sp_rate), (kill)?1:2))
 //Instant kill with no drops/exp/etc
-#define status_kill(bl) status_percent_damage(NULL, bl, 100, 0, true)
+#define status_kill(bl) status_percent_damage(NULL, (bl), 100, 0, true)
 
-#define status_get_range(bl) status->get_status_data(bl)->rhw.range
-#define status_get_hp(bl) status->get_status_data(bl)->hp
-#define status_get_max_hp(bl) status->get_status_data(bl)->max_hp
-#define status_get_sp(bl) status->get_status_data(bl)->sp
-#define status_get_max_sp(bl) status->get_status_data(bl)->max_sp
-#define status_get_str(bl) status->get_status_data(bl)->str
-#define status_get_agi(bl) status->get_status_data(bl)->agi
-#define status_get_vit(bl) status->get_status_data(bl)->vit
-#define status_get_int(bl) status->get_status_data(bl)->int_
-#define status_get_dex(bl) status->get_status_data(bl)->dex
-#define status_get_luk(bl) status->get_status_data(bl)->luk
-#define status_get_hit(bl) status->get_status_data(bl)->hit
-#define status_get_flee(bl) status->get_status_data(bl)->flee
-#define status_get_mdef(bl) status->get_status_data(bl)->mdef
-#define status_get_flee2(bl) status->get_status_data(bl)->flee2
-#define status_get_def2(bl) status->get_status_data(bl)->def2
-#define status_get_mdef2(bl) status->get_status_data(bl)->mdef2
-#define status_get_critical(bl) status->get_status_data(bl)->cri
-#define status_get_batk(bl) status->get_status_data(bl)->batk
-#define status_get_watk(bl) status->get_status_data(bl)->rhw.atk
-#define status_get_watk2(bl) status->get_status_data(bl)->rhw.atk2
-#define status_get_matk_max(bl) status->get_status_data(bl)->matk_max
-#define status_get_matk_min(bl) status->get_status_data(bl)->matk_min
-#define status_get_lwatk(bl) status->get_status_data(bl)->lhw.atk
-#define status_get_lwatk2(bl) status->get_status_data(bl)->lhw.atk2
-#define status_get_adelay(bl) status->get_status_data(bl)->adelay
-#define status_get_amotion(bl) status->get_status_data(bl)->amotion
-#define status_get_dmotion(bl) status->get_status_data(bl)->dmotion
-#define status_get_element(bl) status->get_status_data(bl)->def_ele
-#define status_get_element_level(bl) status->get_status_data(bl)->ele_lv
-#define status_get_attack_sc_element(bl, sc) status->calc_attack_element(bl, sc, 0)
-#define status_get_attack_element(bl) status->get_status_data(bl)->rhw.ele
-#define status_get_attack_lelement(bl) status->get_status_data(bl)->lhw.ele
-#define status_get_race(bl) status->get_status_data(bl)->race
-#define status_get_size(bl) status->get_status_data(bl)->size
-#define status_get_mode(bl) status->get_status_data(bl)->mode
+#define status_get_range(bl)                 (status->get_status_data(bl)->rhw.range)
+#define status_get_hp(bl)                    (status->get_status_data(bl)->hp)
+#define status_get_max_hp(bl)                (status->get_status_data(bl)->max_hp)
+#define status_get_sp(bl)                    (status->get_status_data(bl)->sp)
+#define status_get_max_sp(bl)                (status->get_status_data(bl)->max_sp)
+#define status_get_str(bl)                   (status->get_status_data(bl)->str)
+#define status_get_agi(bl)                   (status->get_status_data(bl)->agi)
+#define status_get_vit(bl)                   (status->get_status_data(bl)->vit)
+#define status_get_int(bl)                   (status->get_status_data(bl)->int_)
+#define status_get_dex(bl)                   (status->get_status_data(bl)->dex)
+#define status_get_luk(bl)                   (status->get_status_data(bl)->luk)
+#define status_get_hit(bl)                   (status->get_status_data(bl)->hit)
+#define status_get_flee(bl)                  (status->get_status_data(bl)->flee)
+#define status_get_mdef(bl)                  (status->get_status_data(bl)->mdef)
+#define status_get_flee2(bl)                 (status->get_status_data(bl)->flee2)
+#define status_get_def2(bl)                  (status->get_status_data(bl)->def2)
+#define status_get_mdef2(bl)                 (status->get_status_data(bl)->mdef2)
+#define status_get_critical(bl)              (status->get_status_data(bl)->cri)
+#define status_get_batk(bl)                  (status->get_status_data(bl)->batk)
+#define status_get_watk(bl)                  (status->get_status_data(bl)->rhw.atk)
+#define status_get_watk2(bl)                 (status->get_status_data(bl)->rhw.atk2)
+#define status_get_matk_max(bl)              (status->get_status_data(bl)->matk_max)
+#define status_get_matk_min(bl)              (status->get_status_data(bl)->matk_min)
+#define status_get_lwatk(bl)                 (status->get_status_data(bl)->lhw.atk)
+#define status_get_lwatk2(bl)                (status->get_status_data(bl)->lhw.atk2)
+#define status_get_adelay(bl)                (status->get_status_data(bl)->adelay)
+#define status_get_amotion(bl)               (status->get_status_data(bl)->amotion)
+#define status_get_dmotion(bl)               (status->get_status_data(bl)->dmotion)
+#define status_get_element(bl)               (status->get_status_data(bl)->def_ele)
+#define status_get_element_level(bl)         (status->get_status_data(bl)->ele_lv)
+#define status_get_attack_sc_element(bl, sc) (status->calc_attack_element((bl), (sc), 0))
+#define status_get_attack_element(bl)        (status->get_status_data(bl)->rhw.ele)
+#define status_get_attack_lelement(bl)       (status->get_status_data(bl)->lhw.ele)
+#define status_get_race(bl)                  (status->get_status_data(bl)->race)
+#define status_get_size(bl)                  (status->get_status_data(bl)->size)
+#define status_get_mode(bl)                  (status->get_status_data(bl)->mode)
 
 //Short version, receives rate in 1->100 range, and does not uses a flag setting.
-#define sc_start(bl, type, rate, val1, tick) status->change_start(bl,type,100*(rate),val1,0,0,0,tick,0)
-#define sc_start2(bl, type, rate, val1, val2, tick) status->change_start(bl,type,100*(rate),val1,val2,0,0,tick,0)
-#define sc_start4(bl, type, rate, val1, val2, val3, val4, tick) status->change_start(bl,type,100*(rate),val1,val2,val3,val4,tick,0)
+#define sc_start(bl, type, rate, val1, tick)                    (status->change_start((bl),(type),100*(rate),(val1),0,0,0,(tick),0))
+#define sc_start2(bl, type, rate, val1, val2, tick)             (status->change_start((bl),(type),100*(rate),(val1),(val2),0,0,(tick),0))
+#define sc_start4(bl, type, rate, val1, val2, val3, val4, tick) (status->change_start((bl),(type),100*(rate),(val1),(val2),(val3),(val4),(tick),0))
 
-#define status_change_end(bl,type,tid) status->change_end_(bl,type,tid,__FILE__,__LINE__)
+#define status_change_end(bl,type,tid) (status->change_end_((bl),(type),(tid),__FILE__,__LINE__))
 
-#define status_calc_bl(bl, flag) status->calc_bl_(bl, (enum scb_flag)(flag), SCO_NONE)
-#define status_calc_mob(md, opt) status->calc_bl_(&(md)->bl, SCB_ALL, opt)
-#define status_calc_pet(pd, opt) status->calc_bl_(&(pd)->bl, SCB_ALL, opt)
-#define status_calc_pc(sd, opt) status->calc_bl_(&(sd)->bl, SCB_ALL, opt)
-#define status_calc_homunculus(hd, opt) status->calc_bl_(&(hd)->bl, SCB_ALL, opt)
-#define status_calc_mercenary(md, opt) status->calc_bl_(&(md)->bl, SCB_ALL, opt)
-#define status_calc_elemental(ed, opt) status->calc_bl_(&(ed)->bl, SCB_ALL, opt)
-#define status_calc_npc(nd, opt) status->calc_bl_(&(nd)->bl, SCB_ALL, opt)
+#define status_calc_bl(bl, flag)        (status->calc_bl_((bl), (enum scb_flag)(flag), SCO_NONE))
+#define status_calc_mob(md, opt)        (status->calc_bl_(&(md)->bl, SCB_ALL, (opt)))
+#define status_calc_pet(pd, opt)        (status->calc_bl_(&(pd)->bl, SCB_ALL, (opt)))
+#define status_calc_pc(sd, opt)         (status->calc_bl_(&(sd)->bl, SCB_ALL, (opt)))
+#define status_calc_homunculus(hd, opt) (status->calc_bl_(&(hd)->bl, SCB_ALL, (opt)))
+#define status_calc_mercenary(md, opt)  (status->calc_bl_(&(md)->bl, SCB_ALL, (opt)))
+#define status_calc_elemental(ed, opt)  (status->calc_bl_(&(ed)->bl, SCB_ALL, (opt)))
+#define status_calc_npc(nd, opt)        (status->calc_bl_(&(nd)->bl, SCB_ALL, (opt)))
 
 // bonus values and upgrade chances for refining equipment
 struct s_refine_info {
-- 
cgit v1.2.3-70-g09d2


From d33469689ea8e671fa0d525d54bce6932dfe9107 Mon Sep 17 00:00:00 2001
From: shennetsind <ind@henn.et>
Date: Sun, 2 Feb 2014 15:02:14 -0200
Subject: Introducing HPM Datacheck

http://hercules.ws/board/topic/4283-introducing-hpm-datacheck/
Signed-off-by: shennetsind <ind@henn.et>
---
 src/char/char.h          |  6 ++--
 src/char/int_auction.h   |  6 ++--
 src/char/int_elemental.h |  6 ++--
 src/char/int_guild.h     |  6 ++--
 src/char/int_homun.h     |  6 ++--
 src/char/int_mail.h      |  6 ++--
 src/char/int_mercenary.h |  6 ++--
 src/char/int_party.h     |  6 ++--
 src/char/int_pet.h       |  6 ++--
 src/char/int_quest.h     |  6 ++--
 src/char/int_storage.h   |  6 ++--
 src/char/inter.h         |  6 ++--
 src/char/pincode.h       |  6 ++--
 src/common/HPM.c         | 26 ++++++++++++++++++
 src/common/HPM.h         |  8 ++++--
 src/common/HPMi.h        | 15 ++++++----
 src/common/atomic.h      |  6 ++--
 src/common/cbasetypes.h  |  6 ++--
 src/common/conf.h        |  6 ++--
 src/common/console.h     |  6 ++--
 src/common/core.h        |  6 ++--
 src/common/db.h          |  6 ++--
 src/common/des.h         |  6 ++--
 src/common/ers.h         |  6 ++--
 src/common/grfio.h       |  6 ++--
 src/common/malloc.h      |  6 ++--
 src/common/mapindex.h    |  6 ++--
 src/common/md5calc.h     |  6 ++--
 src/common/mmo.h         |  6 ++--
 src/common/mutex.h       |  6 ++--
 src/common/nullpo.h      |  6 ++--
 src/common/random.h      |  6 ++--
 src/common/showmsg.h     |  6 ++--
 src/common/socket.h      |  6 ++--
 src/common/spinlock.h    |  6 ++--
 src/common/strlib.h      |  6 ++--
 src/common/thread.h      |  6 ++--
 src/common/timer.h       |  8 ++++--
 src/common/utils.h       |  6 ++--
 src/config/const.h       |  7 +++--
 src/login/account.h      |  6 ++--
 src/login/ipban.h        |  6 ++--
 src/login/login.h        |  6 ++--
 src/login/loginlog.h     |  6 ++--
 src/map/HPMmap.c         | 71 ++++++++++++++++++++++++++++++++++++++++--------
 src/map/HPMmap.h         | 10 +++++--
 src/map/atcommand.h      |  6 ++--
 src/map/battle.h         |  6 ++--
 src/map/battleground.h   |  6 ++--
 src/map/buyingstore.h    |  6 ++--
 src/map/chat.h           |  6 ++--
 src/map/chrif.h          |  6 ++--
 src/map/clif.h           |  6 ++--
 src/map/date.h           |  6 ++--
 src/map/duel.h           |  6 ++--
 src/map/elemental.h      |  6 ++--
 src/map/guild.h          |  6 ++--
 src/map/homunculus.h     |  6 ++--
 src/map/instance.h       |  6 ++--
 src/map/intif.h          |  6 ++--
 src/map/irc-bot.h        |  6 ++--
 src/map/itemdb.h         |  6 ++--
 src/map/log.h            |  6 ++--
 src/map/mail.h           |  6 ++--
 src/map/map.c            |  2 ++
 src/map/map.h            |  6 ++--
 src/map/mapreg.h         |  6 ++--
 src/map/mercenary.h      |  6 ++--
 src/map/mob.h            |  6 ++--
 src/map/npc.h            |  6 ++--
 src/map/packets.h        |  6 ++--
 src/map/packets_struct.h |  6 ++--
 src/map/party.h          |  6 ++--
 src/map/path.h           |  6 ++--
 src/map/pc.h             |  7 +++--
 src/map/pc_groups.h      |  6 ++--
 src/map/pet.h            |  6 ++--
 src/map/quest.h          |  6 ++--
 src/map/script.h         |  6 ++--
 src/map/searchstore.h    |  6 ++--
 src/map/skill.h          |  6 ++--
 src/map/status.h         |  6 ++--
 src/map/storage.h        |  6 ++--
 src/map/trade.h          |  7 +++--
 src/map/unit.h           | 11 ++++----
 src/map/vending.h        |  6 ++--
 86 files changed, 357 insertions(+), 265 deletions(-)

(limited to 'src/common/utils.h')

diff --git a/src/char/char.h b/src/char/char.h
index 3e3774c1f..06c0556c5 100644
--- a/src/char/char.h
+++ b/src/char/char.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _CHAR_SQL_H_
-#define _CHAR_SQL_H_
+#ifndef _COMMON_CHAR_H_
+#define _COMMON_CHAR_H_
 
 #include "../config/core.h"
 #include "../common/core.h" // CORE_ST_LAST
@@ -121,4 +121,4 @@ void global_accreg_to_login_start (int account_id, int char_id);
 void global_accreg_to_login_send (void);
 void global_accreg_to_login_add (const char *key, unsigned int index, intptr_t val, bool is_string);
 
-#endif /* _CHAR_SQL_H_ */
+#endif /* _COMMON_CHAR_H_ */
diff --git a/src/char/int_auction.h b/src/char/int_auction.h
index bf26b152c..f10794f73 100644
--- a/src/char/int_auction.h
+++ b/src/char/int_auction.h
@@ -1,12 +1,12 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _INT_AUCTION_SQL_H_
-#define _INT_AUCTION_SQL_H_
+#ifndef _CHAR_INT_AUCTION_H_
+#define _CHAR_INT_AUCTION_H_
 
 int inter_auction_parse_frommap(int fd);
 
 int inter_auction_sql_init(void);
 void inter_auction_sql_final(void);
 
-#endif /* _INT_AUCTION_SQL_H_ */
+#endif /* _CHAR_INT_AUCTION_H_ */
diff --git a/src/char/int_elemental.h b/src/char/int_elemental.h
index 7eb5c2958..c90891fc4 100644
--- a/src/char/int_elemental.h
+++ b/src/char/int_elemental.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _INT_ELEMENTAL_SQL_H_
-#define _INT_ELEMENTAL_SQL_H_
+#ifndef _CHAR_INT_ELEMENTAL_H_
+#define _CHAR_INT_ELEMENTAL_H_
 
 struct s_elemental;
 
@@ -12,4 +12,4 @@ int inter_elemental_parse_frommap(int fd);
 
 bool mapif_elemental_delete(int ele_id);
 
-#endif /* _INT_ELEMENTAL_SQL_H_ */
+#endif /* _CHAR_INT_ELEMENTAL_H_ */
diff --git a/src/char/int_guild.h b/src/char/int_guild.h
index 47c42dcc5..4eb7d310b 100644
--- a/src/char/int_guild.h
+++ b/src/char/int_guild.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _INT_GUILD_SQL_H_
-#define _INT_GUILD_SQL_H_
+#ifndef _CHAR_INT_GUILD_H_
+#define _CHAR_INT_GUILD_H_
 
 enum {
 	GS_BASIC = 0x0001,
@@ -34,4 +34,4 @@ int inter_guild_charname_changed(int guild_id,int account_id, int char_id, char
 int inter_guild_CharOnline(int char_id, int guild_id);
 int inter_guild_CharOffline(int char_id, int guild_id);
 
-#endif /* _INT_GUILD_SQL_H_ */
+#endif /* _CHAR_INT_GUILD_H_ */
diff --git a/src/char/int_homun.h b/src/char/int_homun.h
index 1c0d76269..561dc848f 100644
--- a/src/char/int_homun.h
+++ b/src/char/int_homun.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _INT_HOMUN_SQL_H_
-#define _INT_HOMUN_SQL_H_
+#ifndef _CHAR_INT_HOMUN_H_
+#define _CHAR_INT_HOMUN_H_
 
 struct s_homunculus;
 
@@ -15,4 +15,4 @@ bool mapif_homunculus_load(int homun_id, struct s_homunculus* hd);
 bool mapif_homunculus_delete(int homun_id);
 bool mapif_homunculus_rename(char *name);
 
-#endif /* _INT_HOMUN_SQL_H_ */
+#endif /* _CHAR_INT_HOMUN_H_ */
diff --git a/src/char/int_mail.h b/src/char/int_mail.h
index 77db51e5b..7c06cdc1f 100644
--- a/src/char/int_mail.h
+++ b/src/char/int_mail.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _INT_MAIL_SQL_H_
-#define _INT_MAIL_SQL_H_
+#ifndef _CHAR_INT_MAIL_H_
+#define _CHAR_INT_MAIL_H_
 
 int inter_mail_parse_frommap(int fd);
 void mail_sendmail(int send_id, const char* send_name, int dest_id, const char* dest_name, const char* title, const char* body, int zeny, struct item *item);
@@ -13,4 +13,4 @@ void inter_mail_sql_final(void);
 int mail_savemessage(struct mail_message* msg);
 void mapif_Mail_new(struct mail_message *msg);
 
-#endif /* _INT_MAIL_SQL_H_ */
+#endif /* _CHAR_INT_MAIL_H_ */
diff --git a/src/char/int_mercenary.h b/src/char/int_mercenary.h
index 01e4a841f..b614b8cf7 100644
--- a/src/char/int_mercenary.h
+++ b/src/char/int_mercenary.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _INT_MERCENARY_SQL_H_
-#define _INT_MERCENARY_SQL_H_
+#ifndef _CHAR_INT_MERCENARY_H_
+#define _CHAR_INT_MERCENARY_H_
 
 struct s_mercenary;
 
@@ -17,4 +17,4 @@ bool mercenary_owner_delete(int char_id);
 
 bool mapif_mercenary_delete(int merc_id);
 
-#endif /* _INT_MERCENARY_SQL_H_ */
+#endif /* _CHAR_INT_MERCENARY_H_ */
diff --git a/src/char/int_party.h b/src/char/int_party.h
index d8cdcdc6a..84f00635a 100644
--- a/src/char/int_party.h
+++ b/src/char/int_party.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _INT_PARTY_SQL_H_
-#define _INT_PARTY_SQL_H_
+#ifndef _CHAR_INT_PARTY_H_
+#define _CHAR_INT_PARTY_H_
 
 //Party Flags on what to save/delete.
 enum {
@@ -23,4 +23,4 @@ int inter_party_leave(int party_id,int account_id, int char_id);
 int inter_party_CharOnline(int char_id, int party_id);
 int inter_party_CharOffline(int char_id, int party_id);
 
-#endif /* _INT_PARTY_SQL_H_ */
+#endif /* _CHAR_INT_PARTY_H_ */
diff --git a/src/char/int_pet.h b/src/char/int_pet.h
index 733468c77..a16cb7a37 100644
--- a/src/char/int_pet.h
+++ b/src/char/int_pet.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _INT_PET_SQL_H_
-#define _INT_PET_SQL_H_
+#ifndef _CHAR_INT_PET_H_
+#define _CHAR_INT_PET_H_
 
 struct s_pet;
 
@@ -18,4 +18,4 @@ int inter_pet_sql_init(void);
 //Exported for use in the TXT-SQL converter.
 int inter_pet_tosql(int pet_id, struct s_pet *p);
 
-#endif /* _INT_PET_SQL_H_ */
+#endif /* _CHAR_INT_PET_H_ */
diff --git a/src/char/int_quest.h b/src/char/int_quest.h
index b0403f436..6267c74ad 100644
--- a/src/char/int_quest.h
+++ b/src/char/int_quest.h
@@ -1,10 +1,10 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _QUEST_H_
-#define _QUEST_H_
+#ifndef _CHAR_QUEST_H_
+#define _CHAR_QUEST_H_
 
 int inter_quest_parse_frommap(int fd);
 
-#endif
+#endif /* _CHAR_QUEST_H_ */
 
diff --git a/src/char/int_storage.h b/src/char/int_storage.h
index 811608f82..1693499a5 100644
--- a/src/char/int_storage.h
+++ b/src/char/int_storage.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _INT_STORAGE_SQL_H_
-#define _INT_STORAGE_SQL_H_
+#ifndef _CHAR_INT_STORAGE_H_
+#define _CHAR_INT_STORAGE_H_
 
 struct storage_data;
 struct guild_storage;
@@ -19,4 +19,4 @@ int storage_fromsql(int account_id, struct storage_data* p);
 int storage_tosql(int account_id,struct storage_data *p);
 int guild_storage_tosql(int guild_id, struct guild_storage *p);
 
-#endif /* _INT_STORAGE_SQL_H_ */
+#endif /* _CHAR_INT_STORAGE_H_ */
diff --git a/src/char/inter.h b/src/char/inter.h
index 9b958dc72..2c07b20e2 100644
--- a/src/char/inter.h
+++ b/src/char/inter.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _INTER_SQL_H_
-#define _INTER_SQL_H_
+#ifndef _CHAR_INTER_H_
+#define _CHAR_INTER_H_
 
 struct accreg;
 #include "../common/sql.h"
@@ -41,4 +41,4 @@ uint64 inter_chk_lastuid(int8 flag, uint64 value);
 	#define updateLastUid(val_)
 #endif
 
-#endif /* _INTER_SQL_H_ */
+#endif /* _CHAR_INTER_H_ */
diff --git a/src/char/pincode.h b/src/char/pincode.h
index a17f70de5..3b71eec7c 100644
--- a/src/char/pincode.h
+++ b/src/char/pincode.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _PINCODE_H_
-#define _PINCODE_H_
+#ifndef _CHAR_PINCODE_H_
+#define _CHAR_PINCODE_H_
 
 #include "char.h"
 
@@ -40,4 +40,4 @@ struct pincode_interface *pincode;
 
 void pincode_defaults(void);
 
-#endif /* _PINCODE_H_ */
+#endif /* _CHAR_PINCODE_H_ */
diff --git a/src/common/HPM.c b/src/common/HPM.c
index 1edf24901..cf296e593 100644
--- a/src/common/HPM.c
+++ b/src/common/HPM.c
@@ -116,6 +116,8 @@ struct hplugin *hplugin_load(const char* filename) {
 	bool anyEvent = false;
 	void **import_symbol_ref;
 	Sql **sql_handle;
+	unsigned int *HPMDataCheckLen;
+	struct s_HPMDataCheck *HPMDataCheck;
 		
 	if( HPM->exists(filename) ) {
 		ShowWarning("HPM:plugin_load: attempting to load duplicate '"CL_WHITE"%s"CL_RESET"', skipping...\n", filename);
@@ -203,6 +205,24 @@ struct hplugin *hplugin_load(const char* filename) {
 	if( !HPM->populate(plugin,filename) )
 		return NULL;
 	
+	if( !( HPMDataCheckLen = plugin_import(plugin->dll, "HPMDataCheckLen", unsigned int *) ) ) {
+		ShowWarning("HPM:plugin_load: failed to retrieve 'HPMDataCheckLen' for '"CL_WHITE"%s"CL_RESET"', most likely not including HPMDataCheck.h, skipping...\n", filename);
+		HPM->unload(plugin);
+		return NULL;
+	}
+	
+	if( !( HPMDataCheck = plugin_import(plugin->dll, "HPMDataCheck", struct s_HPMDataCheck *) ) ) {
+		ShowWarning("HPM:plugin_load: failed to retrieve 'HPMDataCheck' for '"CL_WHITE"%s"CL_RESET"', most likely not including HPMDataCheck.h, skipping...\n", filename);
+		HPM->unload(plugin);
+		return NULL;
+	}
+	
+	if( !HPM->DataCheck(HPMDataCheck,*HPMDataCheckLen,plugin->info->name) ) {
+		ShowWarning("HPM:plugin_load: '"CL_WHITE"%s"CL_RESET"' failed DataCheck, out of sync from the core (recompile plugin), skipping...\n", filename);
+		HPM->unload(plugin);
+		return NULL;
+	}
+		
 	/* id */
 	plugin->hpi->pid                = plugin->idx;
 	/* core */
@@ -255,6 +275,11 @@ void hplugins_config_read(void) {
 	const char *config_filename = "conf/plugins.conf"; // FIXME hardcoded name
 	FILE *fp;
 	
+	if( !HPM->DataCheck ) {
+		ShowError("HPM:config_read: HPM->DataCheck not set! Failure\n");
+		return;
+	}
+	
 	/* yes its ugly, its temporary and will be gone as soon as the new inter-server.conf is set */
 	if( (fp = fopen("conf/import/plugins.conf","r")) ) {
 		config_filename = "conf/import/plugins.conf";
@@ -829,4 +854,5 @@ void hpm_defaults(void) {
 	HPM->grabHPData = hplugins_grabHPData;
 	HPM->grabHPDataSub = NULL;
 	HPM->parseConf = hplugins_parse_conf;
+	HPM->DataCheck = NULL;
 }
diff --git a/src/common/HPM.h b/src/common/HPM.h
index 393f8f819..52ad24a03 100644
--- a/src/common/HPM.h
+++ b/src/common/HPM.h
@@ -1,8 +1,8 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 
-#ifndef	_HPM_H_
-#define _HPM_H_
+#ifndef	_COMMON_HPM_H_
+#define _COMMON_HPM_H_
 
 #include "../common/cbasetypes.h"
 #include "../common/HPMi.h"
@@ -146,10 +146,12 @@ struct HPM_interface {
 	bool (*grabHPDataSub) (struct HPDataOperationStorage *ret, enum HPluginDataTypes type, void *ptr);
 	/* for custom config parsing */
 	bool (*parseConf) (const char *w1, const char *w2, enum HPluginConfType point);
+	/* validates plugin data */
+	bool (*DataCheck) (struct s_HPMDataCheck *src, unsigned int size, char *name);
 } HPM_s;
 
 struct HPM_interface *HPM;
 
 void hpm_defaults(void);
 
-#endif /* _HPM_H_ */
+#endif /* _COMMON_HPM_H_ */
diff --git a/src/common/HPMi.h b/src/common/HPMi.h
index fdb6ccf52..b33ad955c 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	_HPMi_H_
-#define _HPMi_H_
+#ifndef	_COMMON_HPMi_H_
+#define _COMMON_HPMi_H_
 
 #include "../common/cbasetypes.h"
 #include "../common/core.h"
@@ -20,7 +20,7 @@ struct map_session_data;
 	#define HPExport
 #endif
 
-#ifndef _SHOWMSG_H_
+#ifndef _COMMON_SHOWMSG_H_
 	HPExport void (*ShowMessage) (const char *, ...);
 	HPExport void (*ShowStatus) (const char *, ...);
 	HPExport void (*ShowSQL) (const char *, ...);
@@ -45,6 +45,11 @@ struct hplugin_info {
 	char* req_version;
 };
 
+struct s_HPMDataCheck {
+	char *name;
+	unsigned int size;
+};
+
 HPExport void *(*import_symbol) (char *name, unsigned int pID);
 HPExport Sql *mysql_handle;
 
@@ -187,8 +192,8 @@ HPExport struct HPMi_interface {
 	/* pc group permission */
 	void (*addPCGPermission) (unsigned int pluginID, char *name, unsigned int *mask);
 } HPMi_s;
-#ifndef _HPM_H_
+#ifndef _COMMON_HPM_H_
 HPExport struct HPMi_interface *HPMi;
 #endif
 
-#endif /* _HPMi_H_ */
+#endif /* _COMMON_HPMi_H_ */
diff --git a/src/common/atomic.h b/src/common/atomic.h
index 5a2ddb4f0..c2227a9d4 100644
--- a/src/common/atomic.h
+++ b/src/common/atomic.h
@@ -1,8 +1,8 @@
 // Copyright (c) rAthena Project (www.rathena.org) - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _rA_ATOMIC_H_
-#define _rA_ATOMIC_H_
+#ifndef _COMMON_ATOMIC_H_
+#define _COMMON_ATOMIC_H_
 
 // Atomic Operations 
 // (Interlocked CompareExchange, Add .. and so on ..)
@@ -144,4 +144,4 @@ static forceinline int32 InterlockedExchange(volatile int32 *target, int32 val){
 #endif //endif compiler decission
 
 
-#endif
+#endif /* _COMMON_ATOMIC_H_ */
diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h
index 977897506..654334a9b 100644
--- a/src/common/cbasetypes.h
+++ b/src/common/cbasetypes.h
@@ -1,5 +1,5 @@
-#ifndef _CBASETYPES_H_
-#define _CBASETYPES_H_
+#ifndef _COMMON_CBASETYPES_H_
+#define _COMMON_CBASETYPES_H_
 
 /*              +--------+-----------+--------+---------+
  *              | ILP32  |   LP64    |  ILP64 | (LL)P64 |
@@ -431,4 +431,4 @@ void SET_FUNCPOINTER(T1& var, T2 p)
 #endif
 
 
-#endif /* _CBASETYPES_H_ */
+#endif /* _COMMON_CBASETYPES_H_ */
diff --git a/src/common/conf.h b/src/common/conf.h
index 05e2b1ada..9aff3df47 100644
--- a/src/common/conf.h
+++ b/src/common/conf.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _CONF_H_
-#define _CONF_H_
+#ifndef _COMMON_CONF_H_
+#define _COMMON_CONF_H_
 
 #include "../common/cbasetypes.h"
 #include "../../3rdparty/libconfig/libconfig.h"
@@ -94,4 +94,4 @@ struct libconfig_interface *libconfig;
 
 void libconfig_defaults(void);
 
-#endif // _CONF_H_
+#endif // _COMMON_CONF_H_
diff --git a/src/common/console.h b/src/common/console.h
index 1beed964a..513c769ff 100644
--- a/src/common/console.h
+++ b/src/common/console.h
@@ -1,8 +1,8 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 
-#ifndef	_CONSOLE_H_
-#define	_CONSOLE_H_
+#ifndef	_COMMON_CONSOLE_H_
+#define	_COMMON_CONSOLE_H_
 
 #include "../common/thread.h"
 #include "../common/mutex.h"
@@ -72,4 +72,4 @@ struct console_interface *console;
 
 void console_defaults(void);
 
-#endif /* _CONSOLE_H_ */
+#endif /* _COMMON_CONSOLE_H_ */
diff --git a/src/common/core.h b/src/common/core.h
index 8fdcdcfc3..72f956e1d 100644
--- a/src/common/core.h
+++ b/src/common/core.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef	_CORE_H_
-#define	_CORE_H_
+#ifndef	_COMMON_CORE_H_
+#define	_COMMON_CORE_H_
 
 #include "../common/db.h"
 #include "../common/mmo.h"
@@ -50,4 +50,4 @@ enum E_CORE_ST {
 /// If NULL, runflag is set to CORE_ST_STOP instead.
 extern void (*shutdown_callback)(void);
 
-#endif /* _CORE_H_ */
+#endif /* _COMMON_CORE_H_ */
diff --git a/src/common/db.h b/src/common/db.h
index c00489b93..67abe6f19 100644
--- a/src/common/db.h
+++ b/src/common/db.h
@@ -39,8 +39,8 @@
  * @encoding US-ASCII                                                        *
  * @see common#db.c                                                          *
 \*****************************************************************************/
-#ifndef _DB_H_
-#define _DB_H_
+#ifndef _COMMON_DB_H_
+#define _COMMON_DB_H_
 
 #include "../common/cbasetypes.h"
 #include <stdarg.h>
@@ -1548,4 +1548,4 @@ void  linkdb_foreach (struct linkdb_node** head, LinkDBFunc func, ...);
 
 
 
-#endif /* _DB_H_ */
+#endif /* _COMMON_DB_H_ */
diff --git a/src/common/des.h b/src/common/des.h
index e42136436..3f55448ba 100644
--- a/src/common/des.h
+++ b/src/common/des.h
@@ -1,7 +1,7 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
-#ifndef	_DES_H_
-#define	_DES_H_
+#ifndef	_COMMON_DES_H_
+#define	_COMMON_DES_H_
 
 
 /// One 64-bit block.
@@ -12,4 +12,4 @@ void des_decrypt_block(BIT64* block);
 void des_decrypt(unsigned char* data, size_t size);
 
 
-#endif // _DES_H_
+#endif // _COMMON_DES_H_
diff --git a/src/common/ers.h b/src/common/ers.h
index d74ee02a5..4dae19f3b 100644
--- a/src/common/ers.h
+++ b/src/common/ers.h
@@ -37,8 +37,8 @@
  * @author Flavio @ Amazon Project                                           *
  * @encoding US-ASCII                                                        *
 \*****************************************************************************/
-#ifndef _ERS_H_
-#define _ERS_H_
+#ifndef _COMMON_ERS_H_
+#define _COMMON_ERS_H_
 
 #include "../common/cbasetypes.h"
 
@@ -180,4 +180,4 @@ void ers_report(void);
 void ers_force_destroy_all(void);
 #endif /* DISABLE_ERS / not DISABLE_ERS */
 
-#endif /* _ERS_H_ */
+#endif /* _COMMON_ERS_H_ */
diff --git a/src/common/grfio.h b/src/common/grfio.h
index a88b20393..4f5d0d6bc 100644
--- a/src/common/grfio.h
+++ b/src/common/grfio.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef	_GRFIO_H_
-#define	_GRFIO_H_
+#ifndef	_COMMON_GRFIO_H_
+#define	_COMMON_GRFIO_H_
 
 void grfio_init(const char* fname);
 void grfio_final(void);
@@ -14,4 +14,4 @@ unsigned long grfio_crc32(const unsigned char *buf, unsigned int len);
 int decode_zip(void* dest, unsigned long* destLen, const void* source, unsigned long sourceLen);
 int encode_zip(void* dest, unsigned long* destLen, const void* source, unsigned long sourceLen);
 
-#endif /* _GRFIO_H_ */
+#endif /* _COMMON_GRFIO_H_ */
diff --git a/src/common/malloc.h b/src/common/malloc.h
index 19b5213bb..7309bb0f7 100644
--- a/src/common/malloc.h
+++ b/src/common/malloc.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _MALLOC_H_
-#define _MALLOC_H_
+#ifndef _COMMON_MALLOC_H_
+#define _COMMON_MALLOC_H_
 
 #include "../common/cbasetypes.h"
 
@@ -88,4 +88,4 @@ struct malloc_interface {
 void memmgr_report (int extra);
 
 struct malloc_interface *iMalloc;
-#endif /* _MALLOC_H_ */
+#endif /* _COMMON_MALLOC_H_ */
diff --git a/src/common/mapindex.h b/src/common/mapindex.h
index 98150f441..fa9b9e920 100644
--- a/src/common/mapindex.h
+++ b/src/common/mapindex.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAPINDEX_H_
-#define _MAPINDEX_H_
+#ifndef _COMMON_MAPINDEX_H_
+#define _COMMON_MAPINDEX_H_
 
 #include "../common/db.h"
 #include "../common/mmo.h"
@@ -90,4 +90,4 @@ struct mapindex_interface *mapindex;
 
 void mapindex_defaults(void);
 
-#endif /* _MAPINDEX_H_ */
+#endif /* _COMMON_MAPINDEX_H_ */
diff --git a/src/common/md5calc.h b/src/common/md5calc.h
index 323affa2c..d0caf6787 100644
--- a/src/common/md5calc.h
+++ b/src/common/md5calc.h
@@ -1,8 +1,8 @@
-#ifndef _MD5CALC_H_
-#define _MD5CALC_H_
+#ifndef _COMMON_MD5CALC_H_
+#define _COMMON_MD5CALC_H_
 
 void MD5_String(const char * string, char * output);
 void MD5_Binary(const char * string, unsigned char * output);
 void MD5_Salt(unsigned int len, char * output);
 
-#endif /* _MD5CALC_H_ */
+#endif /* _COMMON_MD5CALC_H_ */
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 573962601..2b66c516c 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef	_MMO_H_
-#define	_MMO_H_
+#ifndef	_COMMON_MMO_H_
+#define	_COMMON_MMO_H_
 
 #include "cbasetypes.h"
 #include "../common/db.h"
@@ -886,4 +886,4 @@ enum e_pc_reg_loading {
 #error MAX_ZENY is too big
 #endif
 
-#endif /* _MMO_H_ */
+#endif /* _COMMON_MMO_H_ */
diff --git a/src/common/mutex.h b/src/common/mutex.h
index 1999627cd..eeb24e6ff 100644
--- a/src/common/mutex.h
+++ b/src/common/mutex.h
@@ -1,8 +1,8 @@
 // Copyright (c) rAthena Project (www.rathena.org) - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder  
 
-#ifndef _rA_MUTEX_H_
-#define _rA_MUTEX_H_
+#ifndef _COMMON_MUTEX_H_
+#define _COMMON_MUTEX_H_
 
 
 typedef struct ramutex *ramutex; // Mutex
@@ -89,4 +89,4 @@ void racond_signal( racond c );
 void racond_broadcast( racond c );
 
 
-#endif
+#endif /* _COMMON_MUTEX_H_ */
diff --git a/src/common/nullpo.h b/src/common/nullpo.h
index 581252cca..fb1cf0feb 100644
--- a/src/common/nullpo.h
+++ b/src/common/nullpo.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef COMMON_NULLPO_H
-#define COMMON_NULLPO_H
+#ifndef _COMMON_NULLPO_H_
+#define _COMMON_NULLPO_H_
 
 #include "../common/cbasetypes.h"
 
@@ -125,4 +125,4 @@
 
 void assert_report(const char *file, int line, const char *func, const char *targetname, const char *title);
 
-#endif /* COMMON_NULLPO_H */
+#endif /* _COMMON_NULLPO_H_ */
diff --git a/src/common/random.h b/src/common/random.h
index 43dfd36c0..ab83fb4d4 100644
--- a/src/common/random.h
+++ b/src/common/random.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _RANDOM_H_
-#define _RANDOM_H_
+#ifndef _COMMON_RANDOM_H_
+#define _COMMON_RANDOM_H_
 
 #include "../common/cbasetypes.h"
 
@@ -15,4 +15,4 @@ int32 rnd_value(int32 min, int32 max);// [min, max]
 double rnd_uniform(void);// [0.0, 1.0)
 double rnd_uniform53(void);// [0.0, 1.0)
 
-#endif /* _RANDOM_H_ */
+#endif /* _COMMON_RANDOM_H_ */
diff --git a/src/common/showmsg.h b/src/common/showmsg.h
index 01eae4480..b59214ab0 100644
--- a/src/common/showmsg.h
+++ b/src/common/showmsg.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _SHOWMSG_H_
-#define _SHOWMSG_H_
+#ifndef _COMMON_SHOWMSG_H_
+#define _COMMON_SHOWMSG_H_
 
 #ifndef _HPMi_H_
 	#include "../../3rdparty/libconfig/libconfig.h"
@@ -104,4 +104,4 @@ extern void ClearScreen(void);
 #endif
 extern int _vShowMessage(enum msg_type flag, const char *string, va_list ap);
 
-#endif /* _SHOWMSG_H_ */
+#endif /* _COMMON_SHOWMSG_H_ */
diff --git a/src/common/socket.h b/src/common/socket.h
index 6879d2e90..ca9141716 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef	_SOCKET_H_
-#define _SOCKET_H_
+#ifndef	_COMMON_SOCKET_H_
+#define _COMMON_SOCKET_H_
 
 #include "../common/cbasetypes.h"
 
@@ -196,4 +196,4 @@ void socket_defaults(void);
 	#define set_eof(fd) ( sockt->set_eof(fd) )
 #endif /* _H_SOCKET_C_ */
 
-#endif /* _SOCKET_H_ */
+#endif /* _COMMON_SOCKET_H_ */
diff --git a/src/common/spinlock.h b/src/common/spinlock.h
index 9b9e4ce94..29fbb355b 100644
--- a/src/common/spinlock.h
+++ b/src/common/spinlock.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _rA_SPINLOCK_H_
-#define _rA_SPINLOCK_H_
+#ifndef _COMMON_SPINLOCK_H_
+#define _COMMON_SPINLOCK_H_
 
 //
 // CAS based Spinlock Implementation
@@ -101,4 +101,4 @@ static forceinline void LeaveSpinLock(PSPIN_LOCK lck){
 
 
 
-#endif
+#endif /* _COMMON_SPINLOCK_H_ */
diff --git a/src/common/strlib.h b/src/common/strlib.h
index 7a1066401..10844d257 100644
--- a/src/common/strlib.h
+++ b/src/common/strlib.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _STRLIB_H_
-#define _STRLIB_H_
+#ifndef _COMMON_STRLIB_H_
+#define _COMMON_STRLIB_H_
 
 #include "../common/cbasetypes.h"
 #include <stdarg.h>
@@ -191,4 +191,4 @@ void strlib_defaults(void);
 	#define bin2hex(output,input,count)  (strlib->bin2hex((output),(input),(count)))
 #endif /* STRLIB_C */
 
-#endif /* _STRLIB_H_ */
+#endif /* _COMMON_STRLIB_H_ */
diff --git a/src/common/thread.h b/src/common/thread.h
index a5a66e954..d6b2bbc6e 100644
--- a/src/common/thread.h
+++ b/src/common/thread.h
@@ -2,8 +2,8 @@
 // For more information, see LICENCE in the main folder
 
 #pragma once 
-#ifndef _rA_THREAD_H_
-#define _rA_THREAD_H_
+#ifndef _COMMON_THREAD_H_
+#define _COMMON_THREAD_H_
 
 #include "../common/cbasetypes.h"
 
@@ -116,4 +116,4 @@ void rathread_init();
 void rathread_final();
 
 
-#endif
+#endif /* _COMMON_THREAD_H_ */
diff --git a/src/common/timer.h b/src/common/timer.h
index af1a2b036..ab3ffc21f 100644
--- a/src/common/timer.h
+++ b/src/common/timer.h
@@ -1,8 +1,10 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
-#ifndef	_TIMER_H_
-#define	_TIMER_H_
+
+#ifndef	_COMMON_TIMER_H_
+#define	_COMMON_TIMER_H_
+
 #include "../common/cbasetypes.h"
 
 #define DIFF_TICK(a,b) ((a)-(b))
@@ -65,4 +67,4 @@ struct timer_interface *timer;
 
 void timer_defaults(void);
 
-#endif /* _TIMER_H_ */
+#endif /* _COMMON_TIMER_H_ */
diff --git a/src/common/utils.h b/src/common/utils.h
index 719e1e533..68dd01ac4 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _UTILS_H_
-#define _UTILS_H_
+#ifndef _COMMON_UTILS_H_
+#define _COMMON_UTILS_H_
 
 #include "../common/cbasetypes.h"
 #include <stdio.h> // FILE*
@@ -54,4 +54,4 @@ struct HCache_interface *HCache;
 
 void HCache_defaults(void);
 
-#endif /* _UTILS_H_ */
+#endif /* _COMMON_UTILS_H_ */
diff --git a/src/config/const.h b/src/config/const.h
index fc82d66f9..6557cb987 100644
--- a/src/config/const.h
+++ b/src/config/const.h
@@ -1,8 +1,9 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
-#ifndef _H_CONSTANTS_
-#define _H_CONSTANTS_
+
+#ifndef _CONFIG_CONSTANTS_H_
+#define _CONFIG_CONSTANTS_H_
 
 /**
  * Hercules configuration file (http://hercules.ws)
@@ -117,4 +118,4 @@
 /**
  * End of File
  **/
-#endif /* _H_CONSTANTS_ */
+#endif /* _CONFIG_CONSTANTS_H_ */
diff --git a/src/login/account.h b/src/login/account.h
index 74a9e9626..234e7c0c1 100644
--- a/src/login/account.h
+++ b/src/login/account.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef __ACCOUNT_H_INCLUDED__
-#define __ACCOUNT_H_INCLUDED__
+#ifndef _LOGIN_ACCOUNT_H_
+#define _LOGIN_ACCOUNT_H_
 
 #include "../common/cbasetypes.h"
 #include "../common/mmo.h" // ACCOUNT_REG2_NUM
@@ -139,4 +139,4 @@ Sql *account_db_sql_up(AccountDB* self);
 void mmo_send_accreg2(AccountDB* self, int fd, int account_id, int char_id);
 void mmo_save_accreg2(AccountDB* self, int fd, int account_id, int char_id);
 
-#endif // __ACCOUNT_H_INCLUDED__
+#endif /* _LOGIN_ACCOUNT_H_ */
diff --git a/src/login/ipban.h b/src/login/ipban.h
index b2a1a7d9e..e6851d8dd 100644
--- a/src/login/ipban.h
+++ b/src/login/ipban.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef __IPBAN_H_INCLUDED__
-#define __IPBAN_H_INCLUDED__
+#ifndef _LOGIN_IPBAN_H_
+#define _LOGIN_IPBAN_H_
 
 #include "../common/cbasetypes.h"
 
@@ -22,4 +22,4 @@ void ipban_log(uint32 ip);
 bool ipban_config_read(const char* key, const char* value);
 
 
-#endif // __IPBAN_H_INCLUDED__
+#endif /* _LOGIN_IPBAN_H_ */
diff --git a/src/login/login.h b/src/login/login.h
index d6a021125..14c361a15 100644
--- a/src/login/login.h
+++ b/src/login/login.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _LOGIN_H_
-#define _LOGIN_H_
+#ifndef _LOGIN_LOGIN_H_
+#define _LOGIN_LOGIN_H_
 
 #include "../common/mmo.h" // NAME_LENGTH,SEX_*
 #include "../common/core.h" // CORE_ST_LAST
@@ -100,4 +100,4 @@ extern struct mmo_char_server server[MAX_SERVERS];
 extern struct Login_Config login_config;
 
 
-#endif /* _LOGIN_H_ */
+#endif /* _LOGIN_LOGIN_H_ */
diff --git a/src/login/loginlog.h b/src/login/loginlog.h
index a1ffaae85..730fb6e62 100644
--- a/src/login/loginlog.h
+++ b/src/login/loginlog.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef __LOGINLOG_H_INCLUDED__
-#define __LOGINLOG_H_INCLUDED__
+#ifndef _LOGIN_LOGINLOG_H_
+#define _LOGIN_LOGINLOG_H_
 
 
 unsigned long loginlog_failedattempts(uint32 ip, unsigned int minutes);
@@ -12,4 +12,4 @@ bool loginlog_final(void);
 bool loginlog_config_read(const char* w1, const char* w2);
 
 
-#endif // __LOGINLOG_H_INCLUDED__
+#endif /* _LOGIN_LOGINLOG_H_ */
diff --git a/src/map/HPMmap.c b/src/map/HPMmap.c
index 4b1338b8d..1688f37ce 100644
--- a/src/map/HPMmap.c
+++ b/src/map/HPMmap.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <time.h>
 
+#include "../plugins/HPMDataCheck.h"
+
 struct HPM_atcommand_list {
 	//tracking currently not enabled
 	// - requires modifying how plugins calls atcommand creation
@@ -46,6 +48,11 @@ struct HPM_atcommand_list {
 struct HPM_atcommand_list *atcommand_list = NULL;
 unsigned int atcommand_list_items = 0;
 
+/**
+ * (char*) data name -> (unsigned int) HPMDataCheck[] index
+ **/
+DBMap *datacheck_db;
+
 bool HPM_map_grabHPData(struct HPDataOperationStorage *ret, enum HPluginDataTypes type, void *ptr) {
 	/* record address */
 	switch( type ) {
@@ -113,20 +120,28 @@ void HPM_map_atcommands(void) {
 	}
 }
 
-void HPM_map_do_final(void) {
-	unsigned char i;
+/**
+ * Called by HPM->DataCheck on a plugins incoming data, ensures data structs in use are matching!
+ **/
+bool HPM_map_DataCheck (struct s_HPMDataCheck *src, unsigned int size, char *name) {
+	unsigned int i, j;
 	
-	if( atcommand_list )
-		aFree(atcommand_list);
-	/**
-	 * why is pcg->HPM being cleared here? because PCG's do_final is not final,
-	 * is used on reload, and would thus cause plugin-provided permissions to go away
-	 **/
-	for( i = 0; i < pcg->HPMpermissions_count; i++ ) {
-		aFree(pcg->HPMpermissions[i].name);
+	for(i = 0; i < size; i++) {
+		
+		if( !strdb_exists(datacheck_db, src[i].name) ) {
+			ShowError("HPMDataCheck:%s: '%s' was not found\n",name,src[i].name);
+			return false;
+		} else {
+			j = strdb_uiget(datacheck_db, src[i].name);/* not double lookup; exists sets cache to found data */
+			ShowDebug("Testing[%s/%s] %u vs %u\n",src[i].name,HPMDataCheck[j].name,src[i].size,HPMDataCheck[j].size);
+			if( src[i].size != HPMDataCheck[j].size ) {
+				ShowWarning("HPMDataCheck:%s: '%s' size mismatch %u != %u\n",name,src[i].name,src[i].size,HPMDataCheck[j].size);
+				return false;
+			}
+		}
 	}
-	if( pcg->HPMpermissions )
-		aFree(pcg->HPMpermissions);
+	
+	return true;
 }
 
 /**
@@ -141,3 +156,35 @@ void HPM_map_add_group_permission(unsigned int pluginID, char *name, unsigned in
 	pcg->HPMpermissions[index].name = aStrdup(name);
 	pcg->HPMpermissions[index].mask = mask;
 }
+
+void HPM_map_do_init(void) {
+	unsigned int i;
+	
+	/**
+	 * Populates datacheck_db for easy lookup later on
+	 **/
+	datacheck_db = strdb_alloc(DB_OPT_BASE,0);
+	
+	for(i = 0; i < HPMDataCheckLen; i++) {
+		strdb_uiput(datacheck_db, HPMDataCheck[i].name, i);
+	}
+	
+}
+
+void HPM_map_do_final(void) {
+	unsigned char i;
+	
+	if( atcommand_list )
+		aFree(atcommand_list);
+	/**
+	 * why is pcg->HPM being cleared here? because PCG's do_final is not final,
+	 * is used on reload, and would thus cause plugin-provided permissions to go away
+	 **/
+	for( i = 0; i < pcg->HPMpermissions_count; i++ ) {
+		aFree(pcg->HPMpermissions[i].name);
+	}
+	if( pcg->HPMpermissions )
+		aFree(pcg->HPMpermissions);
+	
+	db_destroy(datacheck_db);
+}
diff --git a/src/map/HPMmap.h b/src/map/HPMmap.h
index ff8cf4c74..f291575fb 100644
--- a/src/map/HPMmap.h
+++ b/src/map/HPMmap.h
@@ -1,8 +1,8 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 
-#ifndef _HPM_MAP_
-#define _HPM_MAP_
+#ifndef _MAP_HPMMAP_H_
+#define _MAP_HPMMAP_H_
 
 #include "../common/cbasetypes.h"
 #include "../map/atcommand.h"
@@ -22,4 +22,8 @@ void HPM_map_do_final(void);
 
 void HPM_map_add_group_permission(unsigned int pluginID, char *name, unsigned int *mask);
 
-#endif /* _HPM_MAP_ */
+bool HPM_map_DataCheck(struct s_HPMDataCheck *src, unsigned int size, char *name);
+
+void HPM_map_do_init(void);
+
+#endif /* _MAP_HPMMAP_H_ */
diff --git a/src/map/atcommand.h b/src/map/atcommand.h
index f95940924..39f7cc2b2 100644
--- a/src/map/atcommand.h
+++ b/src/map/atcommand.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _ATCOMMAND_H_
-#define _ATCOMMAND_H_
+#ifndef _MAP_ATCOMMAND_H_
+#define _MAP_ATCOMMAND_H_
 
 #include "../common/conf.h"
 #include "../common/db.h"
@@ -121,4 +121,4 @@ void atcommand_defaults(void);
 /* stay here */
 #define ACMD(x) static bool atcommand_ ## x (const int fd, struct map_session_data* sd, const char* command, const char* message, struct AtCommandInfo *info)
 
-#endif /* _ATCOMMAND_H_ */
+#endif /* _MAP_ATCOMMAND_H_ */
diff --git a/src/map/battle.h b/src/map/battle.h
index 98f2e37e8..0fcef7292 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _BATTLE_H_
-#define _BATTLE_H_
+#ifndef _MAP_BATTLE_H_
+#define _MAP_BATTLE_H_
 
 #include "../common/cbasetypes.h"
 #include "map.h" //ELE_MAX
@@ -596,4 +596,4 @@ struct battle_interface {
 struct battle_interface *battle;
 
 void battle_defaults(void);
-#endif /* _BATTLE_H_ */
+#endif /* _MAP_BATTLE_H_ */
diff --git a/src/map/battleground.h b/src/map/battleground.h
index 4aeb9f879..ed7347566 100644
--- a/src/map/battleground.h
+++ b/src/map/battleground.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _BATTLEGROUND_H_
-#define _BATTLEGROUND_H_
+#ifndef _MAP_BATTLEGROUND_H_
+#define _MAP_BATTLEGROUND_H_
 
 #include "../common/mmo.h" // struct party
 #include "clif.h"
@@ -112,4 +112,4 @@ struct battleground_interface *bg;
 
 void battleground_defaults(void);
 
-#endif /* _BATTLEGROUND_H_ */
+#endif /* _MAP_BATTLEGROUND_H_ */
diff --git a/src/map/buyingstore.h b/src/map/buyingstore.h
index b0db40661..5141a1013 100644
--- a/src/map/buyingstore.h
+++ b/src/map/buyingstore.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _BUYINGSTORE_H_
-#define _BUYINGSTORE_H_
+#ifndef _MAP_BUYINGSTORE_H_
+#define _MAP_BUYINGSTORE_H_
 
 /**
  * Declarations
@@ -70,4 +70,4 @@ struct buyingstore_interface *buyingstore;
 
 void buyingstore_defaults (void);
 
-#endif  // _BUYINGSTORE_H_
+#endif  // _MAP_BUYINGSTORE_H_
diff --git a/src/map/chat.h b/src/map/chat.h
index fcbadf008..71e5a11ec 100644
--- a/src/map/chat.h
+++ b/src/map/chat.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _CHAT_H_
-#define _CHAT_H_
+#ifndef _MAP_CHAT_H_
+#define _MAP_CHAT_H_
 
 #include "map.h" // struct block_list, CHATROOM_TITLE_SIZE
 
@@ -55,4 +55,4 @@ struct chat_interface *chat;
 
 void chat_defaults(void);
 
-#endif /* _CHAT_H_ */
+#endif /* _MAP_CHAT_H_ */
diff --git a/src/map/chrif.h b/src/map/chrif.h
index 163fdf670..59e45a2ea 100644
--- a/src/map/chrif.h
+++ b/src/map/chrif.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _CHRIF_H_
-#define _CHRIF_H_
+#ifndef _MAP_CHRIF_H_
+#define _MAP_CHRIF_H_
 
 #include "../common/cbasetypes.h"
 #include <time.h>
@@ -148,4 +148,4 @@ void chrif_defaults(void);
 // There's no need for another function when a simple macro can do exactly the same effect
 #define chrif_char_offline(x) chrif->char_offline_nsd((x)->status.account_id,(x)->status.char_id)
 
-#endif /* _CHRIF_H_ */
+#endif /* _MAP_CHRIF_H_ */
diff --git a/src/map/clif.h b/src/map/clif.h
index 6405bbd3e..1e0319b7b 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _CLIF_H_
-#define _CLIF_H_
+#ifndef _MAP_CLIF_H_
+#define _MAP_CLIF_H_
 
 #include "../common/cbasetypes.h"
 #include "../common/db.h"
@@ -1275,4 +1275,4 @@ struct clif_interface *clif;
 
 void clif_defaults(void);
 
-#endif /* _CLIF_H_ */
+#endif /* _MAP_CLIF_H_ */
diff --git a/src/map/date.h b/src/map/date.h
index cc19d88d1..02238d7ea 100644
--- a/src/map/date.h
+++ b/src/map/date.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _DATE_H_
-#define _DATE_H_
+#ifndef _MAP_DATE_H_
+#define _MAP_DATE_H_
 
 int date_get_year(void);
 int date_get_month(void);
@@ -15,4 +15,4 @@ int is_day_of_sun(void);
 int is_day_of_moon(void);
 int is_day_of_star(void);
 
-#endif /* _DATE_H_ */
+#endif /* _MAP_DATE_H_ */
diff --git a/src/map/duel.h b/src/map/duel.h
index d60c9531a..5405d2eee 100644
--- a/src/map/duel.h
+++ b/src/map/duel.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _DUEL_H_
-#define _DUEL_H_
+#ifndef _MAP_DUEL_H_
+#define _MAP_DUEL_H_
 
 struct duel {
 	int members_count;
@@ -42,4 +42,4 @@ struct duel_interface *duel;
 
 void duel_defaults(void);
 
-#endif /* _DUEL_H_ */
+#endif /* _MAP_DUEL_H_ */
diff --git a/src/map/elemental.h b/src/map/elemental.h
index 830a6a577..6d04a41a5 100644
--- a/src/map/elemental.h
+++ b/src/map/elemental.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _ELEMENTAL_H_
-#define _ELEMENTAL_H_
+#ifndef _MAP_ELEMENTAL_H_
+#define _MAP_ELEMENTAL_H_
 
 #include "status.h" // struct status_data, struct status_change
 #include "unit.h" // struct unit_data
@@ -120,4 +120,4 @@ struct elemental_interface *elemental;
 
 void elemental_defaults(void);
 
-#endif /* _ELEMENTAL_H_ */
+#endif /* _MAP_ELEMENTAL_H_ */
diff --git a/src/map/guild.h b/src/map/guild.h
index 7878d75c3..b03bd664d 100644
--- a/src/map/guild.h
+++ b/src/map/guild.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _GUILD_H_
-#define _GUILD_H_
+#ifndef _MAP_GUILD_H_
+#define _MAP_GUILD_H_
 
 //#include "../common/mmo.h"
 #include "map.h" // NAME_LENGTH
@@ -173,4 +173,4 @@ struct guild_interface *guild;
 
 void guild_defaults(void);
 
-#endif /* _GUILD_H_ */
+#endif /* _MAP_GUILD_H_ */
diff --git a/src/map/homunculus.h b/src/map/homunculus.h
index 117f9da8e..db250f511 100644
--- a/src/map/homunculus.h
+++ b/src/map/homunculus.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _HOMUNCULUS_H_
-#define _HOMUNCULUS_H_
+#ifndef _MAP_HOMUNCULUS_H_
+#define _MAP_HOMUNCULUS_H_
 
 #include "status.h" // struct status_data, struct status_change
 #include "unit.h" // struct unit_data
@@ -146,4 +146,4 @@ struct homunculus_interface *homun;
 
 void homunculus_defaults(void);
 
-#endif /* _HOMUNCULUS_H_ */
+#endif /* _MAP_HOMUNCULUS_H_ */
diff --git a/src/map/instance.h b/src/map/instance.h
index 764a55b2b..66a7d0d6c 100644
--- a/src/map/instance.h
+++ b/src/map/instance.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _INSTANCE_H_
-#define _INSTANCE_H_
+#ifndef _MAP_INSTANCE_H_
+#define _MAP_INSTANCE_H_
 
 #define INSTANCE_NAME_LENGTH (60+1)
 
@@ -82,4 +82,4 @@ struct instance_interface *instance;
 
 void instance_defaults(void);
 
-#endif
+#endif /* _MAP_INSTANCE_H_ */
diff --git a/src/map/intif.h b/src/map/intif.h
index f0bb5c16e..290dcfcdc 100644
--- a/src/map/intif.h
+++ b/src/map/intif.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _INTIF_H_
-#define _INFIF_H_
+#ifndef _MAP_INTIF_H_
+#define _MAP_INTIF_H_
 
 
 /**
@@ -183,4 +183,4 @@ struct intif_interface *intif;
 
 void intif_defaults(void);
 
-#endif /* _INTIF_H_ */
+#endif /* _MAP_INTIF_H_ */
diff --git a/src/map/irc-bot.h b/src/map/irc-bot.h
index 7d6a19eba..c15a5d46a 100644
--- a/src/map/irc-bot.h
+++ b/src/map/irc-bot.h
@@ -3,8 +3,8 @@
 // Base Author: shennetsind @ http://hercules.ws
 
 
-#ifndef _IRC_BOT_H_
-#define _IRC_BOT_H_
+#ifndef _MAP_IRC_BOT_H_
+#define _MAP_IRC_BOT_H_
 
 #define IRC_NICK_LENGTH 40
 #define IRC_IDENT_LENGTH 40
@@ -61,4 +61,4 @@ struct irc_bot_interface *ircbot;
 
 void ircbot_defaults(void);
 
-#endif /* _IRC_BOT_H_ */
+#endif /* _MAP_IRC_BOT_H_ */
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index b3ff606df..74ced13e0 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _ITEMDB_H_
-#define _ITEMDB_H_
+#ifndef _MAP_ITEMDB_H_
+#define _MAP_ITEMDB_H_
 
 #include "../common/db.h"
 #include "../common/mmo.h" // ITEM_NAME_LENGTH
@@ -582,4 +582,4 @@ struct itemdb_interface *itemdb;
 
 void itemdb_defaults(void);
 
-#endif /* _ITEMDB_H_ */
+#endif /* _MAP_ITEMDB_H_ */
diff --git a/src/map/log.h b/src/map/log.h
index 9864a54d7..b2cb92c20 100644
--- a/src/map/log.h
+++ b/src/map/log.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _LOG_H_
-#define _LOG_H_
+#ifndef _MAP_LOG_H_
+#define _MAP_LOG_H_
 
 #include "../common/cbasetypes.h"
 #include "../common/sql.h"
@@ -134,4 +134,4 @@ struct log_interface *logs;
 
 void log_defaults(void);
 
-#endif /* _LOG_H_ */
+#endif /* _MAP_LOG_H_ */
diff --git a/src/map/mail.h b/src/map/mail.h
index b2b9048cb..8df537ff3 100644
--- a/src/map/mail.h
+++ b/src/map/mail.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAIL_H_
-#define _MAIL_H_
+#ifndef _MAP_MAIL_H_
+#define _MAP_MAIL_H_
 
 #include "../common/mmo.h"
 
@@ -23,4 +23,4 @@ struct mail_interface *mail;
 
 void mail_defaults(void);
 
-#endif /* _MAIL_H_ */
+#endif /* _MAP_MAIL_H_ */
diff --git a/src/map/map.c b/src/map/map.c
index 33721b028..2be61587f 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -5447,6 +5447,8 @@ int do_init(int argc, char *argv[])
 	
 	map_load_defaults();
 
+	HPM_map_do_init();
+	HPM->DataCheck = HPM_map_DataCheck;
 	HPM->load_sub = HPM_map_plugin_load_sub;
 	HPM->symbol_defaults_sub = map_hp_symbols;
 	HPM->grabHPDataSub = HPM_map_grabHPData;
diff --git a/src/map/map.h b/src/map/map.h
index 130b181da..8faf6388e 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_H_
-#define _MAP_H_
+#ifndef _MAP_MAP_H_
+#define _MAP_MAP_H_
 
 #include "../common/cbasetypes.h"
 #include "../common/core.h" // CORE_ST_LAST
@@ -1066,4 +1066,4 @@ struct map_interface *map;
 
 void map_defaults(void);
 
-#endif /* _MAP_H_ */
+#endif /* _MAP_MAP_H_ */
diff --git a/src/map/mapreg.h b/src/map/mapreg.h
index 157e634cc..c92b6f602 100644
--- a/src/map/mapreg.h
+++ b/src/map/mapreg.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAPREG_H_
-#define _MAPREG_H_
+#ifndef _MAP_MAPREG_H_
+#define _MAP_MAPREG_H_
 
 #include "../common/cbasetypes.h"
 #include "../common/db.h"
@@ -51,4 +51,4 @@ struct mapreg_interface *mapreg;
 
 void mapreg_defaults(void);
 
-#endif /* _MAPREG_H_ */
+#endif /* _MAP_MAPREG_H_ */
diff --git a/src/map/mercenary.h b/src/map/mercenary.h
index 3f2214b65..dd9266b2e 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.h
@@ -1,8 +1,8 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
-#ifndef _MERCENARY_H_
-#define _MERCENARY_H_
+#ifndef _MAP_MERCENARY_H_
+#define _MAP_MERCENARY_H_
 
 #include "status.h" // struct status_data, struct status_change
 #include "unit.h" // struct unit_data
@@ -98,4 +98,4 @@ struct mercenary_interface *mercenary;
 
 void mercenary_defaults(void);
 
-#endif /* _MERCENARY_H_ */
+#endif /* _MAP_MERCENARY_H_ */
diff --git a/src/map/mob.h b/src/map/mob.h
index 9321cb4fd..80175b1db 100644
--- a/src/map/mob.h
+++ b/src/map/mob.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MOB_H_
-#define _MOB_H_
+#ifndef _MAP_MOB_H_
+#define _MAP_MOB_H_
 
 #include "../common/mmo.h" // struct item
 #include "guild.h" // struct guardian_data
@@ -364,4 +364,4 @@ struct mob_interface *mob;
 
 void mob_defaults(void);
 
-#endif /* _MOB_H_ */
+#endif /* _MAP_MOB_H_ */
diff --git a/src/map/npc.h b/src/map/npc.h
index 266d174fb..719974ac4 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _NPC_H_
-#define _NPC_H_
+#ifndef _MAP_NPC_H_
+#define _MAP_NPC_H_
 
 #include "map.h" // struct block_list
 #include "status.h" // struct status_change
@@ -346,4 +346,4 @@ struct pcre_interface *libpcre;
 void npc_chat_defaults(void);
 #endif
 
-#endif /* _NPC_H_ */
+#endif /* _MAP_NPC_H_ */
diff --git a/src/map/packets.h b/src/map/packets.h
index cea916f6d..4cf6f6d6a 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -3,8 +3,8 @@
 
 //Included directly by clif.h in packet_loaddb()
 
-#ifndef _PACKETS_H_
-#define _PACKETS_H_
+#ifndef _MAP_PACKETS_H_
+#define _MAP_PACKETS_H_
 
 #ifndef packet
 	#define packet(a,b,...)
@@ -2693,4 +2693,4 @@ packet(0x020d,-1);
 	packetKeys(OBFUSCATIONKEY1,OBFUSCATIONKEY2,OBFUSCATIONKEY3);
 #endif
 
-#endif /* _PACKETS_H_ */
+#endif /* _MAP_PACKETS_H_ */
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index 1156f4465..4a599463a 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -3,8 +3,8 @@
 
 /* Hercules Renewal: Phase Two http://hercules.ws/board/topic/383-hercules-renewal-phase-two/ */
 
-#ifndef _PACKETS_STRUCT_H_
-#define _PACKETS_STRUCT_H_
+#ifndef _MAP_PACKETS_STRUCT_H_
+#define _MAP_PACKETS_STRUCT_H_
 
 #include "../common/mmo.h"
 
@@ -945,4 +945,4 @@ struct packet_npc_market_open {
 #pragma pack(pop)
 #endif // not NetBSD < 6 / Solaris
 
-#endif /* _PACKETS_STRUCT_H_ */
+#endif /* _MAP_PACKETS_STRUCT_H_ */
diff --git a/src/map/party.h b/src/map/party.h
index 051c98af2..05b5309e6 100644
--- a/src/map/party.h
+++ b/src/map/party.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _PARTY_H_
-#define _PARTY_H_
+#ifndef _MAP_PARTY_H_
+#define _MAP_PARTY_H_
 
 #include "../common/mmo.h" // struct party
 #include "../config/core.h"
@@ -141,4 +141,4 @@ struct party_interface *party;
 
 void party_defaults(void);
 
-#endif /* _PARTY_H_ */
+#endif /* _MAP_PARTY_H_ */
diff --git a/src/map/path.h b/src/map/path.h
index a889a6409..0b67a0120 100644
--- a/src/map/path.h
+++ b/src/map/path.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _PATH_H_
-#define _PATH_H_
+#ifndef _MAP_PATH_H_
+#define _MAP_PATH_H_
 
 #include "map.h" // enum cell_chk
 
@@ -46,4 +46,4 @@ struct path_interface *path;
 
 void path_defaults(void);
 
-#endif /* _PATH_H_ */
+#endif /* _MAP_PATH_H_ */
diff --git a/src/map/pc.h b/src/map/pc.h
index 487266646..03b3ddca0 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -1,8 +1,9 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
-#ifndef _PC_H_
-#define _PC_H_
+
+#ifndef _MAP_PC_H_
+#define _MAP_PC_H_
 
 #include "../common/mmo.h" // JOB_*, MAX_FAME_LIST, struct fame_list, struct mmo_charstatus
 #include "../common/ers.h"
@@ -1044,4 +1045,4 @@ struct pc_interface *pc;
 
 void pc_defaults(void);
 
-#endif /* _PC_H_ */
+#endif /* _MAP_PC_H_ */
diff --git a/src/map/pc_groups.h b/src/map/pc_groups.h
index 3396512ea..5c03f999f 100644
--- a/src/map/pc_groups.h
+++ b/src/map/pc_groups.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _PC_GROUPS_H_
-#define _PC_GROUPS_H_
+#ifndef _MAP_PC_GROUPS_H_
+#define _MAP_PC_GROUPS_H_
 
 /// PC permissions
 enum e_pc_permission {
@@ -92,4 +92,4 @@ struct pc_groups_interface *pcg;
 
 void pc_groups_defaults(void);
 
-#endif // _PC_GROUPS_H_
+#endif /* _MAP_PC_GROUPS_H_ */
diff --git a/src/map/pet.h b/src/map/pet.h
index f1a219700..537a50c4b 100644
--- a/src/map/pet.h
+++ b/src/map/pet.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _PET_H_
-#define _PET_H_
+#ifndef _MAP_PET_H_
+#define _MAP_PET_H_
 
 #define MAX_PET_DB	300
 #define MAX_PETLOOT_SIZE	30
@@ -152,4 +152,4 @@ struct pet_interface *pet;
 
 void pet_defaults(void);
 
-#endif /* _PET_H_ */
+#endif /* _MAP_PET_H_ */
diff --git a/src/map/quest.h b/src/map/quest.h
index 28815a6c3..e01e35619 100644
--- a/src/map/quest.h
+++ b/src/map/quest.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _QUEST_H_
-#define _QUEST_H_
+#ifndef _MAP_QUEST_H_
+#define _MAP_QUEST_H_
 
 #define MAX_QUEST_DB (60355+1) // Highest quest ID + 1
 
@@ -48,4 +48,4 @@ struct quest_interface *quest;
 
 void quest_defaults(void);
 
-#endif
+#endif /* _MAP_QUEST_H_ */
diff --git a/src/map/script.h b/src/map/script.h
index 97db2a775..b7e9e5741 100644
--- a/src/map/script.h
+++ b/src/map/script.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _SCRIPT_H_
-#define _SCRIPT_H_
+#ifndef _MAP_SCRIPT_H_
+#define _MAP_SCRIPT_H_
 
 #include "../common/strlib.h" //StringBuf
 #include "../common/cbasetypes.h"
@@ -700,4 +700,4 @@ struct script_interface *script;
 
 void script_defaults(void);
 
-#endif /* _SCRIPT_H_ */
+#endif /* _MAP_SCRIPT_H_ */
diff --git a/src/map/searchstore.h b/src/map/searchstore.h
index d7a327181..827e39053 100644
--- a/src/map/searchstore.h
+++ b/src/map/searchstore.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _SEARCHSTORE_H_
-#define _SEARCHSTORE_H_
+#ifndef _MAP_SEARCHSTORE_H_
+#define _MAP_SEARCHSTORE_H_
 
 /**
  * Defines
@@ -93,4 +93,4 @@ struct searchstore_interface *searchstore;
 
 void searchstore_defaults (void);
 
-#endif  // _SEARCHSTORE_H_
+#endif /* _MAP_SEARCHSTORE_H_ */
diff --git a/src/map/skill.h b/src/map/skill.h
index 28cb548d2..78829f17e 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _SKILL_H_
-#define _SKILL_H_
+#ifndef _MAP_SKILL_H_
+#define _MAP_SKILL_H_
 
 #include "../common/mmo.h" // MAX_SKILL, struct square
 #include "../common/db.h"
@@ -2015,4 +2015,4 @@ struct skill_interface *skill;
 
 void skill_defaults(void);
 
-#endif /* _SKILL_H_ */
+#endif /* _MAP_SKILL_H_ */
diff --git a/src/map/status.h b/src/map/status.h
index f319b1506..d3148b4e0 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _STATUS_H_
-#define _STATUS_H_
+#ifndef _MAP_STATUS_H_
+#define _MAP_STATUS_H_
 
 #include "../common/mmo.h"
 
@@ -2012,4 +2012,4 @@ struct status_interface *status;
 
 void status_defaults(void);
 
-#endif /* _STATUS_H_ */
+#endif /* _MAP_STATUS_H_ */
diff --git a/src/map/storage.h b/src/map/storage.h
index 8a10c9f3b..8f9f904f6 100644
--- a/src/map/storage.h
+++ b/src/map/storage.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _STORAGE_H_
-#define _STORAGE_H_
+#ifndef _MAP_STORAGE_H_
+#define _MAP_STORAGE_H_
 
 struct storage_data;
 struct guild_storage;
@@ -59,4 +59,4 @@ struct guild_storage_interface *gstorage;
 void storage_defaults(void);
 void gstorage_defaults(void);
 
-#endif /* _STORAGE_H_ */
+#endif /* _MAP_STORAGE_H_ */
diff --git a/src/map/trade.h b/src/map/trade.h
index d0b900504..f2c0d4622 100644
--- a/src/map/trade.h
+++ b/src/map/trade.h
@@ -2,10 +2,11 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef	_TRADE_H_
-#define	_TRADE_H_
+#ifndef	_MAP_TRADE_H_
+#define	_MAP_TRADE_H_
 
 //Max distance from traders to enable a trade to take place.
+//TODO: battle_config candidate?
 #define TRADE_DISTANCE 2
 
 struct map_session_data;
@@ -26,4 +27,4 @@ struct trade_interface *trade;
 
 void trade_defaults(void);
 
-#endif /* _TRADE_H_ */
+#endif /* _MAP_TRADE_H_ */
diff --git a/src/map/unit.h b/src/map/unit.h
index a2d743875..33fa4e052 100644
--- a/src/map/unit.h
+++ b/src/map/unit.h
@@ -1,8 +1,9 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+// Portions Copyright (c) Athena Dev Teams
 
-#ifndef _UNIT_H_
-#define _UNIT_H_
+#ifndef _MAP_UNIT_H_
+#define _MAP_UNIT_H_
 
 //#include "map.h"
 struct block_list;
@@ -125,4 +126,4 @@ struct unit_interface *unit;
 
 void unit_defaults(void);
 
-#endif /* _UNIT_H_ */
+#endif /* _MAP_UNIT_H_ */
diff --git a/src/map/vending.h b/src/map/vending.h
index b760bf064..b2ba22955 100644
--- a/src/map/vending.h
+++ b/src/map/vending.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef	_VENDING_H_
-#define	_VENDING_H_
+#ifndef	_MAP_VENDING_H_
+#define	_MAP_VENDING_H_
 
 #include "../common/cbasetypes.h"
 #include "../common/db.h"
@@ -35,4 +35,4 @@ struct vending_interface *vending;
 
 void vending_defaults(void);
 
-#endif /* _VENDING_H_ */
+#endif /* _MAP_VENDING_H_ */
-- 
cgit v1.2.3-70-g09d2


From 9a425c11b61fb6f4e299013c7d8d9841129b8f45 Mon Sep 17 00:00:00 2001
From: panikon <panikon@zoho.com>
Date: Tue, 6 May 2014 21:14:46 -0300
Subject: Bug fixes and other changes

#Fixed issue where a corrupted map cache would lead to a crash
*Moved Big-endian compatibility functions to common/utils.h
#Fixed issue 8162
*http://hercules.ws/board/tracker/issue-8162-loadnpc-doesnt-trigger-oninit-of-duplicate-npcs/
*Added options to npc_parse_duplicate
#Fixed issue 8169
*http://hercules.ws/board/tracker/issue-8169-script-command-guildskill-skill-idlevel-not-working-as-intended/
*Changed *guildskill behavior, now it behaves exactly as depicted in the documentation
*Updated *guildskill documentation
#Added missing GBI types to mapif_parse_GuildBasicInfoChange now it's possible to change guild exp, lv, skill point and skill information
#GeoIP revamp
*GeoIP module was partially rewritten
*Added several data checks to prevent corruption and crashes
*Updated GeoIP database
*See https://github.com/maxmind/geoip-api-c/blob/master/libGeoIP/GeoIP.c for more information
#Added packetver checks regarding NST_MARKET
*Now *tradertype warns if user is trying to use this feature with older clients
---
 db/GeoIP.dat            | Bin 587854 -> 668134 bytes
 doc/script_commands.txt |   5 +-
 src/char/int_guild.c    |  50 ++++++++++++++++----
 src/char/inter.c        | 119 +++++++++++++++++++++++++++++++++++++++++-------
 src/common/mmo.h        |  14 +++++-
 src/common/utils.c      |  52 +++++++++++++++++++++
 src/common/utils.h      |  10 ++++
 src/map/clif.c          |   6 +++
 src/map/intif.c         |  20 +++++++-
 src/map/map.c           |  14 ++++++
 src/map/npc.c           |  21 +++++++--
 src/map/npc.h           |   2 +-
 src/map/script.c        |  35 +++++++++++---
 src/tool/mapcache.c     |  59 ++----------------------
 14 files changed, 313 insertions(+), 94 deletions(-)

(limited to 'src/common/utils.h')

diff --git a/db/GeoIP.dat b/db/GeoIP.dat
index 55ccd4d4e..18e348371 100644
Binary files a/db/GeoIP.dat and b/db/GeoIP.dat differ
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 53edd191c..6aa75e82a 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -5181,9 +5181,10 @@ This command will bump up the specified guild skill by the specified
 number of levels. This refers to the invoking character and will only work 
 if the invoking character is a member of a guild AND it's guild master, 
 otherwise no failure message will be given and no error will occur, but 
-nothing will happen - same about the guild skill trying to exceed the 
-possible maximum. The full list of guild skills is available in 
+nothing will happen. The full list of guild skills is available in 
 'db/(pre-)re/skill_db.txt', these are all the GD_ skills at the end.
+If a level higher than the maximum is given as parameter the skill will be
+leveled to the maximum and not above.
 
 // This would give your character's guild one level of Approval 
 // (GD_APPROVAL ID 10000). Notice that if you try to add two levels of 
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index 28b803027..d8556f023 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -1421,29 +1421,61 @@ int mapif_parse_GuildMessage(int fd,int guild_id,int account_id,char *mes,int le
 	return mapif_guild_message(guild_id,account_id,mes,len, fd);
 }
 
-// Modification of the guild
+/**
+ * Changes basic guild information
+ * The types are available in mmo.h::guild_basic_info
+ **/
 int mapif_parse_GuildBasicInfoChange(int fd, int guild_id, int type, const void *data, int len) {
 	struct guild *g;
-	short value = *((const int16 *)data);
+	struct guild_skill gd_skill;
+	short value;
 	g = inter_guild_fromsql(guild_id);
-	if(g==NULL)
+
+	if( g == NULL )
 		return 0;
 
 	switch(type) {
+		case GBI_EXP:
+			value = *((const int16 *)data);
+			if( g->exp+value < 0 )
+				return 0;
+			g->exp += value;
+			guild_calcinfo(g);
+			break;
+
 		case GBI_GUILDLV:
+			value = *((const int16 *)data);
 			if (value > 0 && g->guild_lv + value <= MAX_GUILDLEVEL) {
 				g->guild_lv += value;
 				g->skill_point += value;
 			} else if (value < 0 && g->guild_lv + value >= 1)
 				g->guild_lv += value;
-			mapif_guild_info(-1,g);
-			g->save_flag |= GS_LEVEL;
-			return 0;
-		default:
-			ShowError("int_guild: GuildBasicInfoChange: Unknown type %d\n",type);
 			break;
+
+		case GBI_SKILLPOINT:
+			value = *((const int16 *)data);
+			if( g->skill_point+value < 0 )
+				return 0;
+			g->skill_point += value;
+			break;
+
+		case GBI_SKILLLV:
+			gd_skill = *((const struct guild_skill*)data);
+			memcpy(&(g->skill[(gd_skill.id - GD_SKILLBASE)]), &gd_skill, sizeof(gd_skill));
+			if( !guild_calcinfo(g) )
+				mapif_guild_info(-1,g);
+			g->save_flag |= GS_SKILL;
+			mapif_guild_skillupack(g->guild_id, gd_skill.id, 0);
+			break;
+
+		default:
+			ShowError("int_guild: GuildBasicInfoChange: Unknown type %d, see mmo.h::guild_basic_info for more information\n",type);
+			return 0;
 	}
-	mapif_guild_basicinfochanged(guild_id,type,data,len);
+	mapif_guild_info(-1,g);
+	g->save_flag |= GS_LEVEL;
+	// Information is already sent in mapif_guild_info
+	//mapif_guild_basicinfochanged(guild_id,type,data,len);
 	return 0;
 }
 
diff --git a/src/char/inter.c b/src/char/inter.c
index 6a8412b25..a2ff556d9 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -370,7 +370,11 @@ const char* job_name(int class_) {
 }
 
 /* [Dekamaster/Nightroad] */
-const char * geoip_countryname[253] = {"Unknown","Asia/Pacific Region","Europe","Andorra","United Arab Emirates","Afghanistan","Antigua and Barbuda","Anguilla","Albania","Armenia","Netherlands Antilles",
+#define GEOIP_MAX_COUNTRIES 255
+#define GEOIP_STRUCTURE_INFO_MAX_SIZE 20
+#define GEOIP_COUNTRY_BEGIN 16776960
+
+const char * geoip_countryname[GEOIP_MAX_COUNTRIES] = {"Unknown","Asia/Pacific Region","Europe","Andorra","United Arab Emirates","Afghanistan","Antigua and Barbuda","Anguilla","Albania","Armenia","Netherlands Antilles",
 		"Angola","Antarctica","Argentina","American Samoa","Austria","Australia","Aruba","Azerbaijan","Bosnia and Herzegovina","Barbados",
 		"Bangladesh","Belgium","Burkina Faso","Bulgaria","Bahrain","Burundi","Benin","Bermuda","Brunei Darussalam","Bolivia",
 		"Brazil","Bahamas","Bhutan","Bouvet Island","Botswana","Belarus","Belize","Canada","Cocos (Keeling) Islands","Congo, The Democratic Republic of the",
@@ -395,17 +399,15 @@ const char * geoip_countryname[253] = {"Unknown","Asia/Pacific Region","Europe",
 		"Tanzania, United Republic of","Ukraine","Uganda","United States Minor Outlying Islands","United States","Uruguay","Uzbekistan","Holy See (Vatican City State)","Saint Vincent and the Grenadines","Venezuela",
 		"Virgin Islands, British","Virgin Islands, U.S.","Vietnam","Vanuatu","Wallis and Futuna","Samoa","Yemen","Mayotte","Serbia","South Africa",
 		"Zambia","Montenegro","Zimbabwe","Anonymous Proxy","Satellite Provider","Other","Aland Islands","Guernsey","Isle of Man","Jersey",
-		"Saint Barthelemy","Saint Martin"};
-unsigned char *geoip_cache;
-void geoip_readdb(void){
-	struct stat bufa;
-	FILE *db=fopen("./db/GeoIP.dat","rb");
-	fstat(fileno(db), &bufa);
-	geoip_cache = (unsigned char *) malloc(sizeof(unsigned char) * bufa.st_size);
-	if(fread(geoip_cache, sizeof(unsigned char), bufa.st_size, db) != bufa.st_size) { ShowError("geoip_cache reading didn't read all elements \n"); }
-	fclose(db);
-	ShowStatus("Finished Reading "CL_GREEN"GeoIP"CL_RESET" Database.\n");
-}
+		"Saint Barthelemy", "Saint Martin", "Bonaire, Saint Eustatius and Saba", "South Sudan"};
+/**
+ * GeoIP information
+ **/
+struct s_geoip {
+	unsigned char *cache; // GeoIP.dat information see geoip_init()
+	bool active;
+} geoip;
+
 /* [Dekamaster/Nightroad] */
 /* WHY NOT A DBMAP: There are millions of entries in GeoIP and it has its own algorithm to go quickly through them, a DBMap wouldn't be efficient */
 const char* geoip_getcountry(uint32 ipnum){
@@ -414,8 +416,11 @@ const char* geoip_getcountry(uint32 ipnum){
 	const unsigned char *buf;
 	unsigned int offset = 0;
 
+	if( geoip.active == false )
+		return geoip_countryname[0];
+
 	for (depth = 31; depth >= 0; depth--) {
-		buf = geoip_cache + (long)6 *offset;
+		buf = geoip.cache + (long)6 *offset;
 		if (ipnum & (1 << depth)) {
 			/* Take the right-hand branch */
 			x =   (buf[3*1 + 0] << (0*8))
@@ -427,15 +432,96 @@ const char* geoip_getcountry(uint32 ipnum){
 				+ (buf[3*0 + 1] << (1*8))
 				+ (buf[3*0 + 2] << (2*8));
 		}
-		if (x >= 16776960) {
-			x=x-16776960;
+		if (x >= GEOIP_COUNTRY_BEGIN) {
+			x = x-GEOIP_COUNTRY_BEGIN;
+
+			if( x > GEOIP_MAX_COUNTRIES )
+				return geoip_countryname[0];
+
 			return geoip_countryname[x];
 		}
 		offset = x;
 	}
+	ShowError("geoip_getcountry(): Error traversing database for ipnum %d\n", ipnum);
+	ShowWarning("geoip_getcountry(): Possible database corruption!\n");
+
 	return geoip_countryname[0];
 }
 
+/**
+ * Disables GeoIP
+ * frees geoip.cache
+ **/
+void geoip_final( void ) {
+	if( geoip.cache )
+		aFree(geoip.cache);
+
+	if( geoip.active ) {
+		ShowStatus("GeoIP "CL_RED"disabled"CL_RESET".\n");
+		geoip.active = false;
+	}
+}
+
+/**
+ * Reads GeoIP database and stores it into memory
+ * geoip.cache should be freed after use!
+ * http://dev.maxmind.com/geoip/legacy/geolite/
+ **/
+void geoip_init(void) {
+	int i, fno;
+	char db_type = 1;
+	unsigned char delim[3];
+	struct stat bufa;
+	FILE *db;
+
+	geoip.active = true;
+
+	db = fopen("./db/GeoIP.dat","rb");
+	if( db == NULL ) {
+		ShowError("geoip_readdb: Error reading GeoIP.dat!\n");
+		geoip_final();
+		return;
+	}
+	fno = fileno(db);
+	if( fstat(fno, &bufa) < 0 ) {
+		ShowError("geoip_readdb: Error stating GeoIP.dat! Error %d\n", errno);
+		geoip_final();
+		return;
+	}
+	geoip.cache = aMalloc( (sizeof(geoip.cache) * bufa.st_size) );
+	if( fread(geoip.cache, sizeof(unsigned char), bufa.st_size, db) != bufa.st_size ) {
+		ShowError("geoip_cache: Couldn't read all elements!\n");
+		fclose(db);
+		geoip_final();
+		return;
+	}
+
+	// Search database type
+	lseek(fno, -3l, SEEK_END);
+	for( i = 0; i < GEOIP_STRUCTURE_INFO_MAX_SIZE; i++ ) {
+		read(fno, delim, 3);
+		if( delim[0] == 255 && delim[1] == 255 && delim[2] == 255 ) {
+			read(fno, &db_type, 1);
+			break;
+		} else {
+			lseek(fno, -4l, SEEK_CUR);
+		}
+	}
+	
+	fclose(db);
+
+	if( db_type != 1 ) {
+		if( db_type )
+			ShowError("geoip_init(): Database type is not supported %d!\n", db_type);
+		else
+			ShowError("geoip_init(): GeoIP is corrupted!\n");
+
+		geoip_final();
+		return;
+	}
+	ShowStatus("Finished Reading "CL_GREEN"GeoIP"CL_RESET" Database.\n");
+}
+
 /**
  * Argument-list version of inter_msg_to_fd
  * @see inter_msg_to_fd
@@ -934,7 +1020,7 @@ int inter_init_sql(const char *file)
 	inter_mail_sql_init();
 	inter_auction_sql_init();
 
-	geoip_readdb();
+	geoip_init();
 	msg_config_read("conf/messages.conf", false);
 	return 0;
 }
@@ -954,6 +1040,7 @@ void inter_final(void)
 	inter_mail_sql_final();
 	inter_auction_sql_final();
 
+	geoip_final();
 	do_final_msg();
 	return;
 }
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 07a05677f..d535d2874 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -632,11 +632,21 @@ enum fame_list_type {
 	RANKTYPE_PK         = 3, //Not supported yet
 };
 
-enum { //Change Guild Infos
+/**
+ * Guild Basic Information
+ * It is used to request changes via intif_guild_change_basicinfo in map-server and to
+ * signalize changes made in char-server via mapif_parse_GuildMemberInfoChange
+ **/
+enum guild_basic_info {
 	GBI_EXP = 1,    ///< Guild Experience (EXP)
 	GBI_GUILDLV,    ///< Guild level
 	GBI_SKILLPOINT, ///< Guild skillpoints
-	GBI_SKILLLV,    ///< Guild skill_lv ?? seem unused
+
+	/**
+	 * Changes a skill level, struct guild_skill should be sent.
+	 * All checks regarding max skill level should be done in _map-server_
+	 **/
+	GBI_SKILLLV,    ///< Guild skill_lv
 };
 
 enum { //Change Member Infos
diff --git a/src/common/utils.c b/src/common/utils.c
index 9a7d4971b..47747dd32 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -263,7 +263,59 @@ uint32 MakeDWord(uint16 word0, uint16 word1)
 		( (uint32)(word0        ) )|
 		( (uint32)(word1 << 0x10) );
 }
+/*************************************
+* Big-endian compatibility functions * 
+* From mapcache.c                    *
+*************************************/
 
+// Converts an int16 from current machine order to little-endian
+int16 MakeShortLE(int16 val)
+{
+	unsigned char buf[2];
+	buf[0] = (unsigned char)( (val & 0x00FF)         );
+	buf[1] = (unsigned char)( (val & 0xFF00) >> 0x08 );
+	return *((int16*)buf);
+}
+
+// Converts an int32 from current machine order to little-endian
+int32 MakeLongLE(int32 val)
+{
+	unsigned char buf[4];
+	buf[0] = (unsigned char)( (val & 0x000000FF)         );
+	buf[1] = (unsigned char)( (val & 0x0000FF00) >> 0x08 );
+	buf[2] = (unsigned char)( (val & 0x00FF0000) >> 0x10 );
+	buf[3] = (unsigned char)( (val & 0xFF000000) >> 0x18 );
+	return *((int32*)buf);
+}
+
+// Reads an uint16 in little-endian from the buffer
+uint16 GetUShort(const unsigned char* buf)
+{
+	return	 ( ((uint16)(buf[0]))         )
+			|( ((uint16)(buf[1])) << 0x08 );
+}
+
+// Reads an uint32 in little-endian from the buffer
+uint32 GetULong(const unsigned char* buf)
+{
+	return	 ( ((uint32)(buf[0]))         )
+			|( ((uint32)(buf[1])) << 0x08 )
+			|( ((uint32)(buf[2])) << 0x10 )
+			|( ((uint32)(buf[3])) << 0x18 );
+}
+
+// Reads an int32 in little-endian from the buffer
+int32 GetLong(const unsigned char* buf)
+{
+	return (int32)GetULong(buf);
+}
+
+// Reads a float (32 bits) from the buffer
+float GetFloat(const unsigned char* buf)
+{
+	uint32 val = GetULong(buf);
+	return *((float*)(void*)&val);
+}
 
 /// calculates the value of A / B, in percent (rounded down)
 unsigned int get_percentage(const unsigned int A, const unsigned int B)
diff --git a/src/common/utils.h b/src/common/utils.h
index 68dd01ac4..f89546b8a 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -36,6 +36,16 @@ extern uint16 GetWord(uint32 val, int idx);
 extern uint16 MakeWord(uint8 byte0, uint8 byte1);
 extern uint32 MakeDWord(uint16 word0, uint16 word1);
 
+//////////////////////////////////////////////////////////////////////////
+// Big-endian compatibility functions
+//////////////////////////////////////////////////////////////////////////
+extern int16 MakeShortLE(int16 val);
+extern int32 MakeLongLE(int32 val);
+extern uint16 GetUShort(const unsigned char* buf);
+extern uint32 GetULong(const unsigned char* buf);
+extern int32 GetLong(const unsigned char* buf);
+extern float GetFloat(const unsigned char* buf);
+
 size_t hread(void * ptr, size_t size, size_t count, FILE * stream);
 size_t hwrite(const void * ptr, size_t size, size_t count, FILE * stream);
 
diff --git a/src/map/clif.c b/src/map/clif.c
index 2fbf64e09..24dcfebf4 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -18179,6 +18179,7 @@ void clif_parse_NPCShopClosed(int fd, struct map_session_data *sd) {
 }
 /* NPC Market (by Ind after an extensive debugging of the packet, only possible thanks to Yommy <3) */
 void clif_npc_market_open(struct map_session_data *sd, struct npc_data *nd) {
+#if PACKETVER >= 20131223
 	struct npc_item_list *shop = nd->u.scr.shop->item;
 	unsigned short shop_size = nd->u.scr.shop->items, i, c;
 	struct item_data *id = NULL;
@@ -18199,12 +18200,14 @@ void clif_npc_market_open(struct map_session_data *sd, struct npc_data *nd) {
 	npcmarket_open.PacketLength = 4 + ( sizeof(npcmarket_open.list[0]) * c );
 
 	clif->send(&npcmarket_open,npcmarket_open.PacketLength,&sd->bl,SELF);
+#endif
 }
 void clif_parse_NPCMarketClosed(int fd, struct map_session_data *sd) {
 	/* TODO track the state <3~ */
 	sd->npc_shopid = 0;
 }
 void clif_npc_market_purchase_ack(struct map_session_data *sd, struct packet_npc_market_purchase *req, unsigned char response) {
+#if PACKETVER >= 20131223
 	unsigned short c = 0;
 
 	npcmarket_result.PacketType = npcmarketresultackType;
@@ -18237,11 +18240,14 @@ void clif_npc_market_purchase_ack(struct map_session_data *sd, struct packet_npc
 	npcmarket_result.PacketLength = 5 + ( sizeof(npcmarket_result.list[0]) * c );;
 
 	clif->send(&npcmarket_result,npcmarket_result.PacketLength,&sd->bl,SELF);
+#endif
 }
 void clif_parse_NPCMarketPurchase(int fd, struct map_session_data *sd) {
+#if PACKETVER >= 20131223
 	struct packet_npc_market_purchase *p = P2PTR(fd);
 
 	clif->npc_market_purchase_ack(sd,p,npc->market_buylist(sd,(p->PacketLength - 4) / sizeof(p->list[0]),p));
+#endif
 }
 /* */
 unsigned short clif_decrypt_cmd( int cmd, struct map_session_data *sd ) {
diff --git a/src/map/intif.c b/src/map/intif.c
index 1aa5a46d4..6bd24368a 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -692,7 +692,10 @@ int intif_guild_message(int guild_id,int account_id,const char *mes,int len)
 	return 0;
 }
 
-// Request a change of Guild basic information
+/**
+ * Requests to change a basic guild information, it is parsed via mapif_parse_GuildBasicInfoChange
+ * To see the information types that can be changed see mmo.h::guild_basic_info
+ **/
 int intif_guild_change_basicinfo(int guild_id,int type,const void *data,int len)
 {
 	if (intif->CheckForCharServer())
@@ -1237,6 +1240,21 @@ void intif_parse_GuildBasicInfoChanged(int fd) {
 		case GBI_EXP:        g->exp = RFIFOQ(fd,10); break;
 		case GBI_GUILDLV:    g->guild_lv = RFIFOW(fd,10); break;
 		case GBI_SKILLPOINT: g->skill_point = RFIFOL(fd,10); break;
+		case GBI_SKILLLV: {
+			int idx, max;
+			struct guild_skill *gs = (struct guild_skill *)RFIFOP(fd,10);
+
+			if( gs == NULL )
+				return;
+
+			idx = gs->id - GD_SKILLBASE;
+			max = guild->skill_get_max(gs->id);
+			if( gs->lv > max )
+				gs->lv = max;
+
+			memcpy(&(g->skill[idx]), gs, sizeof(g->skill[idx]));
+			break;
+		}
 	}
 }
 
diff --git a/src/map/map.c b/src/map/map.c
index 04ac8a239..11ef56cb3 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -2846,6 +2846,7 @@ int map_eraseipport(unsigned short map_index, uint32 ip, uint16 port) {
  * [Shinryo]: Init the mapcache
  *------------------------------------------*/
 char *map_init_mapcache(FILE *fp) {
+	struct map_cache_main_header header;
 	size_t size = 0;
 	char *buffer;
 
@@ -2869,6 +2870,19 @@ char *map_init_mapcache(FILE *fp) {
 		return NULL;
 	}
 
+	rewind(fp);
+
+	// Get main header to verify if data is corrupted
+	if( fread(&header, sizeof(header), 1, fp) != 1 ) {
+		ShowError("map_init_mapcache: Error obtaining main header!\n");
+		return NULL;
+	}
+	ShowError("Map cache is corrupted!\r"); // If the file is totally corrupted this will allow us to warn the user
+	if( GetULong((unsigned char *)&(header.file_size)) != size ) {
+		ShowError("map_init_mapcache: Map cache is corrupted!\n");
+		return NULL;
+	}
+
 	return buffer;
 }
 
diff --git a/src/map/npc.c b/src/map/npc.c
index ae374e961..43e4bcc88 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -2935,7 +2935,8 @@ const char* npc_parse_script(char* w1, char* w2, char* w3, char* w4, const char*
 /// shop/cashshop/npc: <map name>,<x>,<y>,<facing>%TAB%duplicate(<name of target>)%TAB%<NPC Name>%TAB%<sprite id>
 /// npc: -%TAB%duplicate(<name of target>)%TAB%<NPC Name>%TAB%<sprite id>,<triggerX>,<triggerY>
 /// npc: <map name>,<x>,<y>,<facing>%TAB%duplicate(<name of target>)%TAB%<NPC Name>%TAB%<sprite id>,<triggerX>,<triggerY>
-const char* npc_parse_duplicate(char* w1, char* w2, char* w3, char* w4, const char* start, const char* buffer, const char* filepath)
+/// !!Only NPO_ONINIT is available trough options!!
+const char* npc_parse_duplicate(char* w1, char* w2, char* w3, char* w4, const char* start, const char* buffer, const char* filepath, int options)
 {
 	int x, y, dir, m, xs = -1, ys = -1;
 	char mapname[32];
@@ -3074,6 +3075,20 @@ const char* npc_parse_duplicate(char* w1, char* w2, char* w3, char* w4, const ch
 
 	nd->u.scr.timerid = INVALID_TIMER;
 
+	if( type == SCRIPT && options&NPO_ONINIT ) {
+		// From npc_parse_script
+		char evname[EVENT_NAME_LENGTH];
+		struct event_data *ev;
+
+		snprintf(evname, ARRAYLENGTH(evname), "%s::OnInit", nd->exname);
+
+		if( ( ev = (struct event_data*)strdb_get(npc->ev_db, evname) ) ) {
+
+			//Execute OnInit
+			script->run(nd->u.scr.script,ev->pos,0,nd->bl.id);
+
+		}
+	}
 	return end;
 }
 
@@ -3137,7 +3152,7 @@ int npc_duplicate4instance(struct npc_data *snd, int16 m) {
 		else
 			snprintf(w4, sizeof(w4), "%d", snd->class_);
 
-		npc->parse_duplicate(w1, w2, w3, w4, stat_buf, stat_buf, "INSTANCING");
+		npc->parse_duplicate(w1, w2, w3, w4, stat_buf, stat_buf, "INSTANCING", NPO_NONE);
 	}
 
 	return 0;
@@ -4094,7 +4109,7 @@ int npc_parsesrcfile(const char* filepath, bool runOnInit) {
 		}
 		else if( (i=0, sscanf(w2,"duplicate%n",&i), (i > 0 && w2[i] == '(')) && count > 3 )
 		{
-			p = npc->parse_duplicate(w1,w2,w3,w4, p, buffer, filepath);
+			p = npc->parse_duplicate(w1,w2,w3,w4, p, buffer, filepath, (runOnInit?NPO_ONINIT:NPO_NONE));
 		}
 		else if( (strcmp(w2,"monster") == 0 || strcmp(w2,"boss_monster") == 0) && count > 3 )
 		{
diff --git a/src/map/npc.h b/src/map/npc.h
index 346a9f8c0..d1e060a39 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -237,7 +237,7 @@ struct npc_interface {
 	void (*convertlabel_db) (struct npc_label_list *label_list, const char *filepath);
 	const char* (*skip_script) (const char *start, const char *buffer, const char *filepath);
 	const char* (*parse_script) (char *w1, char *w2, char *w3, char *w4, const char *start, const char *buffer, const char *filepath, int options);
-	const char* (*parse_duplicate) (char *w1, char *w2, char *w3, char *w4, const char *start, const char *buffer, const char *filepath);
+	const char* (*parse_duplicate) (char* w1, char* w2, char* w3, char* w4, const char* start, const char* buffer, const char* filepath, int options);
 	int (*duplicate4instance) (struct npc_data *snd, int16 m);
 	void (*setcells) (struct npc_data *nd);
 	int (*unsetcells_sub) (struct block_list *bl, va_list ap);
diff --git a/src/map/script.c b/src/map/script.c
index 3e11a510e..c57b086f4 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -8268,20 +8268,36 @@ BUILDIN(addtoskill) {
 /// guildskill <skill id>,<amount>;
 /// guildskill "<skill name>",<amount>;
 BUILDIN(guildskill) {
-	int id;
+	int skill_id, id, max_points;
 	int level;
+
 	TBL_PC* sd;
-	int i;
+	struct guild *gd;
+	struct guild_skill gd_skill;
 
 	sd = script->rid2sd(st);
 	if( sd == NULL )
-		return true;// no player attached, report source
+		return false; // no player attached, report source
 
-	id = ( script_isstringtype(st,2) ? skill->name2id(script_getstr(st,2)) : script_getnum(st,2) );
+	if( (gd = sd->guild) == NULL )
+		return true;
+
+	skill_id = ( script_isstringtype(st,2) ? skill->name2id(script_getstr(st,2)) : script_getnum(st,2) );
 	level = script_getnum(st,3);
-	for( i=0; i < level; i++ )
-		guild->skillup(sd, id);
 
+	id = skill_id - GD_SKILLBASE;
+	max_points = guild->skill_get_max(skill_id);
+
+	if( (gd->skill[id].lv + level) > max_points )
+		level = max_points - gd->skill[id].lv;
+
+	if( level == 0 )
+		return true;
+
+	memcpy(&gd_skill, &(gd->skill[id]), sizeof(gd->skill[id]));
+	gd_skill.lv += level;
+
+	intif->guild_change_basicinfo( gd->guild_id, GBI_SKILLLV, &(gd_skill), sizeof(gd_skill) );
 	return true;
 }
 
@@ -18538,6 +18554,13 @@ BUILDIN(tradertype) {
 		npc->market_delfromsql(nd,USHRT_MAX);
 	}
 
+#if PACKETVER < 20131223
+	if( type == NST_MARKET ) {
+		ShowWarning("buildin_tradertype: NST_MARKET is only available with PACKETVER 20131223 or newer!\n");
+		script->reportsrc(st);
+	}
+#endif
+
 	nd->u.scr.shop->type = type;
 
 	return true;
diff --git a/src/tool/mapcache.c b/src/tool/mapcache.c
index caa55c87a..85d5fb548 100644
--- a/src/tool/mapcache.c
+++ b/src/tool/mapcache.c
@@ -6,6 +6,7 @@
 #include "../common/malloc.h"
 #include "../common/mmo.h"
 #include "../common/showmsg.h"
+#include "../common/utils.h"
 
 #include "../config/renewal.h"
 
@@ -49,60 +50,10 @@ struct map_info {
 	int32 len;
 };
 
-
-/*************************************
-* Big-endian compatibility functions *
-*************************************/
-
-// Converts an int16 from current machine order to little-endian
-int16 MakeShortLE(int16 val)
-{
-	unsigned char buf[2];
-	buf[0] = (unsigned char)( (val & 0x00FF)         );
-	buf[1] = (unsigned char)( (val & 0xFF00) >> 0x08 );
-	return *((int16*)buf);
-}
-
-// Converts an int32 from current machine order to little-endian
-int32 MakeLongLE(int32 val)
-{
-	unsigned char buf[4];
-	buf[0] = (unsigned char)( (val & 0x000000FF)         );
-	buf[1] = (unsigned char)( (val & 0x0000FF00) >> 0x08 );
-	buf[2] = (unsigned char)( (val & 0x00FF0000) >> 0x10 );
-	buf[3] = (unsigned char)( (val & 0xFF000000) >> 0x18 );
-	return *((int32*)buf);
-}
-
-// Reads an uint16 in little-endian from the buffer
-uint16 GetUShort(const unsigned char* buf)
-{
-	return	 ( ((uint16)(buf[0]))         )
-			|( ((uint16)(buf[1])) << 0x08 );
-}
-
-// Reads an uint32 in little-endian from the buffer
-uint32 GetULong(const unsigned char* buf)
-{
-	return	 ( ((uint32)(buf[0]))         )
-			|( ((uint32)(buf[1])) << 0x08 )
-			|( ((uint32)(buf[2])) << 0x10 )
-			|( ((uint32)(buf[3])) << 0x18 );
-}
-
-// Reads an int32 in little-endian from the buffer
-int32 GetLong(const unsigned char* buf)
-{
-	return (int32)GetULong(buf);
-}
-
-// Reads a float (32 bits) from the buffer
-float GetFloat(const unsigned char* buf)
-{
-	uint32 val = GetULong(buf);
-	return *((float*)(void*)&val);
-}
-
+ /*************************************
+ * Big-endian compatibility functions *
+ * Moved to utils.h                   *
+ *************************************/
 
 // Reads a map from GRF's GAT and RSW files
 int read_map(char *name, struct map_data *m)
-- 
cgit v1.2.3-70-g09d2


From b6b3f58795288701d0e162d43fa6f0a47af913b3 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Sun, 4 May 2014 06:13:56 +0200
Subject: Fixed order of includes in all source files

- Changed order according to the (upcoming) code style guidelines.
- Fixes several issues caused by missing headers when their include
  order is changed or in plugins.

Signed-off-by: Haru <haru@dotalux.com>
---
 src/char/char.c          |  44 +++++-----
 src/char/char.h          |   1 -
 src/char/int_auction.c   |  25 +++---
 src/char/int_elemental.c |  22 +++--
 src/char/int_elemental.h |   2 +-
 src/char/int_guild.c     |  24 ++---
 src/char/int_guild.h     |   3 -
 src/char/int_homun.c     |  21 +++--
 src/char/int_homun.h     |   2 +
 src/char/int_mail.c      |  20 +++--
 src/char/int_mail.h      |   3 +
 src/char/int_mercenary.c |  22 +++--
 src/char/int_mercenary.h |   4 +-
 src/char/int_party.c     |  25 +++---
 src/char/int_party.h     |   2 -
 src/char/int_pet.c       |  22 +++--
 src/char/int_quest.c     |  22 ++---
 src/char/int_storage.c   |  22 +++--
 src/char/inter.c         |  43 ++++-----
 src/char/inter.h         |   5 +-
 src/char/pincode.c       |  11 ++-
 src/common/HPM.c         |  31 ++++---
 src/common/HPM.h         |   6 +-
 src/common/HPMi.h        |  16 +---
 src/common/cbasetypes.h  |   6 ++
 src/common/conf.c        |   3 +
 src/common/conf.h        |   1 +
 src/common/console.c     | 223 ++++++++++++++++++++++++-----------------------
 src/common/console.h     |  21 +++--
 src/common/core.c        |  38 ++++----
 src/common/core.h        |   3 +-
 src/common/db.c          |  10 ++-
 src/common/db.h          |   3 +-
 src/common/des.c         |   7 +-
 src/common/ers.c         |   8 +-
 src/common/grfio.c       |  17 ++--
 src/common/malloc.c      |  11 ++-
 src/common/mapindex.c    |  15 ++--
 src/common/md5calc.c     |   8 +-
 src/common/mmo.h         |   6 +-
 src/common/mutex.c       |   5 +-
 src/common/mutex.h       |   1 +
 src/common/nullpo.c      |   6 +-
 src/common/random.c      |  18 ++--
 src/common/showmsg.c     |  17 ++--
 src/common/showmsg.h     |  23 +++--
 src/common/socket.c      |  64 +++++++-------
 src/common/socket.h      |  12 +--
 src/common/spinlock.h    |   9 +-
 src/common/sql.c         |  12 ++-
 src/common/sql.h         |   3 +-
 src/common/strlib.c      |  13 +--
 src/common/strlib.h      |  15 ++--
 src/common/sysinfo.c     |  32 +++++--
 src/common/sysinfo.h     |  16 ----
 src/common/thread.c      |  31 ++++---
 src/common/thread.h      |   1 -
 src/common/timer.c       |  19 ++--
 src/common/utils.c       |  36 ++++----
 src/common/utils.h       |   3 +-
 src/config/const.h       |   7 --
 src/config/renewal.h     |   1 +
 src/login/account.h      |   1 +
 src/login/account_sql.c  |  17 ++--
 src/login/ipban_sql.c    |  14 +--
 src/login/login.c        |  21 +++--
 src/login/login.h        |   2 +-
 src/login/loginlog.h     |   2 +-
 src/login/loginlog_sql.c |   9 +-
 src/map/HPMmap.c         |  42 ++++-----
 src/map/atcommand.c      |  67 +++++++-------
 src/map/atcommand.h      |   2 +-
 src/map/battle.c         |  61 +++++++------
 src/map/battle.h         |   2 +-
 src/map/battleground.c   |  33 +++----
 src/map/battleground.h   |   2 +-
 src/map/buyingstore.c    |  17 ++--
 src/map/buyingstore.h    |   5 ++
 src/map/chat.c           |  23 ++---
 src/map/chat.h           |   5 +-
 src/map/chrif.c          |  35 ++++----
 src/map/chrif.h          |   4 +-
 src/map/clif.c           |  83 +++++++++---------
 src/map/clif.h           |   9 +-
 src/map/date.c           |   6 +-
 src/map/date.h           |   2 +
 src/map/duel.c           |  10 ++-
 src/map/duel.h           |   4 +
 src/map/elemental.c      |  54 ++++++------
 src/map/elemental.h      |   1 +
 src/map/guild.c          |  47 +++++-----
 src/map/guild.h          |  16 +---
 src/map/homunculus.c     |  56 ++++++------
 src/map/homunculus.h     |   3 +-
 src/map/instance.c       |  34 ++++----
 src/map/instance.h       |   3 +
 src/map/intif.c          |  51 ++++++-----
 src/map/intif.h          |  13 +--
 src/map/irc-bot.c        |  22 ++---
 src/map/irc-bot.h        |   2 +
 src/map/itemdb.c         |  27 +++---
 src/map/itemdb.h         |   5 +-
 src/map/log.c            |  23 ++---
 src/map/log.h            |   5 +-
 src/map/mail.c           |  16 ++--
 src/map/mail.h           |   6 +-
 src/map/map.c            |  96 ++++++++++----------
 src/map/map.h            |   9 +-
 src/map/mapreg_sql.c     |  14 +--
 src/map/mercenary.c      |  54 ++++++------
 src/map/mercenary.h      |   1 +
 src/map/mob.c            |  69 ++++++++-------
 src/map/mob.h            |   9 +-
 src/map/npc.c            |  57 ++++++------
 src/map/npc.h            |   4 +-
 src/map/npc_chat.c       |  26 +++---
 src/map/party.c          |  43 ++++-----
 src/map/party.h          |   7 +-
 src/map/path.c           |  17 ++--
 src/map/path.h           |   1 +
 src/map/pc.c             |  59 +++++++------
 src/map/pc.h             |  29 +++---
 src/map/pc_groups.c      |  14 +--
 src/map/pc_groups.h      |   4 +
 src/map/pet.c            |  48 +++++-----
 src/map/pet.h            |  10 ++-
 src/map/quest.c          |  45 +++++-----
 src/map/quest.h          |   4 +
 src/map/script.c         |  79 +++++++++--------
 src/map/script.h         |  12 +--
 src/map/searchstore.c    |  11 ++-
 src/map/searchstore.h    |   6 ++
 src/map/skill.c          |  64 +++++++-------
 src/map/skill.h          |  14 +--
 src/map/status.c         |  59 +++++++------
 src/map/status.h         |  16 ++--
 src/map/storage.c        |  32 +++----
 src/map/storage.h        |   5 +-
 src/map/trade.c          |  24 ++---
 src/map/unit.c           |  63 ++++++-------
 src/map/unit.h           |  12 ++-
 src/map/vending.c        |  27 +++---
 src/map/vending.h        |   1 +
 src/tool/mapcache.c      |  14 +--
 144 files changed, 1676 insertions(+), 1367 deletions(-)

(limited to 'src/common/utils.h')

diff --git a/src/char/char.c b/src/char/char.c
index 77e393c0d..6c0902644 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -2,7 +2,30 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "../config/core.h" // CONSOLE_INPUT
+#include "char.h"
+
+#include <signal.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <time.h>
+
+#include "int_elemental.h"
+#include "int_guild.h"
+#include "int_homun.h"
+#include "int_mercenary.h"
+#include "int_party.h"
+#include "int_storage.h"
+#include "inter.h"
+#include "pincode.h"
+#include "../common/HPM.h"
 #include "../common/cbasetypes.h"
+#include "../common/console.h"
 #include "../common/core.h"
 #include "../common/db.h"
 #include "../common/malloc.h"
@@ -13,25 +36,6 @@
 #include "../common/strlib.h"
 #include "../common/timer.h"
 #include "../common/utils.h"
-#include "../common/console.h"
-#include "../common/HPM.h"
-#include "int_guild.h"
-#include "int_homun.h"
-#include "int_mercenary.h"
-#include "int_elemental.h"
-#include "int_party.h"
-#include "int_storage.h"
-#include "char.h"
-#include "inter.h"
-#include "pincode.h"
-
-#include <sys/types.h>
-#include <time.h>
-#include <signal.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 // private declarations
 #define CHAR_CONF_NAME	"conf/char-server.conf"
@@ -5497,7 +5501,7 @@ int do_init(int argc, char **argv) {
 	
 	Sql_HerculesUpdateCheck(sql_handle);
 #ifdef CONSOLE_INPUT
-	console->setSQL(sql_handle);
+	console->input->setSQL(sql_handle);
 #endif
 	ShowStatus("The char-server is "CL_GREEN"ready"CL_RESET" (Server is listening on the port %d).\n\n", char_port);
 	
diff --git a/src/char/char.h b/src/char/char.h
index 2928929de..09a78f6b9 100644
--- a/src/char/char.h
+++ b/src/char/char.h
@@ -5,7 +5,6 @@
 #ifndef _COMMON_CHAR_H_
 #define _COMMON_CHAR_H_
 
-#include "../config/core.h"
 #include "../common/core.h" // CORE_ST_LAST
 #include "../common/db.h"
 
diff --git a/src/char/int_auction.c b/src/char/int_auction.c
index 924930867..886b5be26 100644
--- a/src/char/int_auction.c
+++ b/src/char/int_auction.c
@@ -2,22 +2,25 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/mmo.h"
-#include "../common/malloc.h"
+#define HERCULES_CORE
+
+#include "int_auction.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "char.h"
+#include "int_mail.h"
+#include "inter.h"
 #include "../common/db.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
 #include "../common/showmsg.h"
 #include "../common/socket.h"
-#include "../common/strlib.h"
 #include "../common/sql.h"
+#include "../common/strlib.h"
 #include "../common/timer.h"
-#include "char.h"
-#include "inter.h"
-#include "int_mail.h"
-#include "int_auction.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
 
 static DBMap* auction_db_ = NULL; // int auction_id -> struct auction_data*
 
diff --git a/src/char/int_elemental.c b/src/char/int_elemental.c
index ed0c2a9ed..3a36e75a2 100644
--- a/src/char/int_elemental.c
+++ b/src/char/int_elemental.c
@@ -2,20 +2,24 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/mmo.h"
-#include "../common/malloc.h"
-#include "../common/strlib.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/utils.h"
-#include "../common/sql.h"
-#include "char.h"
-#include "inter.h"
+#define HERCULES_CORE
+
+#include "int_elemental.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "char.h"
+#include "inter.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/sql.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
+
 bool mapif_elemental_save(struct s_elemental* ele) {
 	bool flag = true;
 	
diff --git a/src/char/int_elemental.h b/src/char/int_elemental.h
index c90891fc4..c869e6fc2 100644
--- a/src/char/int_elemental.h
+++ b/src/char/int_elemental.h
@@ -4,7 +4,7 @@
 #ifndef _CHAR_INT_ELEMENTAL_H_
 #define _CHAR_INT_ELEMENTAL_H_
 
-struct s_elemental;
+#include "../common/cbasetypes.h"
 
 void inter_elemental_sql_init(void);
 void inter_elemental_sql_final(void);
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index 895cbbb94..ffbe48e10 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -2,21 +2,25 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "../config/core.h" // DBPATH
+#include "int_guild.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "char.h"
+#include "inter.h"
 #include "../common/cbasetypes.h"
-#include "../common/mmo.h"
-#include "../common/malloc.h"
-#include "../common/socket.h"
 #include "../common/db.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
 #include "../common/showmsg.h"
+#include "../common/socket.h"
 #include "../common/strlib.h"
 #include "../common/timer.h"
-#include "char.h"
-#include "inter.h"
-#include "int_guild.h"
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.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 4eb7d310b..5e657ff06 100644
--- a/src/char/int_guild.h
+++ b/src/char/int_guild.h
@@ -20,9 +20,6 @@ enum {
 	GS_REMOVE = 0x8000,
 };
 
-struct guild;
-struct guild_castle;
-
 int inter_guild_parse_frommap(int fd);
 int inter_guild_sql_init(void);
 void inter_guild_sql_final(void);
diff --git a/src/char/int_homun.c b/src/char/int_homun.c
index 143277f05..795a6b927 100644
--- a/src/char/int_homun.c
+++ b/src/char/int_homun.c
@@ -2,20 +2,23 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/mmo.h"
-#include "../common/malloc.h"
-#include "../common/strlib.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/utils.h"
-#include "../common/sql.h"
-#include "char.h"
-#include "inter.h"
+#define HERCULES_CORE
+
+#include "int_homun.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "char.h"
+#include "inter.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/sql.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
 
 int inter_homunculus_sql_init(void)
 {
diff --git a/src/char/int_homun.h b/src/char/int_homun.h
index 561dc848f..9477f4f03 100644
--- a/src/char/int_homun.h
+++ b/src/char/int_homun.h
@@ -4,6 +4,8 @@
 #ifndef _CHAR_INT_HOMUN_H_
 #define _CHAR_INT_HOMUN_H_
 
+#include "../common/cbasetypes.h"
+
 struct s_homunculus;
 
 int inter_homunculus_sql_init(void);
diff --git a/src/char/int_mail.c b/src/char/int_mail.c
index 826771676..86a36d59f 100644
--- a/src/char/int_mail.c
+++ b/src/char/int_mail.c
@@ -2,19 +2,23 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/mmo.h"
+#define HERCULES_CORE
+
+#include "int_mail.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "char.h"
+#include "inter.h"
 #include "../common/malloc.h"
+#include "../common/mmo.h"
 #include "../common/showmsg.h"
 #include "../common/socket.h"
-#include "../common/strlib.h"
 #include "../common/sql.h"
+#include "../common/strlib.h"
 #include "../common/timer.h"
-#include "char.h"
-#include "inter.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
 
 static int mail_fromsql(int char_id, struct mail_data* md)
 {
diff --git a/src/char/int_mail.h b/src/char/int_mail.h
index 7c06cdc1f..824ba48a3 100644
--- a/src/char/int_mail.h
+++ b/src/char/int_mail.h
@@ -4,6 +4,9 @@
 #ifndef _CHAR_INT_MAIL_H_
 #define _CHAR_INT_MAIL_H_
 
+struct item;
+struct mail_message;
+
 int inter_mail_parse_frommap(int fd);
 void mail_sendmail(int send_id, const char* send_name, int dest_id, const char* dest_name, const char* title, const char* body, int zeny, struct item *item);
 
diff --git a/src/char/int_mercenary.c b/src/char/int_mercenary.c
index aecb3844a..1dffb656c 100644
--- a/src/char/int_mercenary.c
+++ b/src/char/int_mercenary.c
@@ -2,20 +2,24 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/mmo.h"
-#include "../common/malloc.h"
-#include "../common/strlib.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/utils.h"
-#include "../common/sql.h"
-#include "char.h"
-#include "inter.h"
+#define HERCULES_CORE
+
+#include "int_mercenary.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "char.h"
+#include "inter.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/sql.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
+
 bool mercenary_owner_fromsql(int char_id, struct mmo_charstatus *status)
 {
 	char* data;
diff --git a/src/char/int_mercenary.h b/src/char/int_mercenary.h
index b614b8cf7..195a83b34 100644
--- a/src/char/int_mercenary.h
+++ b/src/char/int_mercenary.h
@@ -4,7 +4,9 @@
 #ifndef _CHAR_INT_MERCENARY_H_
 #define _CHAR_INT_MERCENARY_H_
 
-struct s_mercenary;
+#include "../common/cbasetypes.h"
+
+struct mmo_charstatus;
 
 int inter_mercenary_sql_init(void);
 void inter_mercenary_sql_final(void);
diff --git a/src/char/int_party.c b/src/char/int_party.c
index 7c328c452..3e4a743d6 100644
--- a/src/char/int_party.c
+++ b/src/char/int_party.c
@@ -2,23 +2,26 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/mmo.h"
-#include "../common/db.h"
-#include "../common/malloc.h"
-#include "../common/strlib.h"
-#include "../common/socket.h"
-#include "../common/showmsg.h"
-#include "../common/mapindex.h"
-#include "../common/sql.h"
-#include "char.h"
-#include "inter.h"
+#define HERCULES_CORE
+
 #include "int_party.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "char.h"
+#include "inter.h"
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+#include "../common/malloc.h"
+#include "../common/mapindex.h"
+#include "../common/mmo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/sql.h"
+#include "../common/strlib.h"
+
 struct party_data {
 	struct party party;
 	unsigned int min_lv, max_lv;
diff --git a/src/char/int_party.h b/src/char/int_party.h
index 84f00635a..098c1e9a9 100644
--- a/src/char/int_party.h
+++ b/src/char/int_party.h
@@ -14,8 +14,6 @@ enum {
 	PS_BREAK = 0x20, //Specify that this party must be deleted.
 };
 
-struct party;
-
 int inter_party_parse_frommap(int fd);
 int inter_party_sql_init(void);
 void inter_party_sql_final(void);
diff --git a/src/char/int_pet.c b/src/char/int_pet.c
index 25f00e6f0..29c40eff9 100644
--- a/src/char/int_pet.c
+++ b/src/char/int_pet.c
@@ -2,20 +2,24 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/mmo.h"
-#include "../common/malloc.h"
-#include "../common/socket.h"
-#include "../common/strlib.h"
-#include "../common/showmsg.h"
-#include "../common/utils.h"
-#include "../common/sql.h"
-#include "char.h"
-#include "inter.h"
+#define HERCULES_CORE
+
+#include "int_pet.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "char.h"
+#include "inter.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/sql.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
+
 struct s_pet *pet_pt;
 
 //---------------------------------------------------------
diff --git a/src/char/int_quest.c b/src/char/int_quest.c
index 061dd89d9..61b43c57d 100644
--- a/src/char/int_quest.c
+++ b/src/char/int_quest.c
@@ -2,23 +2,25 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/mmo.h"
+#define HERCULES_CORE
+
+#include "int_quest.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "char.h"
+#include "inter.h"
 #include "../common/db.h"
 #include "../common/malloc.h"
+#include "../common/mmo.h"
 #include "../common/showmsg.h"
 #include "../common/socket.h"
-#include "../common/strlib.h"
 #include "../common/sql.h"
+#include "../common/strlib.h"
 #include "../common/timer.h"
 
-#include "char.h"
-#include "inter.h"
-#include "int_quest.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
 /**
  * Loads the entire questlog for a character.
  *
diff --git a/src/char/int_storage.c b/src/char/int_storage.c
index 966e61bb3..bf7b76da0 100644
--- a/src/char/int_storage.c
+++ b/src/char/int_storage.c
@@ -2,19 +2,23 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/mmo.h"
-#include "../common/malloc.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/strlib.h" // StringBuf
-#include "../common/sql.h"
-#include "char.h"
-#include "inter.h"
+#define HERCULES_CORE
+
+#include "../config/core.h" // GP_BOUND_ITEMS
+#include "int_storage.h"
 
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 
+#include "char.h"
+#include "inter.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/sql.h"
+#include "../common/strlib.h" // StringBuf
 
 #define STORAGE_MEMINC	16
 
diff --git a/src/char/inter.c b/src/char/inter.c
index c48b26fdd..8b6368e9d 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -2,33 +2,34 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/mmo.h"
-#include "../common/db.h"
-#include "../common/malloc.h"
-#include "../common/strlib.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "char.h"
+#define HERCULES_CORE
+
 #include "inter.h"
-#include "int_party.h"
-#include "int_guild.h"
-#include "int_storage.h"
-#include "int_pet.h"
-#include "int_homun.h"
-#include "int_mercenary.h"
-#include "int_mail.h"
-#include "int_auction.h"
-#include "int_quest.h"
-#include "int_elemental.h"
 
+#include <errno.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
-#include <errno.h>
-
+#include <string.h>
 #include <sys/stat.h> // for stat/lstat/fstat - [Dekamaster/Ultimate GM Tool]
 
+#include "char.h"
+#include "int_auction.h"
+#include "int_elemental.h"
+#include "int_guild.h"
+#include "int_homun.h"
+#include "int_mail.h"
+#include "int_mercenary.h"
+#include "int_party.h"
+#include "int_pet.h"
+#include "int_quest.h"
+#include "int_storage.h"
+#include "../common/db.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.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 25b0c2a96..5e655237e 100644
--- a/src/char/inter.h
+++ b/src/char/inter.h
@@ -5,9 +5,10 @@
 #ifndef _CHAR_INTER_H_
 #define _CHAR_INTER_H_
 
-struct accreg;
-#include "../common/sql.h"
 #include "char.h"
+#include "../common/sql.h"
+
+struct accreg;
 
 int inter_init_sql(const char *file);
 void inter_final(void);
diff --git a/src/char/pincode.c b/src/char/pincode.c
index d51953448..59182f12d 100644
--- a/src/char/pincode.c
+++ b/src/char/pincode.c
@@ -2,16 +2,19 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "pincode.h"
+
+#include <stdlib.h>
+
+#include "char.h"
 #include "../common/cbasetypes.h"
 #include "../common/mmo.h"
 #include "../common/random.h"
 #include "../common/showmsg.h"
 #include "../common/socket.h"
 #include "../common/strlib.h"
-#include "char.h"
-#include "pincode.h"
-
-#include <stdlib.h>
 
 int enabled = PINCODE_OK;
 int changetime = 0;
diff --git a/src/common/HPM.c b/src/common/HPM.c
index 9ffce87de..00b92dc60 100644
--- a/src/common/HPM.c
+++ b/src/common/HPM.c
@@ -1,26 +1,31 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 
+#define HERCULES_CORE
+
+#include "../config/core.h" // CONSOLE_INPUT
+#include "HPM.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "../common/cbasetypes.h"
-#include "../common/mmo.h"
+#include "../common/conf.h"
+#include "../common/console.h"
 #include "../common/core.h"
 #include "../common/malloc.h"
+#include "../common/mmo.h"
 #include "../common/showmsg.h"
 #include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/conf.h"
-#include "../common/utils.h"
-#include "../common/console.h"
-#include "../common/strlib.h"
 #include "../common/sql.h"
+#include "../common/strlib.h"
 #include "../common/sysinfo.h"
-#include "HPM.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #ifndef WIN32
-#include <unistd.h>
+#	include <unistd.h>
 #endif
 
 struct malloc_interface iMalloc_HPM;
@@ -686,7 +691,7 @@ bool hplugins_parse_conf(const char *w1, const char *w2, enum HPluginConfType po
 void hplugins_share_defaults(void) {
 	/* console */
 #ifdef CONSOLE_INPUT
-	HPM->share(console->addCommand,"addCPCommand");
+	HPM->share(console->input->addCommand,"addCPCommand");
 #endif
 	/* our own */
 	HPM->share(hplugins_addpacket,"addPacket");
@@ -755,7 +760,7 @@ void hpm_init(void) {
 	HPM->symbol_defaults();
 	
 #ifdef CONSOLE_INPUT
-	console->addCommand("plugins",CPCMD_A(plugins));
+	console->input->addCommand("plugins",CPCMD_A(plugins));
 #endif
 	return;
 }
diff --git a/src/common/HPM.h b/src/common/HPM.h
index 0f0df4cda..9c176cfd6 100644
--- a/src/common/HPM.h
+++ b/src/common/HPM.h
@@ -4,8 +4,12 @@
 #ifndef _COMMON_HPM_H_
 #define _COMMON_HPM_H_
 
-#include "../common/cbasetypes.h"
+#ifndef HERCULES_CORE
+#error You should never include HPM.h from a plugin.
+#endif
+
 #include "../common/HPMi.h"
+#include "../common/cbasetypes.h"
 
 #ifdef WIN32
 	#ifndef WIN32_LEAN_AND_MEAN
diff --git a/src/common/HPMi.h b/src/common/HPMi.h
index 19206aeca..b98e87d90 100644
--- a/src/common/HPMi.h
+++ b/src/common/HPMi.h
@@ -5,8 +5,8 @@
 #define _COMMON_HPMI_H_
 
 #include "../common/cbasetypes.h"
-#include "../common/core.h"
 #include "../common/console.h"
+#include "../common/core.h"
 #include "../common/sql.h"
 
 struct script_state;
@@ -20,18 +20,6 @@ struct map_session_data;
 	#define HPExport
 #endif
 
-#ifndef _COMMON_SHOWMSG_H_
-	HPExport void (*ShowMessage) (const char *, ...);
-	HPExport void (*ShowStatus) (const char *, ...);
-	HPExport void (*ShowSQL) (const char *, ...);
-	HPExport void (*ShowInfo) (const char *, ...);
-	HPExport void (*ShowNotice) (const char *, ...);
-	HPExport void (*ShowWarning) (const char *, ...);
-	HPExport void (*ShowDebug) (const char *, ...);
-	HPExport void (*ShowError) (const char *, ...);
-	HPExport void (*ShowFatalError) (const char *, ...);
-#endif
-
 /* after */
 #include "../common/showmsg.h"
 
@@ -192,7 +180,7 @@ HPExport struct HPMi_interface {
 	/* pc group permission */
 	void (*addPCGPermission) (unsigned int pluginID, char *name, unsigned int *mask);
 } HPMi_s;
-#ifndef _COMMON_HPM_H_
+#ifndef HERCULES_CORE
 HPExport struct HPMi_interface *HPMi;
 #endif
 
diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h
index f44e80413..da0d6b307 100644
--- a/src/common/cbasetypes.h
+++ b/src/common/cbasetypes.h
@@ -442,5 +442,11 @@ void SET_FUNCPOINTER(T1& var, T2 p)
 #define SET_FUNCPOINTER(var,p) ((var) = (p))
 #endif
 
+/* pointer size fix which fixes several gcc warnings */
+#ifdef __64BIT__
+	#define __64BPTRSIZE(y) ((intptr)(y))
+#else
+	#define __64BPTRSIZE(y) (y)
+#endif
 
 #endif /* _COMMON_CBASETYPES_H_ */
diff --git a/src/common/conf.c b/src/common/conf.c
index b816b2f7f..46a034497 100644
--- a/src/common/conf.c
+++ b/src/common/conf.c
@@ -2,7 +2,10 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
 #include "conf.h"
+
 #include "../../3rdparty/libconfig/libconfig.h"
 
 #include "../common/showmsg.h" // ShowError
diff --git a/src/common/conf.h b/src/common/conf.h
index 9aff3df47..e5b637e47 100644
--- a/src/common/conf.h
+++ b/src/common/conf.h
@@ -6,6 +6,7 @@
 #define _COMMON_CONF_H_
 
 #include "../common/cbasetypes.h"
+
 #include "../../3rdparty/libconfig/libconfig.h"
 
 /**
diff --git a/src/common/console.c b/src/common/console.c
index d8f352c8a..6a82db555 100644
--- a/src/common/console.c
+++ b/src/common/console.c
@@ -2,42 +2,46 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "../config/core.h" // CONSOLE_INPUT, MAX_CONSOLE_INPUT
+#include "console.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "../common/cbasetypes.h"
-#include "../common/showmsg.h"
 #include "../common/core.h"
+#include "../common/showmsg.h"
 #include "../common/sysinfo.h"
-#include "../config/core.h"
-#include "console.h"
 
 #ifndef MINICORE
-	#include "../common/ers.h"
-	#include "../common/malloc.h"
-	#include "../common/atomic.h"
-	#include "../common/spinlock.h"
-	#include "../common/thread.h"
-	#include "../common/mutex.h"
-	#include "../common/timer.h"
-	#include "../common/strlib.h"
-	#include "../common/sql.h"
+#	include "../common/atomic.h"
+#	include "../common/ers.h"
+#	include "../common/malloc.h"
+#	include "../common/mutex.h"
+#	include "../common/spinlock.h"
+#	include "../common/sql.h"
+#	include "../common/strlib.h"
+#	include "../common/thread.h"
+#	include "../common/timer.h"
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
 #if !defined(WIN32)
-	#include <unistd.h>
-	#include <sys/time.h>
+#	include <sys/time.h>
+#	include <unistd.h>
 #else
-	#include "../common/winapi.h" // Console close event handling
+#	include "../common/winapi.h" // Console close event handling
+#	ifdef CONSOLE_INPUT
+#		include <conio.h> /* _kbhit() */
+#	endif
 #endif
 
+struct console_interface console_s;
 #ifdef CONSOLE_INPUT
-	#if defined(WIN32)
-		#include <conio.h> /* _kbhit() */
-	#endif
+struct console_input_interface console_input_s;
 #endif
 
-struct console_interface console_s;
-
 /*======================================
  *	CORE : Display title
  *--------------------------------------*/
@@ -116,12 +120,12 @@ CPCMD_C(mem_report,server) {
  **/
 CPCMD(help) {
 	unsigned int i = 0;
-	for ( i = 0; i < console->cmd_list_count; i++ ) {
-		if( console->cmd_list[i]->next_count ) {
-			ShowInfo("- '"CL_WHITE"%s"CL_RESET"' subs\n",console->cmd_list[i]->cmd);
-			console->parse_list_subs(console->cmd_list[i],2);
+	for ( i = 0; i < console->input->cmd_list_count; i++ ) {
+		if( console->input->cmd_list[i]->next_count ) {
+			ShowInfo("- '"CL_WHITE"%s"CL_RESET"' subs\n",console->input->cmd_list[i]->cmd);
+			console->input->parse_list_subs(console->input->cmd_list[i],2);
 		} else {
-			ShowInfo("- '"CL_WHITE"%s"CL_RESET"'\n",console->cmd_list[i]->cmd);
+			ShowInfo("- '"CL_WHITE"%s"CL_RESET"'\n",console->input->cmd_list[i]->cmd);
 		}
 	}
 }
@@ -144,7 +148,7 @@ CPCMD_C(skip,update) {
 		ShowDebug("usage example: sql update skip 2013-02-14--16-15.sql\n");
 		return;
 	}
-	Sql_HerculesUpdateSkip(console->SQL, line);
+	Sql_HerculesUpdateSkip(console->input->SQL, line);
 }
 
 /**
@@ -206,7 +210,7 @@ void console_load_defaults(void) {
 	unsigned int i, len = ARRAYLENGTH(default_list);
 	struct CParseEntry *cmd;
 	
-	RECREATE(console->cmds,struct CParseEntry *, len);
+	RECREATE(console->input->cmds,struct CParseEntry *, len);
 	
 	for(i = 0; i < len; i++) {
 		CREATE(cmd, struct CParseEntry, 1);
@@ -220,12 +224,12 @@ void console_load_defaults(void) {
 		
 		cmd->next_count = 0;
 		
-		console->cmd_count++;
-		console->cmds[i] = cmd;
+		console->input->cmd_count++;
+		console->input->cmds[i] = cmd;
 		default_list[i].self = cmd;
 		if( !default_list[i].connect ) {
-			RECREATE(console->cmd_list,struct CParseEntry *, ++console->cmd_list_count);
-			console->cmd_list[console->cmd_list_count - 1] = cmd;
+			RECREATE(console->input->cmd_list,struct CParseEntry *, ++console->input->cmd_list_count);
+			console->input->cmd_list[console->input->cmd_list_count - 1] = cmd;
 		}
 	}
 	
@@ -233,11 +237,11 @@ void console_load_defaults(void) {
 		unsigned int k;
 		if( !default_list[i].connect )
 			continue;
-		for(k = 0; k < console->cmd_count; k++) {
-			if( strcmpi(default_list[i].connect,console->cmds[k]->cmd) == 0 ) {
+		for(k = 0; k < console->input->cmd_count; k++) {
+			if( strcmpi(default_list[i].connect,console->input->cmds[k]->cmd) == 0 ) {
 				cmd = default_list[i].self;
-				RECREATE(console->cmds[k]->u.next, struct CParseEntry *, ++console->cmds[k]->next_count);
-				console->cmds[k]->u.next[console->cmds[k]->next_count - 1] = cmd;
+				RECREATE(console->input->cmds[k]->u.next, struct CParseEntry *, ++console->input->cmds[k]->next_count);
+				console->input->cmds[k]->u.next[console->input->cmds[k]->next_count - 1] = cmd;
 				break;
 			}
 		}
@@ -256,23 +260,23 @@ void console_parse_create(char *name, CParseFunc func) {
 	safestrncpy(sublist, name, CP_CMD_LENGTH * 5);
 	tok = strtok(sublist,":");
 	
-	for ( i = 0; i < console->cmd_list_count; i++ ) {
-		if( strcmpi(tok,console->cmd_list[i]->cmd) == 0 )
+	for ( i = 0; i < console->input->cmd_list_count; i++ ) {
+		if( strcmpi(tok,console->input->cmd_list[i]->cmd) == 0 )
 			break;
 	}
 
-	if( i == console->cmd_list_count ) {
-		RECREATE(console->cmds,struct CParseEntry *, ++console->cmd_count);
+	if( i == console->input->cmd_list_count ) {
+		RECREATE(console->input->cmds,struct CParseEntry *, ++console->input->cmd_count);
 		CREATE(cmd, struct CParseEntry, 1);
 		safestrncpy(cmd->cmd, tok, CP_CMD_LENGTH);
 		cmd->next_count = 0;
-		console->cmds[console->cmd_count - 1] = cmd;
-		RECREATE(console->cmd_list,struct CParseEntry *, ++console->cmd_list_count);
-		console->cmd_list[console->cmd_list_count - 1] = cmd;
-		i = console->cmd_list_count - 1;
+		console->input->cmds[console->input->cmd_count - 1] = cmd;
+		RECREATE(console->input->cmd_list,struct CParseEntry *, ++console->input->cmd_list_count);
+		console->input->cmd_list[console->input->cmd_list_count - 1] = cmd;
+		i = console->input->cmd_list_count - 1;
 	}
 
-	cmd = console->cmd_list[i];
+	cmd = console->input->cmd_list[i];
 	while( ( tok = strtok(NULL, ":") ) != NULL ) {
 		
 		for(i = 0; i < cmd->next_count; i++) {
@@ -281,13 +285,13 @@ void console_parse_create(char *name, CParseFunc func) {
 		}
 		
 		if ( i == cmd->next_count ) {
-			RECREATE(console->cmds,struct CParseEntry *, ++console->cmd_count);
-			CREATE(console->cmds[console->cmd_count-1], struct CParseEntry, 1);
-			safestrncpy(console->cmds[console->cmd_count-1]->cmd, tok, CP_CMD_LENGTH);
-			console->cmds[console->cmd_count-1]->next_count = 0;
+			RECREATE(console->input->cmds,struct CParseEntry *, ++console->input->cmd_count);
+			CREATE(console->input->cmds[console->input->cmd_count-1], struct CParseEntry, 1);
+			safestrncpy(console->input->cmds[console->input->cmd_count-1]->cmd, tok, CP_CMD_LENGTH);
+			console->input->cmds[console->input->cmd_count-1]->next_count = 0;
 			RECREATE(cmd->u.next, struct CParseEntry *, ++cmd->next_count);
-			cmd->u.next[cmd->next_count - 1] = console->cmds[console->cmd_count-1];
-			cmd = console->cmds[console->cmd_count-1];
+			cmd->u.next[cmd->next_count - 1] = console->input->cmds[console->input->cmd_count-1];
+			cmd = console->input->cmds[console->input->cmd_count-1];
 			continue;
 		}
 		
@@ -302,7 +306,7 @@ void console_parse_list_subs(struct CParseEntry *cmd, unsigned char depth) {
 			memset(msg, '-', depth);
 			snprintf(msg + depth,CP_CMD_LENGTH * 2, " '"CL_WHITE"%s"CL_RESET"'",cmd->u.next[i]->cmd);
 			ShowInfo("%s subs\n",msg);
-			console->parse_list_subs(cmd->u.next[i],depth + 1);
+			console->input->parse_list_subs(cmd->u.next[i],depth + 1);
 		} else {
 			memset(msg, '-', depth);
 			snprintf(msg + depth,CP_CMD_LENGTH * 2, " %s",cmd->u.next[i]->cmd);
@@ -320,21 +324,21 @@ void console_parse_sub(char *line) {
 	memcpy(bline, line, 200);
 	tok = strtok(line, " ");
 	
-	for ( i = 0; i < console->cmd_list_count; i++ ) {
-		if( strcmpi(tok,console->cmd_list[i]->cmd) == 0 )
+	for ( i = 0; i < console->input->cmd_list_count; i++ ) {
+		if( strcmpi(tok,console->input->cmd_list[i]->cmd) == 0 )
 			break;
 	}
 	
-	if( i == console->cmd_list_count ) {
+	if( i == console->input->cmd_list_count ) {
 		ShowError("'"CL_WHITE"%s"CL_RESET"' is not a known command, type '"CL_WHITE"help"CL_RESET"' to list all commands\n",line);
 		return;
 	}
 	
-	cmd = console->cmd_list[i];
+	cmd = console->input->cmd_list[i];
 	
 	len += snprintf(sublist,CP_CMD_LENGTH * 5,"%s", cmd->cmd) + 1;
 	
-	if( cmd->next_count == 0 && console->cmd_list[i]->u.func ) {
+	if( cmd->next_count == 0 && console->input->cmd_list[i]->u.func ) {
 		char *r = NULL;
 		if( (tok = strtok(NULL, " ")) ) {
 			r = bline;
@@ -351,7 +355,7 @@ void console_parse_sub(char *line) {
 				if( strcmpi("help",tok) == 0 ) {
 					if( cmd->next_count ) {
 						ShowInfo("- '"CL_WHITE"%s"CL_RESET"' subs\n",sublist);
-						console->parse_list_subs(cmd,2);
+						console->input->parse_list_subs(cmd,2);
 					} else {
 						ShowError("'"CL_WHITE"%s"CL_RESET"' doesn't possess any subcommands\n",sublist);
 					}
@@ -392,95 +396,95 @@ void console_parse(char* line) {
 }
 void *cThread_main(void *x) {
 		
-	while( console->ptstate ) {/* loopx */
-		if( console->key_pressed() ) {
+	while( console->input->ptstate ) {/* loopx */
+		if( console->input->key_pressed() ) {
 			char input[MAX_CONSOLE_INPUT];
 					
-			console->parse(input);
+			console->input->parse(input);
 			if( input[0] != '\0' ) {/* did we get something? */
-				EnterSpinLock(&console->ptlock);
+				EnterSpinLock(&console->input->ptlock);
 				
 				if( cinput.count == CONSOLE_PARSE_SIZE ) {
-					LeaveSpinLock(&console->ptlock);
+					LeaveSpinLock(&console->input->ptlock);
 					continue;/* drop */
 				}
 				
 				safestrncpy(cinput.queue[cinput.count++],input,MAX_CONSOLE_INPUT);
-				LeaveSpinLock(&console->ptlock);
+				LeaveSpinLock(&console->input->ptlock);
 			}
 		}
-		ramutex_lock( console->ptmutex );
-		racond_wait( console->ptcond,	console->ptmutex,  -1 );
-		ramutex_unlock( console->ptmutex );
+		ramutex_lock( console->input->ptmutex );
+		racond_wait( console->input->ptcond,	console->input->ptmutex,  -1 );
+		ramutex_unlock( console->input->ptmutex );
 	}
 		
 	return NULL;
 }
 int console_parse_timer(int tid, int64 tick, int id, intptr_t data) {
 	int i;
-	EnterSpinLock(&console->ptlock);
+	EnterSpinLock(&console->input->ptlock);
 	for(i = 0; i < cinput.count; i++) {
-		console->parse_sub(cinput.queue[i]);
+		console->input->parse_sub(cinput.queue[i]);
 	}
 	cinput.count = 0;
-	LeaveSpinLock(&console->ptlock);
-	racond_signal(console->ptcond);
+	LeaveSpinLock(&console->input->ptlock);
+	racond_signal(console->input->ptcond);
 	return 0;
 }
 void console_parse_final(void) {
-	if( console->ptstate ) {
-		InterlockedDecrement(&console->ptstate);
-		racond_signal(console->ptcond);
+	if( console->input->ptstate ) {
+		InterlockedDecrement(&console->input->ptstate);
+		racond_signal(console->input->ptcond);
 		
 		/* wait for thread to close */
-		rathread_wait(console->pthread, NULL);
+		rathread_wait(console->input->pthread, NULL);
 
-		racond_destroy(console->ptcond);
-		ramutex_destroy(console->ptmutex);
+		racond_destroy(console->input->ptcond);
+		ramutex_destroy(console->input->ptmutex);
 	}
 }
 void console_parse_init(void) {
 	cinput.count = 0;
 	
-	console->ptstate = 1;
+	console->input->ptstate = 1;
 
-	InitializeSpinLock(&console->ptlock);
+	InitializeSpinLock(&console->input->ptlock);
 	
-	console->ptmutex = ramutex_create();
-	console->ptcond = racond_create();
+	console->input->ptmutex = ramutex_create();
+	console->input->ptcond = racond_create();
 	
-	if( (console->pthread = rathread_create(console->pthread_main, NULL)) == NULL ){
+	if( (console->input->pthread = rathread_create(console->input->pthread_main, NULL)) == NULL ){
 		ShowFatalError("console_parse_init: failed to spawn console_parse thread.\n");
 		exit(EXIT_FAILURE);
 	}
 	
-	timer->add_func_list(console->parse_timer, "console_parse_timer");
-	timer->add_interval(timer->gettick() + 1000, console->parse_timer, 0, 0, 500);/* start listening in 1s; re-try every 0.5s */
+	timer->add_func_list(console->input->parse_timer, "console_parse_timer");
+	timer->add_interval(timer->gettick() + 1000, console->input->parse_timer, 0, 0, 500);/* start listening in 1s; re-try every 0.5s */
 	
 }
 void console_setSQL(Sql *SQL_handle) {
-	console->SQL = SQL_handle;
+	console->input->SQL = SQL_handle;
 }
 #endif /* CONSOLE_INPUT */
 
 void console_init (void) {
 #ifdef CONSOLE_INPUT
-	console->cmd_count = console->cmd_list_count = 0;
-	console->load_defaults();
-	console->parse_init();
+	console->input->cmd_count = console->input->cmd_list_count = 0;
+	console->input->load_defaults();
+	console->input->parse_init();
 #endif
 }
 void console_final(void) {
 #ifdef CONSOLE_INPUT
 	unsigned int i;
-	console->parse_final();
-	for( i = 0; i < console->cmd_count; i++ ) {
-		if( console->cmds[i]->next_count )
-			aFree(console->cmds[i]->u.next);
-		aFree(console->cmds[i]);
+	console->input->parse_final();
+	for( i = 0; i < console->input->cmd_count; i++ ) {
+		if( console->input->cmds[i]->next_count )
+			aFree(console->input->cmds[i]->u.next);
+		aFree(console->input->cmds[i]);
 	}
-	aFree(console->cmds);
-	aFree(console->cmd_list);
+	aFree(console->input->cmds);
+	aFree(console->input->cmd_list);
 #endif
 }
 void console_defaults(void) {
@@ -489,17 +493,20 @@ void console_defaults(void) {
 	console->final = console_final;
 	console->display_title = display_title;
 #ifdef CONSOLE_INPUT
-	console->parse_init = console_parse_init;
-	console->parse_final = console_parse_final;
-	console->parse_timer = console_parse_timer;
-	console->pthread_main = cThread_main;
-	console->parse = console_parse;
-	console->parse_sub = console_parse_sub;
-	console->key_pressed = console_parse_key_pressed;
-	console->load_defaults = console_load_defaults;
-	console->parse_list_subs = console_parse_list_subs;
-	console->addCommand = console_parse_create;
-	console->setSQL = console_setSQL;
-	console->SQL = NULL;
+	console->input = &console_input_s;
+	console->input->parse_init = console_parse_init;
+	console->input->parse_final = console_parse_final;
+	console->input->parse_timer = console_parse_timer;
+	console->input->pthread_main = cThread_main;
+	console->input->parse = console_parse;
+	console->input->parse_sub = console_parse_sub;
+	console->input->key_pressed = console_parse_key_pressed;
+	console->input->load_defaults = console_load_defaults;
+	console->input->parse_list_subs = console_parse_list_subs;
+	console->input->addCommand = console_parse_create;
+	console->input->setSQL = console_setSQL;
+	console->input->SQL = NULL;
+#else
+	console->input = NULL;
 #endif
 }
diff --git a/src/common/console.h b/src/common/console.h
index 3d19ddc9d..d2c58f978 100644
--- a/src/common/console.h
+++ b/src/common/console.h
@@ -4,11 +4,13 @@
 #ifndef _COMMON_CONSOLE_H_
 #define _COMMON_CONSOLE_H_
 
-#include "../common/thread.h"
+#include "../config/core.h" // MAX_CONSOLE_INPUT
+
+#include "../common/cbasetypes.h"
 #include "../common/mutex.h"
 #include "../common/spinlock.h"
 #include "../common/sql.h"
-#include "../config/core.h"
+#include "../common/thread.h"
 
 /**
  * Queue Max
@@ -47,11 +49,8 @@ struct {
 	unsigned short count;
 } cinput;
 
-struct console_interface {
-	void (*init) (void);
-	void (*final) (void);
-	void (*display_title) (void);
 #ifdef CONSOLE_INPUT
+struct console_input_interface {
 	/* vars */
 	SPIN_LOCK ptlock;/* parse thread lock */
 	rAthread pthread;/* parse thread */
@@ -77,7 +76,17 @@ struct console_interface {
 	void (*parse_list_subs) (struct CParseEntry *cmd, unsigned char depth);
 	void (*addCommand) (char *name, CParseFunc func);
 	void (*setSQL) (Sql *SQL_handle);
+};
+#else
+struct console_input_interface;
 #endif
+
+struct console_interface {
+	void (*init) (void);
+	void (*final) (void);
+	void (*display_title) (void);
+
+	struct console_input_interface *input;
 };
 
 struct console_interface *console;
diff --git a/src/common/core.c b/src/common/core.c
index 49b272488..85f824866 100644
--- a/src/common/core.c
+++ b/src/common/core.c
@@ -2,36 +2,40 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/mmo.h"
-#include "../common/showmsg.h"
-#include "../common/malloc.h"
-#include "../common/strlib.h"
+#define HERCULES_CORE
+
+#include "../config/core.h"
 #include "core.h"
+
+#include "../common/cbasetypes.h"
 #include "../common/console.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
 #include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
 #include "../common/sysinfo.h"
 
 #ifndef MINICORE
-	#include "../common/db.h"
-	#include "../common/socket.h"
-	#include "../common/timer.h"
-	#include "../common/thread.h"
-	#include "../common/sql.h"
-	#include "../config/core.h"
-	#include "../common/HPM.h"
-	#include "../common/utils.h"
-	#include "../common/conf.h"
-	#include "../common/ers.h"
+#	include "../common/HPM.h"
+#	include "../common/conf.h"
+#	include "../common/db.h"
+#	include "../common/ers.h"
+#	include "../common/socket.h"
+#	include "../common/sql.h"
+#	include "../common/thread.h"
+#	include "../common/timer.h"
+#	include "../common/utils.h"
 #endif
 
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <signal.h>
 #include <string.h>
 #ifndef _WIN32
-#include <unistd.h>
+#	include <unistd.h>
 #else
-#include "../common/winapi.h" // Console close event handling
+#	include "../common/winapi.h" // Console close event handling
 #endif
 
 /// Called when a terminate signal is received.
diff --git a/src/common/core.h b/src/common/core.h
index e9f7c5961..ba75e6b01 100644
--- a/src/common/core.h
+++ b/src/common/core.h
@@ -7,11 +7,10 @@
 
 #include "../common/db.h"
 #include "../common/mmo.h"
-#include "../config/core.h"
 
 /* so that developers with --enable-debug can raise signals from any section of the code they'd like */
 #ifdef DEBUG
-	#include <signal.h>
+#	include <signal.h>
 #endif
 
 extern int arg_c;
diff --git a/src/common/db.c b/src/common/db.c
index 8d6b08815..1781aa96f 100644
--- a/src/common/db.c
+++ b/src/common/db.c
@@ -67,14 +67,18 @@
  * @encoding US-ASCII
  * @see #db.h
 \*****************************************************************************/
+
+#define HERCULES_CORE
+
+#include "db.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "db.h"
-#include "../common/mmo.h"
+#include "../common/ers.h"
 #include "../common/malloc.h"
+#include "../common/mmo.h"
 #include "../common/showmsg.h"
-#include "../common/ers.h"
 #include "../common/strlib.h"
 
 /*****************************************************************************\
diff --git a/src/common/db.h b/src/common/db.h
index 67abe6f19..0d2548806 100644
--- a/src/common/db.h
+++ b/src/common/db.h
@@ -42,9 +42,10 @@
 #ifndef _COMMON_DB_H_
 #define _COMMON_DB_H_
 
-#include "../common/cbasetypes.h"
 #include <stdarg.h>
 
+#include "../common/cbasetypes.h"
+
 /*****************************************************************************\
  *  (1) Section with public typedefs, enums, unions, structures and defines. *
  *  DBRelease    - Enumeration of release options.                           *
diff --git a/src/common/des.c b/src/common/des.c
index ed6d098dc..7f952be76 100644
--- a/src/common/des.c
+++ b/src/common/des.c
@@ -1,8 +1,11 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
-#include "../common/cbasetypes.h"
-#include "../common/des.h"
 
+#define HERCULES_CORE
+
+#include "des.h"
+
+#include "../common/cbasetypes.h"
 
 /// DES (Data Encryption Standard) algorithm, modified version.
 /// @see http://www.eathena.ws/board/index.php?autocom=bugtracker&showbug=5099.
diff --git a/src/common/ers.c b/src/common/ers.c
index 5a3d7314a..d9895e4f2 100644
--- a/src/common/ers.c
+++ b/src/common/ers.c
@@ -39,14 +39,18 @@
  * @encoding US-ASCII                                                        *
  * @see common#ers.h                                                         *
 \*****************************************************************************/
+
+#define HERCULES_CORE
+
+#include "ers.h"
+
 #include <stdlib.h>
 #include <string.h>
 
 #include "../common/cbasetypes.h"
 #include "../common/malloc.h" // CREATE, RECREATE, aMalloc, aFree
-#include "../common/showmsg.h" // ShowMessage, ShowError, ShowFatalError, CL_BOLD, CL_NORMAL
 #include "../common/nullpo.h"
-#include "ers.h"
+#include "../common/showmsg.h" // ShowMessage, ShowError, ShowFatalError, CL_BOLD, CL_NORMAL
 
 #ifndef DISABLE_ERS
 
diff --git a/src/common/grfio.c b/src/common/grfio.c
index bde0ed720..1111fb3f3 100644
--- a/src/common/grfio.c
+++ b/src/common/grfio.c
@@ -2,13 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/des.h"
-#include "../common/malloc.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
-#include "../common/nullpo.h"
+#define HERCULES_CORE
+
 #include "grfio.h"
 
 #include <stdio.h>
@@ -17,6 +12,14 @@
 #include <sys/stat.h>
 #include <zlib.h>
 
+#include "../common/cbasetypes.h"
+#include "../common/des.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
+
 //----------------------------
 //	file entry table struct
 //----------------------------
diff --git a/src/common/malloc.c b/src/common/malloc.c
index 5b39cbab6..13cf0b5ce 100644
--- a/src/common/malloc.c
+++ b/src/common/malloc.c
@@ -2,16 +2,19 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/malloc.h"
-#include "../common/core.h"
-#include "../common/showmsg.h"
-#include "../common/sysinfo.h"
+#define HERCULES_CORE
+
+#include "malloc.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
+#include "../common/core.h"
+#include "../common/showmsg.h"
+#include "../common/sysinfo.h"
+
 struct malloc_interface iMalloc_s;
 
 ////////////// Memory Libraries //////////////////
diff --git a/src/common/mapindex.c b/src/common/mapindex.c
index 3128a3cb0..5c69c7063 100644
--- a/src/common/mapindex.c
+++ b/src/common/mapindex.c
@@ -2,16 +2,19 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/mmo.h"
-#include "../common/showmsg.h"
-#include "../common/malloc.h"
-#include "../common/strlib.h"
-#include "../common/db.h"
+#define HERCULES_CORE
+
 #include "mapindex.h"
 
-#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+
+#include "../common/db.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
 
 /* mapindex.c interface source */
 struct mapindex_interface mapindex_s;
diff --git a/src/common/md5calc.c b/src/common/md5calc.c
index 05fde42cc..e7b506e27 100644
--- a/src/common/md5calc.c
+++ b/src/common/md5calc.c
@@ -6,11 +6,15 @@
  *
  ***********************************************************/
 
-#include "../common/random.h"
+#define HERCULES_CORE
+
 #include "md5calc.h"
-#include <string.h>
+
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+
+#include "../common/random.h"
 
 #ifndef UINT_MAX
 #define UINT_MAX 4294967295U
diff --git a/src/common/mmo.h b/src/common/mmo.h
index d535d2874..1d826463e 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -5,10 +5,11 @@
 #ifndef _COMMON_MMO_H_
 #define _COMMON_MMO_H_
 
-#include "cbasetypes.h"
-#include "../common/db.h"
 #include <time.h>
 
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+
 // server->client protocol version
 //        0 - pre-?
 //        1 - ?                    - 0x196
@@ -96,6 +97,7 @@
 //Official Limit: 2.1b ( the var that stores the money doesn't go much higher than this by default )
 #define MAX_BANK_ZENY 2100000000
 
+#define MAX_LEVEL 175
 #define MAX_FAME 1000000000
 #define MAX_CART 100
 #define MAX_SKILL 1478
diff --git a/src/common/mutex.c b/src/common/mutex.c
index 0668dbc41..12524c3b7 100644
--- a/src/common/mutex.c
+++ b/src/common/mutex.c
@@ -1,6 +1,10 @@
 // Copyright (c) rAthena Project (www.rathena.org) - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
+#define HERCULES_CORE
+
+#include "mutex.h"
+
 #ifdef WIN32
 #include "../common/winapi.h"
 #else
@@ -13,7 +17,6 @@
 #include "../common/malloc.h"
 #include "../common/showmsg.h"
 #include "../common/timer.h"
-#include "../common/mutex.h"
 
 struct ramutex{
 #ifdef WIN32
diff --git a/src/common/mutex.h b/src/common/mutex.h
index eeb24e6ff..3b83b66d6 100644
--- a/src/common/mutex.h
+++ b/src/common/mutex.h
@@ -4,6 +4,7 @@
 #ifndef _COMMON_MUTEX_H_
 #define _COMMON_MUTEX_H_
 
+#include "../common/cbasetypes.h"
 
 typedef struct ramutex *ramutex; // Mutex
 typedef struct racond *racond; // Condition Var
diff --git a/src/common/nullpo.c b/src/common/nullpo.c
index 1cb471aff..1891835f1 100644
--- a/src/common/nullpo.c
+++ b/src/common/nullpo.c
@@ -2,10 +2,14 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "nullpo.h"
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
-#include "../common/nullpo.h"
+
 #include "../common/showmsg.h"
 
 /**
diff --git a/src/common/random.c b/src/common/random.c
index e46c52cad..7019a31f3 100644
--- a/src/common/random.c
+++ b/src/common/random.c
@@ -1,17 +1,23 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
+#define HERCULES_CORE
+
+#include "random.h"
+
+#include <time.h> // time
+
+#include <mt19937ar.h> // init_genrand, genrand_int32, genrand_res53
+
 #include "../common/showmsg.h"
 #include "../common/timer.h" // gettick
-#include "random.h"
+
 #if defined(WIN32)
-	#include "../common/winapi.h"
+#	include "../common/winapi.h"
 #elif defined(HAVE_GETPID) || defined(HAVE_GETTID)
-	#include <sys/types.h>
-	#include <unistd.h>
+#	include <sys/types.h>
+#	include <unistd.h>
 #endif
-#include <time.h> // time
-#include <mt19937ar.h> // init_genrand, genrand_int32, genrand_res53
 
 
 /// Initializes the random number generator with an appropriate seed.
diff --git a/src/common/showmsg.c b/src/common/showmsg.c
index 14342fe5e..1dbcba282 100644
--- a/src/common/showmsg.c
+++ b/src/common/showmsg.c
@@ -2,23 +2,26 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/strlib.h" // StringBuf
+#define HERCULES_CORE
+
 #include "showmsg.h"
-#include "core.h" //[Ind] - For SERVER_TYPE
 
+#include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h> // atexit
 #include <string.h>
-#include <stdarg.h>
 #include <time.h>
-#include <stdlib.h> // atexit
 
 #include "../../3rdparty/libconfig/libconfig.h"
 
+#include "../common/cbasetypes.h"
+#include "../common/core.h" //[Ind] - For SERVER_TYPE
+#include "../common/strlib.h" // StringBuf
+
 #ifdef WIN32
-#include "../common/winapi.h"
+#	include "../common/winapi.h"
 #else // not WIN32
-#include <unistd.h>
+#	include <unistd.h>
 #endif // WIN32
 
 #if defined(DEBUGLOGMAP)
diff --git a/src/common/showmsg.h b/src/common/showmsg.h
index 49fbc34fb..5b32f39ae 100644
--- a/src/common/showmsg.h
+++ b/src/common/showmsg.h
@@ -5,12 +5,14 @@
 #ifndef _COMMON_SHOWMSG_H_
 #define _COMMON_SHOWMSG_H_
 
-#ifndef _COMMON_HPMI_H_
-	#include "../../3rdparty/libconfig/libconfig.h"
-#endif
-
 #include <stdarg.h>
 
+#ifdef HERCULES_CORE
+#	include "../../3rdparty/libconfig/libconfig.h"
+#else
+#	include "../common/HPMi.h"
+#endif
+
 // for help with the console colors look here:
 // http://www.edoceo.com/liberum/?doc=printf-with-color
 // some code explanation (used here):
@@ -90,7 +92,7 @@ enum msg_type {
 };
 
 extern void ClearScreen(void);
-#ifndef _COMMON_HPMI_H_
+#ifdef HERCULES_CORE
 	extern void ShowMessage(const char *, ...);
 	extern void ShowStatus(const char *, ...);
 	extern void ShowSQL(const char *, ...);
@@ -101,7 +103,18 @@ extern void ClearScreen(void);
 	extern void ShowError(const char *, ...);
 	extern void ShowFatalError(const char *, ...);
 	extern void ShowConfigWarning(config_setting_t *config, const char *string, ...);
+#else
+	HPExport void (*ShowMessage) (const char *, ...);
+	HPExport void (*ShowStatus) (const char *, ...);
+	HPExport void (*ShowSQL) (const char *, ...);
+	HPExport void (*ShowInfo) (const char *, ...);
+	HPExport void (*ShowNotice) (const char *, ...);
+	HPExport void (*ShowWarning) (const char *, ...);
+	HPExport void (*ShowDebug) (const char *, ...);
+	HPExport void (*ShowError) (const char *, ...);
+	HPExport void (*ShowFatalError) (const char *, ...);
 #endif
+
 extern int _vShowMessage(enum msg_type flag, const char *string, va_list ap);
 
 #endif /* _COMMON_SHOWMSG_H_ */
diff --git a/src/common/socket.c b/src/common/socket.c
index 35d350e95..3738f2c2a 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -2,48 +2,50 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/mmo.h"
-#include "../common/timer.h"
-#include "../common/malloc.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../config/core.h"
-#include "../common/HPM.h"
+#define HERCULES_CORE
 
+#include "../config/core.h" // SHOW_SERVER_STATS
 #define _H_SOCKET_C_
-
 #include "socket.h"
+#undef _H_SOCKET_C_
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 
+#include "../common/HPM.h"
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+
 #ifdef WIN32
-	#include "../common/winapi.h"
+#	include "../common/winapi.h"
 #else
-	#include <errno.h>
-	#include <sys/socket.h>
-	#include <netinet/in.h>
-	#include <netinet/tcp.h>
-	#include <net/if.h>
-	#include <unistd.h>
-	#include <sys/time.h>
-	#include <sys/ioctl.h>
-	#include <netdb.h>
-	#include <arpa/inet.h>
-
-	#ifndef SIOCGIFCONF
-	#include <sys/sockio.h> // SIOCGIFCONF on Solaris, maybe others? [Shinomori]
-	#endif
-	#ifndef FIONBIO
-	#include <sys/filio.h> // FIONBIO on Solaris [FlavioJS]
-	#endif
-
-	#ifdef HAVE_SETRLIMIT
-	#include <sys/resource.h>
-	#endif
+#	include <arpa/inet.h>
+#	include <errno.h>
+#	include <net/if.h>
+#	include <netdb.h>
+#	include <netinet/in.h>
+#	include <netinet/tcp.h>
+#	include <sys/ioctl.h>
+#	include <sys/socket.h>
+#	include <sys/time.h>
+#	include <unistd.h>
+
+#	ifndef SIOCGIFCONF
+#		include <sys/sockio.h> // SIOCGIFCONF on Solaris, maybe others? [Shinomori]
+#	endif
+#	ifndef FIONBIO
+#		include <sys/filio.h> // FIONBIO on Solaris [FlavioJS]
+#	endif
+
+#	ifdef HAVE_SETRLIMIT
+#		include <sys/resource.h>
+#	endif
 #endif
 
 /**
diff --git a/src/common/socket.h b/src/common/socket.h
index 75adde4cf..804b9284f 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -5,19 +5,19 @@
 #ifndef _COMMON_SOCKET_H_
 #define _COMMON_SOCKET_H_
 
+#include <time.h>
+
 #include "../common/cbasetypes.h"
 
 #ifdef WIN32
-	#include "../common/winapi.h"
+#	include "../common/winapi.h"
 	typedef long in_addr_t;
 #else
-	#include <sys/types.h>
-	#include <sys/socket.h>
-	#include <netinet/in.h>
+#	include <netinet/in.h>
+#	include <sys/socket.h>
+#	include <sys/types.h>
 #endif
 
-#include <time.h>
-
 struct HPluginData;
 
 #define FIFOSIZE_SERVERLINK 256*1024
diff --git a/src/common/spinlock.h b/src/common/spinlock.h
index 29fbb355b..0058e1d83 100644
--- a/src/common/spinlock.h
+++ b/src/common/spinlock.h
@@ -1,4 +1,3 @@
-#pragma once
 #ifndef _COMMON_SPINLOCK_H_
 #define _COMMON_SPINLOCK_H_
 
@@ -15,14 +14,14 @@
 //
 //
  
+#include "../common/atomic.h"
+#include "../common/cbasetypes.h"
+#include "../common/thread.h"
+
 #ifdef WIN32
 #include "../common/winapi.h"
 #endif
 
-#include "../common/cbasetypes.h"
-#include "../common/atomic.h"
-#include "../common/thread.h"
-
 #ifdef WIN32
 
 typedef struct __declspec( align(64) ) SPIN_LOCK{
diff --git a/src/common/sql.c b/src/common/sql.c
index 79ccc8e92..aeb56bff0 100644
--- a/src/common/sql.c
+++ b/src/common/sql.c
@@ -2,19 +2,23 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "sql.h"
+
+#include <stdlib.h> // strtoul
+#include <string.h> // strlen/strnlen/memcpy/memset
+
 #include "../common/cbasetypes.h"
 #include "../common/malloc.h"
 #include "../common/showmsg.h"
 #include "../common/strlib.h"
 #include "../common/timer.h"
-#include "sql.h"
 
 #ifdef WIN32
-#include "../common/winapi.h"
+#	include "../common/winapi.h" // Needed before mysql.h
 #endif
 #include <mysql.h>
-#include <string.h>// strlen/strnlen/memcpy/memset
-#include <stdlib.h>// strtoul
 
 void hercules_mysql_error_handler(unsigned int ecode);
 
diff --git a/src/common/sql.h b/src/common/sql.h
index 1fb436853..807e0843c 100644
--- a/src/common/sql.h
+++ b/src/common/sql.h
@@ -5,10 +5,9 @@
 #ifndef _COMMON_SQL_H_
 #define _COMMON_SQL_H_
 
-#include "../common/cbasetypes.h"
 #include <stdarg.h>// va_list
 
-
+#include "../common/cbasetypes.h"
 
 // Return codes
 #define SQL_ERROR (-1)
diff --git a/src/common/strlib.c b/src/common/strlib.c
index 361595b07..e2e802915 100644
--- a/src/common/strlib.c
+++ b/src/common/strlib.c
@@ -2,16 +2,19 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/showmsg.h"
-#define STRLIB_C
+#define HERCULES_CORE
+
+#define _H_STRLIB_C_
 #include "strlib.h"
+#undef _H_STRLIB_C_
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
 
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/showmsg.h"
 
 #define J_MAX_MALLOC_SIZE 65535
 
diff --git a/src/common/strlib.h b/src/common/strlib.h
index 10844d257..decf661a6 100644
--- a/src/common/strlib.h
+++ b/src/common/strlib.h
@@ -5,15 +5,16 @@
 #ifndef _COMMON_STRLIB_H_
 #define _COMMON_STRLIB_H_
 
-#include "../common/cbasetypes.h"
 #include <stdarg.h>
 
+#include "../common/cbasetypes.h"
+
 #ifndef __USE_GNU
-	#define __USE_GNU  // required to enable strnlen on some platforms
-	#include <string.h>
-	#undef __USE_GNU
+#	define __USE_GNU  // required to enable strnlen on some platforms
+#	include <string.h>
+#	undef __USE_GNU
 #else
-	#include <string.h>
+#	include <string.h>
 #endif
 
 #ifdef WIN32
@@ -165,7 +166,7 @@ struct sv_interface *sv;
 void strlib_defaults(void);
 
 /* the purpose of these macros is simply to not make calling them be an annoyance */
-#ifndef STRLIB_C
+#ifndef _H_STRLIB_C_
 	#define jstrescape(pt)             (strlib->jstrescape(pt))
 	#define jstrescapecpy(pt,spt)      (strlib->jstrescapecpy((pt),(spt)))
 	#define jmemescapecpy(pt,spt,size) (strlib->jmemescapecpy((pt),(spt),(size)))
@@ -189,6 +190,6 @@ void strlib_defaults(void);
 	#define safesnprintf(buf,sz,fmt,...) (strlib->safesnprintf((buf),(sz),(fmt),##__VA_ARGS__))
 	#define strline(str,pos)             (strlib->strline((str),(pos)))
 	#define bin2hex(output,input,count)  (strlib->bin2hex((output),(input),(count)))
-#endif /* STRLIB_C */
+#endif /* _H_STRLIB_C_ */
 
 #endif /* _COMMON_STRLIB_H_ */
diff --git a/src/common/sysinfo.c b/src/common/sysinfo.c
index a56896458..3fdfadb41 100644
--- a/src/common/sysinfo.c
+++ b/src/common/sysinfo.c
@@ -4,23 +4,39 @@
 
 /// See sysinfo.h for a description of this file
 
-#define _COMMON_SYSINFO_P_
+#define HERCULES_CORE
+
 #include "sysinfo.h"
-#undef _COMMON_SYSINFO_P_
+
+#include <stdio.h> // fopen
+#include <stdlib.h> // atoi
 
 #include "../common/cbasetypes.h"
 #include "../common/core.h"
-#include "../common/strlib.h"
 #include "../common/malloc.h"
+#include "../common/strlib.h"
 
 #ifdef WIN32
-#include <windows.h>
-#include <string.h> // strlen
+#	include <string.h> // strlen
+#	include <windows.h>
 #else
-#include <unistd.h>
+#	include <unistd.h>
 #endif
-#include <stdio.h> // fopen
-#include <stdlib.h> // atoi
+
+/// Private interface fields
+struct sysinfo_private {
+	char *platform;
+	char *osversion;
+	char *cpu;
+	int cpucores;
+	char *arch;
+	char *compiler;
+	char *cflags;
+	char *vcstype_name;
+	int vcstype;
+	char *vcsrevision_src;
+	char *vcsrevision_scripts;
+};
 
 /// sysinfo.c interface source
 struct sysinfo_interface sysinfo_s;
diff --git a/src/common/sysinfo.h b/src/common/sysinfo.h
index 17faac26b..c0c4d276a 100644
--- a/src/common/sysinfo.h
+++ b/src/common/sysinfo.h
@@ -13,23 +13,7 @@
 
 #include "../common/cbasetypes.h"
 
-#ifdef _COMMON_SYSINFO_P_
-struct sysinfo_private {
-	char *platform;
-	char *osversion;
-	char *cpu;
-	int cpucores;
-	char *arch;
-	char *compiler;
-	char *cflags;
-	char *vcstype_name;
-	int vcstype;
-	char *vcsrevision_src;
-	char *vcsrevision_scripts;
-};
-#else
 struct sysinfo_private;
-#endif
 
 /**
  * sysinfo.c interface
diff --git a/src/common/thread.c b/src/common/thread.c
index 4d110f2dd..4f73aa9b3 100644
--- a/src/common/thread.c
+++ b/src/common/thread.c
@@ -6,24 +6,27 @@
 // Copyright (c) rAthena Project (www.rathena.org) - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
+#define HERCULES_CORE
+
+#include "thread.h"
+
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/showmsg.h"
+
 #ifdef WIN32
-#include "../common/winapi.h"
-#define getpagesize() 4096 // @TODO: implement this properly (GetSystemInfo .. dwPageSize..). (Atm as on all supported win platforms its 4k its static.)
-#define __thread __declspec( thread ) 
+#	include "../common/winapi.h"
+#	define getpagesize() 4096 // @TODO: implement this properly (GetSystemInfo .. dwPageSize..). (Atm as on all supported win platforms its 4k its static.)
+#	define __thread __declspec( thread ) 
 #else
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <signal.h>
-#include <pthread.h>
-#include <sched.h>
+#	include <stdlib.h>
+#	include <unistd.h>
+#	include <string.h>
+#	include <signal.h>
+#	include <pthread.h>
+#	include <sched.h>
 #endif
 
-#include "cbasetypes.h"
-#include "malloc.h"
-#include "showmsg.h"
-#include "thread.h"
-
 // When Compiling using MSC (on win32..) we know we have support in any case!
 #ifdef _MSC_VER 
 #define HAS_TLS 
diff --git a/src/common/thread.h b/src/common/thread.h
index d6b2bbc6e..887c03179 100644
--- a/src/common/thread.h
+++ b/src/common/thread.h
@@ -1,7 +1,6 @@
 // Copyright (c) rAthena Project (www.rathena.org) - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#pragma once 
 #ifndef _COMMON_THREAD_H_
 #define _COMMON_THREAD_H_
 
diff --git a/src/common/timer.c b/src/common/timer.c
index 526854582..10f14b0f2 100644
--- a/src/common/timer.c
+++ b/src/common/timer.c
@@ -2,11 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/db.h"
-#include "../common/malloc.h"
-#include "../common/showmsg.h"
-#include "../common/utils.h"
+#define HERCULES_CORE
+
 #include "timer.h"
 
 #include <stdio.h>
@@ -14,11 +11,17 @@
 #include <string.h>
 #include <time.h>
 
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+#include "../common/malloc.h"
+#include "../common/showmsg.h"
+#include "../common/utils.h"
+
 #ifdef WIN32
-#include "../common/winapi.h" // GetTickCount()
+#	include "../common/winapi.h" // GetTickCount()
 #else
-#include <unistd.h>
-#include <sys/time.h> // struct timeval, gettimeofday()
+#	include <sys/time.h> // struct timeval, gettimeofday()
+#	include <unistd.h>
 #endif
 
 struct timer_interface timer_s;
diff --git a/src/common/utils.c b/src/common/utils.c
index 47747dd32..84925f707 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -2,33 +2,35 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/mmo.h"
-#include "../common/malloc.h"
-#include "../common/showmsg.h"
-#include "../common/core.h"
-#include "socket.h"
+#define HERCULES_CORE
+
 #include "utils.h"
 
-#include <stdio.h>
+#include <math.h> // floor()
 #include <stdarg.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h> // floor()
+#include <sys/stat.h> // cache purposes [Ind/Hercules]
+
+#include "../common/cbasetypes.h"
+#include "../common/core.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
 
 #ifdef WIN32
-	#include "../common/winapi.h"
-	#ifndef F_OK
-		#define F_OK   0x0
-	#endif  /* F_OK */
+#	include "../common/winapi.h"
+#	ifndef F_OK
+#		define F_OK   0x0
+#	endif  /* F_OK */
 #else
-	#include <unistd.h>
-	#include <dirent.h>
-	#include <sys/stat.h>
+#	include <dirent.h>
+#	include <sys/stat.h>
+#	include <unistd.h>
 #endif
 
-#include <sys/stat.h> // cache purposes [Ind/Hercules]
-
 struct HCache_interface HCache_s;
 
 /// Dumps given buffer into file pointed to by a handle.
diff --git a/src/common/utils.h b/src/common/utils.h
index f89546b8a..823651163 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -5,10 +5,11 @@
 #ifndef _COMMON_UTILS_H_
 #define _COMMON_UTILS_H_
 
-#include "../common/cbasetypes.h"
 #include <stdio.h> // FILE*
 #include <time.h>
 
+#include "../common/cbasetypes.h"
+
 /* [HCache] 1-byte key to ensure our method is the latest, we can modify to ensure the method matches */
 #define HCACHE_KEY 'k'
 
diff --git a/src/config/const.h b/src/config/const.h
index 6557cb987..f9baa4d7d 100644
--- a/src/config/const.h
+++ b/src/config/const.h
@@ -52,13 +52,6 @@
 	#define DEFTYPE_MAX CHAR_MAX
 #endif
 
-/* pointer size fix which fixes several gcc warnings */
-#ifdef __64BIT__
-	#define __64BPTRSIZE(y) ((intptr)(y))
-#else
-	#define __64BPTRSIZE(y) (y)
-#endif
-
 /* ATCMD_FUNC(mobinfo) HIT and FLEE calculations */
 #ifdef RENEWAL
 	#define MOB_FLEE(mobdata) ( (mobdata)->lv + (mobdata)->status.agi + 100 )
diff --git a/src/config/renewal.h b/src/config/renewal.h
index 36615d63b..36bdd3958 100644
--- a/src/config/renewal.h
+++ b/src/config/renewal.h
@@ -74,5 +74,6 @@
 #define RENEWAL_ASPD
 
 #endif // DISABLE_RENEWAL
+#undef DISABLE_RENEWAL
 
 #endif // _CONFIG_RENEWAL_H_
diff --git a/src/login/account.h b/src/login/account.h
index 234e7c0c1..329ae31c8 100644
--- a/src/login/account.h
+++ b/src/login/account.h
@@ -7,6 +7,7 @@
 
 #include "../common/cbasetypes.h"
 #include "../common/mmo.h" // ACCOUNT_REG2_NUM
+#include "../common/sql.h" // Sql
 
 typedef struct AccountDB AccountDB;
 typedef struct AccountDBIterator AccountDBIterator;
diff --git a/src/login/account_sql.c b/src/login/account_sql.c
index 1483196ab..2e4ed7ab9 100644
--- a/src/login/account_sql.c
+++ b/src/login/account_sql.c
@@ -2,17 +2,22 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "../config/core.h" // CONSOLE_INPUT
+#include "account.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "../common/console.h"
 #include "../common/malloc.h"
 #include "../common/mmo.h"
 #include "../common/showmsg.h"
+#include "../common/socket.h"
 #include "../common/sql.h"
 #include "../common/strlib.h"
 #include "../common/timer.h"
-#include "../common/console.h"
-#include "../common/socket.h"
-#include "account.h"
-#include <stdlib.h>
-#include <string.h>
 
 /// global defines
 #define ACCOUNT_SQL_DB_VERSION 20110114
@@ -652,7 +657,7 @@ Sql* account_db_sql_up(AccountDB* self) {
 	AccountDB_SQL* db = (AccountDB_SQL*)self;
 	Sql_HerculesUpdateCheck(db->accounts);
 #ifdef CONSOLE_INPUT
-	console->setSQL(db->accounts);
+	console->input->setSQL(db->accounts);
 #endif
 	return db->accounts;
 }
diff --git a/src/login/ipban_sql.c b/src/login/ipban_sql.c
index 74f45e418..081f28d84 100644
--- a/src/login/ipban_sql.c
+++ b/src/login/ipban_sql.c
@@ -2,6 +2,15 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "ipban.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "login.h"
+#include "loginlog.h"
 #include "../common/cbasetypes.h"
 #include "../common/db.h"
 #include "../common/malloc.h"
@@ -9,11 +18,6 @@
 #include "../common/socket.h"
 #include "../common/strlib.h"
 #include "../common/timer.h"
-#include "login.h"
-#include "ipban.h"
-#include "loginlog.h"
-#include <stdlib.h>
-#include <string.h>
 
 // global sql settings
 static char   global_db_hostname[32] = "127.0.0.1";
diff --git a/src/login/login.c b/src/login/login.c
index af59fcf38..cb46e0226 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -2,6 +2,18 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "login.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "account.h"
+#include "ipban.h"
+#include "loginlog.h"
+#include "../common/HPM.h"
 #include "../common/core.h"
 #include "../common/db.h"
 #include "../common/malloc.h"
@@ -12,15 +24,6 @@
 #include "../common/strlib.h"
 #include "../common/timer.h"
 #include "../common/utils.h"
-#include "../common/HPM.h"
-#include "account.h"
-#include "ipban.h"
-#include "login.h"
-#include "loginlog.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 struct Login_Config login_config;
 
diff --git a/src/login/login.h b/src/login/login.h
index 14c361a15..e77b96a0e 100644
--- a/src/login/login.h
+++ b/src/login/login.h
@@ -5,8 +5,8 @@
 #ifndef _LOGIN_LOGIN_H_
 #define _LOGIN_LOGIN_H_
 
-#include "../common/mmo.h" // NAME_LENGTH,SEX_*
 #include "../common/core.h" // CORE_ST_LAST
+#include "../common/mmo.h" // NAME_LENGTH,SEX_*
 
 enum E_LOGINSERVER_ST
 {
diff --git a/src/login/loginlog.h b/src/login/loginlog.h
index 730fb6e62..a86ad431c 100644
--- a/src/login/loginlog.h
+++ b/src/login/loginlog.h
@@ -4,6 +4,7 @@
 #ifndef _LOGIN_LOGINLOG_H_
 #define _LOGIN_LOGINLOG_H_
 
+#include "../common/cbasetypes.h"
 
 unsigned long loginlog_failedattempts(uint32 ip, unsigned int minutes);
 void login_log(uint32 ip, const char* username, int rcode, const char* message);
@@ -11,5 +12,4 @@ bool loginlog_init(void);
 bool loginlog_final(void);
 bool loginlog_config_read(const char* w1, const char* w2);
 
-
 #endif /* _LOGIN_LOGINLOG_H_ */
diff --git a/src/login/loginlog_sql.c b/src/login/loginlog_sql.c
index 231ac783b..2cbc02c93 100644
--- a/src/login/loginlog_sql.c
+++ b/src/login/loginlog_sql.c
@@ -2,13 +2,18 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "loginlog.h"
+
+#include <string.h>
+#include <stdlib.h> // exit
+
 #include "../common/cbasetypes.h"
 #include "../common/mmo.h"
 #include "../common/socket.h"
 #include "../common/sql.h"
 #include "../common/strlib.h"
-#include <string.h>
-#include <stdlib.h> // exit
 
 // global sql settings (in ipban_sql.c)
 static char   global_db_hostname[32] = "127.0.0.1";
diff --git a/src/map/HPMmap.c b/src/map/HPMmap.c
index 061479d87..cb8c979c6 100644
--- a/src/map/HPMmap.c
+++ b/src/map/HPMmap.c
@@ -1,25 +1,15 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 
-#include "../common/cbasetypes.h"
-#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"
-
+#define HERCULES_CORE
 
 #include "HPMmap.h"
-#include "pc.h"
-#include "map.h"
 
-//
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
 #include "atcommand.h"
 #include "battle.h"
 #include "battleground.h"
@@ -37,12 +27,14 @@
 #include "itemdb.h"
 #include "log.h"
 #include "mail.h"
+#include "map.h"
 #include "mapreg.h"
 #include "mercenary.h"
 #include "mob.h"
 #include "npc.h"
 #include "party.h"
 #include "path.h"
+#include "pc.h"
 #include "pc_groups.h"
 #include "pet.h"
 #include "quest.h"
@@ -54,11 +46,19 @@
 #include "trade.h"
 #include "unit.h"
 #include "vending.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
+#include "../common/HPM.h"
+#include "../common/cbasetypes.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"
 
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 5fd0faf86..df3be40a5 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -2,57 +2,60 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/mmo.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/core.h"
-#include "../common/showmsg.h"
-#include "../common/malloc.h"
-#include "../common/random.h"
-#include "../common/socket.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
-#include "../common/conf.h"
-#include "../common/sysinfo.h"
+#define HERCULES_CORE
 
+#include "../config/core.h" // AUTOLOOTITEM_SIZE, AUTOTRADE_PERSISTENCY, MAX_CARTS, MAX_SUGGESTIONS, MOB_FLEE(), MOB_HIT(), RENEWAL, RENEWAL_DROP, RENEWAL_EXP
 #include "atcommand.h"
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "battle.h"
 #include "chat.h"
-#include "clif.h"
 #include "chrif.h"
+#include "clif.h"
 #include "duel.h"
+#include "elemental.h"
+#include "guild.h"
+#include "homunculus.h"
 #include "intif.h"
 #include "itemdb.h"
 #include "log.h"
+#include "mail.h"
 #include "map.h"
-#include "pc.h"
-#include "pc_groups.h" // groupid2name
-#include "status.h"
-#include "skill.h"
+#include "mapreg.h"
+#include "mercenary.h"
 #include "mob.h"
 #include "npc.h"
-#include "pet.h"
-#include "homunculus.h"
-#include "mail.h"
-#include "mercenary.h"
-#include "elemental.h"
 #include "party.h"
-#include "guild.h"
+#include "pc.h"
+#include "pc_groups.h" // groupid2name
+#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 "mapreg.h"
-#include "quest.h"
-#include "searchstore.h"
+#include "../common/cbasetypes.h"
+#include "../common/conf.h"
+#include "../common/core.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/sysinfo.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 #include "HPMmap.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-
 struct atcommand_interface atcommand_s;
 
 static char atcmd_output[CHAT_SIZE_MAX];
diff --git a/src/map/atcommand.h b/src/map/atcommand.h
index bc4ab30a3..c8a1863af 100644
--- a/src/map/atcommand.h
+++ b/src/map/atcommand.h
@@ -5,9 +5,9 @@
 #ifndef _MAP_ATCOMMAND_H_
 #define _MAP_ATCOMMAND_H_
 
+#include "pc_groups.h"
 #include "../common/conf.h"
 #include "../common/db.h"
-#include "pc_groups.h"
 
 /**
  * Declarations
diff --git a/src/map/battle.c b/src/map/battle.c
index 9089b7102..0865ee4ba 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2,41 +2,44 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/malloc.h"
-#include "../common/showmsg.h"
-#include "../common/ers.h"
-#include "../common/random.h"
-#include "../common/socket.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
-#include "../common/sysinfo.h"
-#include "../common/HPM.h"
+#define HERCULES_CORE
 
-#include "map.h"
-#include "path.h"
-#include "pc.h"
-#include "status.h"
-#include "skill.h"
-#include "homunculus.h"
-#include "mercenary.h"
-#include "elemental.h"
-#include "mob.h"
-#include "itemdb.h"
-#include "clif.h"
-#include "pet.h"
-#include "guild.h"
-#include "party.h"
+#include "../config/core.h" // CELL_NOSTACK, CIRCULAR_AREA, CONSOLE_INPUT, HMAP_ZONE_DAMAGE_CAP_TYPE, OFFICIAL_WALKPATH, RENEWAL, RENEWAL_ASPD, RENEWAL_CAST, RENEWAL_DROP, RENEWAL_EDP, RENEWAL_EXP, RENEWAL_LVDMG, RE_LVL_DMOD(), RE_LVL_MDMOD(), RE_LVL_TMDMOD(), RE_SKILL_REDUCTION(), SCRIPT_CALLFUNC_CHECK, SECURE_NPCTIMEOUT, STATS_OPT_OUT
 #include "battle.h"
-#include "battleground.h"
-#include "chrif.h"
 
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
+
+#include "battleground.h"
+#include "chrif.h"
+#include "clif.h"
+#include "elemental.h"
+#include "guild.h"
+#include "homunculus.h"
+#include "itemdb.h"
+#include "map.h"
+#include "mercenary.h"
+#include "mob.h"
+#include "party.h"
+#include "path.h"
+#include "pc.h"
+#include "pet.h"
+#include "skill.h"
+#include "status.h"
+#include "../common/HPM.h"
+#include "../common/cbasetypes.h"
+#include "../common/ers.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/sysinfo.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 struct Battle_Config battle_config;
 struct battle_interface battle_s;
diff --git a/src/map/battle.h b/src/map/battle.h
index 88038ddb4..fbe097c78 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -5,8 +5,8 @@
 #ifndef _MAP_BATTLE_H_
 #define _MAP_BATTLE_H_
 
-#include "../common/cbasetypes.h"
 #include "map.h" //ELE_MAX
+#include "../common/cbasetypes.h"
 
 /**
  * Declarations
diff --git a/src/map/battleground.c b/src/map/battleground.c
index 68539e25d..a7169de0e 100644
--- a/src/map/battleground.c
+++ b/src/map/battleground.c
@@ -2,29 +2,32 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/timer.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/strlib.h"
-#include "../common/conf.h"
+#define HERCULES_CORE
 
 #include "battleground.h"
+
+#include <string.h>
+#include <stdio.h>
+
 #include "battle.h"
 #include "clif.h"
+#include "homunculus.h"
 #include "map.h"
+#include "mapreg.h"
+#include "mercenary.h"
+#include "mob.h" // struct mob_data
 #include "npc.h"
-#include "pc.h"
 #include "party.h"
+#include "pc.h"
 #include "pet.h"
-#include "homunculus.h"
-#include "mercenary.h"
-#include "mapreg.h"
-
-#include <string.h>
-#include <stdio.h>
+#include "../common/cbasetypes.h"
+#include "../common/conf.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
 
 struct battleground_interface bg_s;
 
diff --git a/src/map/battleground.h b/src/map/battleground.h
index 05c4eb060..ec0a86f14 100644
--- a/src/map/battleground.h
+++ b/src/map/battleground.h
@@ -5,9 +5,9 @@
 #ifndef _MAP_BATTLEGROUND_H_
 #define _MAP_BATTLEGROUND_H_
 
-#include "../common/mmo.h" // struct party
 #include "clif.h"
 #include "guild.h"
+#include "../common/mmo.h" // struct party
 
 /**
  * Defines
diff --git a/src/map/buyingstore.c b/src/map/buyingstore.c
index 2a15e66fc..80264b30d 100644
--- a/src/map/buyingstore.c
+++ b/src/map/buyingstore.c
@@ -2,18 +2,21 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/db.h"  // ARR_FIND
-#include "../common/showmsg.h"  // ShowWarning
-#include "../common/socket.h"  // RBUF*
-#include "../common/strlib.h"  // safestrncpy
+#define HERCULES_CORE
+
+#include "buyingstore.h"  // struct s_buyingstore
+
 #include "atcommand.h"  // msg_txt
 #include "battle.h"  // battle_config.*
-#include "buyingstore.h"  // struct s_buyingstore
+#include "chrif.h"
 #include "clif.h"  // clif->buyingstore_*
 #include "log.h"  // log_pick_pc, log_zeny
 #include "pc.h"  // struct map_session_data
-#include "chrif.h"
+#include "../common/cbasetypes.h"
+#include "../common/db.h"  // ARR_FIND
+#include "../common/showmsg.h"  // ShowWarning
+#include "../common/socket.h"  // RBUF*
+#include "../common/strlib.h"  // safestrncpy
 
 struct buyingstore_interface buyingstore_s;
 
diff --git a/src/map/buyingstore.h b/src/map/buyingstore.h
index 5141a1013..914631872 100644
--- a/src/map/buyingstore.h
+++ b/src/map/buyingstore.h
@@ -5,6 +5,11 @@
 #ifndef _MAP_BUYINGSTORE_H_
 #define _MAP_BUYINGSTORE_H_
 
+#include "../common/cbasetypes.h"
+#include "../common/mmo.h" // MAX_SLOTS
+
+struct map_session_data;
+
 /**
  * Declarations
  **/
diff --git a/src/map/chat.c b/src/map/chat.c
index 08fc4a575..c9d3e6d46 100644
--- a/src/map/chat.c
+++ b/src/map/chat.c
@@ -2,12 +2,13 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/mmo.h"
+#define HERCULES_CORE
+
+#include "chat.h"
+
+#include <stdio.h>
+#include <string.h>
+
 #include "atcommand.h" // msg_txt()
 #include "battle.h" // struct battle_config
 #include "clif.h"
@@ -15,10 +16,12 @@
 #include "npc.h" // npc_event_do()
 #include "pc.h"
 #include "skill.h" // ext_skill_unit_onplace()
-#include "chat.h"
-
-#include <stdio.h>
-#include <string.h>
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
 
 struct chat_interface chat_s;
 
diff --git a/src/map/chat.h b/src/map/chat.h
index b0c6cd905..cbc2a391e 100644
--- a/src/map/chat.h
+++ b/src/map/chat.h
@@ -6,9 +6,12 @@
 #define _MAP_CHAT_H_
 
 #include "map.h" // struct block_list, CHATROOM_TITLE_SIZE
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
 
-struct map_session_data;
 struct chat_data;
+struct map_session_data;
+struct npc_data;
 
 #define MAX_CHAT_USERS 20
 
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 99a1935fd..81e2d387c 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -2,15 +2,16 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/ers.h"
-#include "../common/HPM.h"
+#define HERCULES_CORE
+
+#include "../config/core.h" // AUTOTRADE_PERSISTENCY, STATS_OPT_OUT
+#include "chrif.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <time.h>
 
 #include "map.h"
 #include "battle.h"
@@ -25,15 +26,17 @@
 #include "instance.h"
 #include "mercenary.h"
 #include "elemental.h"
-#include "chrif.h"
 #include "quest.h"
 #include "storage.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <time.h>
+#include "../common/HPM.h"
+#include "../common/cbasetypes.h"
+#include "../common/ers.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
 
 struct chrif_interface chrif_s;
 
diff --git a/src/map/chrif.h b/src/map/chrif.h
index 25e955604..84efc66d3 100644
--- a/src/map/chrif.h
+++ b/src/map/chrif.h
@@ -5,9 +5,11 @@
 #ifndef _MAP_CHRIF_H_
 #define _MAP_CHRIF_H_
 
-#include "../common/cbasetypes.h"
 #include <time.h>
+
 #include "map.h" //TBL_stuff
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
 
 struct status_change_entry;
 
diff --git a/src/map/clif.c b/src/map/clif.c
index 062a437a2..1da6070e8 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -2,56 +2,59 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/grfio.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
-#include "../common/ers.h"
-#include "../common/conf.h"
-#include "../common/HPM.h"
+#define HERCULES_CORE
+
+#include "../config/core.h" // ANTI_MAYAP_CHEAT, NEW_CARTS, RENEWAL, SECURE_NPCTIMEOUT
+#include "clif.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <time.h>
 
-#include "map.h"
-#include "chrif.h"
-#include "pc.h"
-#include "status.h"
-#include "npc.h"
-#include "itemdb.h"
-#include "chat.h"
-#include "trade.h"
-#include "storage.h"
-#include "script.h"
-#include "skill.h"
 #include "atcommand.h"
-#include "intif.h"
 #include "battle.h"
 #include "battleground.h"
-#include "mob.h"
-#include "party.h"
-#include "unit.h"
+#include "chat.h"
+#include "chrif.h"
+#include "elemental.h"
 #include "guild.h"
-#include "vending.h"
-#include "pet.h"
 #include "homunculus.h"
 #include "instance.h"
-#include "mercenary.h"
-#include "elemental.h"
+#include "intif.h"
+#include "irc-bot.h"
+#include "itemdb.h"
 #include "log.h"
-#include "clif.h"
 #include "mail.h"
+#include "map.h"
+#include "mercenary.h"
+#include "mob.h"
+#include "npc.h"
+#include "party.h"
+#include "pc.h"
+#include "pet.h"
 #include "quest.h"
-#include "irc-bot.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <time.h>
+#include "script.h"
+#include "skill.h"
+#include "status.h"
+#include "storage.h"
+#include "trade.h"
+#include "unit.h"
+#include "vending.h"
+#include "../common/HPM.h"
+#include "../common/cbasetypes.h"
+#include "../common/conf.h"
+#include "../common/ers.h"
+#include "../common/grfio.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 struct clif_interface clif_s;
 
diff --git a/src/map/clif.h b/src/map/clif.h
index bbe07b718..f54c4afce 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -5,13 +5,13 @@
 #ifndef _MAP_CLIF_H_
 #define _MAP_CLIF_H_
 
+#include <stdarg.h>
+
+#include "map.h"
+#include "packets_struct.h"
 #include "../common/cbasetypes.h"
 #include "../common/db.h"
 #include "../common/mmo.h"
-#include "../common/socket.h"
-#include "../map/map.h"
-#include "../map/packets_struct.h"
-#include <stdarg.h>
 
 /**
  * Declarations
@@ -20,7 +20,6 @@ struct item;
 struct item_data;
 struct storage_data;
 struct guild_storage;
-struct block_list;
 struct unit_data;
 struct map_session_data;
 struct homun_data;
diff --git a/src/map/date.c b/src/map/date.c
index f38ead858..975a00c50 100644
--- a/src/map/date.c
+++ b/src/map/date.c
@@ -1,10 +1,14 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#include "../common/cbasetypes.h"
+#define HERCULES_CORE
+
 #include "date.h"
+
 #include <time.h>
 
+#include "../common/cbasetypes.h"
+
 int date_get_year(void)
 {
 	time_t t;
diff --git a/src/map/date.h b/src/map/date.h
index 46f0d86c3..b3ed59b2f 100644
--- a/src/map/date.h
+++ b/src/map/date.h
@@ -4,6 +4,8 @@
 #ifndef _MAP_DATE_H_
 #define _MAP_DATE_H_
 
+#include "../common/cbasetypes.h"
+
 int date_get_year(void);
 int date_get_month(void);
 int date_get_day(void);
diff --git a/src/map/duel.c b/src/map/duel.c
index af2741f77..a423ef240 100644
--- a/src/map/duel.c
+++ b/src/map/duel.c
@@ -2,18 +2,20 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
+#define HERCULES_CORE
 
-#include "atcommand.h"  // msg_txt
-#include "clif.h"
 #include "duel.h"
-#include "pc.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
+#include "atcommand.h"  // msg_txt
+#include "clif.h"
+#include "pc.h"
+#include "../common/cbasetypes.h"
+
 /*==========================================
  * Duel organizing functions [LuzZza]
  *------------------------------------------*/
diff --git a/src/map/duel.h b/src/map/duel.h
index 5405d2eee..956aed36d 100644
--- a/src/map/duel.h
+++ b/src/map/duel.h
@@ -5,6 +5,10 @@
 #ifndef _MAP_DUEL_H_
 #define _MAP_DUEL_H_
 
+#include "../common/cbasetypes.h"
+
+struct map_session_data;
+
 struct duel {
 	int members_count;
 	int invites_count;
diff --git a/src/map/elemental.c b/src/map/elemental.c
index f335600d6..323df41e1 100644
--- a/src/map/elemental.c
+++ b/src/map/elemental.c
@@ -2,42 +2,44 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/mmo.h"
-#include "../common/showmsg.h"
-#include "../common/utils.h"
-#include "../common/random.h"
-#include "../common/strlib.h"
+#define HERCULES_CORE
 
-#include "log.h"
-#include "clif.h"
+#include "elemental.h"
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "atcommand.h"
+#include "battle.h"
 #include "chrif.h"
+#include "clif.h"
+#include "guild.h"
 #include "intif.h"
 #include "itemdb.h"
+#include "log.h"
 #include "map.h"
-#include "pc.h"
-#include "status.h"
-#include "skill.h"
 #include "mob.h"
-#include "pet.h"
-#include "battle.h"
+#include "npc.h"
 #include "party.h"
-#include "guild.h"
-#include "atcommand.h"
+#include "pc.h"
+#include "pet.h"
 #include "script.h"
-#include "npc.h"
+#include "skill.h"
+#include "status.h"
 #include "trade.h"
 #include "unit.h"
-#include "elemental.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 struct elemental_interface elemental_s;
 
diff --git a/src/map/elemental.h b/src/map/elemental.h
index 6d04a41a5..aa27aadc9 100644
--- a/src/map/elemental.h
+++ b/src/map/elemental.h
@@ -7,6 +7,7 @@
 
 #include "status.h" // struct status_data, struct status_change
 #include "unit.h" // struct unit_data
+#include "../common/mmo.h" // NAME_LENGTH
 
 /**
  * Defines
diff --git a/src/map/guild.c b/src/map/guild.c
index fa5805c8b..69f67238d 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -2,35 +2,38 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/malloc.h"
-#include "../common/mapindex.h"
-#include "../common/showmsg.h"
-#include "../common/ers.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
-#include "../common/HPM.h"
+#define HERCULES_CORE
 
-#include "map.h"
+#include "../config/core.h" // GP_BOUND_ITEMS
 #include "guild.h"
-#include "storage.h"
-#include "battle.h"
-#include "npc.h"
-#include "pc.h"
-#include "status.h"
-#include "mob.h"
-#include "intif.h"
-#include "clif.h"
-#include "skill.h"
-#include "log.h"
-#include "instance.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "battle.h"
+#include "clif.h"
+#include "instance.h"
+#include "intif.h"
+#include "log.h"
+#include "map.h"
+#include "mob.h"
+#include "npc.h"
+#include "pc.h"
+#include "skill.h"
+#include "status.h"
+#include "storage.h"
+#include "../common/HPM.h"
+#include "../common/cbasetypes.h"
+#include "../common/ers.h"
+#include "../common/malloc.h"
+#include "../common/mapindex.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
+
 struct guild_interface guild_s;
 
 /*==========================================
diff --git a/src/map/guild.h b/src/map/guild.h
index b03bd664d..34e27a56c 100644
--- a/src/map/guild.h
+++ b/src/map/guild.h
@@ -5,18 +5,10 @@
 #ifndef _MAP_GUILD_H_
 #define _MAP_GUILD_H_
 
-//#include "../common/mmo.h"
-#include "map.h" // NAME_LENGTH
-
-/**
- * Declarations
- **/
-struct guild;
-struct guild_member;
-struct guild_position;
-struct guild_castle;
-struct map_session_data;
-struct mob_data;
+#include "map.h" // EVENT_NAME_LENGTH, TBL_PC
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+#include "../common/mmo.h"
 
 /**
  * Defines
diff --git a/src/map/homunculus.c b/src/map/homunculus.c
index ff9f7a5b1..b6a83d1cb 100644
--- a/src/map/homunculus.c
+++ b/src/map/homunculus.c
@@ -2,43 +2,45 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/mmo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
+#define HERCULES_CORE
 
-#include "log.h"
-#include "clif.h"
+#include "../config/core.h" // DBPATH
+#include "homunculus.h"
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "atcommand.h"
+#include "battle.h"
 #include "chrif.h"
+#include "clif.h"
+#include "guild.h"
 #include "intif.h"
 #include "itemdb.h"
+#include "log.h"
 #include "map.h"
-#include "pc.h"
-#include "status.h"
-#include "skill.h"
 #include "mob.h"
-#include "pet.h"
-#include "battle.h"
+#include "npc.h"
 #include "party.h"
-#include "guild.h"
-#include "atcommand.h"
+#include "pc.h"
+#include "pet.h"
 #include "script.h"
-#include "npc.h"
+#include "skill.h"
+#include "status.h"
 #include "trade.h"
 #include "unit.h"
-
-#include "homunculus.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 struct homunculus_interface homunculus_s;
 
diff --git a/src/map/homunculus.h b/src/map/homunculus.h
index e6d59e30e..9eef6af5b 100644
--- a/src/map/homunculus.h
+++ b/src/map/homunculus.h
@@ -5,9 +5,10 @@
 #ifndef _MAP_HOMUNCULUS_H_
 #define _MAP_HOMUNCULUS_H_
 
+#include "pc.h"
 #include "status.h" // struct status_data, struct status_change
 #include "unit.h" // struct unit_data
-#include "pc.h"
+#include "../common/mmo.h"
 
 #define MAX_HOM_SKILL_REQUIRE 5
 #define homdb_checkid(id) ((id) >=  HM_CLASS_BASE && (id) <= HM_CLASS_MAX)
diff --git a/src/map/instance.c b/src/map/instance.c
index caf622b3d..5789d7dd6 100644
--- a/src/map/instance.c
+++ b/src/map/instance.c
@@ -2,30 +2,32 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
-#include "../common/db.h"
-#include "../common/HPM.h"
+#define HERCULES_CORE
 
-#include "clif.h"
 #include "instance.h"
-#include "map.h"
-#include "npc.h"
-#include "party.h"
-#include "pc.h"
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdarg.h>
 #include <time.h>
 
+#include "clif.h"
+#include "map.h"
+#include "npc.h"
+#include "party.h"
+#include "pc.h"
+#include "../common/HPM.h"
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
+
 struct instance_interface instance_s;
 
 /// Checks whether given instance id is valid or not.
diff --git a/src/map/instance.h b/src/map/instance.h
index 712a0f141..ae649eda7 100644
--- a/src/map/instance.h
+++ b/src/map/instance.h
@@ -6,8 +6,11 @@
 #define _MAP_INSTANCE_H_
 
 #include "script.h" // struct reg_db
+#include "../common/cbasetypes.h"
 #include "../common/mmo.h" // struct point
+
 struct block_list;
+struct map_session_data;
 
 #define INSTANCE_NAME_LENGTH (60+1)
 
diff --git a/src/map/intif.c b/src/map/intif.c
index 6bd24368a..383150fbc 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -1,37 +1,40 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/malloc.h"
-#include "../common/strlib.h"
-#include "map.h"
+#define HERCULES_CORE
+
+#include "../config/core.h" // GP_BOUND_ITEMS
+#include "intif.h"
+
+#include <fcntl.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+
+#include "atcommand.h"
 #include "battle.h"
 #include "chrif.h"
 #include "clif.h"
-#include "pc.h"
-#include "intif.h"
-#include "log.h"
-#include "storage.h"
-#include "party.h"
+#include "elemental.h"
 #include "guild.h"
-#include "pet.h"
-#include "atcommand.h"
-#include "mercenary.h"
 #include "homunculus.h"
-#include "elemental.h"
+#include "log.h"
 #include "mail.h"
+#include "map.h"
+#include "mercenary.h"
+#include "party.h"
+#include "pc.h"
+#include "pet.h"
 #include "quest.h"
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <fcntl.h>
-#include <string.h>
-
+#include "storage.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
 
 struct intif_interface intif_s;
 
diff --git a/src/map/intif.h b/src/map/intif.h
index 290dcfcdc..b6ee727f3 100644
--- a/src/map/intif.h
+++ b/src/map/intif.h
@@ -5,19 +5,22 @@
 #ifndef _MAP_INTIF_H_
 #define _MAP_INTIF_H_
 
+#include "../common/cbasetypes.h"
 
 /**
  * Declarations
  **/
-struct party_member;
+struct auction_data;
 struct guild_member;
 struct guild_position;
-struct s_pet;
+struct guild_storage;
+struct mail_message;
+struct map_session_data;
+struct party_member;
+struct s_elemental;
 struct s_homunculus;
 struct s_mercenary;
-struct s_elemental;
-struct mail_message;
-struct auction_data;
+struct s_pet;
 
 /**
  * Defines
diff --git a/src/map/irc-bot.c b/src/map/irc-bot.c
index ff28082e7..6f016697f 100644
--- a/src/map/irc-bot.c
+++ b/src/map/irc-bot.c
@@ -2,23 +2,25 @@
 // See the LICENSE file
 // Base Author: shennetsind @ http://hercules.ws
 
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/strlib.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/random.h"
+#define HERCULES_CORE
 
-#include "map.h"
-#include "pc.h"
-#include "clif.h"
 #include "irc-bot.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "clif.h"
+#include "map.h"
+#include "pc.h"
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+
 //#define IRCBOT_DEBUG
 
 struct irc_bot_interface irc_bot_s;
diff --git a/src/map/irc-bot.h b/src/map/irc-bot.h
index c15a5d46a..60f03fca5 100644
--- a/src/map/irc-bot.h
+++ b/src/map/irc-bot.h
@@ -6,6 +6,8 @@
 #ifndef _MAP_IRC_BOT_H_
 #define _MAP_IRC_BOT_H_
 
+#include "../common/cbasetypes.h"
+
 #define IRC_NICK_LENGTH 40
 #define IRC_IDENT_LENGTH 40
 #define IRC_HOST_LENGTH 63
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index 5eeb90be5..1981f435c 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -2,23 +2,28 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/nullpo.h"
-#include "../common/malloc.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
-#include "../common/conf.h"
+#define HERCULES_CORE
+
+#include "../config/core.h" // DBPATH, RENEWAL
 #include "itemdb.h"
-#include "map.h"
-#include "battle.h" // struct battle_config
-#include "script.h" // item script processing
-#include "pc.h"     // W_MUSICAL, W_WHIP
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "battle.h" // struct battle_config
+#include "map.h"
+#include "mob.h"    // MAX_MOB_DB
+#include "pc.h"     // W_MUSICAL, W_WHIP
+#include "script.h" // item script processing
+#include "../common/conf.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
+
 struct itemdb_interface itemdb_s;
 
 /**
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index 77fb2e2ec..12766b288 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -5,9 +5,12 @@
 #ifndef _MAP_ITEMDB_H_
 #define _MAP_ITEMDB_H_
 
+#include "map.h"
+#include "../common/cbasetypes.h"
+#include "../common/conf.h"
 #include "../common/db.h"
 #include "../common/mmo.h" // ITEM_NAME_LENGTH
-#include "map.h"
+#include "../common/sql.h"
 
 /**
  * Declarations
diff --git a/src/map/log.c b/src/map/log.c
index 19a98f34b..523ef1d65 100644
--- a/src/map/log.c
+++ b/src/map/log.c
@@ -2,22 +2,25 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/sql.h" // SQL_INNODB
-#include "../common/strlib.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
-#include "battle.h"
-#include "itemdb.h"
+#define HERCULES_CORE
+
 #include "log.h"
-#include "map.h"
-#include "mob.h"
-#include "pc.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "battle.h"
+#include "itemdb.h"
+#include "map.h"
+#include "mob.h"
+#include "pc.h"
+#include "../common/cbasetypes.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/sql.h" // SQL_INNODB
+#include "../common/strlib.h"
+
 struct log_interface log_s;
 
 /// obtain log type character for item/zeny logs
diff --git a/src/map/log.h b/src/map/log.h
index b2cb92c20..ecfedeac2 100644
--- a/src/map/log.h
+++ b/src/map/log.h
@@ -11,11 +11,10 @@
 /**
  * Declarations
  **/
-struct block_list;
-struct map_session_data;
-struct mob_data;
 struct item;
 struct item_data;
+struct map_session_data;
+struct mob_data;
 
 /**
  * Defines
diff --git a/src/map/mail.c b/src/map/mail.c
index 371aa892f..7ba7d7470 100644
--- a/src/map/mail.c
+++ b/src/map/mail.c
@@ -2,19 +2,21 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
+#define HERCULES_CORE
 
 #include "mail.h"
-#include "atcommand.h"
-#include "itemdb.h"
-#include "clif.h"
-#include "pc.h"
-#include "log.h"
 
 #include <time.h>
 #include <string.h>
 
+#include "atcommand.h"
+#include "clif.h"
+#include "itemdb.h"
+#include "log.h"
+#include "pc.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+
 struct mail_interface mail_s;
 
 void mail_clear(struct map_session_data *sd)
diff --git a/src/map/mail.h b/src/map/mail.h
index 8df537ff3..30b032ef4 100644
--- a/src/map/mail.h
+++ b/src/map/mail.h
@@ -5,7 +5,11 @@
 #ifndef _MAP_MAIL_H_
 #define _MAP_MAIL_H_
 
-#include "../common/mmo.h"
+#include "../common/cbasetypes.h"
+
+struct item;
+struct mail_message;
+struct map_session_data;
 
 struct mail_interface {
 	void (*clear) (struct map_session_data *sd);
diff --git a/src/map/map.c b/src/map/map.c
index 24a07699f..bccb51d7e 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -2,62 +2,66 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/core.h"
-#include "../common/timer.h"
-#include "../common/ers.h"
-#include "../common/grfio.h"
-#include "../common/malloc.h"
-#include "../common/socket.h" // WFIFO*()
-#include "../common/showmsg.h"
-#include "../common/nullpo.h"
-#include "../common/random.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
-#include "../common/conf.h"
-#include "../common/console.h"
-#include "../common/HPM.h"
+#define HERCULES_CORE
 
+#include "../config/core.h" // CELL_NOSTACK, CIRCULAR_AREA, CONSOLE_INPUT, DBPATH, RENEWAL
 #include "map.h"
-#include "path.h"
+
+#include <math.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "HPMmap.h"
+#include "atcommand.h"
+#include "battle.h"
+#include "battleground.h"
+#include "chat.h"
 #include "chrif.h"
 #include "clif.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 "npc.h" // npc_setcells(), npc_unsetcells()
+#include "party.h"
+#include "path.h"
 #include "pc.h"
+#include "pet.h"
+#include "quest.h"
+#include "script.h"
+#include "skill.h"
 #include "status.h"
-#include "mob.h"
-#include "npc.h" // npc_setcells(), npc_unsetcells()
-#include "chat.h"
-#include "itemdb.h"
 #include "storage.h"
-#include "skill.h"
 #include "trade.h"
-#include "party.h"
 #include "unit.h"
-#include "battle.h"
-#include "battleground.h"
-#include "quest.h"
-#include "script.h"
-#include "mapreg.h"
-#include "guild.h"
-#include "pet.h"
-#include "homunculus.h"
-#include "instance.h"
-#include "mercenary.h"
-#include "elemental.h"
-#include "atcommand.h"
-#include "log.h"
-#include "mail.h"
-#include "irc-bot.h"
-#include "HPMmap.h"
+#include "../common/HPM.h"
+#include "../common/cbasetypes.h"
+#include "../common/conf.h"
+#include "../common/console.h"
+#include "../common/core.h"
+#include "../common/ers.h"
+#include "../common/grfio.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h" // WFIFO*()
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <math.h>
 #ifndef _WIN32
 #include <unistd.h>
 #endif
@@ -5480,8 +5484,8 @@ void map_cp_defaults(void) {
 	map->cpsd->bl.y = MAP_DEFAULT_Y;
 	map->cpsd->bl.m = map->mapname2mapid(MAP_DEFAULT);
 
-	console->addCommand("gm:info",CPCMD_A(gm_position));
-	console->addCommand("gm:use",CPCMD_A(gm_use));
+	console->input->addCommand("gm:info",CPCMD_A(gm_position));
+	console->input->addCommand("gm:use",CPCMD_A(gm_use));
 #endif
 }
 /* Hercules Plugin Mananger */
@@ -5837,7 +5841,7 @@ int do_init(int argc, char *argv[])
 	Sql_HerculesUpdateCheck(map->mysql_handle);
 	
 #ifdef CONSOLE_INPUT
-	console->setSQL(map->mysql_handle);
+	console->input->setSQL(map->mysql_handle);
 #endif
 	
 	ShowStatus("Server is '"CL_GREEN"ready"CL_RESET"' and listening on port '"CL_WHITE"%d"CL_RESET"'.\n\n", map->port);
diff --git a/src/map/map.h b/src/map/map.h
index 6b2e9d909..8277c7a62 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -5,18 +5,18 @@
 #ifndef _MAP_MAP_H_
 #define _MAP_MAP_H_
 
+#include <stdarg.h>
+
+#include "atcommand.h"
 #include "../common/cbasetypes.h"
 #include "../common/core.h" // CORE_ST_LAST
 #include "../common/mmo.h"
 #include "../common/mapindex.h"
 #include "../common/db.h"
-#include "../config/core.h"
 #include "../common/sql.h"
-#include "atcommand.h"
-#include <stdarg.h>
 
+struct mob_data;
 struct npc_data;
-struct item_data;
 struct hChSysCh;
 
 enum E_MAPSERVER_ST {
@@ -36,7 +36,6 @@ enum E_MAPSERVER_ST {
 #define NATURAL_HEAL_INTERVAL 500
 #define MIN_FLOORITEM 2
 #define MAX_FLOORITEM START_ACCOUNT_NUM
-#define MAX_LEVEL 175
 #define MAX_IGNORE_LIST 20 // official is 14
 #define MAX_VENDING 12
 #define MAX_MAP_SIZE (512*512) // Wasn't there something like this already? Can't find it.. [Shinryo]
diff --git a/src/map/mapreg_sql.c b/src/map/mapreg_sql.c
index 61c25f24e..f026fde00 100644
--- a/src/map/mapreg_sql.c
+++ b/src/map/mapreg_sql.c
@@ -2,6 +2,15 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "mapreg.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "map.h" // map->mysql_handle
+#include "script.h"
 #include "../common/cbasetypes.h"
 #include "../common/db.h"
 #include "../common/ers.h"
@@ -10,11 +19,6 @@
 #include "../common/sql.h"
 #include "../common/strlib.h"
 #include "../common/timer.h"
-#include "map.h" // map->mysql_handle
-#include "script.h"
-#include "mapreg.h"
-#include <stdlib.h>
-#include <string.h>
 
 struct mapreg_interface mapreg_s;
 
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 495621014..26bc8c188 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -2,42 +2,44 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/mmo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
+#define HERCULES_CORE
 
-#include "log.h"
-#include "clif.h"
+#include "mercenary.h"
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "atcommand.h"
+#include "battle.h"
 #include "chrif.h"
+#include "clif.h"
+#include "guild.h"
 #include "intif.h"
 #include "itemdb.h"
+#include "log.h"
 #include "map.h"
-#include "pc.h"
-#include "status.h"
-#include "skill.h"
 #include "mob.h"
-#include "pet.h"
-#include "battle.h"
+#include "npc.h"
 #include "party.h"
-#include "guild.h"
-#include "atcommand.h"
+#include "pc.h"
+#include "pet.h"
 #include "script.h"
-#include "npc.h"
+#include "skill.h"
+#include "status.h"
 #include "trade.h"
 #include "unit.h"
-#include "mercenary.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 struct mercenary_interface mercenary_s;
 
diff --git a/src/map/mercenary.h b/src/map/mercenary.h
index dd9266b2e..b998ac006 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.h
@@ -6,6 +6,7 @@
 
 #include "status.h" // struct status_data, struct status_change
 #include "unit.h" // struct unit_data
+#include "../common/cbasetypes.h"
 
 // number of cells that a mercenary can walk to from it's master before being warped
 #define MAX_MER_DISTANCE 15
diff --git a/src/map/mob.c b/src/map/mob.c
index 8f12d4b1b..11ac74621 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2,46 +2,49 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/timer.h"
-#include "../common/db.h"
-#include "../common/nullpo.h"
-#include "../common/malloc.h"
-#include "../common/showmsg.h"
-#include "../common/ers.h"
-#include "../common/random.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
-#include "../common/socket.h"
+#define HERCULES_CORE
 
-#include "map.h"
-#include "path.h"
-#include "clif.h"
-#include "intif.h"
-#include "pc.h"
-#include "pet.h"
-#include "status.h"
+#include "../config/core.h" // AUTOLOOT_DISTANCE, DBPATH, DEFTYPE_MAX, DEFTYPE_MIN, RENEWAL_DROP, RENEWAL_EXP
 #include "mob.h"
-#include "homunculus.h"
-#include "mercenary.h"
+
+#include <math.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "atcommand.h"
+#include "battle.h"
+#include "clif.h"
+#include "date.h"
 #include "elemental.h"
 #include "guild.h"
+#include "homunculus.h"
+#include "intif.h"
 #include "itemdb.h"
-#include "skill.h"
-#include "battle.h"
-#include "party.h"
-#include "npc.h"
 #include "log.h"
-#include "script.h"
-#include "atcommand.h"
-#include "date.h"
+#include "map.h"
+#include "mercenary.h"
+#include "npc.h"
+#include "party.h"
+#include "path.h"
+#include "pc.h"
+#include "pet.h"
 #include "quest.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <math.h>
+#include "script.h"
+#include "skill.h"
+#include "status.h"
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+#include "../common/ers.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 struct mob_interface mob_s;
 
diff --git a/src/map/mob.h b/src/map/mob.h
index 80175b1db..d07f78c77 100644
--- a/src/map/mob.h
+++ b/src/map/mob.h
@@ -5,12 +5,11 @@
 #ifndef _MAP_MOB_H_
 #define _MAP_MOB_H_
 
-#include "../common/mmo.h" // struct item
-#include "guild.h" // struct guardian_data
 #include "map.h" // struct status_data, struct view_data, struct mob_skill
-#include "status.h" // struct status data, struct status_change
-#include "unit.h" // unit_stop_walking(), unit_stop_attack()
-#include "npc.h"
+#include "status.h" // struct status_data, struct status_change
+#include "unit.h" // struct unit_data
+#include "../common/cbasetypes.h"
+#include "../common/mmo.h" // struct item
 
 #define MAX_RANDOMMONSTER 5
 
diff --git a/src/map/npc.c b/src/map/npc.c
index 27759d185..289c42d44 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -2,41 +2,44 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/malloc.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
-#include "../common/ers.h"
-#include "../common/db.h"
-#include "../common/socket.h"
-#include "../common/HPM.h"
+#define HERCULES_CORE
 
-#include "map.h"
-#include "log.h"
+#include "../config/core.h" // NPC_SECURE_TIMEOUT_INPUT, NPC_SECURE_TIMEOUT_MENU, NPC_SECURE_TIMEOUT_NEXT, SECURE_NPCTIMEOUT, SECURE_NPCTIMEOUT_INTERVAL
+#include "npc.h"
+
+#include <errno.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include "battle.h"
+#include "chat.h"
 #include "clif.h"
+#include "instance.h"
 #include "intif.h"
-#include "pc.h"
-#include "status.h"
 #include "itemdb.h"
-#include "script.h"
+#include "log.h"
+#include "map.h"
 #include "mob.h"
+#include "pc.h"
 #include "pet.h"
-#include "instance.h"
-#include "battle.h"
+#include "script.h"
 #include "skill.h"
+#include "status.h"
 #include "unit.h"
-#include "npc.h"
-#include "chat.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <time.h>
-#include <errno.h>
+#include "../common/HPM.h"
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+#include "../common/ers.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 struct npc_interface npc_s;
 
diff --git a/src/map/npc.h b/src/map/npc.h
index d11db0164..a277d4968 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -8,10 +8,10 @@
 #include "map.h" // struct block_list
 #include "status.h" // struct status_change
 #include "unit.h" // struct unit_data
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
 
 struct HPluginData;
-struct block_list;
-struct npc_data;
 struct view_data;
 
 enum npc_parse_options {
diff --git a/src/map/npc_chat.c b/src/map/npc_chat.c
index 9d5639efc..f245ffea5 100644
--- a/src/map/npc_chat.c
+++ b/src/map/npc_chat.c
@@ -2,25 +2,27 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifdef PCRE_SUPPORT
+#define HERCULES_CORE
 
-#include "../common/timer.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
+#ifdef PCRE_SUPPORT
 
-#include "mob.h" // struct mob_data
 #include "npc.h" // struct npc_data
-#include "pc.h" // struct map_session_data
-#include "script.h" // set_var()
-
-#include "../../3rdparty/pcre/include/pcre.h"
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdarg.h>
+
+#include "../../3rdparty/pcre/include/pcre.h"
+
+#include "mob.h" // struct mob_data
+#include "pc.h" // struct map_session_data
+#include "script.h" // set_var()
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
 
 /**
  * interface sources
diff --git a/src/map/party.c b/src/map/party.c
index cf5e7bbe3..7c49e241c 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -2,34 +2,37 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/timer.h"
-#include "../common/socket.h" // last_tick
-#include "../common/nullpo.h"
-#include "../common/malloc.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/utils.h"
-#include "../common/strlib.h"
-#include "../common/HPM.h"
+#define HERCULES_CORE
 
+#include "../config/core.h" // GP_BOUND_ITEMS, RENEWAL_EXP
 #include "party.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "atcommand.h"	//msg_txt()
-#include "pc.h"
-#include "map.h"
-#include "instance.h"
 #include "battle.h"
-#include "intif.h"
 #include "clif.h"
+#include "instance.h"
+#include "intif.h"
+#include "itemdb.h"
 #include "log.h"
+#include "map.h"
+#include "mob.h" // struct mob_data
+#include "pc.h"
 #include "skill.h"
 #include "status.h"
-#include "itemdb.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
+#include "../common/HPM.h"
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h" // last_tick
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 struct party_interface party_s;
 
diff --git a/src/map/party.h b/src/map/party.h
index ed8289af6..3bad22b13 100644
--- a/src/map/party.h
+++ b/src/map/party.h
@@ -5,11 +5,12 @@
 #ifndef _MAP_PARTY_H_
 #define _MAP_PARTY_H_
 
-#include "../common/mmo.h" // struct party
-#include "../config/core.h"
 #include <stdarg.h>
 
-#include "map.h"
+#include "map.h" // TBL_PC
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+#include "../common/mmo.h" // struct party
 
 #define PARTY_BOOKING_JOBS 6
 #define PARTY_BOOKING_RESULTS 10
diff --git a/src/map/path.c b/src/map/path.c
index ae9fc389d..d02e9ee4a 100644
--- a/src/map/path.c
+++ b/src/map/path.c
@@ -2,20 +2,23 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/db.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
+#define HERCULES_CORE
 
+#include "../config/core.h" // CELL_NOSTACK, CIRCULAR_AREA
 #include "path.h"
-#include "map.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "map.h"
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+
 #define SET_OPEN 0
 #define SET_CLOSED 1
 
diff --git a/src/map/path.h b/src/map/path.h
index 0b67a0120..b48ff05fb 100644
--- a/src/map/path.h
+++ b/src/map/path.h
@@ -6,6 +6,7 @@
 #define _MAP_PATH_H_
 
 #include "map.h" // enum cell_chk
+#include "../common/cbasetypes.h"
 
 #define MOVE_COST 10
 #define MOVE_DIAGONAL_COST 14
diff --git a/src/map/pc.c b/src/map/pc.c
index c8fb14e55..45adfe22a 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -2,21 +2,16 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/core.h" // get_svn_revision()
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h" // session[]
-#include "../common/strlib.h" // safestrncpy()
-#include "../common/timer.h"
-#include "../common/utils.h"
-#include "../common/conf.h"
-#include "../common/mmo.h" //NAME_LENGTH
-#include "../common/sysinfo.h"
+#define HERCULES_CORE
 
+#include "../config/core.h" // DBPATH, GP_BOUND_ITEMS, MAX_CARTS, MAX_SPIRITBALL, NEW_CARTS, RENEWAL, RENEWAL_ASPD, RENEWAL_CAST, RENEWAL_DROP, RENEWAL_EXP, SECURE_NPCTIMEOUT
 #include "pc.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
 #include "atcommand.h" // get_atcommand_level()
 #include "battle.h" // battle_config
 #include "battleground.h"
@@ -25,32 +20,40 @@
 #include "clif.h"
 #include "date.h" // is_day_of_*()
 #include "duel.h"
+#include "elemental.h"
+#include "guild.h" // guild->search(), guild_request_info()
+#include "homunculus.h"
+#include "instance.h"
 #include "intif.h"
 #include "itemdb.h"
 #include "log.h"
 #include "mail.h"
 #include "map.h"
-#include "path.h"
-#include "homunculus.h"
-#include "instance.h"
 #include "mercenary.h"
-#include "elemental.h"
+#include "mob.h" // struct mob_data
 #include "npc.h" // fake_nd
-#include "pet.h" // pet_unlocktarget()
 #include "party.h" // party->search()
-#include "guild.h" // guild->search(), guild_request_info()
+#include "path.h"
+#include "pc_groups.h"
+#include "pet.h" // pet_unlocktarget()
+#include "quest.h"
 #include "script.h" // script_config
 #include "skill.h"
 #include "status.h" // struct status_data
 #include "storage.h"
-#include "pc_groups.h"
-#include "quest.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
+#include "../common/cbasetypes.h"
+#include "../common/conf.h"
+#include "../common/core.h" // get_svn_revision()
+#include "../common/malloc.h"
+#include "../common/mmo.h" //NAME_LENGTH
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h" // session[]
+#include "../common/strlib.h" // safestrncpy()
+#include "../common/sysinfo.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 struct pc_interface pc_s;
 
@@ -10651,9 +10654,7 @@ void pc_defaults(void) {
 	memset(pc->exp_table, 0, sizeof(pc->exp_table)
 		   + sizeof(pc->max_level)
 		   + sizeof(pc->statp)
-#if defined(RENEWAL_DROP) || defined(RENEWAL_EXP)
 		   + sizeof(pc->level_penalty)
-#endif
 		   + sizeof(pc->skill_tree)
 		   + sizeof(pc->smith_fame_list)
 		   + sizeof(pc->chemist_fame_list)
diff --git a/src/map/pc.h b/src/map/pc.h
index 70df9ca56..c4026a48d 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -5,23 +5,23 @@
 #ifndef _MAP_PC_H_
 #define _MAP_PC_H_
 
-#include "../common/mmo.h" // JOB_*, MAX_FAME_LIST, struct fame_list, struct mmo_charstatus
-#include "../common/ers.h"
-#include "../common/timer.h" // INVALID_TIMER
-#include "atcommand.h" // AtCommandType
+#include "../config/core.h" // AUTOLOOTITEM_SIZE, RENEWAL, SECURE_NPCTIMEOUT
+
 #include "battle.h" // battle_config
-#include "battleground.h"
+#include "battleground.h" // enum bg_queue_types
 #include "buyingstore.h"  // struct s_buyingstore
-#include "itemdb.h"
-#include "log.h"
-#include "map.h" // RC_MAX
-#include "mob.h"
-#include "pc_groups.h"
-#include "script.h" // struct script_reg, struct script_regstr
+#include "itemdb.h" // MAX_ITEMDELAYS
+#include "log.h" // struct e_log_pick_type
+#include "map.h" // RC_MAX, ELE_MAX
+#include "pc_groups.h" // GroupSettings
+#include "script.h" // struct reg_db
 #include "searchstore.h"  // struct s_search_store_info
-#include "status.h" // OPTION_*, struct weapon_atk
-#include "unit.h" // unit_stop_attack(), unit_stop_walking()
+#include "status.h" // enum sc_type, OPTION_*
+#include "unit.h" // struct unit_data, struct view_data
 #include "vending.h" // struct s_vending
+#include "../common/cbasetypes.h"
+#include "../common/ers.h" // struct eri
+#include "../common/mmo.h" // JOB_*, MAX_FAME_LIST, struct fame_list, struct mmo_charstatus
 
 /**
  * Defines
@@ -742,9 +742,8 @@ struct pc_interface {
 	unsigned int exp_table[CLASS_COUNT][2][MAX_LEVEL];
 	unsigned int max_level[CLASS_COUNT][2];
 	unsigned int statp[MAX_LEVEL+1];
-#if defined(RENEWAL_DROP) || defined(RENEWAL_EXP)
 	unsigned int level_penalty[3][RC_MAX][MAX_LEVEL*2+1];
-#endif
+
 	unsigned int equip_pos[EQI_MAX];
 	/* */
 	struct skill_tree_entry skill_tree[CLASS_COUNT][MAX_SKILL_TREE];
diff --git a/src/map/pc_groups.c b/src/map/pc_groups.c
index 906462c7e..a917ef409 100644
--- a/src/map/pc_groups.c
+++ b/src/map/pc_groups.c
@@ -2,6 +2,14 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "pc_groups.h"
+
+#include "atcommand.h" // atcommand->exists(), atcommand->load_groups()
+#include "clif.h"      // clif->GM_kick()
+#include "map.h"       // mapiterator
+#include "pc.h"        // pc->set_group()
 #include "../common/cbasetypes.h"
 #include "../common/conf.h"
 #include "../common/db.h"
@@ -10,12 +18,6 @@
 #include "../common/showmsg.h"
 #include "../common/strlib.h" // strcmp
 
-#include "pc_groups.h"
-#include "atcommand.h" // atcommand->exists(), atcommand->load_groups()
-#include "clif.h"      // clif->GM_kick()
-#include "map.h"       // mapiterator
-#include "pc.h"        // pc->set_group()
-
 static GroupSettings dummy_group; ///< dummy group used in dummy map sessions @see pc_get_dummy_sd()
 
 struct pc_groups_interface pcg_s;
diff --git a/src/map/pc_groups.h b/src/map/pc_groups.h
index 5c03f999f..7c8cdd82a 100644
--- a/src/map/pc_groups.h
+++ b/src/map/pc_groups.h
@@ -5,6 +5,10 @@
 #ifndef _MAP_PC_GROUPS_H_
 #define _MAP_PC_GROUPS_H_
 
+#include "../common/cbasetypes.h"
+#include "../common/conf.h"
+#include "../common/db.h"
+
 /// PC permissions
 enum e_pc_permission {
 	PC_PERM_NONE                = 0,        //  #0
diff --git a/src/map/pet.c b/src/map/pet.c
index 993497434..aa2be4473 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -2,37 +2,39 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/db.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/malloc.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
-#include "../common/ers.h"
+#define HERCULES_CORE
 
-#include "pc.h"
-#include "status.h"
-#include "map.h"
-#include "path.h"
-#include "intif.h"
-#include "clif.h"
-#include "chrif.h"
 #include "pet.h"
-#include "itemdb.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "atcommand.h" // msg_txt()
 #include "battle.h"
+#include "chrif.h"
+#include "clif.h"
+#include "intif.h"
+#include "itemdb.h"
+#include "log.h"
+#include "map.h"
 #include "mob.h"
 #include "npc.h"
+#include "path.h"
+#include "pc.h"
 #include "script.h"
 #include "skill.h"
+#include "status.h"
 #include "unit.h"
-#include "atcommand.h" // msg_txt()
-#include "log.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "../common/db.h"
+#include "../common/ers.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 struct pet_interface pet_s;
 
diff --git a/src/map/pet.h b/src/map/pet.h
index 4ec30b3fb..8dde0fac2 100644
--- a/src/map/pet.h
+++ b/src/map/pet.h
@@ -5,8 +5,14 @@
 #ifndef _MAP_PET_H_
 #define _MAP_PET_H_
 
-#define MAX_PET_DB	300
-#define MAX_PETLOOT_SIZE	30
+#include "map.h" // struct block_list
+#include "status.h" // enum sc_type
+#include "unit.h" // struct unit_data
+#include "../common/cbasetypes.h"
+#include "../common/mmo.h" // NAME_LENGTH, struct s_pet
+
+#define MAX_PET_DB       300
+#define MAX_PETLOOT_SIZE 30
 
 struct s_pet_db {
 	short class_;
diff --git a/src/map/quest.c b/src/map/quest.c
index bde276f9d..b76d6bc82 100644
--- a/src/map/quest.c
+++ b/src/map/quest.c
@@ -2,36 +2,37 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
+#define HERCULES_CORE
 
-#include "map.h"
-#include "pc.h"
-#include "npc.h"
-#include "itemdb.h"
-#include "script.h"
-#include "intif.h"
-#include "battle.h"
-#include "mob.h"
-#include "party.h"
-#include "unit.h"
-#include "log.h"
-#include "clif.h"
 #include "quest.h"
-#include "chrif.h"
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdarg.h>
 #include <time.h>
 
+#include "battle.h"
+#include "chrif.h"
+#include "clif.h"
+#include "intif.h"
+#include "itemdb.h"
+#include "log.h"
+#include "map.h"
+#include "mob.h"
+#include "npc.h"
+#include "party.h"
+#include "pc.h"
+#include "script.h"
+#include "unit.h"
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 struct quest_interface quest_s;
 
diff --git a/src/map/quest.h b/src/map/quest.h
index e01e35619..87894d639 100644
--- a/src/map/quest.h
+++ b/src/map/quest.h
@@ -5,6 +5,10 @@
 #ifndef _MAP_QUEST_H_
 #define _MAP_QUEST_H_
 
+#include "map.h" // TBL_PC
+#include "../common/cbasetypes.h"
+#include "../common/mmo.h" // MAX_QUEST_OBJECTIVES
+
 #define MAX_QUEST_DB (60355+1) // Highest quest ID + 1
 
 struct quest_db {
diff --git a/src/map/script.c b/src/map/script.c
index aecdf9b28..e4cf7f227 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -2,6 +2,46 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "../config/core.h" // NEW_CARTS, RENEWAL, RENEWAL_ASPD, RENEWAL_CAST, RENEWAL_DROP, RENEWAL_EDP, RENEWAL_EXP, RENEWAL_LVDMG, SCRIPT_CALLFUNC_CHECK, SECURE_NPCTIMEOUT, SECURE_NPCTIMEOUT_INTERVAL
+#include "script.h"
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "atcommand.h"
+#include "battle.h"
+#include "battleground.h"
+#include "chat.h"
+#include "chrif.h"
+#include "clif.h"
+#include "elemental.h"
+#include "guild.h"
+#include "homunculus.h"
+#include "instance.h"
+#include "intif.h"
+#include "itemdb.h"
+#include "log.h"
+#include "mail.h"
+#include "map.h"
+#include "mapreg.h"
+#include "mercenary.h"
+#include "mob.h"
+#include "npc.h"
+#include "party.h"
+#include "path.h"
+#include "pc.h"
+#include "pet.h"
+#include "pet.h"
+#include "quest.h"
+#include "skill.h"
+#include "status.h"
+#include "status.h"
+#include "storage.h"
+#include "unit.h"
 #include "../common/cbasetypes.h"
 #include "../common/malloc.h"
 #include "../common/md5calc.h"
@@ -10,47 +50,10 @@
 #include "../common/showmsg.h"
 #include "../common/socket.h" // usage: getcharip
 #include "../common/strlib.h"
+#include "../common/sysinfo.h"
 #include "../common/timer.h"
 #include "../common/utils.h"
-#include "../common/sysinfo.h"
-
-#include "map.h"
-#include "path.h"
-#include "clif.h"
-#include "chrif.h"
-#include "itemdb.h"
-#include "pc.h"
-#include "status.h"
-#include "storage.h"
-#include "mob.h"
-#include "npc.h"
-#include "pet.h"
-#include "mapreg.h"
-#include "homunculus.h"
-#include "instance.h"
-#include "mercenary.h"
-#include "intif.h"
-#include "skill.h"
-#include "status.h"
-#include "chat.h"
-#include "battle.h"
-#include "battleground.h"
-#include "party.h"
-#include "guild.h"
-#include "atcommand.h"
-#include "log.h"
-#include "unit.h"
-#include "pet.h"
-#include "mail.h"
-#include "script.h"
-#include "quest.h"
-#include "elemental.h"
-#include "../config/core.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
 #ifndef WIN32
 	#include <sys/time.h>
 #endif
diff --git a/src/map/script.h b/src/map/script.h
index 90b18d87f..899c745da 100644
--- a/src/map/script.h
+++ b/src/map/script.h
@@ -5,17 +5,19 @@
 #ifndef _MAP_SCRIPT_H_
 #define _MAP_SCRIPT_H_
 
-#include "../common/strlib.h" //StringBuf
-#include "../common/cbasetypes.h"
-#include "map.h" //EVENT_NAME_LENGTH
-
 #include <setjmp.h>
 #include <errno.h>
 
+#include "map.h" //EVENT_NAME_LENGTH
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+#include "../common/mmo.h" // struct item
+#include "../common/sql.h" // Sql
+#include "../common/strlib.h" //StringBuf
+
 /**
  * Declarations
  **/
-struct map_session_data;
 struct eri;
 
 /**
diff --git a/src/map/searchstore.c b/src/map/searchstore.c
index 0144aea93..72b28aacd 100644
--- a/src/map/searchstore.c
+++ b/src/map/searchstore.c
@@ -2,14 +2,17 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "searchstore.h"  // struct s_search_store_info
+
+#include "battle.h"  // battle_config.*
+#include "clif.h"  // clif->open_search_store_info, clif->search_store_info_*
+#include "pc.h"  // struct map_session_data
 #include "../common/cbasetypes.h"
 #include "../common/malloc.h"  // aMalloc, aRealloc, aFree
 #include "../common/showmsg.h"  // ShowError, ShowWarning
 #include "../common/strlib.h"  // safestrncpy
-#include "battle.h"  // battle_config.*
-#include "clif.h"  // clif->open_search_store_info, clif->search_store_info_*
-#include "pc.h"  // struct map_session_data
-#include "searchstore.h"  // struct s_search_store_info
 
 struct searchstore_interface searchstore_s;
 
diff --git a/src/map/searchstore.h b/src/map/searchstore.h
index 827e39053..c9b93ba54 100644
--- a/src/map/searchstore.h
+++ b/src/map/searchstore.h
@@ -5,6 +5,12 @@
 #ifndef _MAP_SEARCHSTORE_H_
 #define _MAP_SEARCHSTORE_H_
 
+#include <time.h>
+
+#include "map.h" // MESSAGE_SIZE
+#include "../common/cbasetypes.h"
+#include "../common/mmo.h" // MAX_SLOTS
+
 /**
  * Defines
  **/
diff --git a/src/map/skill.c b/src/map/skill.c
index c8388770a..b2e94ec79 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -2,46 +2,48 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/malloc.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
-#include "../common/ers.h"
+#define HERCULES_CORE
 
-#include "map.h"
-#include "path.h"
-#include "clif.h"
-#include "pc.h"
-#include "status.h"
+#include "../config/core.h" // DBPATH, MAGIC_REFLECTION_TYPE, OFFICIAL_WALKPATH, RENEWAL, RENEWAL_CAST, VARCAST_REDUCTION()
 #include "skill.h"
-#include "pet.h"
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include "battle.h"
+#include "battleground.h"
+#include "chrif.h"
+#include "clif.h"
+#include "date.h"
+#include "elemental.h"
+#include "guild.h"
 #include "homunculus.h"
+#include "intif.h"
+#include "itemdb.h"
+#include "log.h"
+#include "map.h"
 #include "mercenary.h"
-#include "elemental.h"
 #include "mob.h"
 #include "npc.h"
-#include "battle.h"
-#include "battleground.h"
 #include "party.h"
-#include "itemdb.h"
+#include "path.h"
+#include "pc.h"
+#include "pet.h"
 #include "script.h"
-#include "intif.h"
-#include "log.h"
-#include "chrif.h"
-#include "guild.h"
-#include "date.h"
+#include "status.h"
 #include "unit.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <math.h>
-
+#include "../common/cbasetypes.h"
+#include "../common/ers.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 #define SKILLUNITTIMER_INTERVAL	100
 
diff --git a/src/map/skill.h b/src/map/skill.h
index dda310bd4..b6dbb1fcb 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -5,19 +5,23 @@
 #ifndef _MAP_SKILL_H_
 #define _MAP_SKILL_H_
 
-#include "../common/mmo.h" // MAX_SKILL, struct square
-#include "../common/db.h"
+#include "../config/core.h" // RENEWAL_CAST
+
 #include "map.h" // struct block_list
+#include "status.h" // enum sc_type
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+#include "../common/mmo.h" // MAX_SKILL, struct square
 
 /**
  * Declarations
  **/
-struct map_session_data;
 struct homun_data;
+struct map_session_data;
+struct mercenary_data;
 struct skill_unit;
-struct skill_unit_group;
-struct status_change_entry;
 struct square;
+struct status_change_entry;
 
 /**
  * Defines
diff --git a/src/map/status.c b/src/map/status.c
index 4c2bc6d22..eb06138da 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -2,43 +2,46 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/malloc.h"
-#include "../common/utils.h"
-#include "../common/ers.h"
-#include "../common/strlib.h"
+#define HERCULES_CORE
+
+#include "../config/core.h" // ANTI_MAYAP_CHEAT, DBPATH, DEFTYPE_MAX, DEFTYPE_MIN, DEVOTION_REFLECT_DAMAGE, RENEWAL, RENEWAL_ASPD, RENEWAL_EDP
+#include "status.h"
 
+#include <math.h>
+#include <memory.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include "battle.h"
+#include "chrif.h"
+#include "clif.h"
+#include "elemental.h"
+#include "guild.h"
+#include "homunculus.h"
+#include "itemdb.h"
 #include "map.h"
+#include "mercenary.h"
+#include "mob.h"
+#include "npc.h"
 #include "path.h"
 #include "pc.h"
 #include "pet.h"
-#include "npc.h"
-#include "mob.h"
-#include "clif.h"
-#include "guild.h"
+#include "script.h"
 #include "skill.h"
-#include "itemdb.h"
-#include "battle.h"
-#include "chrif.h"
 #include "skill.h"
-#include "status.h"
-#include "script.h"
 #include "unit.h"
-#include "homunculus.h"
-#include "mercenary.h"
-#include "elemental.h"
 #include "vending.h"
-
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <memory.h>
-#include <string.h>
-#include <math.h>
+#include "../common/cbasetypes.h"
+#include "../common/ers.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 struct status_interface status_s;
 
diff --git a/src/map/status.h b/src/map/status.h
index e47c2b365..baa586297 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -5,14 +5,18 @@
 #ifndef _MAP_STATUS_H_
 #define _MAP_STATUS_H_
 
+#include "../config/core.h" // defType, NEW_CARTS, RENEWAL, RENEWAL_ASPD
+
+#include "../common/cbasetypes.h"
 #include "../common/mmo.h"
 
 struct block_list;
-struct mob_data;
-struct pet_data;
+struct elemental_data;
 struct homun_data;
 struct mercenary_data;
-struct status_change;
+struct mob_data;
+struct npc_data;
+struct pet_data;
 
 //Change the equation when the values are high enough to discard the
 //imprecision in exchange of overflow protection [Skotlex]
@@ -1878,11 +1882,7 @@ struct status_interface {
 	int hp_coefficient2[CLASS_COUNT];
 	int hp_sigma_val[CLASS_COUNT][MAX_LEVEL+1];
 	int sp_coefficient[CLASS_COUNT];
-#ifdef RENEWAL_ASPD
-	int aspd_base[CLASS_COUNT][MAX_WEAPON_TYPE+1];
-#else
-	int aspd_base[CLASS_COUNT][MAX_WEAPON_TYPE]; //[blackhole89]
-#endif
+	int aspd_base[CLASS_COUNT][MAX_WEAPON_TYPE+1]; // +1 for RENEWAL_ASPD
 	sc_type Skill2SCTable[MAX_SKILL];  // skill  -> status
 	int IconChangeTable[SC_MAX];          // status -> "icon" (icon is a bit of a misnomer, since there exist values with no icon associated)
 	unsigned int ChangeFlagTable[SC_MAX]; // status -> flags
diff --git a/src/map/storage.c b/src/map/storage.c
index e65ed7b80..2db5fff3d 100644
--- a/src/map/storage.c
+++ b/src/map/storage.c
@@ -2,28 +2,30 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/db.h"
-#include "../common/nullpo.h"
-#include "../common/malloc.h"
-#include "../common/showmsg.h"
+#define HERCULES_CORE
 
-#include "map.h" // struct map_session_data
 #include "storage.h"
-#include "chrif.h"
-#include "itemdb.h"
-#include "clif.h"
-#include "intif.h"
-#include "pc.h"
-#include "guild.h"
-#include "battle.h"
-#include "atcommand.h"
-#include "log.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "atcommand.h"
+#include "battle.h"
+#include "chrif.h"
+#include "clif.h"
+#include "guild.h"
+#include "intif.h"
+#include "itemdb.h"
+#include "log.h"
+#include "map.h" // struct map_session_data
+#include "pc.h"
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+
 struct storage_interface storage_s;
 struct guild_storage_interface gstorage_s;
 
diff --git a/src/map/storage.h b/src/map/storage.h
index 8f9f904f6..5edb68cfc 100644
--- a/src/map/storage.h
+++ b/src/map/storage.h
@@ -5,11 +5,12 @@
 #ifndef _MAP_STORAGE_H_
 #define _MAP_STORAGE_H_
 
-struct storage_data;
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+
 struct guild_storage;
 struct item;
 struct map_session_data;
-struct DBMap;
 
 struct storage_interface {
 	/* */
diff --git a/src/map/trade.c b/src/map/trade.c
index 44b669ebd..83426c407 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -2,25 +2,27 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/nullpo.h"
-#include "../common/socket.h"
+#define HERCULES_CORE
 
 #include "trade.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#include "atcommand.h"
+#include "battle.h"
+#include "chrif.h"
 #include "clif.h"
+#include "intif.h"
 #include "itemdb.h"
+#include "log.h"
 #include "map.h"
+#include "npc.h"
 #include "path.h"
 #include "pc.h"
-#include "npc.h"
-#include "battle.h"
-#include "chrif.h"
 #include "storage.h"
-#include "intif.h"
-#include "atcommand.h"
-#include "log.h"
-
-#include <stdio.h>
-#include <string.h>
+#include "../common/nullpo.h"
+#include "../common/socket.h"
 
 struct trade_interface trade_s;
 
diff --git a/src/map/unit.c b/src/map/unit.c
index 151d4bad5..0ad770e80 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -2,45 +2,48 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/showmsg.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/db.h"
-#include "../common/malloc.h"
-#include "../common/random.h"
-#include "../common/HPM.h"
+#define HERCULES_CORE
 
+#include "../config/core.h" // RENEWAL_CAST
+#include "unit.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "battle.h"
+#include "battleground.h"
+#include "chat.h"
+#include "chrif.h"
+#include "clif.h"
+#include "duel.h"
+#include "elemental.h"
+#include "guild.h"
+#include "homunculus.h"
+#include "instance.h"
+#include "intif.h"
 #include "map.h"
+#include "mercenary.h"
+#include "mob.h"
+#include "npc.h"
+#include "party.h"
 #include "path.h"
 #include "pc.h"
-#include "mob.h"
 #include "pet.h"
-#include "homunculus.h"
-#include "instance.h"
-#include "mercenary.h"
-#include "elemental.h"
+#include "script.h"
 #include "skill.h"
-#include "clif.h"
-#include "duel.h"
-#include "npc.h"
-#include "guild.h"
 #include "status.h"
-#include "unit.h"
-#include "battle.h"
-#include "battleground.h"
-#include "chat.h"
+#include "storage.h"
 #include "trade.h"
 #include "vending.h"
-#include "party.h"
-#include "intif.h"
-#include "chrif.h"
-#include "script.h"
-#include "storage.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
+#include "../common/HPM.h"
+#include "../common/db.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/timer.h"
 
 const short dirx[8]={0,-1,-1,-1,0,1,1,1};
 const short diry[8]={1,1,0,-1,-1,-1,0,1};
diff --git a/src/map/unit.h b/src/map/unit.h
index 33fa4e052..9e05647b1 100644
--- a/src/map/unit.h
+++ b/src/map/unit.h
@@ -5,15 +5,13 @@
 #ifndef _MAP_UNIT_H_
 #define _MAP_UNIT_H_
 
-//#include "map.h"
-struct block_list;
-struct unit_data;
-struct map_session_data;
-
 #include "clif.h"  // clr_type
-#include "map.h" // struct block_list
 #include "path.h" // struct walkpath_data
-#include "skill.h" // struct skill_timerskill, struct skill_unit_group, struct skill_unit_group_tickset
+#include "skill.h" // 'MAX_SKILLTIMERSKILL, struct skill_timerskill, struct skill_unit_group, struct skill_unit_group_tickset
+#include "../common/cbasetypes.h"
+
+struct map_session_data;
+struct block_list;
 
 struct unit_data {
 	struct block_list *bl;
diff --git a/src/map/vending.c b/src/map/vending.c
index 9462975b3..c8ac814db 100644
--- a/src/map/vending.c
+++ b/src/map/vending.c
@@ -2,24 +2,27 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/nullpo.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
+#define HERCULES_CORE
+
+#include "vending.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#include "atcommand.h"
+#include "battle.h"
+#include "chrif.h"
 #include "clif.h"
 #include "itemdb.h"
-#include "atcommand.h"
+#include "log.h"
 #include "map.h"
+#include "npc.h"
 #include "path.h"
-#include "chrif.h"
-#include "vending.h"
 #include "pc.h"
-#include "npc.h"
 #include "skill.h"
-#include "battle.h"
-#include "log.h"
-
-#include <stdio.h>
-#include <string.h>
+#include "../common/nullpo.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
 
 struct vending_interface vending_s;
 
diff --git a/src/map/vending.h b/src/map/vending.h
index a212f8385..a70726374 100644
--- a/src/map/vending.h
+++ b/src/map/vending.h
@@ -7,6 +7,7 @@
 
 #include "../common/cbasetypes.h"
 #include "../common/db.h"
+
 struct map_session_data;
 struct s_search_store_search;
 
diff --git a/src/tool/mapcache.c b/src/tool/mapcache.c
index 85d5fb548..96d51aec6 100644
--- a/src/tool/mapcache.c
+++ b/src/tool/mapcache.c
@@ -1,6 +1,14 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
+#define HERCULES_CORE
+
+#include "../config/core.h" // RENEWAL
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "../common/cbasetypes.h"
 #include "../common/grfio.h"
 #include "../common/malloc.h"
@@ -8,12 +16,6 @@
 #include "../common/showmsg.h"
 #include "../common/utils.h"
 
-#include "../config/renewal.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #ifndef _WIN32
 #include <unistd.h>
 #endif
-- 
cgit v1.2.3-70-g09d2


From 94657284973f4037596bae468ebfbee5c217e02b Mon Sep 17 00:00:00 2001
From: panikon <panikon@zoho.com>
Date: Sat, 10 May 2014 06:08:56 -0300
Subject: Revert "Fixed order of includes in all source files"

This reverts commit b6b3f58795288701d0e162d43fa6f0a47af913b3.

Fixes issue 8184
http://hercules.ws/board/tracker/issue-8184-cart-related/
---
 src/char/char.c          |  44 +++++-----
 src/char/char.h          |   1 +
 src/char/int_auction.c   |  25 +++---
 src/char/int_elemental.c |  22 ++---
 src/char/int_elemental.h |   2 +-
 src/char/int_guild.c     |  24 +++--
 src/char/int_guild.h     |   3 +
 src/char/int_homun.c     |  21 ++---
 src/char/int_homun.h     |   2 -
 src/char/int_mail.c      |  20 ++---
 src/char/int_mail.h      |   3 -
 src/char/int_mercenary.c |  22 ++---
 src/char/int_mercenary.h |   4 +-
 src/char/int_party.c     |  25 +++---
 src/char/int_party.h     |   2 +
 src/char/int_pet.c       |  22 ++---
 src/char/int_quest.c     |  22 +++--
 src/char/int_storage.c   |  22 ++---
 src/char/inter.c         |  43 +++++----
 src/char/inter.h         |   5 +-
 src/char/pincode.c       |  11 +--
 src/common/HPM.c         |  31 +++----
 src/common/HPM.h         |   6 +-
 src/common/HPMi.h        |  16 +++-
 src/common/cbasetypes.h  |   6 --
 src/common/conf.c        |   3 -
 src/common/conf.h        |   1 -
 src/common/console.c     | 223 +++++++++++++++++++++++------------------------
 src/common/console.h     |  21 ++---
 src/common/core.c        |  38 ++++----
 src/common/core.h        |   3 +-
 src/common/db.c          |  10 +--
 src/common/db.h          |   3 +-
 src/common/des.c         |   7 +-
 src/common/ers.c         |   8 +-
 src/common/grfio.c       |  17 ++--
 src/common/malloc.c      |  11 +--
 src/common/mapindex.c    |  15 ++--
 src/common/md5calc.c     |   8 +-
 src/common/mmo.h         |   6 +-
 src/common/mutex.c       |   5 +-
 src/common/mutex.h       |   1 -
 src/common/nullpo.c      |   6 +-
 src/common/random.c      |  18 ++--
 src/common/showmsg.c     |  17 ++--
 src/common/showmsg.h     |  23 ++---
 src/common/socket.c      |  64 +++++++-------
 src/common/socket.h      |  12 +--
 src/common/spinlock.h    |   9 +-
 src/common/sql.c         |  12 +--
 src/common/sql.h         |   3 +-
 src/common/strlib.c      |  13 ++-
 src/common/strlib.h      |  15 ++--
 src/common/sysinfo.c     |  32 ++-----
 src/common/sysinfo.h     |  16 ++++
 src/common/thread.c      |  31 +++----
 src/common/thread.h      |   1 +
 src/common/timer.c       |  19 ++--
 src/common/utils.c       |  36 ++++----
 src/common/utils.h       |   3 +-
 src/config/const.h       |   7 ++
 src/config/renewal.h     |   1 -
 src/login/account.h      |   1 -
 src/login/account_sql.c  |  17 ++--
 src/login/ipban_sql.c    |  14 ++-
 src/login/login.c        |  21 ++---
 src/login/login.h        |   2 +-
 src/login/loginlog.h     |   2 +-
 src/login/loginlog_sql.c |   9 +-
 src/map/HPMmap.c         |  42 ++++-----
 src/map/atcommand.c      |  67 +++++++-------
 src/map/atcommand.h      |   2 +-
 src/map/battle.c         |  61 ++++++-------
 src/map/battle.h         |   2 +-
 src/map/battleground.c   |  33 ++++---
 src/map/battleground.h   |   2 +-
 src/map/buyingstore.c    |  17 ++--
 src/map/buyingstore.h    |   5 --
 src/map/chat.c           |  23 +++--
 src/map/chat.h           |   5 +-
 src/map/chrif.c          |  35 ++++----
 src/map/chrif.h          |   4 +-
 src/map/clif.c           |  83 +++++++++---------
 src/map/clif.h           |   9 +-
 src/map/date.c           |   6 +-
 src/map/date.h           |   2 -
 src/map/duel.c           |  10 +--
 src/map/duel.h           |   4 -
 src/map/elemental.c      |  54 ++++++------
 src/map/elemental.h      |   1 -
 src/map/guild.c          |  47 +++++-----
 src/map/guild.h          |  16 +++-
 src/map/homunculus.c     |  56 ++++++------
 src/map/homunculus.h     |   3 +-
 src/map/instance.c       |  34 ++++----
 src/map/instance.h       |   3 -
 src/map/intif.c          |  51 +++++------
 src/map/intif.h          |  13 ++-
 src/map/irc-bot.c        |  22 +++--
 src/map/irc-bot.h        |   2 -
 src/map/itemdb.c         |  27 +++---
 src/map/itemdb.h         |   5 +-
 src/map/log.c            |  23 +++--
 src/map/log.h            |   5 +-
 src/map/mail.c           |  16 ++--
 src/map/mail.h           |   6 +-
 src/map/map.c            |  96 ++++++++++----------
 src/map/map.h            |   9 +-
 src/map/mapreg_sql.c     |  14 ++-
 src/map/mercenary.c      |  54 ++++++------
 src/map/mercenary.h      |   1 -
 src/map/mob.c            |  69 +++++++--------
 src/map/mob.h            |   9 +-
 src/map/npc.c            |  57 ++++++------
 src/map/npc.h            |   4 +-
 src/map/npc_chat.c       |  26 +++---
 src/map/party.c          |  43 +++++----
 src/map/party.h          |   7 +-
 src/map/path.c           |  17 ++--
 src/map/path.h           |   1 -
 src/map/pc.c             |  59 ++++++-------
 src/map/pc.h             |  29 +++---
 src/map/pc_groups.c      |  14 ++-
 src/map/pc_groups.h      |   4 -
 src/map/pet.c            |  48 +++++-----
 src/map/pet.h            |  10 +--
 src/map/quest.c          |  45 +++++-----
 src/map/quest.h          |   4 -
 src/map/script.c         |  79 ++++++++---------
 src/map/script.h         |  12 ++-
 src/map/searchstore.c    |  11 +--
 src/map/searchstore.h    |   6 --
 src/map/skill.c          |  64 +++++++-------
 src/map/skill.h          |  14 ++-
 src/map/status.c         |  59 ++++++-------
 src/map/status.h         |  16 ++--
 src/map/storage.c        |  32 ++++---
 src/map/storage.h        |   5 +-
 src/map/trade.c          |  24 +++--
 src/map/unit.c           |  63 +++++++------
 src/map/unit.h           |  12 +--
 src/map/vending.c        |  27 +++---
 src/map/vending.h        |   1 -
 src/tool/mapcache.c      |  14 ++-
 144 files changed, 1367 insertions(+), 1676 deletions(-)

(limited to 'src/common/utils.h')

diff --git a/src/char/char.c b/src/char/char.c
index 6c0902644..77e393c0d 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -2,30 +2,7 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "../config/core.h" // CONSOLE_INPUT
-#include "char.h"
-
-#include <signal.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <time.h>
-
-#include "int_elemental.h"
-#include "int_guild.h"
-#include "int_homun.h"
-#include "int_mercenary.h"
-#include "int_party.h"
-#include "int_storage.h"
-#include "inter.h"
-#include "pincode.h"
-#include "../common/HPM.h"
 #include "../common/cbasetypes.h"
-#include "../common/console.h"
 #include "../common/core.h"
 #include "../common/db.h"
 #include "../common/malloc.h"
@@ -36,6 +13,25 @@
 #include "../common/strlib.h"
 #include "../common/timer.h"
 #include "../common/utils.h"
+#include "../common/console.h"
+#include "../common/HPM.h"
+#include "int_guild.h"
+#include "int_homun.h"
+#include "int_mercenary.h"
+#include "int_elemental.h"
+#include "int_party.h"
+#include "int_storage.h"
+#include "char.h"
+#include "inter.h"
+#include "pincode.h"
+
+#include <sys/types.h>
+#include <time.h>
+#include <signal.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 // private declarations
 #define CHAR_CONF_NAME	"conf/char-server.conf"
@@ -5501,7 +5497,7 @@ int do_init(int argc, char **argv) {
 	
 	Sql_HerculesUpdateCheck(sql_handle);
 #ifdef CONSOLE_INPUT
-	console->input->setSQL(sql_handle);
+	console->setSQL(sql_handle);
 #endif
 	ShowStatus("The char-server is "CL_GREEN"ready"CL_RESET" (Server is listening on the port %d).\n\n", char_port);
 	
diff --git a/src/char/char.h b/src/char/char.h
index 09a78f6b9..2928929de 100644
--- a/src/char/char.h
+++ b/src/char/char.h
@@ -5,6 +5,7 @@
 #ifndef _COMMON_CHAR_H_
 #define _COMMON_CHAR_H_
 
+#include "../config/core.h"
 #include "../common/core.h" // CORE_ST_LAST
 #include "../common/db.h"
 
diff --git a/src/char/int_auction.c b/src/char/int_auction.c
index 886b5be26..924930867 100644
--- a/src/char/int_auction.c
+++ b/src/char/int_auction.c
@@ -2,25 +2,22 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "int_auction.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "char.h"
-#include "int_mail.h"
-#include "inter.h"
-#include "../common/db.h"
-#include "../common/malloc.h"
 #include "../common/mmo.h"
+#include "../common/malloc.h"
+#include "../common/db.h"
 #include "../common/showmsg.h"
 #include "../common/socket.h"
-#include "../common/sql.h"
 #include "../common/strlib.h"
+#include "../common/sql.h"
 #include "../common/timer.h"
+#include "char.h"
+#include "inter.h"
+#include "int_mail.h"
+#include "int_auction.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
 
 static DBMap* auction_db_ = NULL; // int auction_id -> struct auction_data*
 
diff --git a/src/char/int_elemental.c b/src/char/int_elemental.c
index 3a36e75a2..ed0c2a9ed 100644
--- a/src/char/int_elemental.c
+++ b/src/char/int_elemental.c
@@ -2,23 +2,19 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "int_elemental.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "char.h"
-#include "inter.h"
-#include "../common/malloc.h"
 #include "../common/mmo.h"
+#include "../common/malloc.h"
+#include "../common/strlib.h"
 #include "../common/showmsg.h"
 #include "../common/socket.h"
-#include "../common/sql.h"
-#include "../common/strlib.h"
 #include "../common/utils.h"
+#include "../common/sql.h"
+#include "char.h"
+#include "inter.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 bool mapif_elemental_save(struct s_elemental* ele) {
 	bool flag = true;
diff --git a/src/char/int_elemental.h b/src/char/int_elemental.h
index c869e6fc2..c90891fc4 100644
--- a/src/char/int_elemental.h
+++ b/src/char/int_elemental.h
@@ -4,7 +4,7 @@
 #ifndef _CHAR_INT_ELEMENTAL_H_
 #define _CHAR_INT_ELEMENTAL_H_
 
-#include "../common/cbasetypes.h"
+struct s_elemental;
 
 void inter_elemental_sql_init(void);
 void inter_elemental_sql_final(void);
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index ffbe48e10..895cbbb94 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -2,25 +2,21 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "../config/core.h" // DBPATH
-#include "int_guild.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "char.h"
-#include "inter.h"
 #include "../common/cbasetypes.h"
-#include "../common/db.h"
-#include "../common/malloc.h"
 #include "../common/mmo.h"
-#include "../common/showmsg.h"
+#include "../common/malloc.h"
 #include "../common/socket.h"
+#include "../common/db.h"
+#include "../common/showmsg.h"
 #include "../common/strlib.h"
 #include "../common/timer.h"
+#include "char.h"
+#include "inter.h"
+#include "int_guild.h"
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.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 5e657ff06..4eb7d310b 100644
--- a/src/char/int_guild.h
+++ b/src/char/int_guild.h
@@ -20,6 +20,9 @@ enum {
 	GS_REMOVE = 0x8000,
 };
 
+struct guild;
+struct guild_castle;
+
 int inter_guild_parse_frommap(int fd);
 int inter_guild_sql_init(void);
 void inter_guild_sql_final(void);
diff --git a/src/char/int_homun.c b/src/char/int_homun.c
index 795a6b927..143277f05 100644
--- a/src/char/int_homun.c
+++ b/src/char/int_homun.c
@@ -2,23 +2,20 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "int_homun.h"
+#include "../common/mmo.h"
+#include "../common/malloc.h"
+#include "../common/strlib.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/utils.h"
+#include "../common/sql.h"
+#include "char.h"
+#include "inter.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "char.h"
-#include "inter.h"
-#include "../common/malloc.h"
-#include "../common/mmo.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/sql.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
 
 int inter_homunculus_sql_init(void)
 {
diff --git a/src/char/int_homun.h b/src/char/int_homun.h
index 9477f4f03..561dc848f 100644
--- a/src/char/int_homun.h
+++ b/src/char/int_homun.h
@@ -4,8 +4,6 @@
 #ifndef _CHAR_INT_HOMUN_H_
 #define _CHAR_INT_HOMUN_H_
 
-#include "../common/cbasetypes.h"
-
 struct s_homunculus;
 
 int inter_homunculus_sql_init(void);
diff --git a/src/char/int_mail.c b/src/char/int_mail.c
index 86a36d59f..826771676 100644
--- a/src/char/int_mail.c
+++ b/src/char/int_mail.c
@@ -2,23 +2,19 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "int_mail.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "char.h"
-#include "inter.h"
-#include "../common/malloc.h"
 #include "../common/mmo.h"
+#include "../common/malloc.h"
 #include "../common/showmsg.h"
 #include "../common/socket.h"
-#include "../common/sql.h"
 #include "../common/strlib.h"
+#include "../common/sql.h"
 #include "../common/timer.h"
+#include "char.h"
+#include "inter.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
 
 static int mail_fromsql(int char_id, struct mail_data* md)
 {
diff --git a/src/char/int_mail.h b/src/char/int_mail.h
index 824ba48a3..7c06cdc1f 100644
--- a/src/char/int_mail.h
+++ b/src/char/int_mail.h
@@ -4,9 +4,6 @@
 #ifndef _CHAR_INT_MAIL_H_
 #define _CHAR_INT_MAIL_H_
 
-struct item;
-struct mail_message;
-
 int inter_mail_parse_frommap(int fd);
 void mail_sendmail(int send_id, const char* send_name, int dest_id, const char* dest_name, const char* title, const char* body, int zeny, struct item *item);
 
diff --git a/src/char/int_mercenary.c b/src/char/int_mercenary.c
index 1dffb656c..aecb3844a 100644
--- a/src/char/int_mercenary.c
+++ b/src/char/int_mercenary.c
@@ -2,23 +2,19 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "int_mercenary.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "char.h"
-#include "inter.h"
-#include "../common/malloc.h"
 #include "../common/mmo.h"
+#include "../common/malloc.h"
+#include "../common/strlib.h"
 #include "../common/showmsg.h"
 #include "../common/socket.h"
-#include "../common/sql.h"
-#include "../common/strlib.h"
 #include "../common/utils.h"
+#include "../common/sql.h"
+#include "char.h"
+#include "inter.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 bool mercenary_owner_fromsql(int char_id, struct mmo_charstatus *status)
 {
diff --git a/src/char/int_mercenary.h b/src/char/int_mercenary.h
index 195a83b34..b614b8cf7 100644
--- a/src/char/int_mercenary.h
+++ b/src/char/int_mercenary.h
@@ -4,9 +4,7 @@
 #ifndef _CHAR_INT_MERCENARY_H_
 #define _CHAR_INT_MERCENARY_H_
 
-#include "../common/cbasetypes.h"
-
-struct mmo_charstatus;
+struct s_mercenary;
 
 int inter_mercenary_sql_init(void);
 void inter_mercenary_sql_final(void);
diff --git a/src/char/int_party.c b/src/char/int_party.c
index 3e4a743d6..7c328c452 100644
--- a/src/char/int_party.c
+++ b/src/char/int_party.c
@@ -2,25 +2,22 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "int_party.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "char.h"
-#include "inter.h"
 #include "../common/cbasetypes.h"
+#include "../common/mmo.h"
 #include "../common/db.h"
 #include "../common/malloc.h"
-#include "../common/mapindex.h"
-#include "../common/mmo.h"
-#include "../common/showmsg.h"
+#include "../common/strlib.h"
 #include "../common/socket.h"
+#include "../common/showmsg.h"
+#include "../common/mapindex.h"
 #include "../common/sql.h"
-#include "../common/strlib.h"
+#include "char.h"
+#include "inter.h"
+#include "int_party.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 struct party_data {
 	struct party party;
diff --git a/src/char/int_party.h b/src/char/int_party.h
index 098c1e9a9..84f00635a 100644
--- a/src/char/int_party.h
+++ b/src/char/int_party.h
@@ -14,6 +14,8 @@ enum {
 	PS_BREAK = 0x20, //Specify that this party must be deleted.
 };
 
+struct party;
+
 int inter_party_parse_frommap(int fd);
 int inter_party_sql_init(void);
 void inter_party_sql_final(void);
diff --git a/src/char/int_pet.c b/src/char/int_pet.c
index 29c40eff9..25f00e6f0 100644
--- a/src/char/int_pet.c
+++ b/src/char/int_pet.c
@@ -2,23 +2,19 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "int_pet.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "char.h"
-#include "inter.h"
-#include "../common/malloc.h"
 #include "../common/mmo.h"
-#include "../common/showmsg.h"
+#include "../common/malloc.h"
 #include "../common/socket.h"
-#include "../common/sql.h"
 #include "../common/strlib.h"
+#include "../common/showmsg.h"
 #include "../common/utils.h"
+#include "../common/sql.h"
+#include "char.h"
+#include "inter.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 struct s_pet *pet_pt;
 
diff --git a/src/char/int_quest.c b/src/char/int_quest.c
index 61b43c57d..061dd89d9 100644
--- a/src/char/int_quest.c
+++ b/src/char/int_quest.c
@@ -2,25 +2,23 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "int_quest.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "char.h"
-#include "inter.h"
+#include "../common/mmo.h"
 #include "../common/db.h"
 #include "../common/malloc.h"
-#include "../common/mmo.h"
 #include "../common/showmsg.h"
 #include "../common/socket.h"
-#include "../common/sql.h"
 #include "../common/strlib.h"
+#include "../common/sql.h"
 #include "../common/timer.h"
 
+#include "char.h"
+#include "inter.h"
+#include "int_quest.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
 /**
  * Loads the entire questlog for a character.
  *
diff --git a/src/char/int_storage.c b/src/char/int_storage.c
index bf7b76da0..966e61bb3 100644
--- a/src/char/int_storage.c
+++ b/src/char/int_storage.c
@@ -2,23 +2,19 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "../config/core.h" // GP_BOUND_ITEMS
-#include "int_storage.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "char.h"
-#include "inter.h"
-#include "../common/malloc.h"
 #include "../common/mmo.h"
+#include "../common/malloc.h"
 #include "../common/showmsg.h"
 #include "../common/socket.h"
-#include "../common/sql.h"
 #include "../common/strlib.h" // StringBuf
+#include "../common/sql.h"
+#include "char.h"
+#include "inter.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
 
 #define STORAGE_MEMINC	16
 
diff --git a/src/char/inter.c b/src/char/inter.c
index 972407ef3..515ca0ec4 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -2,34 +2,33 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
+#include "../common/mmo.h"
+#include "../common/db.h"
+#include "../common/malloc.h"
+#include "../common/strlib.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/timer.h"
+#include "char.h"
 #include "inter.h"
+#include "int_party.h"
+#include "int_guild.h"
+#include "int_storage.h"
+#include "int_pet.h"
+#include "int_homun.h"
+#include "int_mercenary.h"
+#include "int_mail.h"
+#include "int_auction.h"
+#include "int_quest.h"
+#include "int_elemental.h"
 
-#include <errno.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+
 #include <sys/stat.h> // for stat/lstat/fstat - [Dekamaster/Ultimate GM Tool]
 
-#include "char.h"
-#include "int_auction.h"
-#include "int_elemental.h"
-#include "int_guild.h"
-#include "int_homun.h"
-#include "int_mail.h"
-#include "int_mercenary.h"
-#include "int_party.h"
-#include "int_pet.h"
-#include "int_quest.h"
-#include "int_storage.h"
-#include "../common/db.h"
-#include "../common/malloc.h"
-#include "../common/mmo.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/strlib.h"
-#include "../common/timer.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 5e655237e..25b0c2a96 100644
--- a/src/char/inter.h
+++ b/src/char/inter.h
@@ -5,10 +5,9 @@
 #ifndef _CHAR_INTER_H_
 #define _CHAR_INTER_H_
 
-#include "char.h"
-#include "../common/sql.h"
-
 struct accreg;
+#include "../common/sql.h"
+#include "char.h"
 
 int inter_init_sql(const char *file);
 void inter_final(void);
diff --git a/src/char/pincode.c b/src/char/pincode.c
index 59182f12d..d51953448 100644
--- a/src/char/pincode.c
+++ b/src/char/pincode.c
@@ -2,19 +2,16 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "pincode.h"
-
-#include <stdlib.h>
-
-#include "char.h"
 #include "../common/cbasetypes.h"
 #include "../common/mmo.h"
 #include "../common/random.h"
 #include "../common/showmsg.h"
 #include "../common/socket.h"
 #include "../common/strlib.h"
+#include "char.h"
+#include "pincode.h"
+
+#include <stdlib.h>
 
 int enabled = PINCODE_OK;
 int changetime = 0;
diff --git a/src/common/HPM.c b/src/common/HPM.c
index 00b92dc60..9ffce87de 100644
--- a/src/common/HPM.c
+++ b/src/common/HPM.c
@@ -1,31 +1,26 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 
-#define HERCULES_CORE
-
-#include "../config/core.h" // CONSOLE_INPUT
-#include "HPM.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "../common/cbasetypes.h"
-#include "../common/conf.h"
-#include "../common/console.h"
+#include "../common/mmo.h"
 #include "../common/core.h"
 #include "../common/malloc.h"
-#include "../common/mmo.h"
 #include "../common/showmsg.h"
 #include "../common/socket.h"
-#include "../common/sql.h"
-#include "../common/strlib.h"
-#include "../common/sysinfo.h"
 #include "../common/timer.h"
+#include "../common/conf.h"
 #include "../common/utils.h"
+#include "../common/console.h"
+#include "../common/strlib.h"
+#include "../common/sql.h"
+#include "../common/sysinfo.h"
+#include "HPM.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #ifndef WIN32
-#	include <unistd.h>
+#include <unistd.h>
 #endif
 
 struct malloc_interface iMalloc_HPM;
@@ -691,7 +686,7 @@ bool hplugins_parse_conf(const char *w1, const char *w2, enum HPluginConfType po
 void hplugins_share_defaults(void) {
 	/* console */
 #ifdef CONSOLE_INPUT
-	HPM->share(console->input->addCommand,"addCPCommand");
+	HPM->share(console->addCommand,"addCPCommand");
 #endif
 	/* our own */
 	HPM->share(hplugins_addpacket,"addPacket");
@@ -760,7 +755,7 @@ void hpm_init(void) {
 	HPM->symbol_defaults();
 	
 #ifdef CONSOLE_INPUT
-	console->input->addCommand("plugins",CPCMD_A(plugins));
+	console->addCommand("plugins",CPCMD_A(plugins));
 #endif
 	return;
 }
diff --git a/src/common/HPM.h b/src/common/HPM.h
index 9c176cfd6..0f0df4cda 100644
--- a/src/common/HPM.h
+++ b/src/common/HPM.h
@@ -4,12 +4,8 @@
 #ifndef _COMMON_HPM_H_
 #define _COMMON_HPM_H_
 
-#ifndef HERCULES_CORE
-#error You should never include HPM.h from a plugin.
-#endif
-
-#include "../common/HPMi.h"
 #include "../common/cbasetypes.h"
+#include "../common/HPMi.h"
 
 #ifdef WIN32
 	#ifndef WIN32_LEAN_AND_MEAN
diff --git a/src/common/HPMi.h b/src/common/HPMi.h
index b98e87d90..19206aeca 100644
--- a/src/common/HPMi.h
+++ b/src/common/HPMi.h
@@ -5,8 +5,8 @@
 #define _COMMON_HPMI_H_
 
 #include "../common/cbasetypes.h"
-#include "../common/console.h"
 #include "../common/core.h"
+#include "../common/console.h"
 #include "../common/sql.h"
 
 struct script_state;
@@ -20,6 +20,18 @@ struct map_session_data;
 	#define HPExport
 #endif
 
+#ifndef _COMMON_SHOWMSG_H_
+	HPExport void (*ShowMessage) (const char *, ...);
+	HPExport void (*ShowStatus) (const char *, ...);
+	HPExport void (*ShowSQL) (const char *, ...);
+	HPExport void (*ShowInfo) (const char *, ...);
+	HPExport void (*ShowNotice) (const char *, ...);
+	HPExport void (*ShowWarning) (const char *, ...);
+	HPExport void (*ShowDebug) (const char *, ...);
+	HPExport void (*ShowError) (const char *, ...);
+	HPExport void (*ShowFatalError) (const char *, ...);
+#endif
+
 /* after */
 #include "../common/showmsg.h"
 
@@ -180,7 +192,7 @@ HPExport struct HPMi_interface {
 	/* pc group permission */
 	void (*addPCGPermission) (unsigned int pluginID, char *name, unsigned int *mask);
 } HPMi_s;
-#ifndef HERCULES_CORE
+#ifndef _COMMON_HPM_H_
 HPExport struct HPMi_interface *HPMi;
 #endif
 
diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h
index da0d6b307..f44e80413 100644
--- a/src/common/cbasetypes.h
+++ b/src/common/cbasetypes.h
@@ -442,11 +442,5 @@ void SET_FUNCPOINTER(T1& var, T2 p)
 #define SET_FUNCPOINTER(var,p) ((var) = (p))
 #endif
 
-/* pointer size fix which fixes several gcc warnings */
-#ifdef __64BIT__
-	#define __64BPTRSIZE(y) ((intptr)(y))
-#else
-	#define __64BPTRSIZE(y) (y)
-#endif
 
 #endif /* _COMMON_CBASETYPES_H_ */
diff --git a/src/common/conf.c b/src/common/conf.c
index 46a034497..b816b2f7f 100644
--- a/src/common/conf.c
+++ b/src/common/conf.c
@@ -2,10 +2,7 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
 #include "conf.h"
-
 #include "../../3rdparty/libconfig/libconfig.h"
 
 #include "../common/showmsg.h" // ShowError
diff --git a/src/common/conf.h b/src/common/conf.h
index e5b637e47..9aff3df47 100644
--- a/src/common/conf.h
+++ b/src/common/conf.h
@@ -6,7 +6,6 @@
 #define _COMMON_CONF_H_
 
 #include "../common/cbasetypes.h"
-
 #include "../../3rdparty/libconfig/libconfig.h"
 
 /**
diff --git a/src/common/console.c b/src/common/console.c
index 6a82db555..d8f352c8a 100644
--- a/src/common/console.c
+++ b/src/common/console.c
@@ -2,46 +2,42 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "../config/core.h" // CONSOLE_INPUT, MAX_CONSOLE_INPUT
-#include "console.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "../common/cbasetypes.h"
-#include "../common/core.h"
 #include "../common/showmsg.h"
+#include "../common/core.h"
 #include "../common/sysinfo.h"
+#include "../config/core.h"
+#include "console.h"
 
 #ifndef MINICORE
-#	include "../common/atomic.h"
-#	include "../common/ers.h"
-#	include "../common/malloc.h"
-#	include "../common/mutex.h"
-#	include "../common/spinlock.h"
-#	include "../common/sql.h"
-#	include "../common/strlib.h"
-#	include "../common/thread.h"
-#	include "../common/timer.h"
+	#include "../common/ers.h"
+	#include "../common/malloc.h"
+	#include "../common/atomic.h"
+	#include "../common/spinlock.h"
+	#include "../common/thread.h"
+	#include "../common/mutex.h"
+	#include "../common/timer.h"
+	#include "../common/strlib.h"
+	#include "../common/sql.h"
 #endif
 
+#include <stdio.h>
+#include <stdlib.h>
 #if !defined(WIN32)
-#	include <sys/time.h>
-#	include <unistd.h>
+	#include <unistd.h>
+	#include <sys/time.h>
 #else
-#	include "../common/winapi.h" // Console close event handling
-#	ifdef CONSOLE_INPUT
-#		include <conio.h> /* _kbhit() */
-#	endif
+	#include "../common/winapi.h" // Console close event handling
 #endif
 
-struct console_interface console_s;
 #ifdef CONSOLE_INPUT
-struct console_input_interface console_input_s;
+	#if defined(WIN32)
+		#include <conio.h> /* _kbhit() */
+	#endif
 #endif
 
+struct console_interface console_s;
+
 /*======================================
  *	CORE : Display title
  *--------------------------------------*/
@@ -120,12 +116,12 @@ CPCMD_C(mem_report,server) {
  **/
 CPCMD(help) {
 	unsigned int i = 0;
-	for ( i = 0; i < console->input->cmd_list_count; i++ ) {
-		if( console->input->cmd_list[i]->next_count ) {
-			ShowInfo("- '"CL_WHITE"%s"CL_RESET"' subs\n",console->input->cmd_list[i]->cmd);
-			console->input->parse_list_subs(console->input->cmd_list[i],2);
+	for ( i = 0; i < console->cmd_list_count; i++ ) {
+		if( console->cmd_list[i]->next_count ) {
+			ShowInfo("- '"CL_WHITE"%s"CL_RESET"' subs\n",console->cmd_list[i]->cmd);
+			console->parse_list_subs(console->cmd_list[i],2);
 		} else {
-			ShowInfo("- '"CL_WHITE"%s"CL_RESET"'\n",console->input->cmd_list[i]->cmd);
+			ShowInfo("- '"CL_WHITE"%s"CL_RESET"'\n",console->cmd_list[i]->cmd);
 		}
 	}
 }
@@ -148,7 +144,7 @@ CPCMD_C(skip,update) {
 		ShowDebug("usage example: sql update skip 2013-02-14--16-15.sql\n");
 		return;
 	}
-	Sql_HerculesUpdateSkip(console->input->SQL, line);
+	Sql_HerculesUpdateSkip(console->SQL, line);
 }
 
 /**
@@ -210,7 +206,7 @@ void console_load_defaults(void) {
 	unsigned int i, len = ARRAYLENGTH(default_list);
 	struct CParseEntry *cmd;
 	
-	RECREATE(console->input->cmds,struct CParseEntry *, len);
+	RECREATE(console->cmds,struct CParseEntry *, len);
 	
 	for(i = 0; i < len; i++) {
 		CREATE(cmd, struct CParseEntry, 1);
@@ -224,12 +220,12 @@ void console_load_defaults(void) {
 		
 		cmd->next_count = 0;
 		
-		console->input->cmd_count++;
-		console->input->cmds[i] = cmd;
+		console->cmd_count++;
+		console->cmds[i] = cmd;
 		default_list[i].self = cmd;
 		if( !default_list[i].connect ) {
-			RECREATE(console->input->cmd_list,struct CParseEntry *, ++console->input->cmd_list_count);
-			console->input->cmd_list[console->input->cmd_list_count - 1] = cmd;
+			RECREATE(console->cmd_list,struct CParseEntry *, ++console->cmd_list_count);
+			console->cmd_list[console->cmd_list_count - 1] = cmd;
 		}
 	}
 	
@@ -237,11 +233,11 @@ void console_load_defaults(void) {
 		unsigned int k;
 		if( !default_list[i].connect )
 			continue;
-		for(k = 0; k < console->input->cmd_count; k++) {
-			if( strcmpi(default_list[i].connect,console->input->cmds[k]->cmd) == 0 ) {
+		for(k = 0; k < console->cmd_count; k++) {
+			if( strcmpi(default_list[i].connect,console->cmds[k]->cmd) == 0 ) {
 				cmd = default_list[i].self;
-				RECREATE(console->input->cmds[k]->u.next, struct CParseEntry *, ++console->input->cmds[k]->next_count);
-				console->input->cmds[k]->u.next[console->input->cmds[k]->next_count - 1] = cmd;
+				RECREATE(console->cmds[k]->u.next, struct CParseEntry *, ++console->cmds[k]->next_count);
+				console->cmds[k]->u.next[console->cmds[k]->next_count - 1] = cmd;
 				break;
 			}
 		}
@@ -260,23 +256,23 @@ void console_parse_create(char *name, CParseFunc func) {
 	safestrncpy(sublist, name, CP_CMD_LENGTH * 5);
 	tok = strtok(sublist,":");
 	
-	for ( i = 0; i < console->input->cmd_list_count; i++ ) {
-		if( strcmpi(tok,console->input->cmd_list[i]->cmd) == 0 )
+	for ( i = 0; i < console->cmd_list_count; i++ ) {
+		if( strcmpi(tok,console->cmd_list[i]->cmd) == 0 )
 			break;
 	}
 
-	if( i == console->input->cmd_list_count ) {
-		RECREATE(console->input->cmds,struct CParseEntry *, ++console->input->cmd_count);
+	if( i == console->cmd_list_count ) {
+		RECREATE(console->cmds,struct CParseEntry *, ++console->cmd_count);
 		CREATE(cmd, struct CParseEntry, 1);
 		safestrncpy(cmd->cmd, tok, CP_CMD_LENGTH);
 		cmd->next_count = 0;
-		console->input->cmds[console->input->cmd_count - 1] = cmd;
-		RECREATE(console->input->cmd_list,struct CParseEntry *, ++console->input->cmd_list_count);
-		console->input->cmd_list[console->input->cmd_list_count - 1] = cmd;
-		i = console->input->cmd_list_count - 1;
+		console->cmds[console->cmd_count - 1] = cmd;
+		RECREATE(console->cmd_list,struct CParseEntry *, ++console->cmd_list_count);
+		console->cmd_list[console->cmd_list_count - 1] = cmd;
+		i = console->cmd_list_count - 1;
 	}
 
-	cmd = console->input->cmd_list[i];
+	cmd = console->cmd_list[i];
 	while( ( tok = strtok(NULL, ":") ) != NULL ) {
 		
 		for(i = 0; i < cmd->next_count; i++) {
@@ -285,13 +281,13 @@ void console_parse_create(char *name, CParseFunc func) {
 		}
 		
 		if ( i == cmd->next_count ) {
-			RECREATE(console->input->cmds,struct CParseEntry *, ++console->input->cmd_count);
-			CREATE(console->input->cmds[console->input->cmd_count-1], struct CParseEntry, 1);
-			safestrncpy(console->input->cmds[console->input->cmd_count-1]->cmd, tok, CP_CMD_LENGTH);
-			console->input->cmds[console->input->cmd_count-1]->next_count = 0;
+			RECREATE(console->cmds,struct CParseEntry *, ++console->cmd_count);
+			CREATE(console->cmds[console->cmd_count-1], struct CParseEntry, 1);
+			safestrncpy(console->cmds[console->cmd_count-1]->cmd, tok, CP_CMD_LENGTH);
+			console->cmds[console->cmd_count-1]->next_count = 0;
 			RECREATE(cmd->u.next, struct CParseEntry *, ++cmd->next_count);
-			cmd->u.next[cmd->next_count - 1] = console->input->cmds[console->input->cmd_count-1];
-			cmd = console->input->cmds[console->input->cmd_count-1];
+			cmd->u.next[cmd->next_count - 1] = console->cmds[console->cmd_count-1];
+			cmd = console->cmds[console->cmd_count-1];
 			continue;
 		}
 		
@@ -306,7 +302,7 @@ void console_parse_list_subs(struct CParseEntry *cmd, unsigned char depth) {
 			memset(msg, '-', depth);
 			snprintf(msg + depth,CP_CMD_LENGTH * 2, " '"CL_WHITE"%s"CL_RESET"'",cmd->u.next[i]->cmd);
 			ShowInfo("%s subs\n",msg);
-			console->input->parse_list_subs(cmd->u.next[i],depth + 1);
+			console->parse_list_subs(cmd->u.next[i],depth + 1);
 		} else {
 			memset(msg, '-', depth);
 			snprintf(msg + depth,CP_CMD_LENGTH * 2, " %s",cmd->u.next[i]->cmd);
@@ -324,21 +320,21 @@ void console_parse_sub(char *line) {
 	memcpy(bline, line, 200);
 	tok = strtok(line, " ");
 	
-	for ( i = 0; i < console->input->cmd_list_count; i++ ) {
-		if( strcmpi(tok,console->input->cmd_list[i]->cmd) == 0 )
+	for ( i = 0; i < console->cmd_list_count; i++ ) {
+		if( strcmpi(tok,console->cmd_list[i]->cmd) == 0 )
 			break;
 	}
 	
-	if( i == console->input->cmd_list_count ) {
+	if( i == console->cmd_list_count ) {
 		ShowError("'"CL_WHITE"%s"CL_RESET"' is not a known command, type '"CL_WHITE"help"CL_RESET"' to list all commands\n",line);
 		return;
 	}
 	
-	cmd = console->input->cmd_list[i];
+	cmd = console->cmd_list[i];
 	
 	len += snprintf(sublist,CP_CMD_LENGTH * 5,"%s", cmd->cmd) + 1;
 	
-	if( cmd->next_count == 0 && console->input->cmd_list[i]->u.func ) {
+	if( cmd->next_count == 0 && console->cmd_list[i]->u.func ) {
 		char *r = NULL;
 		if( (tok = strtok(NULL, " ")) ) {
 			r = bline;
@@ -355,7 +351,7 @@ void console_parse_sub(char *line) {
 				if( strcmpi("help",tok) == 0 ) {
 					if( cmd->next_count ) {
 						ShowInfo("- '"CL_WHITE"%s"CL_RESET"' subs\n",sublist);
-						console->input->parse_list_subs(cmd,2);
+						console->parse_list_subs(cmd,2);
 					} else {
 						ShowError("'"CL_WHITE"%s"CL_RESET"' doesn't possess any subcommands\n",sublist);
 					}
@@ -396,95 +392,95 @@ void console_parse(char* line) {
 }
 void *cThread_main(void *x) {
 		
-	while( console->input->ptstate ) {/* loopx */
-		if( console->input->key_pressed() ) {
+	while( console->ptstate ) {/* loopx */
+		if( console->key_pressed() ) {
 			char input[MAX_CONSOLE_INPUT];
 					
-			console->input->parse(input);
+			console->parse(input);
 			if( input[0] != '\0' ) {/* did we get something? */
-				EnterSpinLock(&console->input->ptlock);
+				EnterSpinLock(&console->ptlock);
 				
 				if( cinput.count == CONSOLE_PARSE_SIZE ) {
-					LeaveSpinLock(&console->input->ptlock);
+					LeaveSpinLock(&console->ptlock);
 					continue;/* drop */
 				}
 				
 				safestrncpy(cinput.queue[cinput.count++],input,MAX_CONSOLE_INPUT);
-				LeaveSpinLock(&console->input->ptlock);
+				LeaveSpinLock(&console->ptlock);
 			}
 		}
-		ramutex_lock( console->input->ptmutex );
-		racond_wait( console->input->ptcond,	console->input->ptmutex,  -1 );
-		ramutex_unlock( console->input->ptmutex );
+		ramutex_lock( console->ptmutex );
+		racond_wait( console->ptcond,	console->ptmutex,  -1 );
+		ramutex_unlock( console->ptmutex );
 	}
 		
 	return NULL;
 }
 int console_parse_timer(int tid, int64 tick, int id, intptr_t data) {
 	int i;
-	EnterSpinLock(&console->input->ptlock);
+	EnterSpinLock(&console->ptlock);
 	for(i = 0; i < cinput.count; i++) {
-		console->input->parse_sub(cinput.queue[i]);
+		console->parse_sub(cinput.queue[i]);
 	}
 	cinput.count = 0;
-	LeaveSpinLock(&console->input->ptlock);
-	racond_signal(console->input->ptcond);
+	LeaveSpinLock(&console->ptlock);
+	racond_signal(console->ptcond);
 	return 0;
 }
 void console_parse_final(void) {
-	if( console->input->ptstate ) {
-		InterlockedDecrement(&console->input->ptstate);
-		racond_signal(console->input->ptcond);
+	if( console->ptstate ) {
+		InterlockedDecrement(&console->ptstate);
+		racond_signal(console->ptcond);
 		
 		/* wait for thread to close */
-		rathread_wait(console->input->pthread, NULL);
+		rathread_wait(console->pthread, NULL);
 
-		racond_destroy(console->input->ptcond);
-		ramutex_destroy(console->input->ptmutex);
+		racond_destroy(console->ptcond);
+		ramutex_destroy(console->ptmutex);
 	}
 }
 void console_parse_init(void) {
 	cinput.count = 0;
 	
-	console->input->ptstate = 1;
+	console->ptstate = 1;
 
-	InitializeSpinLock(&console->input->ptlock);
+	InitializeSpinLock(&console->ptlock);
 	
-	console->input->ptmutex = ramutex_create();
-	console->input->ptcond = racond_create();
+	console->ptmutex = ramutex_create();
+	console->ptcond = racond_create();
 	
-	if( (console->input->pthread = rathread_create(console->input->pthread_main, NULL)) == NULL ){
+	if( (console->pthread = rathread_create(console->pthread_main, NULL)) == NULL ){
 		ShowFatalError("console_parse_init: failed to spawn console_parse thread.\n");
 		exit(EXIT_FAILURE);
 	}
 	
-	timer->add_func_list(console->input->parse_timer, "console_parse_timer");
-	timer->add_interval(timer->gettick() + 1000, console->input->parse_timer, 0, 0, 500);/* start listening in 1s; re-try every 0.5s */
+	timer->add_func_list(console->parse_timer, "console_parse_timer");
+	timer->add_interval(timer->gettick() + 1000, console->parse_timer, 0, 0, 500);/* start listening in 1s; re-try every 0.5s */
 	
 }
 void console_setSQL(Sql *SQL_handle) {
-	console->input->SQL = SQL_handle;
+	console->SQL = SQL_handle;
 }
 #endif /* CONSOLE_INPUT */
 
 void console_init (void) {
 #ifdef CONSOLE_INPUT
-	console->input->cmd_count = console->input->cmd_list_count = 0;
-	console->input->load_defaults();
-	console->input->parse_init();
+	console->cmd_count = console->cmd_list_count = 0;
+	console->load_defaults();
+	console->parse_init();
 #endif
 }
 void console_final(void) {
 #ifdef CONSOLE_INPUT
 	unsigned int i;
-	console->input->parse_final();
-	for( i = 0; i < console->input->cmd_count; i++ ) {
-		if( console->input->cmds[i]->next_count )
-			aFree(console->input->cmds[i]->u.next);
-		aFree(console->input->cmds[i]);
+	console->parse_final();
+	for( i = 0; i < console->cmd_count; i++ ) {
+		if( console->cmds[i]->next_count )
+			aFree(console->cmds[i]->u.next);
+		aFree(console->cmds[i]);
 	}
-	aFree(console->input->cmds);
-	aFree(console->input->cmd_list);
+	aFree(console->cmds);
+	aFree(console->cmd_list);
 #endif
 }
 void console_defaults(void) {
@@ -493,20 +489,17 @@ void console_defaults(void) {
 	console->final = console_final;
 	console->display_title = display_title;
 #ifdef CONSOLE_INPUT
-	console->input = &console_input_s;
-	console->input->parse_init = console_parse_init;
-	console->input->parse_final = console_parse_final;
-	console->input->parse_timer = console_parse_timer;
-	console->input->pthread_main = cThread_main;
-	console->input->parse = console_parse;
-	console->input->parse_sub = console_parse_sub;
-	console->input->key_pressed = console_parse_key_pressed;
-	console->input->load_defaults = console_load_defaults;
-	console->input->parse_list_subs = console_parse_list_subs;
-	console->input->addCommand = console_parse_create;
-	console->input->setSQL = console_setSQL;
-	console->input->SQL = NULL;
-#else
-	console->input = NULL;
+	console->parse_init = console_parse_init;
+	console->parse_final = console_parse_final;
+	console->parse_timer = console_parse_timer;
+	console->pthread_main = cThread_main;
+	console->parse = console_parse;
+	console->parse_sub = console_parse_sub;
+	console->key_pressed = console_parse_key_pressed;
+	console->load_defaults = console_load_defaults;
+	console->parse_list_subs = console_parse_list_subs;
+	console->addCommand = console_parse_create;
+	console->setSQL = console_setSQL;
+	console->SQL = NULL;
 #endif
 }
diff --git a/src/common/console.h b/src/common/console.h
index d2c58f978..3d19ddc9d 100644
--- a/src/common/console.h
+++ b/src/common/console.h
@@ -4,13 +4,11 @@
 #ifndef _COMMON_CONSOLE_H_
 #define _COMMON_CONSOLE_H_
 
-#include "../config/core.h" // MAX_CONSOLE_INPUT
-
-#include "../common/cbasetypes.h"
+#include "../common/thread.h"
 #include "../common/mutex.h"
 #include "../common/spinlock.h"
 #include "../common/sql.h"
-#include "../common/thread.h"
+#include "../config/core.h"
 
 /**
  * Queue Max
@@ -49,8 +47,11 @@ struct {
 	unsigned short count;
 } cinput;
 
+struct console_interface {
+	void (*init) (void);
+	void (*final) (void);
+	void (*display_title) (void);
 #ifdef CONSOLE_INPUT
-struct console_input_interface {
 	/* vars */
 	SPIN_LOCK ptlock;/* parse thread lock */
 	rAthread pthread;/* parse thread */
@@ -76,17 +77,7 @@ struct console_input_interface {
 	void (*parse_list_subs) (struct CParseEntry *cmd, unsigned char depth);
 	void (*addCommand) (char *name, CParseFunc func);
 	void (*setSQL) (Sql *SQL_handle);
-};
-#else
-struct console_input_interface;
 #endif
-
-struct console_interface {
-	void (*init) (void);
-	void (*final) (void);
-	void (*display_title) (void);
-
-	struct console_input_interface *input;
 };
 
 struct console_interface *console;
diff --git a/src/common/core.c b/src/common/core.c
index 85f824866..49b272488 100644
--- a/src/common/core.c
+++ b/src/common/core.c
@@ -2,40 +2,36 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "../config/core.h"
-#include "core.h"
-
-#include "../common/cbasetypes.h"
-#include "../common/console.h"
-#include "../common/malloc.h"
 #include "../common/mmo.h"
-#include "../common/random.h"
 #include "../common/showmsg.h"
+#include "../common/malloc.h"
 #include "../common/strlib.h"
+#include "core.h"
+#include "../common/console.h"
+#include "../common/random.h"
 #include "../common/sysinfo.h"
 
 #ifndef MINICORE
-#	include "../common/HPM.h"
-#	include "../common/conf.h"
-#	include "../common/db.h"
-#	include "../common/ers.h"
-#	include "../common/socket.h"
-#	include "../common/sql.h"
-#	include "../common/thread.h"
-#	include "../common/timer.h"
-#	include "../common/utils.h"
+	#include "../common/db.h"
+	#include "../common/socket.h"
+	#include "../common/timer.h"
+	#include "../common/thread.h"
+	#include "../common/sql.h"
+	#include "../config/core.h"
+	#include "../common/HPM.h"
+	#include "../common/utils.h"
+	#include "../common/conf.h"
+	#include "../common/ers.h"
 #endif
 
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <signal.h>
 #include <string.h>
 #ifndef _WIN32
-#	include <unistd.h>
+#include <unistd.h>
 #else
-#	include "../common/winapi.h" // Console close event handling
+#include "../common/winapi.h" // Console close event handling
 #endif
 
 /// Called when a terminate signal is received.
diff --git a/src/common/core.h b/src/common/core.h
index ba75e6b01..e9f7c5961 100644
--- a/src/common/core.h
+++ b/src/common/core.h
@@ -7,10 +7,11 @@
 
 #include "../common/db.h"
 #include "../common/mmo.h"
+#include "../config/core.h"
 
 /* so that developers with --enable-debug can raise signals from any section of the code they'd like */
 #ifdef DEBUG
-#	include <signal.h>
+	#include <signal.h>
 #endif
 
 extern int arg_c;
diff --git a/src/common/db.c b/src/common/db.c
index 1781aa96f..8d6b08815 100644
--- a/src/common/db.c
+++ b/src/common/db.c
@@ -67,18 +67,14 @@
  * @encoding US-ASCII
  * @see #db.h
 \*****************************************************************************/
-
-#define HERCULES_CORE
-
-#include "db.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "../common/ers.h"
-#include "../common/malloc.h"
+#include "db.h"
 #include "../common/mmo.h"
+#include "../common/malloc.h"
 #include "../common/showmsg.h"
+#include "../common/ers.h"
 #include "../common/strlib.h"
 
 /*****************************************************************************\
diff --git a/src/common/db.h b/src/common/db.h
index 0d2548806..67abe6f19 100644
--- a/src/common/db.h
+++ b/src/common/db.h
@@ -42,9 +42,8 @@
 #ifndef _COMMON_DB_H_
 #define _COMMON_DB_H_
 
-#include <stdarg.h>
-
 #include "../common/cbasetypes.h"
+#include <stdarg.h>
 
 /*****************************************************************************\
  *  (1) Section with public typedefs, enums, unions, structures and defines. *
diff --git a/src/common/des.c b/src/common/des.c
index 7f952be76..ed6d098dc 100644
--- a/src/common/des.c
+++ b/src/common/des.c
@@ -1,11 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
-
-#define HERCULES_CORE
-
-#include "des.h"
-
 #include "../common/cbasetypes.h"
+#include "../common/des.h"
+
 
 /// DES (Data Encryption Standard) algorithm, modified version.
 /// @see http://www.eathena.ws/board/index.php?autocom=bugtracker&showbug=5099.
diff --git a/src/common/ers.c b/src/common/ers.c
index d9895e4f2..5a3d7314a 100644
--- a/src/common/ers.c
+++ b/src/common/ers.c
@@ -39,18 +39,14 @@
  * @encoding US-ASCII                                                        *
  * @see common#ers.h                                                         *
 \*****************************************************************************/
-
-#define HERCULES_CORE
-
-#include "ers.h"
-
 #include <stdlib.h>
 #include <string.h>
 
 #include "../common/cbasetypes.h"
 #include "../common/malloc.h" // CREATE, RECREATE, aMalloc, aFree
-#include "../common/nullpo.h"
 #include "../common/showmsg.h" // ShowMessage, ShowError, ShowFatalError, CL_BOLD, CL_NORMAL
+#include "../common/nullpo.h"
+#include "ers.h"
 
 #ifndef DISABLE_ERS
 
diff --git a/src/common/grfio.c b/src/common/grfio.c
index 1111fb3f3..bde0ed720 100644
--- a/src/common/grfio.c
+++ b/src/common/grfio.c
@@ -2,8 +2,13 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
+#include "../common/cbasetypes.h"
+#include "../common/des.h"
+#include "../common/malloc.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
+#include "../common/nullpo.h"
 #include "grfio.h"
 
 #include <stdio.h>
@@ -12,14 +17,6 @@
 #include <sys/stat.h>
 #include <zlib.h>
 
-#include "../common/cbasetypes.h"
-#include "../common/des.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
-
 //----------------------------
 //	file entry table struct
 //----------------------------
diff --git a/src/common/malloc.c b/src/common/malloc.c
index 13cf0b5ce..5b39cbab6 100644
--- a/src/common/malloc.c
+++ b/src/common/malloc.c
@@ -2,19 +2,16 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "malloc.h"
+#include "../common/malloc.h"
+#include "../common/core.h"
+#include "../common/showmsg.h"
+#include "../common/sysinfo.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
-#include "../common/core.h"
-#include "../common/showmsg.h"
-#include "../common/sysinfo.h"
-
 struct malloc_interface iMalloc_s;
 
 ////////////// Memory Libraries //////////////////
diff --git a/src/common/mapindex.c b/src/common/mapindex.c
index 5c69c7063..3128a3cb0 100644
--- a/src/common/mapindex.c
+++ b/src/common/mapindex.c
@@ -2,19 +2,16 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
+#include "../common/mmo.h"
+#include "../common/showmsg.h"
+#include "../common/malloc.h"
+#include "../common/strlib.h"
+#include "../common/db.h"
 #include "mapindex.h"
 
+#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-
-#include "../common/db.h"
-#include "../common/malloc.h"
-#include "../common/mmo.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
 
 /* mapindex.c interface source */
 struct mapindex_interface mapindex_s;
diff --git a/src/common/md5calc.c b/src/common/md5calc.c
index e7b506e27..05fde42cc 100644
--- a/src/common/md5calc.c
+++ b/src/common/md5calc.c
@@ -6,15 +6,11 @@
  *
  ***********************************************************/
 
-#define HERCULES_CORE
-
+#include "../common/random.h"
 #include "md5calc.h"
-
+#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-
-#include "../common/random.h"
 
 #ifndef UINT_MAX
 #define UINT_MAX 4294967295U
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 1d826463e..d535d2874 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -5,10 +5,9 @@
 #ifndef _COMMON_MMO_H_
 #define _COMMON_MMO_H_
 
-#include <time.h>
-
-#include "../common/cbasetypes.h"
+#include "cbasetypes.h"
 #include "../common/db.h"
+#include <time.h>
 
 // server->client protocol version
 //        0 - pre-?
@@ -97,7 +96,6 @@
 //Official Limit: 2.1b ( the var that stores the money doesn't go much higher than this by default )
 #define MAX_BANK_ZENY 2100000000
 
-#define MAX_LEVEL 175
 #define MAX_FAME 1000000000
 #define MAX_CART 100
 #define MAX_SKILL 1478
diff --git a/src/common/mutex.c b/src/common/mutex.c
index 12524c3b7..0668dbc41 100644
--- a/src/common/mutex.c
+++ b/src/common/mutex.c
@@ -1,10 +1,6 @@
 // Copyright (c) rAthena Project (www.rathena.org) - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#define HERCULES_CORE
-
-#include "mutex.h"
-
 #ifdef WIN32
 #include "../common/winapi.h"
 #else
@@ -17,6 +13,7 @@
 #include "../common/malloc.h"
 #include "../common/showmsg.h"
 #include "../common/timer.h"
+#include "../common/mutex.h"
 
 struct ramutex{
 #ifdef WIN32
diff --git a/src/common/mutex.h b/src/common/mutex.h
index 3b83b66d6..eeb24e6ff 100644
--- a/src/common/mutex.h
+++ b/src/common/mutex.h
@@ -4,7 +4,6 @@
 #ifndef _COMMON_MUTEX_H_
 #define _COMMON_MUTEX_H_
 
-#include "../common/cbasetypes.h"
 
 typedef struct ramutex *ramutex; // Mutex
 typedef struct racond *racond; // Condition Var
diff --git a/src/common/nullpo.c b/src/common/nullpo.c
index 1891835f1..1cb471aff 100644
--- a/src/common/nullpo.c
+++ b/src/common/nullpo.c
@@ -2,14 +2,10 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "nullpo.h"
-
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
-
+#include "../common/nullpo.h"
 #include "../common/showmsg.h"
 
 /**
diff --git a/src/common/random.c b/src/common/random.c
index 7019a31f3..e46c52cad 100644
--- a/src/common/random.c
+++ b/src/common/random.c
@@ -1,23 +1,17 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#define HERCULES_CORE
-
-#include "random.h"
-
-#include <time.h> // time
-
-#include <mt19937ar.h> // init_genrand, genrand_int32, genrand_res53
-
 #include "../common/showmsg.h"
 #include "../common/timer.h" // gettick
-
+#include "random.h"
 #if defined(WIN32)
-#	include "../common/winapi.h"
+	#include "../common/winapi.h"
 #elif defined(HAVE_GETPID) || defined(HAVE_GETTID)
-#	include <sys/types.h>
-#	include <unistd.h>
+	#include <sys/types.h>
+	#include <unistd.h>
 #endif
+#include <time.h> // time
+#include <mt19937ar.h> // init_genrand, genrand_int32, genrand_res53
 
 
 /// Initializes the random number generator with an appropriate seed.
diff --git a/src/common/showmsg.c b/src/common/showmsg.c
index 1dbcba282..14342fe5e 100644
--- a/src/common/showmsg.c
+++ b/src/common/showmsg.c
@@ -2,26 +2,23 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
+#include "../common/cbasetypes.h"
+#include "../common/strlib.h" // StringBuf
 #include "showmsg.h"
+#include "core.h" //[Ind] - For SERVER_TYPE
 
-#include <stdarg.h>
 #include <stdio.h>
-#include <stdlib.h> // atexit
 #include <string.h>
+#include <stdarg.h>
 #include <time.h>
+#include <stdlib.h> // atexit
 
 #include "../../3rdparty/libconfig/libconfig.h"
 
-#include "../common/cbasetypes.h"
-#include "../common/core.h" //[Ind] - For SERVER_TYPE
-#include "../common/strlib.h" // StringBuf
-
 #ifdef WIN32
-#	include "../common/winapi.h"
+#include "../common/winapi.h"
 #else // not WIN32
-#	include <unistd.h>
+#include <unistd.h>
 #endif // WIN32
 
 #if defined(DEBUGLOGMAP)
diff --git a/src/common/showmsg.h b/src/common/showmsg.h
index 5b32f39ae..49fbc34fb 100644
--- a/src/common/showmsg.h
+++ b/src/common/showmsg.h
@@ -5,14 +5,12 @@
 #ifndef _COMMON_SHOWMSG_H_
 #define _COMMON_SHOWMSG_H_
 
-#include <stdarg.h>
-
-#ifdef HERCULES_CORE
-#	include "../../3rdparty/libconfig/libconfig.h"
-#else
-#	include "../common/HPMi.h"
+#ifndef _COMMON_HPMI_H_
+	#include "../../3rdparty/libconfig/libconfig.h"
 #endif
 
+#include <stdarg.h>
+
 // for help with the console colors look here:
 // http://www.edoceo.com/liberum/?doc=printf-with-color
 // some code explanation (used here):
@@ -92,7 +90,7 @@ enum msg_type {
 };
 
 extern void ClearScreen(void);
-#ifdef HERCULES_CORE
+#ifndef _COMMON_HPMI_H_
 	extern void ShowMessage(const char *, ...);
 	extern void ShowStatus(const char *, ...);
 	extern void ShowSQL(const char *, ...);
@@ -103,18 +101,7 @@ extern void ClearScreen(void);
 	extern void ShowError(const char *, ...);
 	extern void ShowFatalError(const char *, ...);
 	extern void ShowConfigWarning(config_setting_t *config, const char *string, ...);
-#else
-	HPExport void (*ShowMessage) (const char *, ...);
-	HPExport void (*ShowStatus) (const char *, ...);
-	HPExport void (*ShowSQL) (const char *, ...);
-	HPExport void (*ShowInfo) (const char *, ...);
-	HPExport void (*ShowNotice) (const char *, ...);
-	HPExport void (*ShowWarning) (const char *, ...);
-	HPExport void (*ShowDebug) (const char *, ...);
-	HPExport void (*ShowError) (const char *, ...);
-	HPExport void (*ShowFatalError) (const char *, ...);
 #endif
-
 extern int _vShowMessage(enum msg_type flag, const char *string, va_list ap);
 
 #endif /* _COMMON_SHOWMSG_H_ */
diff --git a/src/common/socket.c b/src/common/socket.c
index 3738f2c2a..35d350e95 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -2,50 +2,48 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
+#include "../common/cbasetypes.h"
+#include "../common/mmo.h"
+#include "../common/timer.h"
+#include "../common/malloc.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../config/core.h"
+#include "../common/HPM.h"
 
-#include "../config/core.h" // SHOW_SERVER_STATS
 #define _H_SOCKET_C_
+
 #include "socket.h"
-#undef _H_SOCKET_C_
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 
-#include "../common/HPM.h"
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/mmo.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/timer.h"
-
 #ifdef WIN32
-#	include "../common/winapi.h"
+	#include "../common/winapi.h"
 #else
-#	include <arpa/inet.h>
-#	include <errno.h>
-#	include <net/if.h>
-#	include <netdb.h>
-#	include <netinet/in.h>
-#	include <netinet/tcp.h>
-#	include <sys/ioctl.h>
-#	include <sys/socket.h>
-#	include <sys/time.h>
-#	include <unistd.h>
-
-#	ifndef SIOCGIFCONF
-#		include <sys/sockio.h> // SIOCGIFCONF on Solaris, maybe others? [Shinomori]
-#	endif
-#	ifndef FIONBIO
-#		include <sys/filio.h> // FIONBIO on Solaris [FlavioJS]
-#	endif
-
-#	ifdef HAVE_SETRLIMIT
-#		include <sys/resource.h>
-#	endif
+	#include <errno.h>
+	#include <sys/socket.h>
+	#include <netinet/in.h>
+	#include <netinet/tcp.h>
+	#include <net/if.h>
+	#include <unistd.h>
+	#include <sys/time.h>
+	#include <sys/ioctl.h>
+	#include <netdb.h>
+	#include <arpa/inet.h>
+
+	#ifndef SIOCGIFCONF
+	#include <sys/sockio.h> // SIOCGIFCONF on Solaris, maybe others? [Shinomori]
+	#endif
+	#ifndef FIONBIO
+	#include <sys/filio.h> // FIONBIO on Solaris [FlavioJS]
+	#endif
+
+	#ifdef HAVE_SETRLIMIT
+	#include <sys/resource.h>
+	#endif
 #endif
 
 /**
diff --git a/src/common/socket.h b/src/common/socket.h
index 804b9284f..75adde4cf 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -5,19 +5,19 @@
 #ifndef _COMMON_SOCKET_H_
 #define _COMMON_SOCKET_H_
 
-#include <time.h>
-
 #include "../common/cbasetypes.h"
 
 #ifdef WIN32
-#	include "../common/winapi.h"
+	#include "../common/winapi.h"
 	typedef long in_addr_t;
 #else
-#	include <netinet/in.h>
-#	include <sys/socket.h>
-#	include <sys/types.h>
+	#include <sys/types.h>
+	#include <sys/socket.h>
+	#include <netinet/in.h>
 #endif
 
+#include <time.h>
+
 struct HPluginData;
 
 #define FIFOSIZE_SERVERLINK 256*1024
diff --git a/src/common/spinlock.h b/src/common/spinlock.h
index 0058e1d83..29fbb355b 100644
--- a/src/common/spinlock.h
+++ b/src/common/spinlock.h
@@ -1,3 +1,4 @@
+#pragma once
 #ifndef _COMMON_SPINLOCK_H_
 #define _COMMON_SPINLOCK_H_
 
@@ -14,14 +15,14 @@
 //
 //
  
-#include "../common/atomic.h"
-#include "../common/cbasetypes.h"
-#include "../common/thread.h"
-
 #ifdef WIN32
 #include "../common/winapi.h"
 #endif
 
+#include "../common/cbasetypes.h"
+#include "../common/atomic.h"
+#include "../common/thread.h"
+
 #ifdef WIN32
 
 typedef struct __declspec( align(64) ) SPIN_LOCK{
diff --git a/src/common/sql.c b/src/common/sql.c
index aeb56bff0..79ccc8e92 100644
--- a/src/common/sql.c
+++ b/src/common/sql.c
@@ -2,23 +2,19 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "sql.h"
-
-#include <stdlib.h> // strtoul
-#include <string.h> // strlen/strnlen/memcpy/memset
-
 #include "../common/cbasetypes.h"
 #include "../common/malloc.h"
 #include "../common/showmsg.h"
 #include "../common/strlib.h"
 #include "../common/timer.h"
+#include "sql.h"
 
 #ifdef WIN32
-#	include "../common/winapi.h" // Needed before mysql.h
+#include "../common/winapi.h"
 #endif
 #include <mysql.h>
+#include <string.h>// strlen/strnlen/memcpy/memset
+#include <stdlib.h>// strtoul
 
 void hercules_mysql_error_handler(unsigned int ecode);
 
diff --git a/src/common/sql.h b/src/common/sql.h
index 807e0843c..1fb436853 100644
--- a/src/common/sql.h
+++ b/src/common/sql.h
@@ -5,9 +5,10 @@
 #ifndef _COMMON_SQL_H_
 #define _COMMON_SQL_H_
 
+#include "../common/cbasetypes.h"
 #include <stdarg.h>// va_list
 
-#include "../common/cbasetypes.h"
+
 
 // Return codes
 #define SQL_ERROR (-1)
diff --git a/src/common/strlib.c b/src/common/strlib.c
index e2e802915..361595b07 100644
--- a/src/common/strlib.c
+++ b/src/common/strlib.c
@@ -2,19 +2,16 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#define _H_STRLIB_C_
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/showmsg.h"
+#define STRLIB_C
 #include "strlib.h"
-#undef _H_STRLIB_C_
 
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <errno.h>
 
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/showmsg.h"
 
 #define J_MAX_MALLOC_SIZE 65535
 
diff --git a/src/common/strlib.h b/src/common/strlib.h
index decf661a6..10844d257 100644
--- a/src/common/strlib.h
+++ b/src/common/strlib.h
@@ -5,16 +5,15 @@
 #ifndef _COMMON_STRLIB_H_
 #define _COMMON_STRLIB_H_
 
-#include <stdarg.h>
-
 #include "../common/cbasetypes.h"
+#include <stdarg.h>
 
 #ifndef __USE_GNU
-#	define __USE_GNU  // required to enable strnlen on some platforms
-#	include <string.h>
-#	undef __USE_GNU
+	#define __USE_GNU  // required to enable strnlen on some platforms
+	#include <string.h>
+	#undef __USE_GNU
 #else
-#	include <string.h>
+	#include <string.h>
 #endif
 
 #ifdef WIN32
@@ -166,7 +165,7 @@ struct sv_interface *sv;
 void strlib_defaults(void);
 
 /* the purpose of these macros is simply to not make calling them be an annoyance */
-#ifndef _H_STRLIB_C_
+#ifndef STRLIB_C
 	#define jstrescape(pt)             (strlib->jstrescape(pt))
 	#define jstrescapecpy(pt,spt)      (strlib->jstrescapecpy((pt),(spt)))
 	#define jmemescapecpy(pt,spt,size) (strlib->jmemescapecpy((pt),(spt),(size)))
@@ -190,6 +189,6 @@ void strlib_defaults(void);
 	#define safesnprintf(buf,sz,fmt,...) (strlib->safesnprintf((buf),(sz),(fmt),##__VA_ARGS__))
 	#define strline(str,pos)             (strlib->strline((str),(pos)))
 	#define bin2hex(output,input,count)  (strlib->bin2hex((output),(input),(count)))
-#endif /* _H_STRLIB_C_ */
+#endif /* STRLIB_C */
 
 #endif /* _COMMON_STRLIB_H_ */
diff --git a/src/common/sysinfo.c b/src/common/sysinfo.c
index 3fdfadb41..a56896458 100644
--- a/src/common/sysinfo.c
+++ b/src/common/sysinfo.c
@@ -4,39 +4,23 @@
 
 /// See sysinfo.h for a description of this file
 
-#define HERCULES_CORE
-
+#define _COMMON_SYSINFO_P_
 #include "sysinfo.h"
-
-#include <stdio.h> // fopen
-#include <stdlib.h> // atoi
+#undef _COMMON_SYSINFO_P_
 
 #include "../common/cbasetypes.h"
 #include "../common/core.h"
-#include "../common/malloc.h"
 #include "../common/strlib.h"
+#include "../common/malloc.h"
 
 #ifdef WIN32
-#	include <string.h> // strlen
-#	include <windows.h>
+#include <windows.h>
+#include <string.h> // strlen
 #else
-#	include <unistd.h>
+#include <unistd.h>
 #endif
-
-/// Private interface fields
-struct sysinfo_private {
-	char *platform;
-	char *osversion;
-	char *cpu;
-	int cpucores;
-	char *arch;
-	char *compiler;
-	char *cflags;
-	char *vcstype_name;
-	int vcstype;
-	char *vcsrevision_src;
-	char *vcsrevision_scripts;
-};
+#include <stdio.h> // fopen
+#include <stdlib.h> // atoi
 
 /// sysinfo.c interface source
 struct sysinfo_interface sysinfo_s;
diff --git a/src/common/sysinfo.h b/src/common/sysinfo.h
index c0c4d276a..17faac26b 100644
--- a/src/common/sysinfo.h
+++ b/src/common/sysinfo.h
@@ -13,7 +13,23 @@
 
 #include "../common/cbasetypes.h"
 
+#ifdef _COMMON_SYSINFO_P_
+struct sysinfo_private {
+	char *platform;
+	char *osversion;
+	char *cpu;
+	int cpucores;
+	char *arch;
+	char *compiler;
+	char *cflags;
+	char *vcstype_name;
+	int vcstype;
+	char *vcsrevision_src;
+	char *vcsrevision_scripts;
+};
+#else
 struct sysinfo_private;
+#endif
 
 /**
  * sysinfo.c interface
diff --git a/src/common/thread.c b/src/common/thread.c
index 4f73aa9b3..4d110f2dd 100644
--- a/src/common/thread.c
+++ b/src/common/thread.c
@@ -6,27 +6,24 @@
 // Copyright (c) rAthena Project (www.rathena.org) - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#define HERCULES_CORE
-
-#include "thread.h"
-
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/showmsg.h"
-
 #ifdef WIN32
-#	include "../common/winapi.h"
-#	define getpagesize() 4096 // @TODO: implement this properly (GetSystemInfo .. dwPageSize..). (Atm as on all supported win platforms its 4k its static.)
-#	define __thread __declspec( thread ) 
+#include "../common/winapi.h"
+#define getpagesize() 4096 // @TODO: implement this properly (GetSystemInfo .. dwPageSize..). (Atm as on all supported win platforms its 4k its static.)
+#define __thread __declspec( thread ) 
 #else
-#	include <stdlib.h>
-#	include <unistd.h>
-#	include <string.h>
-#	include <signal.h>
-#	include <pthread.h>
-#	include <sched.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <signal.h>
+#include <pthread.h>
+#include <sched.h>
 #endif
 
+#include "cbasetypes.h"
+#include "malloc.h"
+#include "showmsg.h"
+#include "thread.h"
+
 // When Compiling using MSC (on win32..) we know we have support in any case!
 #ifdef _MSC_VER 
 #define HAS_TLS 
diff --git a/src/common/thread.h b/src/common/thread.h
index 887c03179..d6b2bbc6e 100644
--- a/src/common/thread.h
+++ b/src/common/thread.h
@@ -1,6 +1,7 @@
 // Copyright (c) rAthena Project (www.rathena.org) - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
+#pragma once 
 #ifndef _COMMON_THREAD_H_
 #define _COMMON_THREAD_H_
 
diff --git a/src/common/timer.c b/src/common/timer.c
index 10f14b0f2..526854582 100644
--- a/src/common/timer.c
+++ b/src/common/timer.c
@@ -2,8 +2,11 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+#include "../common/malloc.h"
+#include "../common/showmsg.h"
+#include "../common/utils.h"
 #include "timer.h"
 
 #include <stdio.h>
@@ -11,17 +14,11 @@
 #include <string.h>
 #include <time.h>
 
-#include "../common/cbasetypes.h"
-#include "../common/db.h"
-#include "../common/malloc.h"
-#include "../common/showmsg.h"
-#include "../common/utils.h"
-
 #ifdef WIN32
-#	include "../common/winapi.h" // GetTickCount()
+#include "../common/winapi.h" // GetTickCount()
 #else
-#	include <sys/time.h> // struct timeval, gettimeofday()
-#	include <unistd.h>
+#include <unistd.h>
+#include <sys/time.h> // struct timeval, gettimeofday()
 #endif
 
 struct timer_interface timer_s;
diff --git a/src/common/utils.c b/src/common/utils.c
index 84925f707..47747dd32 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -2,35 +2,33 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
+#include "../common/cbasetypes.h"
+#include "../common/mmo.h"
+#include "../common/malloc.h"
+#include "../common/showmsg.h"
+#include "../common/core.h"
+#include "socket.h"
 #include "utils.h"
 
-#include <math.h> // floor()
-#include <stdarg.h>
 #include <stdio.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/stat.h> // cache purposes [Ind/Hercules]
-
-#include "../common/cbasetypes.h"
-#include "../common/core.h"
-#include "../common/malloc.h"
-#include "../common/mmo.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
+#include <math.h> // floor()
 
 #ifdef WIN32
-#	include "../common/winapi.h"
-#	ifndef F_OK
-#		define F_OK   0x0
-#	endif  /* F_OK */
+	#include "../common/winapi.h"
+	#ifndef F_OK
+		#define F_OK   0x0
+	#endif  /* F_OK */
 #else
-#	include <dirent.h>
-#	include <sys/stat.h>
-#	include <unistd.h>
+	#include <unistd.h>
+	#include <dirent.h>
+	#include <sys/stat.h>
 #endif
 
+#include <sys/stat.h> // cache purposes [Ind/Hercules]
+
 struct HCache_interface HCache_s;
 
 /// Dumps given buffer into file pointed to by a handle.
diff --git a/src/common/utils.h b/src/common/utils.h
index 823651163..f89546b8a 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -5,11 +5,10 @@
 #ifndef _COMMON_UTILS_H_
 #define _COMMON_UTILS_H_
 
+#include "../common/cbasetypes.h"
 #include <stdio.h> // FILE*
 #include <time.h>
 
-#include "../common/cbasetypes.h"
-
 /* [HCache] 1-byte key to ensure our method is the latest, we can modify to ensure the method matches */
 #define HCACHE_KEY 'k'
 
diff --git a/src/config/const.h b/src/config/const.h
index f9baa4d7d..6557cb987 100644
--- a/src/config/const.h
+++ b/src/config/const.h
@@ -52,6 +52,13 @@
 	#define DEFTYPE_MAX CHAR_MAX
 #endif
 
+/* pointer size fix which fixes several gcc warnings */
+#ifdef __64BIT__
+	#define __64BPTRSIZE(y) ((intptr)(y))
+#else
+	#define __64BPTRSIZE(y) (y)
+#endif
+
 /* ATCMD_FUNC(mobinfo) HIT and FLEE calculations */
 #ifdef RENEWAL
 	#define MOB_FLEE(mobdata) ( (mobdata)->lv + (mobdata)->status.agi + 100 )
diff --git a/src/config/renewal.h b/src/config/renewal.h
index 36bdd3958..36615d63b 100644
--- a/src/config/renewal.h
+++ b/src/config/renewal.h
@@ -74,6 +74,5 @@
 #define RENEWAL_ASPD
 
 #endif // DISABLE_RENEWAL
-#undef DISABLE_RENEWAL
 
 #endif // _CONFIG_RENEWAL_H_
diff --git a/src/login/account.h b/src/login/account.h
index 329ae31c8..234e7c0c1 100644
--- a/src/login/account.h
+++ b/src/login/account.h
@@ -7,7 +7,6 @@
 
 #include "../common/cbasetypes.h"
 #include "../common/mmo.h" // ACCOUNT_REG2_NUM
-#include "../common/sql.h" // Sql
 
 typedef struct AccountDB AccountDB;
 typedef struct AccountDBIterator AccountDBIterator;
diff --git a/src/login/account_sql.c b/src/login/account_sql.c
index 2e4ed7ab9..1483196ab 100644
--- a/src/login/account_sql.c
+++ b/src/login/account_sql.c
@@ -2,22 +2,17 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "../config/core.h" // CONSOLE_INPUT
-#include "account.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "../common/console.h"
 #include "../common/malloc.h"
 #include "../common/mmo.h"
 #include "../common/showmsg.h"
-#include "../common/socket.h"
 #include "../common/sql.h"
 #include "../common/strlib.h"
 #include "../common/timer.h"
+#include "../common/console.h"
+#include "../common/socket.h"
+#include "account.h"
+#include <stdlib.h>
+#include <string.h>
 
 /// global defines
 #define ACCOUNT_SQL_DB_VERSION 20110114
@@ -657,7 +652,7 @@ Sql* account_db_sql_up(AccountDB* self) {
 	AccountDB_SQL* db = (AccountDB_SQL*)self;
 	Sql_HerculesUpdateCheck(db->accounts);
 #ifdef CONSOLE_INPUT
-	console->input->setSQL(db->accounts);
+	console->setSQL(db->accounts);
 #endif
 	return db->accounts;
 }
diff --git a/src/login/ipban_sql.c b/src/login/ipban_sql.c
index 081f28d84..74f45e418 100644
--- a/src/login/ipban_sql.c
+++ b/src/login/ipban_sql.c
@@ -2,15 +2,6 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "ipban.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "login.h"
-#include "loginlog.h"
 #include "../common/cbasetypes.h"
 #include "../common/db.h"
 #include "../common/malloc.h"
@@ -18,6 +9,11 @@
 #include "../common/socket.h"
 #include "../common/strlib.h"
 #include "../common/timer.h"
+#include "login.h"
+#include "ipban.h"
+#include "loginlog.h"
+#include <stdlib.h>
+#include <string.h>
 
 // global sql settings
 static char   global_db_hostname[32] = "127.0.0.1";
diff --git a/src/login/login.c b/src/login/login.c
index cb46e0226..af59fcf38 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -2,18 +2,6 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "login.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "account.h"
-#include "ipban.h"
-#include "loginlog.h"
-#include "../common/HPM.h"
 #include "../common/core.h"
 #include "../common/db.h"
 #include "../common/malloc.h"
@@ -24,6 +12,15 @@
 #include "../common/strlib.h"
 #include "../common/timer.h"
 #include "../common/utils.h"
+#include "../common/HPM.h"
+#include "account.h"
+#include "ipban.h"
+#include "login.h"
+#include "loginlog.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 struct Login_Config login_config;
 
diff --git a/src/login/login.h b/src/login/login.h
index e77b96a0e..14c361a15 100644
--- a/src/login/login.h
+++ b/src/login/login.h
@@ -5,8 +5,8 @@
 #ifndef _LOGIN_LOGIN_H_
 #define _LOGIN_LOGIN_H_
 
-#include "../common/core.h" // CORE_ST_LAST
 #include "../common/mmo.h" // NAME_LENGTH,SEX_*
+#include "../common/core.h" // CORE_ST_LAST
 
 enum E_LOGINSERVER_ST
 {
diff --git a/src/login/loginlog.h b/src/login/loginlog.h
index a86ad431c..730fb6e62 100644
--- a/src/login/loginlog.h
+++ b/src/login/loginlog.h
@@ -4,7 +4,6 @@
 #ifndef _LOGIN_LOGINLOG_H_
 #define _LOGIN_LOGINLOG_H_
 
-#include "../common/cbasetypes.h"
 
 unsigned long loginlog_failedattempts(uint32 ip, unsigned int minutes);
 void login_log(uint32 ip, const char* username, int rcode, const char* message);
@@ -12,4 +11,5 @@ bool loginlog_init(void);
 bool loginlog_final(void);
 bool loginlog_config_read(const char* w1, const char* w2);
 
+
 #endif /* _LOGIN_LOGINLOG_H_ */
diff --git a/src/login/loginlog_sql.c b/src/login/loginlog_sql.c
index 2cbc02c93..231ac783b 100644
--- a/src/login/loginlog_sql.c
+++ b/src/login/loginlog_sql.c
@@ -2,18 +2,13 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "loginlog.h"
-
-#include <string.h>
-#include <stdlib.h> // exit
-
 #include "../common/cbasetypes.h"
 #include "../common/mmo.h"
 #include "../common/socket.h"
 #include "../common/sql.h"
 #include "../common/strlib.h"
+#include <string.h>
+#include <stdlib.h> // exit
 
 // global sql settings (in ipban_sql.c)
 static char   global_db_hostname[32] = "127.0.0.1";
diff --git a/src/map/HPMmap.c b/src/map/HPMmap.c
index cb8c979c6..061479d87 100644
--- a/src/map/HPMmap.c
+++ b/src/map/HPMmap.c
@@ -1,15 +1,25 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 
-#define HERCULES_CORE
+#include "../common/cbasetypes.h"
+#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 <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
+#include "HPMmap.h"
+#include "pc.h"
+#include "map.h"
 
+//
 #include "atcommand.h"
 #include "battle.h"
 #include "battleground.h"
@@ -27,14 +37,12 @@
 #include "itemdb.h"
 #include "log.h"
 #include "mail.h"
-#include "map.h"
 #include "mapreg.h"
 #include "mercenary.h"
 #include "mob.h"
 #include "npc.h"
 #include "party.h"
 #include "path.h"
-#include "pc.h"
 #include "pc_groups.h"
 #include "pet.h"
 #include "quest.h"
@@ -46,19 +54,11 @@
 #include "trade.h"
 #include "unit.h"
 #include "vending.h"
-#include "../common/HPM.h"
-#include "../common/cbasetypes.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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
 
 #include "../common/HPMDataCheck.h"
 
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index df3be40a5..5fd0faf86 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -2,60 +2,57 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
+#include "../common/cbasetypes.h"
+#include "../common/mmo.h"
+#include "../common/timer.h"
+#include "../common/nullpo.h"
+#include "../common/core.h"
+#include "../common/showmsg.h"
+#include "../common/malloc.h"
+#include "../common/random.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
+#include "../common/conf.h"
+#include "../common/sysinfo.h"
 
-#include "../config/core.h" // AUTOLOOTITEM_SIZE, AUTOTRADE_PERSISTENCY, MAX_CARTS, MAX_SUGGESTIONS, MOB_FLEE(), MOB_HIT(), RENEWAL, RENEWAL_DROP, RENEWAL_EXP
 #include "atcommand.h"
-
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "battle.h"
 #include "chat.h"
-#include "chrif.h"
 #include "clif.h"
+#include "chrif.h"
 #include "duel.h"
-#include "elemental.h"
-#include "guild.h"
-#include "homunculus.h"
 #include "intif.h"
 #include "itemdb.h"
 #include "log.h"
-#include "mail.h"
 #include "map.h"
-#include "mapreg.h"
-#include "mercenary.h"
-#include "mob.h"
-#include "npc.h"
-#include "party.h"
 #include "pc.h"
 #include "pc_groups.h" // groupid2name
+#include "status.h"
+#include "skill.h"
+#include "mob.h"
+#include "npc.h"
 #include "pet.h"
-#include "quest.h"
+#include "homunculus.h"
+#include "mail.h"
+#include "mercenary.h"
+#include "elemental.h"
+#include "party.h"
+#include "guild.h"
 #include "script.h"
-#include "searchstore.h"
-#include "skill.h"
-#include "status.h"
 #include "storage.h"
 #include "trade.h"
 #include "unit.h"
-#include "../common/cbasetypes.h"
-#include "../common/conf.h"
-#include "../common/core.h"
-#include "../common/malloc.h"
-#include "../common/mmo.h"
-#include "../common/nullpo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/strlib.h"
-#include "../common/sysinfo.h"
-#include "../common/timer.h"
-#include "../common/utils.h"
+#include "mapreg.h"
+#include "quest.h"
+#include "searchstore.h"
 #include "HPMmap.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
 struct atcommand_interface atcommand_s;
 
 static char atcmd_output[CHAT_SIZE_MAX];
diff --git a/src/map/atcommand.h b/src/map/atcommand.h
index c8a1863af..bc4ab30a3 100644
--- a/src/map/atcommand.h
+++ b/src/map/atcommand.h
@@ -5,9 +5,9 @@
 #ifndef _MAP_ATCOMMAND_H_
 #define _MAP_ATCOMMAND_H_
 
-#include "pc_groups.h"
 #include "../common/conf.h"
 #include "../common/db.h"
+#include "pc_groups.h"
 
 /**
  * Declarations
diff --git a/src/map/battle.c b/src/map/battle.c
index 0865ee4ba..9089b7102 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2,44 +2,41 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "../config/core.h" // CELL_NOSTACK, CIRCULAR_AREA, CONSOLE_INPUT, HMAP_ZONE_DAMAGE_CAP_TYPE, OFFICIAL_WALKPATH, RENEWAL, RENEWAL_ASPD, RENEWAL_CAST, RENEWAL_DROP, RENEWAL_EDP, RENEWAL_EXP, RENEWAL_LVDMG, RE_LVL_DMOD(), RE_LVL_MDMOD(), RE_LVL_TMDMOD(), RE_SKILL_REDUCTION(), SCRIPT_CALLFUNC_CHECK, SECURE_NPCTIMEOUT, STATS_OPT_OUT
-#include "battle.h"
-
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "battleground.h"
-#include "chrif.h"
-#include "clif.h"
-#include "elemental.h"
-#include "guild.h"
-#include "homunculus.h"
-#include "itemdb.h"
-#include "map.h"
-#include "mercenary.h"
-#include "mob.h"
-#include "party.h"
-#include "path.h"
-#include "pc.h"
-#include "pet.h"
-#include "skill.h"
-#include "status.h"
-#include "../common/HPM.h"
 #include "../common/cbasetypes.h"
-#include "../common/ers.h"
-#include "../common/malloc.h"
+#include "../common/timer.h"
 #include "../common/nullpo.h"
-#include "../common/random.h"
+#include "../common/malloc.h"
 #include "../common/showmsg.h"
+#include "../common/ers.h"
+#include "../common/random.h"
 #include "../common/socket.h"
 #include "../common/strlib.h"
-#include "../common/sysinfo.h"
-#include "../common/timer.h"
 #include "../common/utils.h"
+#include "../common/sysinfo.h"
+#include "../common/HPM.h"
+
+#include "map.h"
+#include "path.h"
+#include "pc.h"
+#include "status.h"
+#include "skill.h"
+#include "homunculus.h"
+#include "mercenary.h"
+#include "elemental.h"
+#include "mob.h"
+#include "itemdb.h"
+#include "clif.h"
+#include "pet.h"
+#include "guild.h"
+#include "party.h"
+#include "battle.h"
+#include "battleground.h"
+#include "chrif.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
 
 struct Battle_Config battle_config;
 struct battle_interface battle_s;
diff --git a/src/map/battle.h b/src/map/battle.h
index fbe097c78..88038ddb4 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -5,8 +5,8 @@
 #ifndef _MAP_BATTLE_H_
 #define _MAP_BATTLE_H_
 
-#include "map.h" //ELE_MAX
 #include "../common/cbasetypes.h"
+#include "map.h" //ELE_MAX
 
 /**
  * Declarations
diff --git a/src/map/battleground.c b/src/map/battleground.c
index a7169de0e..68539e25d 100644
--- a/src/map/battleground.c
+++ b/src/map/battleground.c
@@ -2,32 +2,29 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
+#include "../common/cbasetypes.h"
+#include "../common/timer.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/conf.h"
 
 #include "battleground.h"
-
-#include <string.h>
-#include <stdio.h>
-
 #include "battle.h"
 #include "clif.h"
-#include "homunculus.h"
 #include "map.h"
-#include "mapreg.h"
-#include "mercenary.h"
-#include "mob.h" // struct mob_data
 #include "npc.h"
-#include "party.h"
 #include "pc.h"
+#include "party.h"
 #include "pet.h"
-#include "../common/cbasetypes.h"
-#include "../common/conf.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/strlib.h"
-#include "../common/timer.h"
+#include "homunculus.h"
+#include "mercenary.h"
+#include "mapreg.h"
+
+#include <string.h>
+#include <stdio.h>
 
 struct battleground_interface bg_s;
 
diff --git a/src/map/battleground.h b/src/map/battleground.h
index ec0a86f14..05c4eb060 100644
--- a/src/map/battleground.h
+++ b/src/map/battleground.h
@@ -5,9 +5,9 @@
 #ifndef _MAP_BATTLEGROUND_H_
 #define _MAP_BATTLEGROUND_H_
 
+#include "../common/mmo.h" // struct party
 #include "clif.h"
 #include "guild.h"
-#include "../common/mmo.h" // struct party
 
 /**
  * Defines
diff --git a/src/map/buyingstore.c b/src/map/buyingstore.c
index 80264b30d..2a15e66fc 100644
--- a/src/map/buyingstore.c
+++ b/src/map/buyingstore.c
@@ -2,21 +2,18 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "buyingstore.h"  // struct s_buyingstore
-
-#include "atcommand.h"  // msg_txt
-#include "battle.h"  // battle_config.*
-#include "chrif.h"
-#include "clif.h"  // clif->buyingstore_*
-#include "log.h"  // log_pick_pc, log_zeny
-#include "pc.h"  // struct map_session_data
 #include "../common/cbasetypes.h"
 #include "../common/db.h"  // ARR_FIND
 #include "../common/showmsg.h"  // ShowWarning
 #include "../common/socket.h"  // RBUF*
 #include "../common/strlib.h"  // safestrncpy
+#include "atcommand.h"  // msg_txt
+#include "battle.h"  // battle_config.*
+#include "buyingstore.h"  // struct s_buyingstore
+#include "clif.h"  // clif->buyingstore_*
+#include "log.h"  // log_pick_pc, log_zeny
+#include "pc.h"  // struct map_session_data
+#include "chrif.h"
 
 struct buyingstore_interface buyingstore_s;
 
diff --git a/src/map/buyingstore.h b/src/map/buyingstore.h
index 914631872..5141a1013 100644
--- a/src/map/buyingstore.h
+++ b/src/map/buyingstore.h
@@ -5,11 +5,6 @@
 #ifndef _MAP_BUYINGSTORE_H_
 #define _MAP_BUYINGSTORE_H_
 
-#include "../common/cbasetypes.h"
-#include "../common/mmo.h" // MAX_SLOTS
-
-struct map_session_data;
-
 /**
  * Declarations
  **/
diff --git a/src/map/chat.c b/src/map/chat.c
index c9d3e6d46..08fc4a575 100644
--- a/src/map/chat.c
+++ b/src/map/chat.c
@@ -2,13 +2,12 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "chat.h"
-
-#include <stdio.h>
-#include <string.h>
-
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/mmo.h"
 #include "atcommand.h" // msg_txt()
 #include "battle.h" // struct battle_config
 #include "clif.h"
@@ -16,12 +15,10 @@
 #include "npc.h" // npc_event_do()
 #include "pc.h"
 #include "skill.h" // ext_skill_unit_onplace()
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/mmo.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
+#include "chat.h"
+
+#include <stdio.h>
+#include <string.h>
 
 struct chat_interface chat_s;
 
diff --git a/src/map/chat.h b/src/map/chat.h
index cbc2a391e..b0c6cd905 100644
--- a/src/map/chat.h
+++ b/src/map/chat.h
@@ -6,12 +6,9 @@
 #define _MAP_CHAT_H_
 
 #include "map.h" // struct block_list, CHATROOM_TITLE_SIZE
-#include "../common/cbasetypes.h"
-#include "../common/db.h"
 
-struct chat_data;
 struct map_session_data;
-struct npc_data;
+struct chat_data;
 
 #define MAX_CHAT_USERS 20
 
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 81e2d387c..99a1935fd 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -2,16 +2,15 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "../config/core.h" // AUTOTRADE_PERSISTENCY, STATS_OPT_OUT
-#include "chrif.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <time.h>
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/socket.h"
+#include "../common/timer.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/ers.h"
+#include "../common/HPM.h"
 
 #include "map.h"
 #include "battle.h"
@@ -26,17 +25,15 @@
 #include "instance.h"
 #include "mercenary.h"
 #include "elemental.h"
+#include "chrif.h"
 #include "quest.h"
 #include "storage.h"
-#include "../common/HPM.h"
-#include "../common/cbasetypes.h"
-#include "../common/ers.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/strlib.h"
-#include "../common/timer.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <time.h>
 
 struct chrif_interface chrif_s;
 
diff --git a/src/map/chrif.h b/src/map/chrif.h
index 84efc66d3..25e955604 100644
--- a/src/map/chrif.h
+++ b/src/map/chrif.h
@@ -5,11 +5,9 @@
 #ifndef _MAP_CHRIF_H_
 #define _MAP_CHRIF_H_
 
+#include "../common/cbasetypes.h"
 #include <time.h>
-
 #include "map.h" //TBL_stuff
-#include "../common/cbasetypes.h"
-#include "../common/db.h"
 
 struct status_change_entry;
 
diff --git a/src/map/clif.c b/src/map/clif.c
index cb2474961..1a6665307 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -2,59 +2,56 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "../config/core.h" // ANTI_MAYAP_CHEAT, NEW_CARTS, RENEWAL, SECURE_NPCTIMEOUT
-#include "clif.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <time.h>
+#include "../common/cbasetypes.h"
+#include "../common/socket.h"
+#include "../common/timer.h"
+#include "../common/grfio.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
+#include "../common/ers.h"
+#include "../common/conf.h"
+#include "../common/HPM.h"
 
+#include "map.h"
+#include "chrif.h"
+#include "pc.h"
+#include "status.h"
+#include "npc.h"
+#include "itemdb.h"
+#include "chat.h"
+#include "trade.h"
+#include "storage.h"
+#include "script.h"
+#include "skill.h"
 #include "atcommand.h"
+#include "intif.h"
 #include "battle.h"
 #include "battleground.h"
-#include "chat.h"
-#include "chrif.h"
-#include "elemental.h"
+#include "mob.h"
+#include "party.h"
+#include "unit.h"
 #include "guild.h"
+#include "vending.h"
+#include "pet.h"
 #include "homunculus.h"
 #include "instance.h"
-#include "intif.h"
-#include "irc-bot.h"
-#include "itemdb.h"
+#include "mercenary.h"
+#include "elemental.h"
 #include "log.h"
+#include "clif.h"
 #include "mail.h"
-#include "map.h"
-#include "mercenary.h"
-#include "mob.h"
-#include "npc.h"
-#include "party.h"
-#include "pc.h"
-#include "pet.h"
 #include "quest.h"
-#include "script.h"
-#include "skill.h"
-#include "status.h"
-#include "storage.h"
-#include "trade.h"
-#include "unit.h"
-#include "vending.h"
-#include "../common/HPM.h"
-#include "../common/cbasetypes.h"
-#include "../common/conf.h"
-#include "../common/ers.h"
-#include "../common/grfio.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/strlib.h"
-#include "../common/timer.h"
-#include "../common/utils.h"
+#include "irc-bot.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <time.h>
 
 struct clif_interface clif_s;
 
diff --git a/src/map/clif.h b/src/map/clif.h
index 7b27e1fe6..0f4a9e756 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -5,13 +5,13 @@
 #ifndef _MAP_CLIF_H_
 #define _MAP_CLIF_H_
 
-#include <stdarg.h>
-
-#include "map.h"
-#include "packets_struct.h"
 #include "../common/cbasetypes.h"
 #include "../common/db.h"
 #include "../common/mmo.h"
+#include "../common/socket.h"
+#include "../map/map.h"
+#include "../map/packets_struct.h"
+#include <stdarg.h>
 
 /**
  * Declarations
@@ -20,6 +20,7 @@ struct item;
 struct item_data;
 struct storage_data;
 struct guild_storage;
+struct block_list;
 struct unit_data;
 struct map_session_data;
 struct homun_data;
diff --git a/src/map/date.c b/src/map/date.c
index 975a00c50..f38ead858 100644
--- a/src/map/date.c
+++ b/src/map/date.c
@@ -1,14 +1,10 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#define HERCULES_CORE
-
+#include "../common/cbasetypes.h"
 #include "date.h"
-
 #include <time.h>
 
-#include "../common/cbasetypes.h"
-
 int date_get_year(void)
 {
 	time_t t;
diff --git a/src/map/date.h b/src/map/date.h
index b3ed59b2f..46f0d86c3 100644
--- a/src/map/date.h
+++ b/src/map/date.h
@@ -4,8 +4,6 @@
 #ifndef _MAP_DATE_H_
 #define _MAP_DATE_H_
 
-#include "../common/cbasetypes.h"
-
 int date_get_year(void);
 int date_get_month(void);
 int date_get_day(void);
diff --git a/src/map/duel.c b/src/map/duel.c
index a423ef240..af2741f77 100644
--- a/src/map/duel.c
+++ b/src/map/duel.c
@@ -2,20 +2,18 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
+#include "../common/cbasetypes.h"
 
+#include "atcommand.h"  // msg_txt
+#include "clif.h"
 #include "duel.h"
+#include "pc.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
-#include "atcommand.h"  // msg_txt
-#include "clif.h"
-#include "pc.h"
-#include "../common/cbasetypes.h"
-
 /*==========================================
  * Duel organizing functions [LuzZza]
  *------------------------------------------*/
diff --git a/src/map/duel.h b/src/map/duel.h
index 956aed36d..5405d2eee 100644
--- a/src/map/duel.h
+++ b/src/map/duel.h
@@ -5,10 +5,6 @@
 #ifndef _MAP_DUEL_H_
 #define _MAP_DUEL_H_
 
-#include "../common/cbasetypes.h"
-
-struct map_session_data;
-
 struct duel {
 	int members_count;
 	int invites_count;
diff --git a/src/map/elemental.c b/src/map/elemental.c
index 323df41e1..f335600d6 100644
--- a/src/map/elemental.c
+++ b/src/map/elemental.c
@@ -2,44 +2,42 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "elemental.h"
-
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/socket.h"
+#include "../common/timer.h"
+#include "../common/nullpo.h"
+#include "../common/mmo.h"
+#include "../common/showmsg.h"
+#include "../common/utils.h"
+#include "../common/random.h"
+#include "../common/strlib.h"
 
-#include "atcommand.h"
-#include "battle.h"
-#include "chrif.h"
+#include "log.h"
 #include "clif.h"
-#include "guild.h"
+#include "chrif.h"
 #include "intif.h"
 #include "itemdb.h"
-#include "log.h"
 #include "map.h"
-#include "mob.h"
-#include "npc.h"
-#include "party.h"
 #include "pc.h"
+#include "status.h"
+#include "skill.h"
+#include "mob.h"
 #include "pet.h"
+#include "battle.h"
+#include "party.h"
+#include "guild.h"
+#include "atcommand.h"
 #include "script.h"
-#include "skill.h"
-#include "status.h"
+#include "npc.h"
 #include "trade.h"
 #include "unit.h"
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/mmo.h"
-#include "../common/nullpo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/strlib.h"
-#include "../common/timer.h"
-#include "../common/utils.h"
+#include "elemental.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
 
 struct elemental_interface elemental_s;
 
diff --git a/src/map/elemental.h b/src/map/elemental.h
index aa27aadc9..6d04a41a5 100644
--- a/src/map/elemental.h
+++ b/src/map/elemental.h
@@ -7,7 +7,6 @@
 
 #include "status.h" // struct status_data, struct status_change
 #include "unit.h" // struct unit_data
-#include "../common/mmo.h" // NAME_LENGTH
 
 /**
  * Defines
diff --git a/src/map/guild.c b/src/map/guild.c
index 69f67238d..fa5805c8b 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -2,37 +2,34 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "../config/core.h" // GP_BOUND_ITEMS
-#include "guild.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "battle.h"
-#include "clif.h"
-#include "instance.h"
-#include "intif.h"
-#include "log.h"
-#include "map.h"
-#include "mob.h"
-#include "npc.h"
-#include "pc.h"
-#include "skill.h"
-#include "status.h"
-#include "storage.h"
-#include "../common/HPM.h"
 #include "../common/cbasetypes.h"
-#include "../common/ers.h"
+#include "../common/timer.h"
+#include "../common/nullpo.h"
 #include "../common/malloc.h"
 #include "../common/mapindex.h"
-#include "../common/nullpo.h"
 #include "../common/showmsg.h"
+#include "../common/ers.h"
 #include "../common/strlib.h"
-#include "../common/timer.h"
 #include "../common/utils.h"
+#include "../common/HPM.h"
+
+#include "map.h"
+#include "guild.h"
+#include "storage.h"
+#include "battle.h"
+#include "npc.h"
+#include "pc.h"
+#include "status.h"
+#include "mob.h"
+#include "intif.h"
+#include "clif.h"
+#include "skill.h"
+#include "log.h"
+#include "instance.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 struct guild_interface guild_s;
 
diff --git a/src/map/guild.h b/src/map/guild.h
index 34e27a56c..b03bd664d 100644
--- a/src/map/guild.h
+++ b/src/map/guild.h
@@ -5,10 +5,18 @@
 #ifndef _MAP_GUILD_H_
 #define _MAP_GUILD_H_
 
-#include "map.h" // EVENT_NAME_LENGTH, TBL_PC
-#include "../common/cbasetypes.h"
-#include "../common/db.h"
-#include "../common/mmo.h"
+//#include "../common/mmo.h"
+#include "map.h" // NAME_LENGTH
+
+/**
+ * Declarations
+ **/
+struct guild;
+struct guild_member;
+struct guild_position;
+struct guild_castle;
+struct map_session_data;
+struct mob_data;
 
 /**
  * Defines
diff --git a/src/map/homunculus.c b/src/map/homunculus.c
index b6a83d1cb..ff9f7a5b1 100644
--- a/src/map/homunculus.c
+++ b/src/map/homunculus.c
@@ -2,45 +2,43 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "../config/core.h" // DBPATH
-#include "homunculus.h"
-
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/socket.h"
+#include "../common/timer.h"
+#include "../common/nullpo.h"
+#include "../common/mmo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
 
-#include "atcommand.h"
-#include "battle.h"
-#include "chrif.h"
+#include "log.h"
 #include "clif.h"
-#include "guild.h"
+#include "chrif.h"
 #include "intif.h"
 #include "itemdb.h"
-#include "log.h"
 #include "map.h"
-#include "mob.h"
-#include "npc.h"
-#include "party.h"
 #include "pc.h"
+#include "status.h"
+#include "skill.h"
+#include "mob.h"
 #include "pet.h"
+#include "battle.h"
+#include "party.h"
+#include "guild.h"
+#include "atcommand.h"
 #include "script.h"
-#include "skill.h"
-#include "status.h"
+#include "npc.h"
 #include "trade.h"
 #include "unit.h"
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/mmo.h"
-#include "../common/nullpo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/strlib.h"
-#include "../common/timer.h"
-#include "../common/utils.h"
+
+#include "homunculus.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
 
 struct homunculus_interface homunculus_s;
 
diff --git a/src/map/homunculus.h b/src/map/homunculus.h
index 9eef6af5b..e6d59e30e 100644
--- a/src/map/homunculus.h
+++ b/src/map/homunculus.h
@@ -5,10 +5,9 @@
 #ifndef _MAP_HOMUNCULUS_H_
 #define _MAP_HOMUNCULUS_H_
 
-#include "pc.h"
 #include "status.h" // struct status_data, struct status_change
 #include "unit.h" // struct unit_data
-#include "../common/mmo.h"
+#include "pc.h"
 
 #define MAX_HOM_SKILL_REQUIRE 5
 #define homdb_checkid(id) ((id) >=  HM_CLASS_BASE && (id) <= HM_CLASS_MAX)
diff --git a/src/map/instance.c b/src/map/instance.c
index 5789d7dd6..caf622b3d 100644
--- a/src/map/instance.c
+++ b/src/map/instance.c
@@ -2,32 +2,30 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
+#include "../common/cbasetypes.h"
+#include "../common/socket.h"
+#include "../common/timer.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
+#include "../common/db.h"
+#include "../common/HPM.h"
 
+#include "clif.h"
 #include "instance.h"
+#include "map.h"
+#include "npc.h"
+#include "party.h"
+#include "pc.h"
 
-#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdarg.h>
 #include <time.h>
 
-#include "clif.h"
-#include "map.h"
-#include "npc.h"
-#include "party.h"
-#include "pc.h"
-#include "../common/HPM.h"
-#include "../common/cbasetypes.h"
-#include "../common/db.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/strlib.h"
-#include "../common/timer.h"
-#include "../common/utils.h"
-
 struct instance_interface instance_s;
 
 /// Checks whether given instance id is valid or not.
diff --git a/src/map/instance.h b/src/map/instance.h
index ae649eda7..712a0f141 100644
--- a/src/map/instance.h
+++ b/src/map/instance.h
@@ -6,11 +6,8 @@
 #define _MAP_INSTANCE_H_
 
 #include "script.h" // struct reg_db
-#include "../common/cbasetypes.h"
 #include "../common/mmo.h" // struct point
-
 struct block_list;
-struct map_session_data;
 
 #define INSTANCE_NAME_LENGTH (60+1)
 
diff --git a/src/map/intif.c b/src/map/intif.c
index 383150fbc..6bd24368a 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -1,40 +1,37 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#define HERCULES_CORE
-
-#include "../config/core.h" // GP_BOUND_ITEMS
-#include "intif.h"
-
-#include <fcntl.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
-#include "atcommand.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/timer.h"
+#include "../common/nullpo.h"
+#include "../common/malloc.h"
+#include "../common/strlib.h"
+#include "map.h"
 #include "battle.h"
 #include "chrif.h"
 #include "clif.h"
-#include "elemental.h"
-#include "guild.h"
-#include "homunculus.h"
+#include "pc.h"
+#include "intif.h"
 #include "log.h"
-#include "mail.h"
-#include "map.h"
-#include "mercenary.h"
+#include "storage.h"
 #include "party.h"
-#include "pc.h"
+#include "guild.h"
 #include "pet.h"
+#include "atcommand.h"
+#include "mercenary.h"
+#include "homunculus.h"
+#include "elemental.h"
+#include "mail.h"
 #include "quest.h"
-#include "storage.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/strlib.h"
-#include "../common/timer.h"
+
+#include <sys/types.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <fcntl.h>
+#include <string.h>
+
 
 struct intif_interface intif_s;
 
diff --git a/src/map/intif.h b/src/map/intif.h
index b6ee727f3..290dcfcdc 100644
--- a/src/map/intif.h
+++ b/src/map/intif.h
@@ -5,22 +5,19 @@
 #ifndef _MAP_INTIF_H_
 #define _MAP_INTIF_H_
 
-#include "../common/cbasetypes.h"
 
 /**
  * Declarations
  **/
-struct auction_data;
+struct party_member;
 struct guild_member;
 struct guild_position;
-struct guild_storage;
-struct mail_message;
-struct map_session_data;
-struct party_member;
-struct s_elemental;
+struct s_pet;
 struct s_homunculus;
 struct s_mercenary;
-struct s_pet;
+struct s_elemental;
+struct mail_message;
+struct auction_data;
 
 /**
  * Defines
diff --git a/src/map/irc-bot.c b/src/map/irc-bot.c
index 6f016697f..ff28082e7 100644
--- a/src/map/irc-bot.c
+++ b/src/map/irc-bot.c
@@ -2,25 +2,23 @@
 // See the LICENSE file
 // Base Author: shennetsind @ http://hercules.ws
 
-#define HERCULES_CORE
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/strlib.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/timer.h"
+#include "../common/random.h"
 
+#include "map.h"
+#include "pc.h"
+#include "clif.h"
 #include "irc-bot.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "clif.h"
-#include "map.h"
-#include "pc.h"
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/strlib.h"
-#include "../common/timer.h"
-
 //#define IRCBOT_DEBUG
 
 struct irc_bot_interface irc_bot_s;
diff --git a/src/map/irc-bot.h b/src/map/irc-bot.h
index 60f03fca5..c15a5d46a 100644
--- a/src/map/irc-bot.h
+++ b/src/map/irc-bot.h
@@ -6,8 +6,6 @@
 #ifndef _MAP_IRC_BOT_H_
 #define _MAP_IRC_BOT_H_
 
-#include "../common/cbasetypes.h"
-
 #define IRC_NICK_LENGTH 40
 #define IRC_IDENT_LENGTH 40
 #define IRC_HOST_LENGTH 63
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index 1981f435c..5eeb90be5 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -2,27 +2,22 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "../config/core.h" // DBPATH, RENEWAL
-#include "itemdb.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "battle.h" // struct battle_config
-#include "map.h"
-#include "mob.h"    // MAX_MOB_DB
-#include "pc.h"     // W_MUSICAL, W_WHIP
-#include "script.h" // item script processing
-#include "../common/conf.h"
-#include "../common/malloc.h"
 #include "../common/nullpo.h"
+#include "../common/malloc.h"
 #include "../common/random.h"
 #include "../common/showmsg.h"
 #include "../common/strlib.h"
 #include "../common/utils.h"
+#include "../common/conf.h"
+#include "itemdb.h"
+#include "map.h"
+#include "battle.h" // struct battle_config
+#include "script.h" // item script processing
+#include "pc.h"     // W_MUSICAL, W_WHIP
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 struct itemdb_interface itemdb_s;
 
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index 12766b288..77fb2e2ec 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -5,12 +5,9 @@
 #ifndef _MAP_ITEMDB_H_
 #define _MAP_ITEMDB_H_
 
-#include "map.h"
-#include "../common/cbasetypes.h"
-#include "../common/conf.h"
 #include "../common/db.h"
 #include "../common/mmo.h" // ITEM_NAME_LENGTH
-#include "../common/sql.h"
+#include "map.h"
 
 /**
  * Declarations
diff --git a/src/map/log.c b/src/map/log.c
index 523ef1d65..19a98f34b 100644
--- a/src/map/log.c
+++ b/src/map/log.c
@@ -2,24 +2,21 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "log.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
+#include "../common/cbasetypes.h"
+#include "../common/sql.h" // SQL_INNODB
+#include "../common/strlib.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
 #include "battle.h"
 #include "itemdb.h"
+#include "log.h"
 #include "map.h"
 #include "mob.h"
 #include "pc.h"
-#include "../common/cbasetypes.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
-#include "../common/sql.h" // SQL_INNODB
-#include "../common/strlib.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 struct log_interface log_s;
 
diff --git a/src/map/log.h b/src/map/log.h
index ecfedeac2..b2cb92c20 100644
--- a/src/map/log.h
+++ b/src/map/log.h
@@ -11,10 +11,11 @@
 /**
  * Declarations
  **/
-struct item;
-struct item_data;
+struct block_list;
 struct map_session_data;
 struct mob_data;
+struct item;
+struct item_data;
 
 /**
  * Defines
diff --git a/src/map/mail.c b/src/map/mail.c
index 7ba7d7470..371aa892f 100644
--- a/src/map/mail.c
+++ b/src/map/mail.c
@@ -2,20 +2,18 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
 
 #include "mail.h"
-
-#include <time.h>
-#include <string.h>
-
 #include "atcommand.h"
-#include "clif.h"
 #include "itemdb.h"
-#include "log.h"
+#include "clif.h"
 #include "pc.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
+#include "log.h"
+
+#include <time.h>
+#include <string.h>
 
 struct mail_interface mail_s;
 
diff --git a/src/map/mail.h b/src/map/mail.h
index 30b032ef4..8df537ff3 100644
--- a/src/map/mail.h
+++ b/src/map/mail.h
@@ -5,11 +5,7 @@
 #ifndef _MAP_MAIL_H_
 #define _MAP_MAIL_H_
 
-#include "../common/cbasetypes.h"
-
-struct item;
-struct mail_message;
-struct map_session_data;
+#include "../common/mmo.h"
 
 struct mail_interface {
 	void (*clear) (struct map_session_data *sd);
diff --git a/src/map/map.c b/src/map/map.c
index 01d3dbb9f..315924e2e 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -2,66 +2,62 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
+#include "../common/cbasetypes.h"
+#include "../common/core.h"
+#include "../common/timer.h"
+#include "../common/ers.h"
+#include "../common/grfio.h"
+#include "../common/malloc.h"
+#include "../common/socket.h" // WFIFO*()
+#include "../common/showmsg.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
+#include "../common/conf.h"
+#include "../common/console.h"
+#include "../common/HPM.h"
 
-#include "../config/core.h" // CELL_NOSTACK, CIRCULAR_AREA, CONSOLE_INPUT, DBPATH, RENEWAL
 #include "map.h"
-
-#include <math.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "HPMmap.h"
-#include "atcommand.h"
-#include "battle.h"
-#include "battleground.h"
-#include "chat.h"
+#include "path.h"
 #include "chrif.h"
 #include "clif.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 "npc.h" // npc_setcells(), npc_unsetcells()
-#include "party.h"
-#include "path.h"
 #include "pc.h"
-#include "pet.h"
-#include "quest.h"
-#include "script.h"
-#include "skill.h"
 #include "status.h"
+#include "mob.h"
+#include "npc.h" // npc_setcells(), npc_unsetcells()
+#include "chat.h"
+#include "itemdb.h"
 #include "storage.h"
+#include "skill.h"
 #include "trade.h"
+#include "party.h"
 #include "unit.h"
-#include "../common/HPM.h"
-#include "../common/cbasetypes.h"
-#include "../common/conf.h"
-#include "../common/console.h"
-#include "../common/core.h"
-#include "../common/ers.h"
-#include "../common/grfio.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h" // WFIFO*()
-#include "../common/strlib.h"
-#include "../common/timer.h"
-#include "../common/utils.h"
+#include "battle.h"
+#include "battleground.h"
+#include "quest.h"
+#include "script.h"
+#include "mapreg.h"
+#include "guild.h"
+#include "pet.h"
+#include "homunculus.h"
+#include "instance.h"
+#include "mercenary.h"
+#include "elemental.h"
+#include "atcommand.h"
+#include "log.h"
+#include "mail.h"
+#include "irc-bot.h"
+#include "HPMmap.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <math.h>
 #ifndef _WIN32
 #include <unistd.h>
 #endif
@@ -5486,8 +5482,8 @@ void map_cp_defaults(void) {
 	map->cpsd->bl.y = MAP_DEFAULT_Y;
 	map->cpsd->bl.m = map->mapname2mapid(MAP_DEFAULT);
 
-	console->input->addCommand("gm:info",CPCMD_A(gm_position));
-	console->input->addCommand("gm:use",CPCMD_A(gm_use));
+	console->addCommand("gm:info",CPCMD_A(gm_position));
+	console->addCommand("gm:use",CPCMD_A(gm_use));
 #endif
 }
 /* Hercules Plugin Mananger */
@@ -5843,7 +5839,7 @@ int do_init(int argc, char *argv[])
 	Sql_HerculesUpdateCheck(map->mysql_handle);
 	
 #ifdef CONSOLE_INPUT
-	console->input->setSQL(map->mysql_handle);
+	console->setSQL(map->mysql_handle);
 #endif
 	
 	ShowStatus("Server is '"CL_GREEN"ready"CL_RESET"' and listening on port '"CL_WHITE"%d"CL_RESET"'.\n\n", map->port);
diff --git a/src/map/map.h b/src/map/map.h
index 539b02ed8..c61868b13 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -5,18 +5,18 @@
 #ifndef _MAP_MAP_H_
 #define _MAP_MAP_H_
 
-#include <stdarg.h>
-
-#include "atcommand.h"
 #include "../common/cbasetypes.h"
 #include "../common/core.h" // CORE_ST_LAST
 #include "../common/mmo.h"
 #include "../common/mapindex.h"
 #include "../common/db.h"
+#include "../config/core.h"
 #include "../common/sql.h"
+#include "atcommand.h"
+#include <stdarg.h>
 
-struct mob_data;
 struct npc_data;
+struct item_data;
 struct hChSysCh;
 
 enum E_MAPSERVER_ST {
@@ -36,6 +36,7 @@ enum E_MAPSERVER_ST {
 #define NATURAL_HEAL_INTERVAL 500
 #define MIN_FLOORITEM 2
 #define MAX_FLOORITEM START_ACCOUNT_NUM
+#define MAX_LEVEL 175
 #define MAX_IGNORE_LIST 20 // official is 14
 #define MAX_VENDING 12
 #define MAX_MAP_SIZE (512*512) // Wasn't there something like this already? Can't find it.. [Shinryo]
diff --git a/src/map/mapreg_sql.c b/src/map/mapreg_sql.c
index f026fde00..61c25f24e 100644
--- a/src/map/mapreg_sql.c
+++ b/src/map/mapreg_sql.c
@@ -2,15 +2,6 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "mapreg.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "map.h" // map->mysql_handle
-#include "script.h"
 #include "../common/cbasetypes.h"
 #include "../common/db.h"
 #include "../common/ers.h"
@@ -19,6 +10,11 @@
 #include "../common/sql.h"
 #include "../common/strlib.h"
 #include "../common/timer.h"
+#include "map.h" // map->mysql_handle
+#include "script.h"
+#include "mapreg.h"
+#include <stdlib.h>
+#include <string.h>
 
 struct mapreg_interface mapreg_s;
 
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 26bc8c188..495621014 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -2,44 +2,42 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "mercenary.h"
-
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/socket.h"
+#include "../common/timer.h"
+#include "../common/nullpo.h"
+#include "../common/mmo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
 
-#include "atcommand.h"
-#include "battle.h"
-#include "chrif.h"
+#include "log.h"
 #include "clif.h"
-#include "guild.h"
+#include "chrif.h"
 #include "intif.h"
 #include "itemdb.h"
-#include "log.h"
 #include "map.h"
-#include "mob.h"
-#include "npc.h"
-#include "party.h"
 #include "pc.h"
+#include "status.h"
+#include "skill.h"
+#include "mob.h"
 #include "pet.h"
+#include "battle.h"
+#include "party.h"
+#include "guild.h"
+#include "atcommand.h"
 #include "script.h"
-#include "skill.h"
-#include "status.h"
+#include "npc.h"
 #include "trade.h"
 #include "unit.h"
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/mmo.h"
-#include "../common/nullpo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/strlib.h"
-#include "../common/timer.h"
-#include "../common/utils.h"
+#include "mercenary.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
 
 struct mercenary_interface mercenary_s;
 
diff --git a/src/map/mercenary.h b/src/map/mercenary.h
index b998ac006..dd9266b2e 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.h
@@ -6,7 +6,6 @@
 
 #include "status.h" // struct status_data, struct status_change
 #include "unit.h" // struct unit_data
-#include "../common/cbasetypes.h"
 
 // number of cells that a mercenary can walk to from it's master before being warped
 #define MAX_MER_DISTANCE 15
diff --git a/src/map/mob.c b/src/map/mob.c
index 11ac74621..8f12d4b1b 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2,49 +2,46 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "../config/core.h" // AUTOLOOT_DISTANCE, DBPATH, DEFTYPE_MAX, DEFTYPE_MIN, RENEWAL_DROP, RENEWAL_EXP
-#include "mob.h"
-
-#include <math.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "../common/cbasetypes.h"
+#include "../common/timer.h"
+#include "../common/db.h"
+#include "../common/nullpo.h"
+#include "../common/malloc.h"
+#include "../common/showmsg.h"
+#include "../common/ers.h"
+#include "../common/random.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
+#include "../common/socket.h"
 
-#include "atcommand.h"
-#include "battle.h"
+#include "map.h"
+#include "path.h"
 #include "clif.h"
-#include "date.h"
+#include "intif.h"
+#include "pc.h"
+#include "pet.h"
+#include "status.h"
+#include "mob.h"
+#include "homunculus.h"
+#include "mercenary.h"
 #include "elemental.h"
 #include "guild.h"
-#include "homunculus.h"
-#include "intif.h"
 #include "itemdb.h"
-#include "log.h"
-#include "map.h"
-#include "mercenary.h"
-#include "npc.h"
+#include "skill.h"
+#include "battle.h"
 #include "party.h"
-#include "path.h"
-#include "pc.h"
-#include "pet.h"
-#include "quest.h"
+#include "npc.h"
+#include "log.h"
 #include "script.h"
-#include "skill.h"
-#include "status.h"
-#include "../common/cbasetypes.h"
-#include "../common/db.h"
-#include "../common/ers.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/strlib.h"
-#include "../common/timer.h"
-#include "../common/utils.h"
+#include "atcommand.h"
+#include "date.h"
+#include "quest.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <math.h>
 
 struct mob_interface mob_s;
 
diff --git a/src/map/mob.h b/src/map/mob.h
index d07f78c77..80175b1db 100644
--- a/src/map/mob.h
+++ b/src/map/mob.h
@@ -5,11 +5,12 @@
 #ifndef _MAP_MOB_H_
 #define _MAP_MOB_H_
 
-#include "map.h" // struct status_data, struct view_data, struct mob_skill
-#include "status.h" // struct status_data, struct status_change
-#include "unit.h" // struct unit_data
-#include "../common/cbasetypes.h"
 #include "../common/mmo.h" // struct item
+#include "guild.h" // struct guardian_data
+#include "map.h" // struct status_data, struct view_data, struct mob_skill
+#include "status.h" // struct status data, struct status_change
+#include "unit.h" // unit_stop_walking(), unit_stop_attack()
+#include "npc.h"
 
 #define MAX_RANDOMMONSTER 5
 
diff --git a/src/map/npc.c b/src/map/npc.c
index 8e5854dbf..20b500630 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -2,44 +2,41 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "../config/core.h" // NPC_SECURE_TIMEOUT_INPUT, NPC_SECURE_TIMEOUT_MENU, NPC_SECURE_TIMEOUT_NEXT, SECURE_NPCTIMEOUT, SECURE_NPCTIMEOUT_INTERVAL
-#include "npc.h"
-
-#include <errno.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
+#include "../common/cbasetypes.h"
+#include "../common/timer.h"
+#include "../common/nullpo.h"
+#include "../common/malloc.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
+#include "../common/ers.h"
+#include "../common/db.h"
+#include "../common/socket.h"
+#include "../common/HPM.h"
 
-#include "battle.h"
-#include "chat.h"
+#include "map.h"
+#include "log.h"
 #include "clif.h"
-#include "instance.h"
 #include "intif.h"
+#include "pc.h"
+#include "status.h"
 #include "itemdb.h"
-#include "log.h"
-#include "map.h"
+#include "script.h"
 #include "mob.h"
-#include "pc.h"
 #include "pet.h"
-#include "script.h"
+#include "instance.h"
+#include "battle.h"
 #include "skill.h"
-#include "status.h"
 #include "unit.h"
-#include "../common/HPM.h"
-#include "../common/cbasetypes.h"
-#include "../common/db.h"
-#include "../common/ers.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/strlib.h"
-#include "../common/timer.h"
-#include "../common/utils.h"
+#include "npc.h"
+#include "chat.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <time.h>
+#include <errno.h>
 
 struct npc_interface npc_s;
 
diff --git a/src/map/npc.h b/src/map/npc.h
index 6e9686d33..c154b14d0 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -8,10 +8,10 @@
 #include "map.h" // struct block_list
 #include "status.h" // struct status_change
 #include "unit.h" // struct unit_data
-#include "../common/cbasetypes.h"
-#include "../common/db.h"
 
 struct HPluginData;
+struct block_list;
+struct npc_data;
 struct view_data;
 
 enum npc_parse_options {
diff --git a/src/map/npc_chat.c b/src/map/npc_chat.c
index f245ffea5..9d5639efc 100644
--- a/src/map/npc_chat.c
+++ b/src/map/npc_chat.c
@@ -2,27 +2,25 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
 #ifdef PCRE_SUPPORT
 
+#include "../common/timer.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+
+#include "mob.h" // struct mob_data
 #include "npc.h" // struct npc_data
+#include "pc.h" // struct map_session_data
+#include "script.h" // set_var()
+
+#include "../../3rdparty/pcre/include/pcre.h"
 
-#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
-#include "../../3rdparty/pcre/include/pcre.h"
-
-#include "mob.h" // struct mob_data
-#include "pc.h" // struct map_session_data
-#include "script.h" // set_var()
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/timer.h"
+#include <stdarg.h>
 
 /**
  * interface sources
diff --git a/src/map/party.c b/src/map/party.c
index 7c49e241c..cf5e7bbe3 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -2,37 +2,34 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
+#include "../common/cbasetypes.h"
+#include "../common/timer.h"
+#include "../common/socket.h" // last_tick
+#include "../common/nullpo.h"
+#include "../common/malloc.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/utils.h"
+#include "../common/strlib.h"
+#include "../common/HPM.h"
 
-#include "../config/core.h" // GP_BOUND_ITEMS, RENEWAL_EXP
 #include "party.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "atcommand.h"	//msg_txt()
-#include "battle.h"
-#include "clif.h"
+#include "pc.h"
+#include "map.h"
 #include "instance.h"
+#include "battle.h"
 #include "intif.h"
-#include "itemdb.h"
+#include "clif.h"
 #include "log.h"
-#include "map.h"
-#include "mob.h" // struct mob_data
-#include "pc.h"
 #include "skill.h"
 #include "status.h"
-#include "../common/HPM.h"
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h" // last_tick
-#include "../common/strlib.h"
-#include "../common/timer.h"
-#include "../common/utils.h"
+#include "itemdb.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 
 struct party_interface party_s;
 
diff --git a/src/map/party.h b/src/map/party.h
index 3bad22b13..ed8289af6 100644
--- a/src/map/party.h
+++ b/src/map/party.h
@@ -5,12 +5,11 @@
 #ifndef _MAP_PARTY_H_
 #define _MAP_PARTY_H_
 
+#include "../common/mmo.h" // struct party
+#include "../config/core.h"
 #include <stdarg.h>
 
-#include "map.h" // TBL_PC
-#include "../common/cbasetypes.h"
-#include "../common/db.h"
-#include "../common/mmo.h" // struct party
+#include "map.h"
 
 #define PARTY_BOOKING_JOBS 6
 #define PARTY_BOOKING_RESULTS 10
diff --git a/src/map/path.c b/src/map/path.c
index d02e9ee4a..ae9fc389d 100644
--- a/src/map/path.c
+++ b/src/map/path.c
@@ -2,16 +2,6 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "../config/core.h" // CELL_NOSTACK, CIRCULAR_AREA
-#include "path.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "map.h"
 #include "../common/cbasetypes.h"
 #include "../common/db.h"
 #include "../common/malloc.h"
@@ -19,6 +9,13 @@
 #include "../common/random.h"
 #include "../common/showmsg.h"
 
+#include "path.h"
+#include "map.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #define SET_OPEN 0
 #define SET_CLOSED 1
 
diff --git a/src/map/path.h b/src/map/path.h
index b48ff05fb..0b67a0120 100644
--- a/src/map/path.h
+++ b/src/map/path.h
@@ -6,7 +6,6 @@
 #define _MAP_PATH_H_
 
 #include "map.h" // enum cell_chk
-#include "../common/cbasetypes.h"
 
 #define MOVE_COST 10
 #define MOVE_DIAGONAL_COST 14
diff --git a/src/map/pc.c b/src/map/pc.c
index 45adfe22a..c8fb14e55 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -2,16 +2,21 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
+#include "../common/cbasetypes.h"
+#include "../common/core.h" // get_svn_revision()
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h" // session[]
+#include "../common/strlib.h" // safestrncpy()
+#include "../common/timer.h"
+#include "../common/utils.h"
+#include "../common/conf.h"
+#include "../common/mmo.h" //NAME_LENGTH
+#include "../common/sysinfo.h"
 
-#include "../config/core.h" // DBPATH, GP_BOUND_ITEMS, MAX_CARTS, MAX_SPIRITBALL, NEW_CARTS, RENEWAL, RENEWAL_ASPD, RENEWAL_CAST, RENEWAL_DROP, RENEWAL_EXP, SECURE_NPCTIMEOUT
 #include "pc.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
 #include "atcommand.h" // get_atcommand_level()
 #include "battle.h" // battle_config
 #include "battleground.h"
@@ -20,40 +25,32 @@
 #include "clif.h"
 #include "date.h" // is_day_of_*()
 #include "duel.h"
-#include "elemental.h"
-#include "guild.h" // guild->search(), guild_request_info()
-#include "homunculus.h"
-#include "instance.h"
 #include "intif.h"
 #include "itemdb.h"
 #include "log.h"
 #include "mail.h"
 #include "map.h"
+#include "path.h"
+#include "homunculus.h"
+#include "instance.h"
 #include "mercenary.h"
-#include "mob.h" // struct mob_data
+#include "elemental.h"
 #include "npc.h" // fake_nd
-#include "party.h" // party->search()
-#include "path.h"
-#include "pc_groups.h"
 #include "pet.h" // pet_unlocktarget()
-#include "quest.h"
+#include "party.h" // party->search()
+#include "guild.h" // guild->search(), guild_request_info()
 #include "script.h" // script_config
 #include "skill.h"
 #include "status.h" // struct status_data
 #include "storage.h"
-#include "../common/cbasetypes.h"
-#include "../common/conf.h"
-#include "../common/core.h" // get_svn_revision()
-#include "../common/malloc.h"
-#include "../common/mmo.h" //NAME_LENGTH
-#include "../common/nullpo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h" // session[]
-#include "../common/strlib.h" // safestrncpy()
-#include "../common/sysinfo.h"
-#include "../common/timer.h"
-#include "../common/utils.h"
+#include "pc_groups.h"
+#include "quest.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
 
 struct pc_interface pc_s;
 
@@ -10654,7 +10651,9 @@ void pc_defaults(void) {
 	memset(pc->exp_table, 0, sizeof(pc->exp_table)
 		   + sizeof(pc->max_level)
 		   + sizeof(pc->statp)
+#if defined(RENEWAL_DROP) || defined(RENEWAL_EXP)
 		   + sizeof(pc->level_penalty)
+#endif
 		   + sizeof(pc->skill_tree)
 		   + sizeof(pc->smith_fame_list)
 		   + sizeof(pc->chemist_fame_list)
diff --git a/src/map/pc.h b/src/map/pc.h
index c4026a48d..70df9ca56 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -5,23 +5,23 @@
 #ifndef _MAP_PC_H_
 #define _MAP_PC_H_
 
-#include "../config/core.h" // AUTOLOOTITEM_SIZE, RENEWAL, SECURE_NPCTIMEOUT
-
+#include "../common/mmo.h" // JOB_*, MAX_FAME_LIST, struct fame_list, struct mmo_charstatus
+#include "../common/ers.h"
+#include "../common/timer.h" // INVALID_TIMER
+#include "atcommand.h" // AtCommandType
 #include "battle.h" // battle_config
-#include "battleground.h" // enum bg_queue_types
+#include "battleground.h"
 #include "buyingstore.h"  // struct s_buyingstore
-#include "itemdb.h" // MAX_ITEMDELAYS
-#include "log.h" // struct e_log_pick_type
-#include "map.h" // RC_MAX, ELE_MAX
-#include "pc_groups.h" // GroupSettings
-#include "script.h" // struct reg_db
+#include "itemdb.h"
+#include "log.h"
+#include "map.h" // RC_MAX
+#include "mob.h"
+#include "pc_groups.h"
+#include "script.h" // struct script_reg, struct script_regstr
 #include "searchstore.h"  // struct s_search_store_info
-#include "status.h" // enum sc_type, OPTION_*
-#include "unit.h" // struct unit_data, struct view_data
+#include "status.h" // OPTION_*, struct weapon_atk
+#include "unit.h" // unit_stop_attack(), unit_stop_walking()
 #include "vending.h" // struct s_vending
-#include "../common/cbasetypes.h"
-#include "../common/ers.h" // struct eri
-#include "../common/mmo.h" // JOB_*, MAX_FAME_LIST, struct fame_list, struct mmo_charstatus
 
 /**
  * Defines
@@ -742,8 +742,9 @@ struct pc_interface {
 	unsigned int exp_table[CLASS_COUNT][2][MAX_LEVEL];
 	unsigned int max_level[CLASS_COUNT][2];
 	unsigned int statp[MAX_LEVEL+1];
+#if defined(RENEWAL_DROP) || defined(RENEWAL_EXP)
 	unsigned int level_penalty[3][RC_MAX][MAX_LEVEL*2+1];
-
+#endif
 	unsigned int equip_pos[EQI_MAX];
 	/* */
 	struct skill_tree_entry skill_tree[CLASS_COUNT][MAX_SKILL_TREE];
diff --git a/src/map/pc_groups.c b/src/map/pc_groups.c
index a917ef409..906462c7e 100644
--- a/src/map/pc_groups.c
+++ b/src/map/pc_groups.c
@@ -2,14 +2,6 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "pc_groups.h"
-
-#include "atcommand.h" // atcommand->exists(), atcommand->load_groups()
-#include "clif.h"      // clif->GM_kick()
-#include "map.h"       // mapiterator
-#include "pc.h"        // pc->set_group()
 #include "../common/cbasetypes.h"
 #include "../common/conf.h"
 #include "../common/db.h"
@@ -18,6 +10,12 @@
 #include "../common/showmsg.h"
 #include "../common/strlib.h" // strcmp
 
+#include "pc_groups.h"
+#include "atcommand.h" // atcommand->exists(), atcommand->load_groups()
+#include "clif.h"      // clif->GM_kick()
+#include "map.h"       // mapiterator
+#include "pc.h"        // pc->set_group()
+
 static GroupSettings dummy_group; ///< dummy group used in dummy map sessions @see pc_get_dummy_sd()
 
 struct pc_groups_interface pcg_s;
diff --git a/src/map/pc_groups.h b/src/map/pc_groups.h
index 7c8cdd82a..5c03f999f 100644
--- a/src/map/pc_groups.h
+++ b/src/map/pc_groups.h
@@ -5,10 +5,6 @@
 #ifndef _MAP_PC_GROUPS_H_
 #define _MAP_PC_GROUPS_H_
 
-#include "../common/cbasetypes.h"
-#include "../common/conf.h"
-#include "../common/db.h"
-
 /// PC permissions
 enum e_pc_permission {
 	PC_PERM_NONE                = 0,        //  #0
diff --git a/src/map/pet.c b/src/map/pet.c
index aa2be4473..993497434 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -2,39 +2,37 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "pet.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "../common/db.h"
+#include "../common/timer.h"
+#include "../common/nullpo.h"
+#include "../common/malloc.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
+#include "../common/ers.h"
 
-#include "atcommand.h" // msg_txt()
-#include "battle.h"
-#include "chrif.h"
-#include "clif.h"
+#include "pc.h"
+#include "status.h"
+#include "map.h"
+#include "path.h"
 #include "intif.h"
+#include "clif.h"
+#include "chrif.h"
+#include "pet.h"
 #include "itemdb.h"
-#include "log.h"
-#include "map.h"
+#include "battle.h"
 #include "mob.h"
 #include "npc.h"
-#include "path.h"
-#include "pc.h"
 #include "script.h"
 #include "skill.h"
-#include "status.h"
 #include "unit.h"
-#include "../common/db.h"
-#include "../common/ers.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/timer.h"
-#include "../common/utils.h"
+#include "atcommand.h" // msg_txt()
+#include "log.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 struct pet_interface pet_s;
 
diff --git a/src/map/pet.h b/src/map/pet.h
index 8dde0fac2..4ec30b3fb 100644
--- a/src/map/pet.h
+++ b/src/map/pet.h
@@ -5,14 +5,8 @@
 #ifndef _MAP_PET_H_
 #define _MAP_PET_H_
 
-#include "map.h" // struct block_list
-#include "status.h" // enum sc_type
-#include "unit.h" // struct unit_data
-#include "../common/cbasetypes.h"
-#include "../common/mmo.h" // NAME_LENGTH, struct s_pet
-
-#define MAX_PET_DB       300
-#define MAX_PETLOOT_SIZE 30
+#define MAX_PET_DB	300
+#define MAX_PETLOOT_SIZE	30
 
 struct s_pet_db {
 	short class_;
diff --git a/src/map/quest.c b/src/map/quest.c
index b76d6bc82..bde276f9d 100644
--- a/src/map/quest.c
+++ b/src/map/quest.c
@@ -2,37 +2,36 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
+#include "../common/cbasetypes.h"
+#include "../common/socket.h"
+#include "../common/timer.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
 
+#include "map.h"
+#include "pc.h"
+#include "npc.h"
+#include "itemdb.h"
+#include "script.h"
+#include "intif.h"
+#include "battle.h"
+#include "mob.h"
+#include "party.h"
+#include "unit.h"
+#include "log.h"
+#include "clif.h"
 #include "quest.h"
+#include "chrif.h"
 
-#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdarg.h>
 #include <time.h>
 
-#include "battle.h"
-#include "chrif.h"
-#include "clif.h"
-#include "intif.h"
-#include "itemdb.h"
-#include "log.h"
-#include "map.h"
-#include "mob.h"
-#include "npc.h"
-#include "party.h"
-#include "pc.h"
-#include "script.h"
-#include "unit.h"
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/strlib.h"
-#include "../common/timer.h"
-#include "../common/utils.h"
 
 struct quest_interface quest_s;
 
diff --git a/src/map/quest.h b/src/map/quest.h
index 87894d639..e01e35619 100644
--- a/src/map/quest.h
+++ b/src/map/quest.h
@@ -5,10 +5,6 @@
 #ifndef _MAP_QUEST_H_
 #define _MAP_QUEST_H_
 
-#include "map.h" // TBL_PC
-#include "../common/cbasetypes.h"
-#include "../common/mmo.h" // MAX_QUEST_OBJECTIVES
-
 #define MAX_QUEST_DB (60355+1) // Highest quest ID + 1
 
 struct quest_db {
diff --git a/src/map/script.c b/src/map/script.c
index 068be8524..4d77c506b 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -2,46 +2,6 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "../config/core.h" // NEW_CARTS, RENEWAL, RENEWAL_ASPD, RENEWAL_CAST, RENEWAL_DROP, RENEWAL_EDP, RENEWAL_EXP, RENEWAL_LVDMG, SCRIPT_CALLFUNC_CHECK, SECURE_NPCTIMEOUT, SECURE_NPCTIMEOUT_INTERVAL
-#include "script.h"
-
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "atcommand.h"
-#include "battle.h"
-#include "battleground.h"
-#include "chat.h"
-#include "chrif.h"
-#include "clif.h"
-#include "elemental.h"
-#include "guild.h"
-#include "homunculus.h"
-#include "instance.h"
-#include "intif.h"
-#include "itemdb.h"
-#include "log.h"
-#include "mail.h"
-#include "map.h"
-#include "mapreg.h"
-#include "mercenary.h"
-#include "mob.h"
-#include "npc.h"
-#include "party.h"
-#include "path.h"
-#include "pc.h"
-#include "pet.h"
-#include "pet.h"
-#include "quest.h"
-#include "skill.h"
-#include "status.h"
-#include "status.h"
-#include "storage.h"
-#include "unit.h"
 #include "../common/cbasetypes.h"
 #include "../common/malloc.h"
 #include "../common/md5calc.h"
@@ -50,10 +10,47 @@
 #include "../common/showmsg.h"
 #include "../common/socket.h" // usage: getcharip
 #include "../common/strlib.h"
-#include "../common/sysinfo.h"
 #include "../common/timer.h"
 #include "../common/utils.h"
+#include "../common/sysinfo.h"
+
+#include "map.h"
+#include "path.h"
+#include "clif.h"
+#include "chrif.h"
+#include "itemdb.h"
+#include "pc.h"
+#include "status.h"
+#include "storage.h"
+#include "mob.h"
+#include "npc.h"
+#include "pet.h"
+#include "mapreg.h"
+#include "homunculus.h"
+#include "instance.h"
+#include "mercenary.h"
+#include "intif.h"
+#include "skill.h"
+#include "status.h"
+#include "chat.h"
+#include "battle.h"
+#include "battleground.h"
+#include "party.h"
+#include "guild.h"
+#include "atcommand.h"
+#include "log.h"
+#include "unit.h"
+#include "pet.h"
+#include "mail.h"
+#include "script.h"
+#include "quest.h"
+#include "elemental.h"
+#include "../config/core.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
 #ifndef WIN32
 	#include <sys/time.h>
 #endif
diff --git a/src/map/script.h b/src/map/script.h
index 899c745da..90b18d87f 100644
--- a/src/map/script.h
+++ b/src/map/script.h
@@ -5,19 +5,17 @@
 #ifndef _MAP_SCRIPT_H_
 #define _MAP_SCRIPT_H_
 
+#include "../common/strlib.h" //StringBuf
+#include "../common/cbasetypes.h"
+#include "map.h" //EVENT_NAME_LENGTH
+
 #include <setjmp.h>
 #include <errno.h>
 
-#include "map.h" //EVENT_NAME_LENGTH
-#include "../common/cbasetypes.h"
-#include "../common/db.h"
-#include "../common/mmo.h" // struct item
-#include "../common/sql.h" // Sql
-#include "../common/strlib.h" //StringBuf
-
 /**
  * Declarations
  **/
+struct map_session_data;
 struct eri;
 
 /**
diff --git a/src/map/searchstore.c b/src/map/searchstore.c
index 72b28aacd..0144aea93 100644
--- a/src/map/searchstore.c
+++ b/src/map/searchstore.c
@@ -2,17 +2,14 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "searchstore.h"  // struct s_search_store_info
-
-#include "battle.h"  // battle_config.*
-#include "clif.h"  // clif->open_search_store_info, clif->search_store_info_*
-#include "pc.h"  // struct map_session_data
 #include "../common/cbasetypes.h"
 #include "../common/malloc.h"  // aMalloc, aRealloc, aFree
 #include "../common/showmsg.h"  // ShowError, ShowWarning
 #include "../common/strlib.h"  // safestrncpy
+#include "battle.h"  // battle_config.*
+#include "clif.h"  // clif->open_search_store_info, clif->search_store_info_*
+#include "pc.h"  // struct map_session_data
+#include "searchstore.h"  // struct s_search_store_info
 
 struct searchstore_interface searchstore_s;
 
diff --git a/src/map/searchstore.h b/src/map/searchstore.h
index c9b93ba54..827e39053 100644
--- a/src/map/searchstore.h
+++ b/src/map/searchstore.h
@@ -5,12 +5,6 @@
 #ifndef _MAP_SEARCHSTORE_H_
 #define _MAP_SEARCHSTORE_H_
 
-#include <time.h>
-
-#include "map.h" // MESSAGE_SIZE
-#include "../common/cbasetypes.h"
-#include "../common/mmo.h" // MAX_SLOTS
-
 /**
  * Defines
  **/
diff --git a/src/map/skill.c b/src/map/skill.c
index b2e94ec79..c8388770a 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -2,48 +2,46 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "../config/core.h" // DBPATH, MAGIC_REFLECTION_TYPE, OFFICIAL_WALKPATH, RENEWAL, RENEWAL_CAST, VARCAST_REDUCTION()
-#include "skill.h"
-
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
+#include "../common/cbasetypes.h"
+#include "../common/timer.h"
+#include "../common/nullpo.h"
+#include "../common/malloc.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
+#include "../common/ers.h"
 
-#include "battle.h"
-#include "battleground.h"
-#include "chrif.h"
+#include "map.h"
+#include "path.h"
 #include "clif.h"
-#include "date.h"
-#include "elemental.h"
-#include "guild.h"
+#include "pc.h"
+#include "status.h"
+#include "skill.h"
+#include "pet.h"
 #include "homunculus.h"
-#include "intif.h"
-#include "itemdb.h"
-#include "log.h"
-#include "map.h"
 #include "mercenary.h"
+#include "elemental.h"
 #include "mob.h"
 #include "npc.h"
+#include "battle.h"
+#include "battleground.h"
 #include "party.h"
-#include "path.h"
-#include "pc.h"
-#include "pet.h"
+#include "itemdb.h"
 #include "script.h"
-#include "status.h"
+#include "intif.h"
+#include "log.h"
+#include "chrif.h"
+#include "guild.h"
+#include "date.h"
 #include "unit.h"
-#include "../common/cbasetypes.h"
-#include "../common/ers.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/timer.h"
-#include "../common/utils.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <math.h>
+
 
 #define SKILLUNITTIMER_INTERVAL	100
 
diff --git a/src/map/skill.h b/src/map/skill.h
index b6dbb1fcb..dda310bd4 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -5,23 +5,19 @@
 #ifndef _MAP_SKILL_H_
 #define _MAP_SKILL_H_
 
-#include "../config/core.h" // RENEWAL_CAST
-
-#include "map.h" // struct block_list
-#include "status.h" // enum sc_type
-#include "../common/cbasetypes.h"
-#include "../common/db.h"
 #include "../common/mmo.h" // MAX_SKILL, struct square
+#include "../common/db.h"
+#include "map.h" // struct block_list
 
 /**
  * Declarations
  **/
-struct homun_data;
 struct map_session_data;
-struct mercenary_data;
+struct homun_data;
 struct skill_unit;
-struct square;
+struct skill_unit_group;
 struct status_change_entry;
+struct square;
 
 /**
  * Defines
diff --git a/src/map/status.c b/src/map/status.c
index eb06138da..4c2bc6d22 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -2,46 +2,43 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "../config/core.h" // ANTI_MAYAP_CHEAT, DBPATH, DEFTYPE_MAX, DEFTYPE_MIN, DEVOTION_REFLECT_DAMAGE, RENEWAL, RENEWAL_ASPD, RENEWAL_EDP
-#include "status.h"
-
-#include <math.h>
-#include <memory.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
+#include "../common/cbasetypes.h"
+#include "../common/timer.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/malloc.h"
+#include "../common/utils.h"
+#include "../common/ers.h"
+#include "../common/strlib.h"
 
-#include "battle.h"
-#include "chrif.h"
-#include "clif.h"
-#include "elemental.h"
-#include "guild.h"
-#include "homunculus.h"
-#include "itemdb.h"
 #include "map.h"
-#include "mercenary.h"
-#include "mob.h"
-#include "npc.h"
 #include "path.h"
 #include "pc.h"
 #include "pet.h"
-#include "script.h"
+#include "npc.h"
+#include "mob.h"
+#include "clif.h"
+#include "guild.h"
 #include "skill.h"
+#include "itemdb.h"
+#include "battle.h"
+#include "chrif.h"
 #include "skill.h"
+#include "status.h"
+#include "script.h"
 #include "unit.h"
+#include "homunculus.h"
+#include "mercenary.h"
+#include "elemental.h"
 #include "vending.h"
-#include "../common/cbasetypes.h"
-#include "../common/ers.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/timer.h"
-#include "../common/utils.h"
+
+#include <time.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <memory.h>
+#include <string.h>
+#include <math.h>
 
 struct status_interface status_s;
 
diff --git a/src/map/status.h b/src/map/status.h
index baa586297..e47c2b365 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -5,18 +5,14 @@
 #ifndef _MAP_STATUS_H_
 #define _MAP_STATUS_H_
 
-#include "../config/core.h" // defType, NEW_CARTS, RENEWAL, RENEWAL_ASPD
-
-#include "../common/cbasetypes.h"
 #include "../common/mmo.h"
 
 struct block_list;
-struct elemental_data;
-struct homun_data;
-struct mercenary_data;
 struct mob_data;
-struct npc_data;
 struct pet_data;
+struct homun_data;
+struct mercenary_data;
+struct status_change;
 
 //Change the equation when the values are high enough to discard the
 //imprecision in exchange of overflow protection [Skotlex]
@@ -1882,7 +1878,11 @@ struct status_interface {
 	int hp_coefficient2[CLASS_COUNT];
 	int hp_sigma_val[CLASS_COUNT][MAX_LEVEL+1];
 	int sp_coefficient[CLASS_COUNT];
-	int aspd_base[CLASS_COUNT][MAX_WEAPON_TYPE+1]; // +1 for RENEWAL_ASPD
+#ifdef RENEWAL_ASPD
+	int aspd_base[CLASS_COUNT][MAX_WEAPON_TYPE+1];
+#else
+	int aspd_base[CLASS_COUNT][MAX_WEAPON_TYPE]; //[blackhole89]
+#endif
 	sc_type Skill2SCTable[MAX_SKILL];  // skill  -> status
 	int IconChangeTable[SC_MAX];          // status -> "icon" (icon is a bit of a misnomer, since there exist values with no icon associated)
 	unsigned int ChangeFlagTable[SC_MAX]; // status -> flags
diff --git a/src/map/storage.c b/src/map/storage.c
index 2db5fff3d..e65ed7b80 100644
--- a/src/map/storage.c
+++ b/src/map/storage.c
@@ -2,29 +2,27 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+#include "../common/nullpo.h"
+#include "../common/malloc.h"
+#include "../common/showmsg.h"
 
+#include "map.h" // struct map_session_data
 #include "storage.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "atcommand.h"
-#include "battle.h"
 #include "chrif.h"
+#include "itemdb.h"
 #include "clif.h"
-#include "guild.h"
 #include "intif.h"
-#include "itemdb.h"
-#include "log.h"
-#include "map.h" // struct map_session_data
 #include "pc.h"
-#include "../common/cbasetypes.h"
-#include "../common/db.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
+#include "guild.h"
+#include "battle.h"
+#include "atcommand.h"
+#include "log.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 struct storage_interface storage_s;
 struct guild_storage_interface gstorage_s;
diff --git a/src/map/storage.h b/src/map/storage.h
index 5edb68cfc..8f9f904f6 100644
--- a/src/map/storage.h
+++ b/src/map/storage.h
@@ -5,12 +5,11 @@
 #ifndef _MAP_STORAGE_H_
 #define _MAP_STORAGE_H_
 
-#include "../common/cbasetypes.h"
-#include "../common/db.h"
-
+struct storage_data;
 struct guild_storage;
 struct item;
 struct map_session_data;
+struct DBMap;
 
 struct storage_interface {
 	/* */
diff --git a/src/map/trade.c b/src/map/trade.c
index 83426c407..44b669ebd 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -2,27 +2,25 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
+#include "../common/nullpo.h"
+#include "../common/socket.h"
 
 #include "trade.h"
-
-#include <stdio.h>
-#include <string.h>
-
-#include "atcommand.h"
-#include "battle.h"
-#include "chrif.h"
 #include "clif.h"
-#include "intif.h"
 #include "itemdb.h"
-#include "log.h"
 #include "map.h"
-#include "npc.h"
 #include "path.h"
 #include "pc.h"
+#include "npc.h"
+#include "battle.h"
+#include "chrif.h"
 #include "storage.h"
-#include "../common/nullpo.h"
-#include "../common/socket.h"
+#include "intif.h"
+#include "atcommand.h"
+#include "log.h"
+
+#include <stdio.h>
+#include <string.h>
 
 struct trade_interface trade_s;
 
diff --git a/src/map/unit.c b/src/map/unit.c
index 0ad770e80..151d4bad5 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -2,48 +2,45 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "../config/core.h" // RENEWAL_CAST
-#include "unit.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "../common/showmsg.h"
+#include "../common/timer.h"
+#include "../common/nullpo.h"
+#include "../common/db.h"
+#include "../common/malloc.h"
+#include "../common/random.h"
+#include "../common/HPM.h"
 
-#include "battle.h"
-#include "battleground.h"
-#include "chat.h"
-#include "chrif.h"
-#include "clif.h"
-#include "duel.h"
-#include "elemental.h"
-#include "guild.h"
-#include "homunculus.h"
-#include "instance.h"
-#include "intif.h"
 #include "map.h"
-#include "mercenary.h"
-#include "mob.h"
-#include "npc.h"
-#include "party.h"
 #include "path.h"
 #include "pc.h"
+#include "mob.h"
 #include "pet.h"
-#include "script.h"
+#include "homunculus.h"
+#include "instance.h"
+#include "mercenary.h"
+#include "elemental.h"
 #include "skill.h"
+#include "clif.h"
+#include "duel.h"
+#include "npc.h"
+#include "guild.h"
 #include "status.h"
-#include "storage.h"
+#include "unit.h"
+#include "battle.h"
+#include "battleground.h"
+#include "chat.h"
 #include "trade.h"
 #include "vending.h"
-#include "../common/HPM.h"
-#include "../common/db.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
+#include "party.h"
+#include "intif.h"
+#include "chrif.h"
+#include "script.h"
+#include "storage.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 
 const short dirx[8]={0,-1,-1,-1,0,1,1,1};
 const short diry[8]={1,1,0,-1,-1,-1,0,1};
diff --git a/src/map/unit.h b/src/map/unit.h
index 9e05647b1..33fa4e052 100644
--- a/src/map/unit.h
+++ b/src/map/unit.h
@@ -5,13 +5,15 @@
 #ifndef _MAP_UNIT_H_
 #define _MAP_UNIT_H_
 
+//#include "map.h"
+struct block_list;
+struct unit_data;
+struct map_session_data;
+
 #include "clif.h"  // clr_type
+#include "map.h" // struct block_list
 #include "path.h" // struct walkpath_data
-#include "skill.h" // 'MAX_SKILLTIMERSKILL, struct skill_timerskill, struct skill_unit_group, struct skill_unit_group_tickset
-#include "../common/cbasetypes.h"
-
-struct map_session_data;
-struct block_list;
+#include "skill.h" // struct skill_timerskill, struct skill_unit_group, struct skill_unit_group_tickset
 
 struct unit_data {
 	struct block_list *bl;
diff --git a/src/map/vending.c b/src/map/vending.c
index c8ac814db..9462975b3 100644
--- a/src/map/vending.c
+++ b/src/map/vending.c
@@ -2,27 +2,24 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "vending.h"
-
-#include <stdio.h>
-#include <string.h>
-
-#include "atcommand.h"
-#include "battle.h"
-#include "chrif.h"
+#include "../common/nullpo.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
 #include "clif.h"
 #include "itemdb.h"
-#include "log.h"
+#include "atcommand.h"
 #include "map.h"
-#include "npc.h"
 #include "path.h"
+#include "chrif.h"
+#include "vending.h"
 #include "pc.h"
+#include "npc.h"
 #include "skill.h"
-#include "../common/nullpo.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
+#include "battle.h"
+#include "log.h"
+
+#include <stdio.h>
+#include <string.h>
 
 struct vending_interface vending_s;
 
diff --git a/src/map/vending.h b/src/map/vending.h
index a70726374..a212f8385 100644
--- a/src/map/vending.h
+++ b/src/map/vending.h
@@ -7,7 +7,6 @@
 
 #include "../common/cbasetypes.h"
 #include "../common/db.h"
-
 struct map_session_data;
 struct s_search_store_search;
 
diff --git a/src/tool/mapcache.c b/src/tool/mapcache.c
index 96d51aec6..85d5fb548 100644
--- a/src/tool/mapcache.c
+++ b/src/tool/mapcache.c
@@ -1,14 +1,6 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#define HERCULES_CORE
-
-#include "../config/core.h" // RENEWAL
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "../common/cbasetypes.h"
 #include "../common/grfio.h"
 #include "../common/malloc.h"
@@ -16,6 +8,12 @@
 #include "../common/showmsg.h"
 #include "../common/utils.h"
 
+#include "../config/renewal.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #ifndef _WIN32
 #include <unistd.h>
 #endif
-- 
cgit v1.2.3-70-g09d2


From 0ab52ac65bdba93be94e4149e267698d31b41d72 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Sat, 10 May 2014 17:17:13 +0200
Subject: Re-commit of "Fixed order of includes in all source files"

This reverts commit 94657284973f4037596bae468ebfbee5c217e02b.
---
 src/char/char.c          |  44 +++++-----
 src/char/char.h          |   1 -
 src/char/int_auction.c   |  25 +++---
 src/char/int_elemental.c |  22 +++--
 src/char/int_elemental.h |   2 +-
 src/char/int_guild.c     |  24 ++---
 src/char/int_guild.h     |   3 -
 src/char/int_homun.c     |  21 +++--
 src/char/int_homun.h     |   2 +
 src/char/int_mail.c      |  20 +++--
 src/char/int_mail.h      |   3 +
 src/char/int_mercenary.c |  22 +++--
 src/char/int_mercenary.h |   4 +-
 src/char/int_party.c     |  25 +++---
 src/char/int_party.h     |   2 -
 src/char/int_pet.c       |  22 +++--
 src/char/int_quest.c     |  22 ++---
 src/char/int_storage.c   |  22 +++--
 src/char/inter.c         |  43 ++++-----
 src/char/inter.h         |   5 +-
 src/char/pincode.c       |  11 ++-
 src/common/HPM.c         |  31 ++++---
 src/common/HPM.h         |   6 +-
 src/common/HPMi.h        |  16 +---
 src/common/cbasetypes.h  |   6 ++
 src/common/conf.c        |   3 +
 src/common/conf.h        |   1 +
 src/common/console.c     | 223 ++++++++++++++++++++++++-----------------------
 src/common/console.h     |  21 +++--
 src/common/core.c        |  38 ++++----
 src/common/core.h        |   3 +-
 src/common/db.c          |  10 ++-
 src/common/db.h          |   3 +-
 src/common/des.c         |   7 +-
 src/common/ers.c         |   8 +-
 src/common/grfio.c       |  17 ++--
 src/common/malloc.c      |  11 ++-
 src/common/mapindex.c    |  15 ++--
 src/common/md5calc.c     |   8 +-
 src/common/mmo.h         |   6 +-
 src/common/mutex.c       |   5 +-
 src/common/mutex.h       |   1 +
 src/common/nullpo.c      |   6 +-
 src/common/random.c      |  18 ++--
 src/common/showmsg.c     |  17 ++--
 src/common/showmsg.h     |  23 +++--
 src/common/socket.c      |  64 +++++++-------
 src/common/socket.h      |  12 +--
 src/common/spinlock.h    |   9 +-
 src/common/sql.c         |  12 ++-
 src/common/sql.h         |   3 +-
 src/common/strlib.c      |  13 +--
 src/common/strlib.h      |  15 ++--
 src/common/sysinfo.c     |  32 +++++--
 src/common/sysinfo.h     |  16 ----
 src/common/thread.c      |  31 ++++---
 src/common/thread.h      |   1 -
 src/common/timer.c       |  19 ++--
 src/common/utils.c       |  36 ++++----
 src/common/utils.h       |   3 +-
 src/config/const.h       |   7 --
 src/config/renewal.h     |   1 +
 src/login/account.h      |   1 +
 src/login/account_sql.c  |  17 ++--
 src/login/ipban_sql.c    |  14 +--
 src/login/login.c        |  21 +++--
 src/login/login.h        |   2 +-
 src/login/loginlog.h     |   2 +-
 src/login/loginlog_sql.c |   9 +-
 src/map/HPMmap.c         |  42 ++++-----
 src/map/atcommand.c      |  67 +++++++-------
 src/map/atcommand.h      |   2 +-
 src/map/battle.c         |  61 +++++++------
 src/map/battle.h         |   2 +-
 src/map/battleground.c   |  33 +++----
 src/map/battleground.h   |   2 +-
 src/map/buyingstore.c    |  17 ++--
 src/map/buyingstore.h    |   5 ++
 src/map/chat.c           |  23 ++---
 src/map/chat.h           |   5 +-
 src/map/chrif.c          |  35 ++++----
 src/map/chrif.h          |   4 +-
 src/map/clif.c           |  83 +++++++++---------
 src/map/clif.h           |   9 +-
 src/map/date.c           |   6 +-
 src/map/date.h           |   2 +
 src/map/duel.c           |  10 ++-
 src/map/duel.h           |   4 +
 src/map/elemental.c      |  54 ++++++------
 src/map/elemental.h      |   1 +
 src/map/guild.c          |  47 +++++-----
 src/map/guild.h          |  16 +---
 src/map/homunculus.c     |  56 ++++++------
 src/map/homunculus.h     |   3 +-
 src/map/instance.c       |  34 ++++----
 src/map/instance.h       |   3 +
 src/map/intif.c          |  51 ++++++-----
 src/map/intif.h          |  13 +--
 src/map/irc-bot.c        |  22 ++---
 src/map/irc-bot.h        |   2 +
 src/map/itemdb.c         |  27 +++---
 src/map/itemdb.h         |   5 +-
 src/map/log.c            |  23 ++---
 src/map/log.h            |   5 +-
 src/map/mail.c           |  16 ++--
 src/map/mail.h           |   6 +-
 src/map/map.c            |  96 ++++++++++----------
 src/map/map.h            |   9 +-
 src/map/mapreg_sql.c     |  14 +--
 src/map/mercenary.c      |  54 ++++++------
 src/map/mercenary.h      |   1 +
 src/map/mob.c            |  69 ++++++++-------
 src/map/mob.h            |   9 +-
 src/map/npc.c            |  57 ++++++------
 src/map/npc.h            |   4 +-
 src/map/npc_chat.c       |  26 +++---
 src/map/party.c          |  43 ++++-----
 src/map/party.h          |   7 +-
 src/map/path.c           |  17 ++--
 src/map/path.h           |   1 +
 src/map/pc.c             |  59 +++++++------
 src/map/pc.h             |  29 +++---
 src/map/pc_groups.c      |  14 +--
 src/map/pc_groups.h      |   4 +
 src/map/pet.c            |  48 +++++-----
 src/map/pet.h            |  10 ++-
 src/map/quest.c          |  45 +++++-----
 src/map/quest.h          |   4 +
 src/map/script.c         |  79 +++++++++--------
 src/map/script.h         |  12 +--
 src/map/searchstore.c    |  11 ++-
 src/map/searchstore.h    |   6 ++
 src/map/skill.c          |  64 +++++++-------
 src/map/skill.h          |  14 +--
 src/map/status.c         |  59 +++++++------
 src/map/status.h         |  16 ++--
 src/map/storage.c        |  32 +++----
 src/map/storage.h        |   5 +-
 src/map/trade.c          |  24 ++---
 src/map/unit.c           |  63 ++++++-------
 src/map/unit.h           |  12 ++-
 src/map/vending.c        |  27 +++---
 src/map/vending.h        |   1 +
 src/tool/mapcache.c      |  14 +--
 144 files changed, 1676 insertions(+), 1367 deletions(-)

(limited to 'src/common/utils.h')

diff --git a/src/char/char.c b/src/char/char.c
index 77e393c0d..6c0902644 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -2,7 +2,30 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "../config/core.h" // CONSOLE_INPUT
+#include "char.h"
+
+#include <signal.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <time.h>
+
+#include "int_elemental.h"
+#include "int_guild.h"
+#include "int_homun.h"
+#include "int_mercenary.h"
+#include "int_party.h"
+#include "int_storage.h"
+#include "inter.h"
+#include "pincode.h"
+#include "../common/HPM.h"
 #include "../common/cbasetypes.h"
+#include "../common/console.h"
 #include "../common/core.h"
 #include "../common/db.h"
 #include "../common/malloc.h"
@@ -13,25 +36,6 @@
 #include "../common/strlib.h"
 #include "../common/timer.h"
 #include "../common/utils.h"
-#include "../common/console.h"
-#include "../common/HPM.h"
-#include "int_guild.h"
-#include "int_homun.h"
-#include "int_mercenary.h"
-#include "int_elemental.h"
-#include "int_party.h"
-#include "int_storage.h"
-#include "char.h"
-#include "inter.h"
-#include "pincode.h"
-
-#include <sys/types.h>
-#include <time.h>
-#include <signal.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 // private declarations
 #define CHAR_CONF_NAME	"conf/char-server.conf"
@@ -5497,7 +5501,7 @@ int do_init(int argc, char **argv) {
 	
 	Sql_HerculesUpdateCheck(sql_handle);
 #ifdef CONSOLE_INPUT
-	console->setSQL(sql_handle);
+	console->input->setSQL(sql_handle);
 #endif
 	ShowStatus("The char-server is "CL_GREEN"ready"CL_RESET" (Server is listening on the port %d).\n\n", char_port);
 	
diff --git a/src/char/char.h b/src/char/char.h
index 2928929de..09a78f6b9 100644
--- a/src/char/char.h
+++ b/src/char/char.h
@@ -5,7 +5,6 @@
 #ifndef _COMMON_CHAR_H_
 #define _COMMON_CHAR_H_
 
-#include "../config/core.h"
 #include "../common/core.h" // CORE_ST_LAST
 #include "../common/db.h"
 
diff --git a/src/char/int_auction.c b/src/char/int_auction.c
index 924930867..886b5be26 100644
--- a/src/char/int_auction.c
+++ b/src/char/int_auction.c
@@ -2,22 +2,25 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/mmo.h"
-#include "../common/malloc.h"
+#define HERCULES_CORE
+
+#include "int_auction.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "char.h"
+#include "int_mail.h"
+#include "inter.h"
 #include "../common/db.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
 #include "../common/showmsg.h"
 #include "../common/socket.h"
-#include "../common/strlib.h"
 #include "../common/sql.h"
+#include "../common/strlib.h"
 #include "../common/timer.h"
-#include "char.h"
-#include "inter.h"
-#include "int_mail.h"
-#include "int_auction.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
 
 static DBMap* auction_db_ = NULL; // int auction_id -> struct auction_data*
 
diff --git a/src/char/int_elemental.c b/src/char/int_elemental.c
index ed0c2a9ed..3a36e75a2 100644
--- a/src/char/int_elemental.c
+++ b/src/char/int_elemental.c
@@ -2,20 +2,24 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/mmo.h"
-#include "../common/malloc.h"
-#include "../common/strlib.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/utils.h"
-#include "../common/sql.h"
-#include "char.h"
-#include "inter.h"
+#define HERCULES_CORE
+
+#include "int_elemental.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "char.h"
+#include "inter.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/sql.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
+
 bool mapif_elemental_save(struct s_elemental* ele) {
 	bool flag = true;
 	
diff --git a/src/char/int_elemental.h b/src/char/int_elemental.h
index c90891fc4..c869e6fc2 100644
--- a/src/char/int_elemental.h
+++ b/src/char/int_elemental.h
@@ -4,7 +4,7 @@
 #ifndef _CHAR_INT_ELEMENTAL_H_
 #define _CHAR_INT_ELEMENTAL_H_
 
-struct s_elemental;
+#include "../common/cbasetypes.h"
 
 void inter_elemental_sql_init(void);
 void inter_elemental_sql_final(void);
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index 895cbbb94..ffbe48e10 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -2,21 +2,25 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "../config/core.h" // DBPATH
+#include "int_guild.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "char.h"
+#include "inter.h"
 #include "../common/cbasetypes.h"
-#include "../common/mmo.h"
-#include "../common/malloc.h"
-#include "../common/socket.h"
 #include "../common/db.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
 #include "../common/showmsg.h"
+#include "../common/socket.h"
 #include "../common/strlib.h"
 #include "../common/timer.h"
-#include "char.h"
-#include "inter.h"
-#include "int_guild.h"
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.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 4eb7d310b..5e657ff06 100644
--- a/src/char/int_guild.h
+++ b/src/char/int_guild.h
@@ -20,9 +20,6 @@ enum {
 	GS_REMOVE = 0x8000,
 };
 
-struct guild;
-struct guild_castle;
-
 int inter_guild_parse_frommap(int fd);
 int inter_guild_sql_init(void);
 void inter_guild_sql_final(void);
diff --git a/src/char/int_homun.c b/src/char/int_homun.c
index 143277f05..795a6b927 100644
--- a/src/char/int_homun.c
+++ b/src/char/int_homun.c
@@ -2,20 +2,23 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/mmo.h"
-#include "../common/malloc.h"
-#include "../common/strlib.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/utils.h"
-#include "../common/sql.h"
-#include "char.h"
-#include "inter.h"
+#define HERCULES_CORE
+
+#include "int_homun.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "char.h"
+#include "inter.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/sql.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
 
 int inter_homunculus_sql_init(void)
 {
diff --git a/src/char/int_homun.h b/src/char/int_homun.h
index 561dc848f..9477f4f03 100644
--- a/src/char/int_homun.h
+++ b/src/char/int_homun.h
@@ -4,6 +4,8 @@
 #ifndef _CHAR_INT_HOMUN_H_
 #define _CHAR_INT_HOMUN_H_
 
+#include "../common/cbasetypes.h"
+
 struct s_homunculus;
 
 int inter_homunculus_sql_init(void);
diff --git a/src/char/int_mail.c b/src/char/int_mail.c
index 826771676..86a36d59f 100644
--- a/src/char/int_mail.c
+++ b/src/char/int_mail.c
@@ -2,19 +2,23 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/mmo.h"
+#define HERCULES_CORE
+
+#include "int_mail.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "char.h"
+#include "inter.h"
 #include "../common/malloc.h"
+#include "../common/mmo.h"
 #include "../common/showmsg.h"
 #include "../common/socket.h"
-#include "../common/strlib.h"
 #include "../common/sql.h"
+#include "../common/strlib.h"
 #include "../common/timer.h"
-#include "char.h"
-#include "inter.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
 
 static int mail_fromsql(int char_id, struct mail_data* md)
 {
diff --git a/src/char/int_mail.h b/src/char/int_mail.h
index 7c06cdc1f..824ba48a3 100644
--- a/src/char/int_mail.h
+++ b/src/char/int_mail.h
@@ -4,6 +4,9 @@
 #ifndef _CHAR_INT_MAIL_H_
 #define _CHAR_INT_MAIL_H_
 
+struct item;
+struct mail_message;
+
 int inter_mail_parse_frommap(int fd);
 void mail_sendmail(int send_id, const char* send_name, int dest_id, const char* dest_name, const char* title, const char* body, int zeny, struct item *item);
 
diff --git a/src/char/int_mercenary.c b/src/char/int_mercenary.c
index aecb3844a..1dffb656c 100644
--- a/src/char/int_mercenary.c
+++ b/src/char/int_mercenary.c
@@ -2,20 +2,24 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/mmo.h"
-#include "../common/malloc.h"
-#include "../common/strlib.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/utils.h"
-#include "../common/sql.h"
-#include "char.h"
-#include "inter.h"
+#define HERCULES_CORE
+
+#include "int_mercenary.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "char.h"
+#include "inter.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/sql.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
+
 bool mercenary_owner_fromsql(int char_id, struct mmo_charstatus *status)
 {
 	char* data;
diff --git a/src/char/int_mercenary.h b/src/char/int_mercenary.h
index b614b8cf7..195a83b34 100644
--- a/src/char/int_mercenary.h
+++ b/src/char/int_mercenary.h
@@ -4,7 +4,9 @@
 #ifndef _CHAR_INT_MERCENARY_H_
 #define _CHAR_INT_MERCENARY_H_
 
-struct s_mercenary;
+#include "../common/cbasetypes.h"
+
+struct mmo_charstatus;
 
 int inter_mercenary_sql_init(void);
 void inter_mercenary_sql_final(void);
diff --git a/src/char/int_party.c b/src/char/int_party.c
index 7c328c452..3e4a743d6 100644
--- a/src/char/int_party.c
+++ b/src/char/int_party.c
@@ -2,23 +2,26 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/mmo.h"
-#include "../common/db.h"
-#include "../common/malloc.h"
-#include "../common/strlib.h"
-#include "../common/socket.h"
-#include "../common/showmsg.h"
-#include "../common/mapindex.h"
-#include "../common/sql.h"
-#include "char.h"
-#include "inter.h"
+#define HERCULES_CORE
+
 #include "int_party.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "char.h"
+#include "inter.h"
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+#include "../common/malloc.h"
+#include "../common/mapindex.h"
+#include "../common/mmo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/sql.h"
+#include "../common/strlib.h"
+
 struct party_data {
 	struct party party;
 	unsigned int min_lv, max_lv;
diff --git a/src/char/int_party.h b/src/char/int_party.h
index 84f00635a..098c1e9a9 100644
--- a/src/char/int_party.h
+++ b/src/char/int_party.h
@@ -14,8 +14,6 @@ enum {
 	PS_BREAK = 0x20, //Specify that this party must be deleted.
 };
 
-struct party;
-
 int inter_party_parse_frommap(int fd);
 int inter_party_sql_init(void);
 void inter_party_sql_final(void);
diff --git a/src/char/int_pet.c b/src/char/int_pet.c
index 25f00e6f0..29c40eff9 100644
--- a/src/char/int_pet.c
+++ b/src/char/int_pet.c
@@ -2,20 +2,24 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/mmo.h"
-#include "../common/malloc.h"
-#include "../common/socket.h"
-#include "../common/strlib.h"
-#include "../common/showmsg.h"
-#include "../common/utils.h"
-#include "../common/sql.h"
-#include "char.h"
-#include "inter.h"
+#define HERCULES_CORE
+
+#include "int_pet.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "char.h"
+#include "inter.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/sql.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
+
 struct s_pet *pet_pt;
 
 //---------------------------------------------------------
diff --git a/src/char/int_quest.c b/src/char/int_quest.c
index 061dd89d9..61b43c57d 100644
--- a/src/char/int_quest.c
+++ b/src/char/int_quest.c
@@ -2,23 +2,25 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/mmo.h"
+#define HERCULES_CORE
+
+#include "int_quest.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "char.h"
+#include "inter.h"
 #include "../common/db.h"
 #include "../common/malloc.h"
+#include "../common/mmo.h"
 #include "../common/showmsg.h"
 #include "../common/socket.h"
-#include "../common/strlib.h"
 #include "../common/sql.h"
+#include "../common/strlib.h"
 #include "../common/timer.h"
 
-#include "char.h"
-#include "inter.h"
-#include "int_quest.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
 /**
  * Loads the entire questlog for a character.
  *
diff --git a/src/char/int_storage.c b/src/char/int_storage.c
index 966e61bb3..bf7b76da0 100644
--- a/src/char/int_storage.c
+++ b/src/char/int_storage.c
@@ -2,19 +2,23 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/mmo.h"
-#include "../common/malloc.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/strlib.h" // StringBuf
-#include "../common/sql.h"
-#include "char.h"
-#include "inter.h"
+#define HERCULES_CORE
+
+#include "../config/core.h" // GP_BOUND_ITEMS
+#include "int_storage.h"
 
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 
+#include "char.h"
+#include "inter.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/sql.h"
+#include "../common/strlib.h" // StringBuf
 
 #define STORAGE_MEMINC	16
 
diff --git a/src/char/inter.c b/src/char/inter.c
index 515ca0ec4..972407ef3 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -2,33 +2,34 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/mmo.h"
-#include "../common/db.h"
-#include "../common/malloc.h"
-#include "../common/strlib.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "char.h"
+#define HERCULES_CORE
+
 #include "inter.h"
-#include "int_party.h"
-#include "int_guild.h"
-#include "int_storage.h"
-#include "int_pet.h"
-#include "int_homun.h"
-#include "int_mercenary.h"
-#include "int_mail.h"
-#include "int_auction.h"
-#include "int_quest.h"
-#include "int_elemental.h"
 
+#include <errno.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
-#include <errno.h>
-
+#include <string.h>
 #include <sys/stat.h> // for stat/lstat/fstat - [Dekamaster/Ultimate GM Tool]
 
+#include "char.h"
+#include "int_auction.h"
+#include "int_elemental.h"
+#include "int_guild.h"
+#include "int_homun.h"
+#include "int_mail.h"
+#include "int_mercenary.h"
+#include "int_party.h"
+#include "int_pet.h"
+#include "int_quest.h"
+#include "int_storage.h"
+#include "../common/db.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.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 25b0c2a96..5e655237e 100644
--- a/src/char/inter.h
+++ b/src/char/inter.h
@@ -5,9 +5,10 @@
 #ifndef _CHAR_INTER_H_
 #define _CHAR_INTER_H_
 
-struct accreg;
-#include "../common/sql.h"
 #include "char.h"
+#include "../common/sql.h"
+
+struct accreg;
 
 int inter_init_sql(const char *file);
 void inter_final(void);
diff --git a/src/char/pincode.c b/src/char/pincode.c
index d51953448..59182f12d 100644
--- a/src/char/pincode.c
+++ b/src/char/pincode.c
@@ -2,16 +2,19 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "pincode.h"
+
+#include <stdlib.h>
+
+#include "char.h"
 #include "../common/cbasetypes.h"
 #include "../common/mmo.h"
 #include "../common/random.h"
 #include "../common/showmsg.h"
 #include "../common/socket.h"
 #include "../common/strlib.h"
-#include "char.h"
-#include "pincode.h"
-
-#include <stdlib.h>
 
 int enabled = PINCODE_OK;
 int changetime = 0;
diff --git a/src/common/HPM.c b/src/common/HPM.c
index 9ffce87de..00b92dc60 100644
--- a/src/common/HPM.c
+++ b/src/common/HPM.c
@@ -1,26 +1,31 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 
+#define HERCULES_CORE
+
+#include "../config/core.h" // CONSOLE_INPUT
+#include "HPM.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "../common/cbasetypes.h"
-#include "../common/mmo.h"
+#include "../common/conf.h"
+#include "../common/console.h"
 #include "../common/core.h"
 #include "../common/malloc.h"
+#include "../common/mmo.h"
 #include "../common/showmsg.h"
 #include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/conf.h"
-#include "../common/utils.h"
-#include "../common/console.h"
-#include "../common/strlib.h"
 #include "../common/sql.h"
+#include "../common/strlib.h"
 #include "../common/sysinfo.h"
-#include "HPM.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #ifndef WIN32
-#include <unistd.h>
+#	include <unistd.h>
 #endif
 
 struct malloc_interface iMalloc_HPM;
@@ -686,7 +691,7 @@ bool hplugins_parse_conf(const char *w1, const char *w2, enum HPluginConfType po
 void hplugins_share_defaults(void) {
 	/* console */
 #ifdef CONSOLE_INPUT
-	HPM->share(console->addCommand,"addCPCommand");
+	HPM->share(console->input->addCommand,"addCPCommand");
 #endif
 	/* our own */
 	HPM->share(hplugins_addpacket,"addPacket");
@@ -755,7 +760,7 @@ void hpm_init(void) {
 	HPM->symbol_defaults();
 	
 #ifdef CONSOLE_INPUT
-	console->addCommand("plugins",CPCMD_A(plugins));
+	console->input->addCommand("plugins",CPCMD_A(plugins));
 #endif
 	return;
 }
diff --git a/src/common/HPM.h b/src/common/HPM.h
index 0f0df4cda..9c176cfd6 100644
--- a/src/common/HPM.h
+++ b/src/common/HPM.h
@@ -4,8 +4,12 @@
 #ifndef _COMMON_HPM_H_
 #define _COMMON_HPM_H_
 
-#include "../common/cbasetypes.h"
+#ifndef HERCULES_CORE
+#error You should never include HPM.h from a plugin.
+#endif
+
 #include "../common/HPMi.h"
+#include "../common/cbasetypes.h"
 
 #ifdef WIN32
 	#ifndef WIN32_LEAN_AND_MEAN
diff --git a/src/common/HPMi.h b/src/common/HPMi.h
index 19206aeca..b98e87d90 100644
--- a/src/common/HPMi.h
+++ b/src/common/HPMi.h
@@ -5,8 +5,8 @@
 #define _COMMON_HPMI_H_
 
 #include "../common/cbasetypes.h"
-#include "../common/core.h"
 #include "../common/console.h"
+#include "../common/core.h"
 #include "../common/sql.h"
 
 struct script_state;
@@ -20,18 +20,6 @@ struct map_session_data;
 	#define HPExport
 #endif
 
-#ifndef _COMMON_SHOWMSG_H_
-	HPExport void (*ShowMessage) (const char *, ...);
-	HPExport void (*ShowStatus) (const char *, ...);
-	HPExport void (*ShowSQL) (const char *, ...);
-	HPExport void (*ShowInfo) (const char *, ...);
-	HPExport void (*ShowNotice) (const char *, ...);
-	HPExport void (*ShowWarning) (const char *, ...);
-	HPExport void (*ShowDebug) (const char *, ...);
-	HPExport void (*ShowError) (const char *, ...);
-	HPExport void (*ShowFatalError) (const char *, ...);
-#endif
-
 /* after */
 #include "../common/showmsg.h"
 
@@ -192,7 +180,7 @@ HPExport struct HPMi_interface {
 	/* pc group permission */
 	void (*addPCGPermission) (unsigned int pluginID, char *name, unsigned int *mask);
 } HPMi_s;
-#ifndef _COMMON_HPM_H_
+#ifndef HERCULES_CORE
 HPExport struct HPMi_interface *HPMi;
 #endif
 
diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h
index f44e80413..da0d6b307 100644
--- a/src/common/cbasetypes.h
+++ b/src/common/cbasetypes.h
@@ -442,5 +442,11 @@ void SET_FUNCPOINTER(T1& var, T2 p)
 #define SET_FUNCPOINTER(var,p) ((var) = (p))
 #endif
 
+/* pointer size fix which fixes several gcc warnings */
+#ifdef __64BIT__
+	#define __64BPTRSIZE(y) ((intptr)(y))
+#else
+	#define __64BPTRSIZE(y) (y)
+#endif
 
 #endif /* _COMMON_CBASETYPES_H_ */
diff --git a/src/common/conf.c b/src/common/conf.c
index b816b2f7f..46a034497 100644
--- a/src/common/conf.c
+++ b/src/common/conf.c
@@ -2,7 +2,10 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
 #include "conf.h"
+
 #include "../../3rdparty/libconfig/libconfig.h"
 
 #include "../common/showmsg.h" // ShowError
diff --git a/src/common/conf.h b/src/common/conf.h
index 9aff3df47..e5b637e47 100644
--- a/src/common/conf.h
+++ b/src/common/conf.h
@@ -6,6 +6,7 @@
 #define _COMMON_CONF_H_
 
 #include "../common/cbasetypes.h"
+
 #include "../../3rdparty/libconfig/libconfig.h"
 
 /**
diff --git a/src/common/console.c b/src/common/console.c
index d8f352c8a..6a82db555 100644
--- a/src/common/console.c
+++ b/src/common/console.c
@@ -2,42 +2,46 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "../config/core.h" // CONSOLE_INPUT, MAX_CONSOLE_INPUT
+#include "console.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "../common/cbasetypes.h"
-#include "../common/showmsg.h"
 #include "../common/core.h"
+#include "../common/showmsg.h"
 #include "../common/sysinfo.h"
-#include "../config/core.h"
-#include "console.h"
 
 #ifndef MINICORE
-	#include "../common/ers.h"
-	#include "../common/malloc.h"
-	#include "../common/atomic.h"
-	#include "../common/spinlock.h"
-	#include "../common/thread.h"
-	#include "../common/mutex.h"
-	#include "../common/timer.h"
-	#include "../common/strlib.h"
-	#include "../common/sql.h"
+#	include "../common/atomic.h"
+#	include "../common/ers.h"
+#	include "../common/malloc.h"
+#	include "../common/mutex.h"
+#	include "../common/spinlock.h"
+#	include "../common/sql.h"
+#	include "../common/strlib.h"
+#	include "../common/thread.h"
+#	include "../common/timer.h"
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
 #if !defined(WIN32)
-	#include <unistd.h>
-	#include <sys/time.h>
+#	include <sys/time.h>
+#	include <unistd.h>
 #else
-	#include "../common/winapi.h" // Console close event handling
+#	include "../common/winapi.h" // Console close event handling
+#	ifdef CONSOLE_INPUT
+#		include <conio.h> /* _kbhit() */
+#	endif
 #endif
 
+struct console_interface console_s;
 #ifdef CONSOLE_INPUT
-	#if defined(WIN32)
-		#include <conio.h> /* _kbhit() */
-	#endif
+struct console_input_interface console_input_s;
 #endif
 
-struct console_interface console_s;
-
 /*======================================
  *	CORE : Display title
  *--------------------------------------*/
@@ -116,12 +120,12 @@ CPCMD_C(mem_report,server) {
  **/
 CPCMD(help) {
 	unsigned int i = 0;
-	for ( i = 0; i < console->cmd_list_count; i++ ) {
-		if( console->cmd_list[i]->next_count ) {
-			ShowInfo("- '"CL_WHITE"%s"CL_RESET"' subs\n",console->cmd_list[i]->cmd);
-			console->parse_list_subs(console->cmd_list[i],2);
+	for ( i = 0; i < console->input->cmd_list_count; i++ ) {
+		if( console->input->cmd_list[i]->next_count ) {
+			ShowInfo("- '"CL_WHITE"%s"CL_RESET"' subs\n",console->input->cmd_list[i]->cmd);
+			console->input->parse_list_subs(console->input->cmd_list[i],2);
 		} else {
-			ShowInfo("- '"CL_WHITE"%s"CL_RESET"'\n",console->cmd_list[i]->cmd);
+			ShowInfo("- '"CL_WHITE"%s"CL_RESET"'\n",console->input->cmd_list[i]->cmd);
 		}
 	}
 }
@@ -144,7 +148,7 @@ CPCMD_C(skip,update) {
 		ShowDebug("usage example: sql update skip 2013-02-14--16-15.sql\n");
 		return;
 	}
-	Sql_HerculesUpdateSkip(console->SQL, line);
+	Sql_HerculesUpdateSkip(console->input->SQL, line);
 }
 
 /**
@@ -206,7 +210,7 @@ void console_load_defaults(void) {
 	unsigned int i, len = ARRAYLENGTH(default_list);
 	struct CParseEntry *cmd;
 	
-	RECREATE(console->cmds,struct CParseEntry *, len);
+	RECREATE(console->input->cmds,struct CParseEntry *, len);
 	
 	for(i = 0; i < len; i++) {
 		CREATE(cmd, struct CParseEntry, 1);
@@ -220,12 +224,12 @@ void console_load_defaults(void) {
 		
 		cmd->next_count = 0;
 		
-		console->cmd_count++;
-		console->cmds[i] = cmd;
+		console->input->cmd_count++;
+		console->input->cmds[i] = cmd;
 		default_list[i].self = cmd;
 		if( !default_list[i].connect ) {
-			RECREATE(console->cmd_list,struct CParseEntry *, ++console->cmd_list_count);
-			console->cmd_list[console->cmd_list_count - 1] = cmd;
+			RECREATE(console->input->cmd_list,struct CParseEntry *, ++console->input->cmd_list_count);
+			console->input->cmd_list[console->input->cmd_list_count - 1] = cmd;
 		}
 	}
 	
@@ -233,11 +237,11 @@ void console_load_defaults(void) {
 		unsigned int k;
 		if( !default_list[i].connect )
 			continue;
-		for(k = 0; k < console->cmd_count; k++) {
-			if( strcmpi(default_list[i].connect,console->cmds[k]->cmd) == 0 ) {
+		for(k = 0; k < console->input->cmd_count; k++) {
+			if( strcmpi(default_list[i].connect,console->input->cmds[k]->cmd) == 0 ) {
 				cmd = default_list[i].self;
-				RECREATE(console->cmds[k]->u.next, struct CParseEntry *, ++console->cmds[k]->next_count);
-				console->cmds[k]->u.next[console->cmds[k]->next_count - 1] = cmd;
+				RECREATE(console->input->cmds[k]->u.next, struct CParseEntry *, ++console->input->cmds[k]->next_count);
+				console->input->cmds[k]->u.next[console->input->cmds[k]->next_count - 1] = cmd;
 				break;
 			}
 		}
@@ -256,23 +260,23 @@ void console_parse_create(char *name, CParseFunc func) {
 	safestrncpy(sublist, name, CP_CMD_LENGTH * 5);
 	tok = strtok(sublist,":");
 	
-	for ( i = 0; i < console->cmd_list_count; i++ ) {
-		if( strcmpi(tok,console->cmd_list[i]->cmd) == 0 )
+	for ( i = 0; i < console->input->cmd_list_count; i++ ) {
+		if( strcmpi(tok,console->input->cmd_list[i]->cmd) == 0 )
 			break;
 	}
 
-	if( i == console->cmd_list_count ) {
-		RECREATE(console->cmds,struct CParseEntry *, ++console->cmd_count);
+	if( i == console->input->cmd_list_count ) {
+		RECREATE(console->input->cmds,struct CParseEntry *, ++console->input->cmd_count);
 		CREATE(cmd, struct CParseEntry, 1);
 		safestrncpy(cmd->cmd, tok, CP_CMD_LENGTH);
 		cmd->next_count = 0;
-		console->cmds[console->cmd_count - 1] = cmd;
-		RECREATE(console->cmd_list,struct CParseEntry *, ++console->cmd_list_count);
-		console->cmd_list[console->cmd_list_count - 1] = cmd;
-		i = console->cmd_list_count - 1;
+		console->input->cmds[console->input->cmd_count - 1] = cmd;
+		RECREATE(console->input->cmd_list,struct CParseEntry *, ++console->input->cmd_list_count);
+		console->input->cmd_list[console->input->cmd_list_count - 1] = cmd;
+		i = console->input->cmd_list_count - 1;
 	}
 
-	cmd = console->cmd_list[i];
+	cmd = console->input->cmd_list[i];
 	while( ( tok = strtok(NULL, ":") ) != NULL ) {
 		
 		for(i = 0; i < cmd->next_count; i++) {
@@ -281,13 +285,13 @@ void console_parse_create(char *name, CParseFunc func) {
 		}
 		
 		if ( i == cmd->next_count ) {
-			RECREATE(console->cmds,struct CParseEntry *, ++console->cmd_count);
-			CREATE(console->cmds[console->cmd_count-1], struct CParseEntry, 1);
-			safestrncpy(console->cmds[console->cmd_count-1]->cmd, tok, CP_CMD_LENGTH);
-			console->cmds[console->cmd_count-1]->next_count = 0;
+			RECREATE(console->input->cmds,struct CParseEntry *, ++console->input->cmd_count);
+			CREATE(console->input->cmds[console->input->cmd_count-1], struct CParseEntry, 1);
+			safestrncpy(console->input->cmds[console->input->cmd_count-1]->cmd, tok, CP_CMD_LENGTH);
+			console->input->cmds[console->input->cmd_count-1]->next_count = 0;
 			RECREATE(cmd->u.next, struct CParseEntry *, ++cmd->next_count);
-			cmd->u.next[cmd->next_count - 1] = console->cmds[console->cmd_count-1];
-			cmd = console->cmds[console->cmd_count-1];
+			cmd->u.next[cmd->next_count - 1] = console->input->cmds[console->input->cmd_count-1];
+			cmd = console->input->cmds[console->input->cmd_count-1];
 			continue;
 		}
 		
@@ -302,7 +306,7 @@ void console_parse_list_subs(struct CParseEntry *cmd, unsigned char depth) {
 			memset(msg, '-', depth);
 			snprintf(msg + depth,CP_CMD_LENGTH * 2, " '"CL_WHITE"%s"CL_RESET"'",cmd->u.next[i]->cmd);
 			ShowInfo("%s subs\n",msg);
-			console->parse_list_subs(cmd->u.next[i],depth + 1);
+			console->input->parse_list_subs(cmd->u.next[i],depth + 1);
 		} else {
 			memset(msg, '-', depth);
 			snprintf(msg + depth,CP_CMD_LENGTH * 2, " %s",cmd->u.next[i]->cmd);
@@ -320,21 +324,21 @@ void console_parse_sub(char *line) {
 	memcpy(bline, line, 200);
 	tok = strtok(line, " ");
 	
-	for ( i = 0; i < console->cmd_list_count; i++ ) {
-		if( strcmpi(tok,console->cmd_list[i]->cmd) == 0 )
+	for ( i = 0; i < console->input->cmd_list_count; i++ ) {
+		if( strcmpi(tok,console->input->cmd_list[i]->cmd) == 0 )
 			break;
 	}
 	
-	if( i == console->cmd_list_count ) {
+	if( i == console->input->cmd_list_count ) {
 		ShowError("'"CL_WHITE"%s"CL_RESET"' is not a known command, type '"CL_WHITE"help"CL_RESET"' to list all commands\n",line);
 		return;
 	}
 	
-	cmd = console->cmd_list[i];
+	cmd = console->input->cmd_list[i];
 	
 	len += snprintf(sublist,CP_CMD_LENGTH * 5,"%s", cmd->cmd) + 1;
 	
-	if( cmd->next_count == 0 && console->cmd_list[i]->u.func ) {
+	if( cmd->next_count == 0 && console->input->cmd_list[i]->u.func ) {
 		char *r = NULL;
 		if( (tok = strtok(NULL, " ")) ) {
 			r = bline;
@@ -351,7 +355,7 @@ void console_parse_sub(char *line) {
 				if( strcmpi("help",tok) == 0 ) {
 					if( cmd->next_count ) {
 						ShowInfo("- '"CL_WHITE"%s"CL_RESET"' subs\n",sublist);
-						console->parse_list_subs(cmd,2);
+						console->input->parse_list_subs(cmd,2);
 					} else {
 						ShowError("'"CL_WHITE"%s"CL_RESET"' doesn't possess any subcommands\n",sublist);
 					}
@@ -392,95 +396,95 @@ void console_parse(char* line) {
 }
 void *cThread_main(void *x) {
 		
-	while( console->ptstate ) {/* loopx */
-		if( console->key_pressed() ) {
+	while( console->input->ptstate ) {/* loopx */
+		if( console->input->key_pressed() ) {
 			char input[MAX_CONSOLE_INPUT];
 					
-			console->parse(input);
+			console->input->parse(input);
 			if( input[0] != '\0' ) {/* did we get something? */
-				EnterSpinLock(&console->ptlock);
+				EnterSpinLock(&console->input->ptlock);
 				
 				if( cinput.count == CONSOLE_PARSE_SIZE ) {
-					LeaveSpinLock(&console->ptlock);
+					LeaveSpinLock(&console->input->ptlock);
 					continue;/* drop */
 				}
 				
 				safestrncpy(cinput.queue[cinput.count++],input,MAX_CONSOLE_INPUT);
-				LeaveSpinLock(&console->ptlock);
+				LeaveSpinLock(&console->input->ptlock);
 			}
 		}
-		ramutex_lock( console->ptmutex );
-		racond_wait( console->ptcond,	console->ptmutex,  -1 );
-		ramutex_unlock( console->ptmutex );
+		ramutex_lock( console->input->ptmutex );
+		racond_wait( console->input->ptcond,	console->input->ptmutex,  -1 );
+		ramutex_unlock( console->input->ptmutex );
 	}
 		
 	return NULL;
 }
 int console_parse_timer(int tid, int64 tick, int id, intptr_t data) {
 	int i;
-	EnterSpinLock(&console->ptlock);
+	EnterSpinLock(&console->input->ptlock);
 	for(i = 0; i < cinput.count; i++) {
-		console->parse_sub(cinput.queue[i]);
+		console->input->parse_sub(cinput.queue[i]);
 	}
 	cinput.count = 0;
-	LeaveSpinLock(&console->ptlock);
-	racond_signal(console->ptcond);
+	LeaveSpinLock(&console->input->ptlock);
+	racond_signal(console->input->ptcond);
 	return 0;
 }
 void console_parse_final(void) {
-	if( console->ptstate ) {
-		InterlockedDecrement(&console->ptstate);
-		racond_signal(console->ptcond);
+	if( console->input->ptstate ) {
+		InterlockedDecrement(&console->input->ptstate);
+		racond_signal(console->input->ptcond);
 		
 		/* wait for thread to close */
-		rathread_wait(console->pthread, NULL);
+		rathread_wait(console->input->pthread, NULL);
 
-		racond_destroy(console->ptcond);
-		ramutex_destroy(console->ptmutex);
+		racond_destroy(console->input->ptcond);
+		ramutex_destroy(console->input->ptmutex);
 	}
 }
 void console_parse_init(void) {
 	cinput.count = 0;
 	
-	console->ptstate = 1;
+	console->input->ptstate = 1;
 
-	InitializeSpinLock(&console->ptlock);
+	InitializeSpinLock(&console->input->ptlock);
 	
-	console->ptmutex = ramutex_create();
-	console->ptcond = racond_create();
+	console->input->ptmutex = ramutex_create();
+	console->input->ptcond = racond_create();
 	
-	if( (console->pthread = rathread_create(console->pthread_main, NULL)) == NULL ){
+	if( (console->input->pthread = rathread_create(console->input->pthread_main, NULL)) == NULL ){
 		ShowFatalError("console_parse_init: failed to spawn console_parse thread.\n");
 		exit(EXIT_FAILURE);
 	}
 	
-	timer->add_func_list(console->parse_timer, "console_parse_timer");
-	timer->add_interval(timer->gettick() + 1000, console->parse_timer, 0, 0, 500);/* start listening in 1s; re-try every 0.5s */
+	timer->add_func_list(console->input->parse_timer, "console_parse_timer");
+	timer->add_interval(timer->gettick() + 1000, console->input->parse_timer, 0, 0, 500);/* start listening in 1s; re-try every 0.5s */
 	
 }
 void console_setSQL(Sql *SQL_handle) {
-	console->SQL = SQL_handle;
+	console->input->SQL = SQL_handle;
 }
 #endif /* CONSOLE_INPUT */
 
 void console_init (void) {
 #ifdef CONSOLE_INPUT
-	console->cmd_count = console->cmd_list_count = 0;
-	console->load_defaults();
-	console->parse_init();
+	console->input->cmd_count = console->input->cmd_list_count = 0;
+	console->input->load_defaults();
+	console->input->parse_init();
 #endif
 }
 void console_final(void) {
 #ifdef CONSOLE_INPUT
 	unsigned int i;
-	console->parse_final();
-	for( i = 0; i < console->cmd_count; i++ ) {
-		if( console->cmds[i]->next_count )
-			aFree(console->cmds[i]->u.next);
-		aFree(console->cmds[i]);
+	console->input->parse_final();
+	for( i = 0; i < console->input->cmd_count; i++ ) {
+		if( console->input->cmds[i]->next_count )
+			aFree(console->input->cmds[i]->u.next);
+		aFree(console->input->cmds[i]);
 	}
-	aFree(console->cmds);
-	aFree(console->cmd_list);
+	aFree(console->input->cmds);
+	aFree(console->input->cmd_list);
 #endif
 }
 void console_defaults(void) {
@@ -489,17 +493,20 @@ void console_defaults(void) {
 	console->final = console_final;
 	console->display_title = display_title;
 #ifdef CONSOLE_INPUT
-	console->parse_init = console_parse_init;
-	console->parse_final = console_parse_final;
-	console->parse_timer = console_parse_timer;
-	console->pthread_main = cThread_main;
-	console->parse = console_parse;
-	console->parse_sub = console_parse_sub;
-	console->key_pressed = console_parse_key_pressed;
-	console->load_defaults = console_load_defaults;
-	console->parse_list_subs = console_parse_list_subs;
-	console->addCommand = console_parse_create;
-	console->setSQL = console_setSQL;
-	console->SQL = NULL;
+	console->input = &console_input_s;
+	console->input->parse_init = console_parse_init;
+	console->input->parse_final = console_parse_final;
+	console->input->parse_timer = console_parse_timer;
+	console->input->pthread_main = cThread_main;
+	console->input->parse = console_parse;
+	console->input->parse_sub = console_parse_sub;
+	console->input->key_pressed = console_parse_key_pressed;
+	console->input->load_defaults = console_load_defaults;
+	console->input->parse_list_subs = console_parse_list_subs;
+	console->input->addCommand = console_parse_create;
+	console->input->setSQL = console_setSQL;
+	console->input->SQL = NULL;
+#else
+	console->input = NULL;
 #endif
 }
diff --git a/src/common/console.h b/src/common/console.h
index 3d19ddc9d..d2c58f978 100644
--- a/src/common/console.h
+++ b/src/common/console.h
@@ -4,11 +4,13 @@
 #ifndef _COMMON_CONSOLE_H_
 #define _COMMON_CONSOLE_H_
 
-#include "../common/thread.h"
+#include "../config/core.h" // MAX_CONSOLE_INPUT
+
+#include "../common/cbasetypes.h"
 #include "../common/mutex.h"
 #include "../common/spinlock.h"
 #include "../common/sql.h"
-#include "../config/core.h"
+#include "../common/thread.h"
 
 /**
  * Queue Max
@@ -47,11 +49,8 @@ struct {
 	unsigned short count;
 } cinput;
 
-struct console_interface {
-	void (*init) (void);
-	void (*final) (void);
-	void (*display_title) (void);
 #ifdef CONSOLE_INPUT
+struct console_input_interface {
 	/* vars */
 	SPIN_LOCK ptlock;/* parse thread lock */
 	rAthread pthread;/* parse thread */
@@ -77,7 +76,17 @@ struct console_interface {
 	void (*parse_list_subs) (struct CParseEntry *cmd, unsigned char depth);
 	void (*addCommand) (char *name, CParseFunc func);
 	void (*setSQL) (Sql *SQL_handle);
+};
+#else
+struct console_input_interface;
 #endif
+
+struct console_interface {
+	void (*init) (void);
+	void (*final) (void);
+	void (*display_title) (void);
+
+	struct console_input_interface *input;
 };
 
 struct console_interface *console;
diff --git a/src/common/core.c b/src/common/core.c
index 49b272488..85f824866 100644
--- a/src/common/core.c
+++ b/src/common/core.c
@@ -2,36 +2,40 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/mmo.h"
-#include "../common/showmsg.h"
-#include "../common/malloc.h"
-#include "../common/strlib.h"
+#define HERCULES_CORE
+
+#include "../config/core.h"
 #include "core.h"
+
+#include "../common/cbasetypes.h"
 #include "../common/console.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
 #include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
 #include "../common/sysinfo.h"
 
 #ifndef MINICORE
-	#include "../common/db.h"
-	#include "../common/socket.h"
-	#include "../common/timer.h"
-	#include "../common/thread.h"
-	#include "../common/sql.h"
-	#include "../config/core.h"
-	#include "../common/HPM.h"
-	#include "../common/utils.h"
-	#include "../common/conf.h"
-	#include "../common/ers.h"
+#	include "../common/HPM.h"
+#	include "../common/conf.h"
+#	include "../common/db.h"
+#	include "../common/ers.h"
+#	include "../common/socket.h"
+#	include "../common/sql.h"
+#	include "../common/thread.h"
+#	include "../common/timer.h"
+#	include "../common/utils.h"
 #endif
 
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <signal.h>
 #include <string.h>
 #ifndef _WIN32
-#include <unistd.h>
+#	include <unistd.h>
 #else
-#include "../common/winapi.h" // Console close event handling
+#	include "../common/winapi.h" // Console close event handling
 #endif
 
 /// Called when a terminate signal is received.
diff --git a/src/common/core.h b/src/common/core.h
index e9f7c5961..ba75e6b01 100644
--- a/src/common/core.h
+++ b/src/common/core.h
@@ -7,11 +7,10 @@
 
 #include "../common/db.h"
 #include "../common/mmo.h"
-#include "../config/core.h"
 
 /* so that developers with --enable-debug can raise signals from any section of the code they'd like */
 #ifdef DEBUG
-	#include <signal.h>
+#	include <signal.h>
 #endif
 
 extern int arg_c;
diff --git a/src/common/db.c b/src/common/db.c
index 8d6b08815..1781aa96f 100644
--- a/src/common/db.c
+++ b/src/common/db.c
@@ -67,14 +67,18 @@
  * @encoding US-ASCII
  * @see #db.h
 \*****************************************************************************/
+
+#define HERCULES_CORE
+
+#include "db.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "db.h"
-#include "../common/mmo.h"
+#include "../common/ers.h"
 #include "../common/malloc.h"
+#include "../common/mmo.h"
 #include "../common/showmsg.h"
-#include "../common/ers.h"
 #include "../common/strlib.h"
 
 /*****************************************************************************\
diff --git a/src/common/db.h b/src/common/db.h
index 67abe6f19..0d2548806 100644
--- a/src/common/db.h
+++ b/src/common/db.h
@@ -42,9 +42,10 @@
 #ifndef _COMMON_DB_H_
 #define _COMMON_DB_H_
 
-#include "../common/cbasetypes.h"
 #include <stdarg.h>
 
+#include "../common/cbasetypes.h"
+
 /*****************************************************************************\
  *  (1) Section with public typedefs, enums, unions, structures and defines. *
  *  DBRelease    - Enumeration of release options.                           *
diff --git a/src/common/des.c b/src/common/des.c
index ed6d098dc..7f952be76 100644
--- a/src/common/des.c
+++ b/src/common/des.c
@@ -1,8 +1,11 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
-#include "../common/cbasetypes.h"
-#include "../common/des.h"
 
+#define HERCULES_CORE
+
+#include "des.h"
+
+#include "../common/cbasetypes.h"
 
 /// DES (Data Encryption Standard) algorithm, modified version.
 /// @see http://www.eathena.ws/board/index.php?autocom=bugtracker&showbug=5099.
diff --git a/src/common/ers.c b/src/common/ers.c
index 5a3d7314a..d9895e4f2 100644
--- a/src/common/ers.c
+++ b/src/common/ers.c
@@ -39,14 +39,18 @@
  * @encoding US-ASCII                                                        *
  * @see common#ers.h                                                         *
 \*****************************************************************************/
+
+#define HERCULES_CORE
+
+#include "ers.h"
+
 #include <stdlib.h>
 #include <string.h>
 
 #include "../common/cbasetypes.h"
 #include "../common/malloc.h" // CREATE, RECREATE, aMalloc, aFree
-#include "../common/showmsg.h" // ShowMessage, ShowError, ShowFatalError, CL_BOLD, CL_NORMAL
 #include "../common/nullpo.h"
-#include "ers.h"
+#include "../common/showmsg.h" // ShowMessage, ShowError, ShowFatalError, CL_BOLD, CL_NORMAL
 
 #ifndef DISABLE_ERS
 
diff --git a/src/common/grfio.c b/src/common/grfio.c
index bde0ed720..1111fb3f3 100644
--- a/src/common/grfio.c
+++ b/src/common/grfio.c
@@ -2,13 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/des.h"
-#include "../common/malloc.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
-#include "../common/nullpo.h"
+#define HERCULES_CORE
+
 #include "grfio.h"
 
 #include <stdio.h>
@@ -17,6 +12,14 @@
 #include <sys/stat.h>
 #include <zlib.h>
 
+#include "../common/cbasetypes.h"
+#include "../common/des.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
+
 //----------------------------
 //	file entry table struct
 //----------------------------
diff --git a/src/common/malloc.c b/src/common/malloc.c
index 5b39cbab6..13cf0b5ce 100644
--- a/src/common/malloc.c
+++ b/src/common/malloc.c
@@ -2,16 +2,19 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/malloc.h"
-#include "../common/core.h"
-#include "../common/showmsg.h"
-#include "../common/sysinfo.h"
+#define HERCULES_CORE
+
+#include "malloc.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
+#include "../common/core.h"
+#include "../common/showmsg.h"
+#include "../common/sysinfo.h"
+
 struct malloc_interface iMalloc_s;
 
 ////////////// Memory Libraries //////////////////
diff --git a/src/common/mapindex.c b/src/common/mapindex.c
index 3128a3cb0..5c69c7063 100644
--- a/src/common/mapindex.c
+++ b/src/common/mapindex.c
@@ -2,16 +2,19 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/mmo.h"
-#include "../common/showmsg.h"
-#include "../common/malloc.h"
-#include "../common/strlib.h"
-#include "../common/db.h"
+#define HERCULES_CORE
+
 #include "mapindex.h"
 
-#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+
+#include "../common/db.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
 
 /* mapindex.c interface source */
 struct mapindex_interface mapindex_s;
diff --git a/src/common/md5calc.c b/src/common/md5calc.c
index 05fde42cc..e7b506e27 100644
--- a/src/common/md5calc.c
+++ b/src/common/md5calc.c
@@ -6,11 +6,15 @@
  *
  ***********************************************************/
 
-#include "../common/random.h"
+#define HERCULES_CORE
+
 #include "md5calc.h"
-#include <string.h>
+
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+
+#include "../common/random.h"
 
 #ifndef UINT_MAX
 #define UINT_MAX 4294967295U
diff --git a/src/common/mmo.h b/src/common/mmo.h
index d535d2874..1d826463e 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -5,10 +5,11 @@
 #ifndef _COMMON_MMO_H_
 #define _COMMON_MMO_H_
 
-#include "cbasetypes.h"
-#include "../common/db.h"
 #include <time.h>
 
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+
 // server->client protocol version
 //        0 - pre-?
 //        1 - ?                    - 0x196
@@ -96,6 +97,7 @@
 //Official Limit: 2.1b ( the var that stores the money doesn't go much higher than this by default )
 #define MAX_BANK_ZENY 2100000000
 
+#define MAX_LEVEL 175
 #define MAX_FAME 1000000000
 #define MAX_CART 100
 #define MAX_SKILL 1478
diff --git a/src/common/mutex.c b/src/common/mutex.c
index 0668dbc41..12524c3b7 100644
--- a/src/common/mutex.c
+++ b/src/common/mutex.c
@@ -1,6 +1,10 @@
 // Copyright (c) rAthena Project (www.rathena.org) - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
+#define HERCULES_CORE
+
+#include "mutex.h"
+
 #ifdef WIN32
 #include "../common/winapi.h"
 #else
@@ -13,7 +17,6 @@
 #include "../common/malloc.h"
 #include "../common/showmsg.h"
 #include "../common/timer.h"
-#include "../common/mutex.h"
 
 struct ramutex{
 #ifdef WIN32
diff --git a/src/common/mutex.h b/src/common/mutex.h
index eeb24e6ff..3b83b66d6 100644
--- a/src/common/mutex.h
+++ b/src/common/mutex.h
@@ -4,6 +4,7 @@
 #ifndef _COMMON_MUTEX_H_
 #define _COMMON_MUTEX_H_
 
+#include "../common/cbasetypes.h"
 
 typedef struct ramutex *ramutex; // Mutex
 typedef struct racond *racond; // Condition Var
diff --git a/src/common/nullpo.c b/src/common/nullpo.c
index 1cb471aff..1891835f1 100644
--- a/src/common/nullpo.c
+++ b/src/common/nullpo.c
@@ -2,10 +2,14 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "nullpo.h"
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
-#include "../common/nullpo.h"
+
 #include "../common/showmsg.h"
 
 /**
diff --git a/src/common/random.c b/src/common/random.c
index e46c52cad..7019a31f3 100644
--- a/src/common/random.c
+++ b/src/common/random.c
@@ -1,17 +1,23 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
+#define HERCULES_CORE
+
+#include "random.h"
+
+#include <time.h> // time
+
+#include <mt19937ar.h> // init_genrand, genrand_int32, genrand_res53
+
 #include "../common/showmsg.h"
 #include "../common/timer.h" // gettick
-#include "random.h"
+
 #if defined(WIN32)
-	#include "../common/winapi.h"
+#	include "../common/winapi.h"
 #elif defined(HAVE_GETPID) || defined(HAVE_GETTID)
-	#include <sys/types.h>
-	#include <unistd.h>
+#	include <sys/types.h>
+#	include <unistd.h>
 #endif
-#include <time.h> // time
-#include <mt19937ar.h> // init_genrand, genrand_int32, genrand_res53
 
 
 /// Initializes the random number generator with an appropriate seed.
diff --git a/src/common/showmsg.c b/src/common/showmsg.c
index 14342fe5e..1dbcba282 100644
--- a/src/common/showmsg.c
+++ b/src/common/showmsg.c
@@ -2,23 +2,26 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/strlib.h" // StringBuf
+#define HERCULES_CORE
+
 #include "showmsg.h"
-#include "core.h" //[Ind] - For SERVER_TYPE
 
+#include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h> // atexit
 #include <string.h>
-#include <stdarg.h>
 #include <time.h>
-#include <stdlib.h> // atexit
 
 #include "../../3rdparty/libconfig/libconfig.h"
 
+#include "../common/cbasetypes.h"
+#include "../common/core.h" //[Ind] - For SERVER_TYPE
+#include "../common/strlib.h" // StringBuf
+
 #ifdef WIN32
-#include "../common/winapi.h"
+#	include "../common/winapi.h"
 #else // not WIN32
-#include <unistd.h>
+#	include <unistd.h>
 #endif // WIN32
 
 #if defined(DEBUGLOGMAP)
diff --git a/src/common/showmsg.h b/src/common/showmsg.h
index 49fbc34fb..5b32f39ae 100644
--- a/src/common/showmsg.h
+++ b/src/common/showmsg.h
@@ -5,12 +5,14 @@
 #ifndef _COMMON_SHOWMSG_H_
 #define _COMMON_SHOWMSG_H_
 
-#ifndef _COMMON_HPMI_H_
-	#include "../../3rdparty/libconfig/libconfig.h"
-#endif
-
 #include <stdarg.h>
 
+#ifdef HERCULES_CORE
+#	include "../../3rdparty/libconfig/libconfig.h"
+#else
+#	include "../common/HPMi.h"
+#endif
+
 // for help with the console colors look here:
 // http://www.edoceo.com/liberum/?doc=printf-with-color
 // some code explanation (used here):
@@ -90,7 +92,7 @@ enum msg_type {
 };
 
 extern void ClearScreen(void);
-#ifndef _COMMON_HPMI_H_
+#ifdef HERCULES_CORE
 	extern void ShowMessage(const char *, ...);
 	extern void ShowStatus(const char *, ...);
 	extern void ShowSQL(const char *, ...);
@@ -101,7 +103,18 @@ extern void ClearScreen(void);
 	extern void ShowError(const char *, ...);
 	extern void ShowFatalError(const char *, ...);
 	extern void ShowConfigWarning(config_setting_t *config, const char *string, ...);
+#else
+	HPExport void (*ShowMessage) (const char *, ...);
+	HPExport void (*ShowStatus) (const char *, ...);
+	HPExport void (*ShowSQL) (const char *, ...);
+	HPExport void (*ShowInfo) (const char *, ...);
+	HPExport void (*ShowNotice) (const char *, ...);
+	HPExport void (*ShowWarning) (const char *, ...);
+	HPExport void (*ShowDebug) (const char *, ...);
+	HPExport void (*ShowError) (const char *, ...);
+	HPExport void (*ShowFatalError) (const char *, ...);
 #endif
+
 extern int _vShowMessage(enum msg_type flag, const char *string, va_list ap);
 
 #endif /* _COMMON_SHOWMSG_H_ */
diff --git a/src/common/socket.c b/src/common/socket.c
index 35d350e95..3738f2c2a 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -2,48 +2,50 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/mmo.h"
-#include "../common/timer.h"
-#include "../common/malloc.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../config/core.h"
-#include "../common/HPM.h"
+#define HERCULES_CORE
 
+#include "../config/core.h" // SHOW_SERVER_STATS
 #define _H_SOCKET_C_
-
 #include "socket.h"
+#undef _H_SOCKET_C_
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 
+#include "../common/HPM.h"
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+
 #ifdef WIN32
-	#include "../common/winapi.h"
+#	include "../common/winapi.h"
 #else
-	#include <errno.h>
-	#include <sys/socket.h>
-	#include <netinet/in.h>
-	#include <netinet/tcp.h>
-	#include <net/if.h>
-	#include <unistd.h>
-	#include <sys/time.h>
-	#include <sys/ioctl.h>
-	#include <netdb.h>
-	#include <arpa/inet.h>
-
-	#ifndef SIOCGIFCONF
-	#include <sys/sockio.h> // SIOCGIFCONF on Solaris, maybe others? [Shinomori]
-	#endif
-	#ifndef FIONBIO
-	#include <sys/filio.h> // FIONBIO on Solaris [FlavioJS]
-	#endif
-
-	#ifdef HAVE_SETRLIMIT
-	#include <sys/resource.h>
-	#endif
+#	include <arpa/inet.h>
+#	include <errno.h>
+#	include <net/if.h>
+#	include <netdb.h>
+#	include <netinet/in.h>
+#	include <netinet/tcp.h>
+#	include <sys/ioctl.h>
+#	include <sys/socket.h>
+#	include <sys/time.h>
+#	include <unistd.h>
+
+#	ifndef SIOCGIFCONF
+#		include <sys/sockio.h> // SIOCGIFCONF on Solaris, maybe others? [Shinomori]
+#	endif
+#	ifndef FIONBIO
+#		include <sys/filio.h> // FIONBIO on Solaris [FlavioJS]
+#	endif
+
+#	ifdef HAVE_SETRLIMIT
+#		include <sys/resource.h>
+#	endif
 #endif
 
 /**
diff --git a/src/common/socket.h b/src/common/socket.h
index 75adde4cf..804b9284f 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -5,19 +5,19 @@
 #ifndef _COMMON_SOCKET_H_
 #define _COMMON_SOCKET_H_
 
+#include <time.h>
+
 #include "../common/cbasetypes.h"
 
 #ifdef WIN32
-	#include "../common/winapi.h"
+#	include "../common/winapi.h"
 	typedef long in_addr_t;
 #else
-	#include <sys/types.h>
-	#include <sys/socket.h>
-	#include <netinet/in.h>
+#	include <netinet/in.h>
+#	include <sys/socket.h>
+#	include <sys/types.h>
 #endif
 
-#include <time.h>
-
 struct HPluginData;
 
 #define FIFOSIZE_SERVERLINK 256*1024
diff --git a/src/common/spinlock.h b/src/common/spinlock.h
index 29fbb355b..0058e1d83 100644
--- a/src/common/spinlock.h
+++ b/src/common/spinlock.h
@@ -1,4 +1,3 @@
-#pragma once
 #ifndef _COMMON_SPINLOCK_H_
 #define _COMMON_SPINLOCK_H_
 
@@ -15,14 +14,14 @@
 //
 //
  
+#include "../common/atomic.h"
+#include "../common/cbasetypes.h"
+#include "../common/thread.h"
+
 #ifdef WIN32
 #include "../common/winapi.h"
 #endif
 
-#include "../common/cbasetypes.h"
-#include "../common/atomic.h"
-#include "../common/thread.h"
-
 #ifdef WIN32
 
 typedef struct __declspec( align(64) ) SPIN_LOCK{
diff --git a/src/common/sql.c b/src/common/sql.c
index 79ccc8e92..aeb56bff0 100644
--- a/src/common/sql.c
+++ b/src/common/sql.c
@@ -2,19 +2,23 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "sql.h"
+
+#include <stdlib.h> // strtoul
+#include <string.h> // strlen/strnlen/memcpy/memset
+
 #include "../common/cbasetypes.h"
 #include "../common/malloc.h"
 #include "../common/showmsg.h"
 #include "../common/strlib.h"
 #include "../common/timer.h"
-#include "sql.h"
 
 #ifdef WIN32
-#include "../common/winapi.h"
+#	include "../common/winapi.h" // Needed before mysql.h
 #endif
 #include <mysql.h>
-#include <string.h>// strlen/strnlen/memcpy/memset
-#include <stdlib.h>// strtoul
 
 void hercules_mysql_error_handler(unsigned int ecode);
 
diff --git a/src/common/sql.h b/src/common/sql.h
index 1fb436853..807e0843c 100644
--- a/src/common/sql.h
+++ b/src/common/sql.h
@@ -5,10 +5,9 @@
 #ifndef _COMMON_SQL_H_
 #define _COMMON_SQL_H_
 
-#include "../common/cbasetypes.h"
 #include <stdarg.h>// va_list
 
-
+#include "../common/cbasetypes.h"
 
 // Return codes
 #define SQL_ERROR (-1)
diff --git a/src/common/strlib.c b/src/common/strlib.c
index 361595b07..e2e802915 100644
--- a/src/common/strlib.c
+++ b/src/common/strlib.c
@@ -2,16 +2,19 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/showmsg.h"
-#define STRLIB_C
+#define HERCULES_CORE
+
+#define _H_STRLIB_C_
 #include "strlib.h"
+#undef _H_STRLIB_C_
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
 
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/showmsg.h"
 
 #define J_MAX_MALLOC_SIZE 65535
 
diff --git a/src/common/strlib.h b/src/common/strlib.h
index 10844d257..decf661a6 100644
--- a/src/common/strlib.h
+++ b/src/common/strlib.h
@@ -5,15 +5,16 @@
 #ifndef _COMMON_STRLIB_H_
 #define _COMMON_STRLIB_H_
 
-#include "../common/cbasetypes.h"
 #include <stdarg.h>
 
+#include "../common/cbasetypes.h"
+
 #ifndef __USE_GNU
-	#define __USE_GNU  // required to enable strnlen on some platforms
-	#include <string.h>
-	#undef __USE_GNU
+#	define __USE_GNU  // required to enable strnlen on some platforms
+#	include <string.h>
+#	undef __USE_GNU
 #else
-	#include <string.h>
+#	include <string.h>
 #endif
 
 #ifdef WIN32
@@ -165,7 +166,7 @@ struct sv_interface *sv;
 void strlib_defaults(void);
 
 /* the purpose of these macros is simply to not make calling them be an annoyance */
-#ifndef STRLIB_C
+#ifndef _H_STRLIB_C_
 	#define jstrescape(pt)             (strlib->jstrescape(pt))
 	#define jstrescapecpy(pt,spt)      (strlib->jstrescapecpy((pt),(spt)))
 	#define jmemescapecpy(pt,spt,size) (strlib->jmemescapecpy((pt),(spt),(size)))
@@ -189,6 +190,6 @@ void strlib_defaults(void);
 	#define safesnprintf(buf,sz,fmt,...) (strlib->safesnprintf((buf),(sz),(fmt),##__VA_ARGS__))
 	#define strline(str,pos)             (strlib->strline((str),(pos)))
 	#define bin2hex(output,input,count)  (strlib->bin2hex((output),(input),(count)))
-#endif /* STRLIB_C */
+#endif /* _H_STRLIB_C_ */
 
 #endif /* _COMMON_STRLIB_H_ */
diff --git a/src/common/sysinfo.c b/src/common/sysinfo.c
index a56896458..3fdfadb41 100644
--- a/src/common/sysinfo.c
+++ b/src/common/sysinfo.c
@@ -4,23 +4,39 @@
 
 /// See sysinfo.h for a description of this file
 
-#define _COMMON_SYSINFO_P_
+#define HERCULES_CORE
+
 #include "sysinfo.h"
-#undef _COMMON_SYSINFO_P_
+
+#include <stdio.h> // fopen
+#include <stdlib.h> // atoi
 
 #include "../common/cbasetypes.h"
 #include "../common/core.h"
-#include "../common/strlib.h"
 #include "../common/malloc.h"
+#include "../common/strlib.h"
 
 #ifdef WIN32
-#include <windows.h>
-#include <string.h> // strlen
+#	include <string.h> // strlen
+#	include <windows.h>
 #else
-#include <unistd.h>
+#	include <unistd.h>
 #endif
-#include <stdio.h> // fopen
-#include <stdlib.h> // atoi
+
+/// Private interface fields
+struct sysinfo_private {
+	char *platform;
+	char *osversion;
+	char *cpu;
+	int cpucores;
+	char *arch;
+	char *compiler;
+	char *cflags;
+	char *vcstype_name;
+	int vcstype;
+	char *vcsrevision_src;
+	char *vcsrevision_scripts;
+};
 
 /// sysinfo.c interface source
 struct sysinfo_interface sysinfo_s;
diff --git a/src/common/sysinfo.h b/src/common/sysinfo.h
index 17faac26b..c0c4d276a 100644
--- a/src/common/sysinfo.h
+++ b/src/common/sysinfo.h
@@ -13,23 +13,7 @@
 
 #include "../common/cbasetypes.h"
 
-#ifdef _COMMON_SYSINFO_P_
-struct sysinfo_private {
-	char *platform;
-	char *osversion;
-	char *cpu;
-	int cpucores;
-	char *arch;
-	char *compiler;
-	char *cflags;
-	char *vcstype_name;
-	int vcstype;
-	char *vcsrevision_src;
-	char *vcsrevision_scripts;
-};
-#else
 struct sysinfo_private;
-#endif
 
 /**
  * sysinfo.c interface
diff --git a/src/common/thread.c b/src/common/thread.c
index 4d110f2dd..4f73aa9b3 100644
--- a/src/common/thread.c
+++ b/src/common/thread.c
@@ -6,24 +6,27 @@
 // Copyright (c) rAthena Project (www.rathena.org) - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
+#define HERCULES_CORE
+
+#include "thread.h"
+
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/showmsg.h"
+
 #ifdef WIN32
-#include "../common/winapi.h"
-#define getpagesize() 4096 // @TODO: implement this properly (GetSystemInfo .. dwPageSize..). (Atm as on all supported win platforms its 4k its static.)
-#define __thread __declspec( thread ) 
+#	include "../common/winapi.h"
+#	define getpagesize() 4096 // @TODO: implement this properly (GetSystemInfo .. dwPageSize..). (Atm as on all supported win platforms its 4k its static.)
+#	define __thread __declspec( thread ) 
 #else
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <signal.h>
-#include <pthread.h>
-#include <sched.h>
+#	include <stdlib.h>
+#	include <unistd.h>
+#	include <string.h>
+#	include <signal.h>
+#	include <pthread.h>
+#	include <sched.h>
 #endif
 
-#include "cbasetypes.h"
-#include "malloc.h"
-#include "showmsg.h"
-#include "thread.h"
-
 // When Compiling using MSC (on win32..) we know we have support in any case!
 #ifdef _MSC_VER 
 #define HAS_TLS 
diff --git a/src/common/thread.h b/src/common/thread.h
index d6b2bbc6e..887c03179 100644
--- a/src/common/thread.h
+++ b/src/common/thread.h
@@ -1,7 +1,6 @@
 // Copyright (c) rAthena Project (www.rathena.org) - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#pragma once 
 #ifndef _COMMON_THREAD_H_
 #define _COMMON_THREAD_H_
 
diff --git a/src/common/timer.c b/src/common/timer.c
index 526854582..10f14b0f2 100644
--- a/src/common/timer.c
+++ b/src/common/timer.c
@@ -2,11 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/db.h"
-#include "../common/malloc.h"
-#include "../common/showmsg.h"
-#include "../common/utils.h"
+#define HERCULES_CORE
+
 #include "timer.h"
 
 #include <stdio.h>
@@ -14,11 +11,17 @@
 #include <string.h>
 #include <time.h>
 
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+#include "../common/malloc.h"
+#include "../common/showmsg.h"
+#include "../common/utils.h"
+
 #ifdef WIN32
-#include "../common/winapi.h" // GetTickCount()
+#	include "../common/winapi.h" // GetTickCount()
 #else
-#include <unistd.h>
-#include <sys/time.h> // struct timeval, gettimeofday()
+#	include <sys/time.h> // struct timeval, gettimeofday()
+#	include <unistd.h>
 #endif
 
 struct timer_interface timer_s;
diff --git a/src/common/utils.c b/src/common/utils.c
index 47747dd32..84925f707 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -2,33 +2,35 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/mmo.h"
-#include "../common/malloc.h"
-#include "../common/showmsg.h"
-#include "../common/core.h"
-#include "socket.h"
+#define HERCULES_CORE
+
 #include "utils.h"
 
-#include <stdio.h>
+#include <math.h> // floor()
 #include <stdarg.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h> // floor()
+#include <sys/stat.h> // cache purposes [Ind/Hercules]
+
+#include "../common/cbasetypes.h"
+#include "../common/core.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
 
 #ifdef WIN32
-	#include "../common/winapi.h"
-	#ifndef F_OK
-		#define F_OK   0x0
-	#endif  /* F_OK */
+#	include "../common/winapi.h"
+#	ifndef F_OK
+#		define F_OK   0x0
+#	endif  /* F_OK */
 #else
-	#include <unistd.h>
-	#include <dirent.h>
-	#include <sys/stat.h>
+#	include <dirent.h>
+#	include <sys/stat.h>
+#	include <unistd.h>
 #endif
 
-#include <sys/stat.h> // cache purposes [Ind/Hercules]
-
 struct HCache_interface HCache_s;
 
 /// Dumps given buffer into file pointed to by a handle.
diff --git a/src/common/utils.h b/src/common/utils.h
index f89546b8a..823651163 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -5,10 +5,11 @@
 #ifndef _COMMON_UTILS_H_
 #define _COMMON_UTILS_H_
 
-#include "../common/cbasetypes.h"
 #include <stdio.h> // FILE*
 #include <time.h>
 
+#include "../common/cbasetypes.h"
+
 /* [HCache] 1-byte key to ensure our method is the latest, we can modify to ensure the method matches */
 #define HCACHE_KEY 'k'
 
diff --git a/src/config/const.h b/src/config/const.h
index 6557cb987..f9baa4d7d 100644
--- a/src/config/const.h
+++ b/src/config/const.h
@@ -52,13 +52,6 @@
 	#define DEFTYPE_MAX CHAR_MAX
 #endif
 
-/* pointer size fix which fixes several gcc warnings */
-#ifdef __64BIT__
-	#define __64BPTRSIZE(y) ((intptr)(y))
-#else
-	#define __64BPTRSIZE(y) (y)
-#endif
-
 /* ATCMD_FUNC(mobinfo) HIT and FLEE calculations */
 #ifdef RENEWAL
 	#define MOB_FLEE(mobdata) ( (mobdata)->lv + (mobdata)->status.agi + 100 )
diff --git a/src/config/renewal.h b/src/config/renewal.h
index 36615d63b..36bdd3958 100644
--- a/src/config/renewal.h
+++ b/src/config/renewal.h
@@ -74,5 +74,6 @@
 #define RENEWAL_ASPD
 
 #endif // DISABLE_RENEWAL
+#undef DISABLE_RENEWAL
 
 #endif // _CONFIG_RENEWAL_H_
diff --git a/src/login/account.h b/src/login/account.h
index 234e7c0c1..329ae31c8 100644
--- a/src/login/account.h
+++ b/src/login/account.h
@@ -7,6 +7,7 @@
 
 #include "../common/cbasetypes.h"
 #include "../common/mmo.h" // ACCOUNT_REG2_NUM
+#include "../common/sql.h" // Sql
 
 typedef struct AccountDB AccountDB;
 typedef struct AccountDBIterator AccountDBIterator;
diff --git a/src/login/account_sql.c b/src/login/account_sql.c
index 1483196ab..2e4ed7ab9 100644
--- a/src/login/account_sql.c
+++ b/src/login/account_sql.c
@@ -2,17 +2,22 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "../config/core.h" // CONSOLE_INPUT
+#include "account.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "../common/console.h"
 #include "../common/malloc.h"
 #include "../common/mmo.h"
 #include "../common/showmsg.h"
+#include "../common/socket.h"
 #include "../common/sql.h"
 #include "../common/strlib.h"
 #include "../common/timer.h"
-#include "../common/console.h"
-#include "../common/socket.h"
-#include "account.h"
-#include <stdlib.h>
-#include <string.h>
 
 /// global defines
 #define ACCOUNT_SQL_DB_VERSION 20110114
@@ -652,7 +657,7 @@ Sql* account_db_sql_up(AccountDB* self) {
 	AccountDB_SQL* db = (AccountDB_SQL*)self;
 	Sql_HerculesUpdateCheck(db->accounts);
 #ifdef CONSOLE_INPUT
-	console->setSQL(db->accounts);
+	console->input->setSQL(db->accounts);
 #endif
 	return db->accounts;
 }
diff --git a/src/login/ipban_sql.c b/src/login/ipban_sql.c
index 74f45e418..081f28d84 100644
--- a/src/login/ipban_sql.c
+++ b/src/login/ipban_sql.c
@@ -2,6 +2,15 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "ipban.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "login.h"
+#include "loginlog.h"
 #include "../common/cbasetypes.h"
 #include "../common/db.h"
 #include "../common/malloc.h"
@@ -9,11 +18,6 @@
 #include "../common/socket.h"
 #include "../common/strlib.h"
 #include "../common/timer.h"
-#include "login.h"
-#include "ipban.h"
-#include "loginlog.h"
-#include <stdlib.h>
-#include <string.h>
 
 // global sql settings
 static char   global_db_hostname[32] = "127.0.0.1";
diff --git a/src/login/login.c b/src/login/login.c
index af59fcf38..cb46e0226 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -2,6 +2,18 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "login.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "account.h"
+#include "ipban.h"
+#include "loginlog.h"
+#include "../common/HPM.h"
 #include "../common/core.h"
 #include "../common/db.h"
 #include "../common/malloc.h"
@@ -12,15 +24,6 @@
 #include "../common/strlib.h"
 #include "../common/timer.h"
 #include "../common/utils.h"
-#include "../common/HPM.h"
-#include "account.h"
-#include "ipban.h"
-#include "login.h"
-#include "loginlog.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 struct Login_Config login_config;
 
diff --git a/src/login/login.h b/src/login/login.h
index 14c361a15..e77b96a0e 100644
--- a/src/login/login.h
+++ b/src/login/login.h
@@ -5,8 +5,8 @@
 #ifndef _LOGIN_LOGIN_H_
 #define _LOGIN_LOGIN_H_
 
-#include "../common/mmo.h" // NAME_LENGTH,SEX_*
 #include "../common/core.h" // CORE_ST_LAST
+#include "../common/mmo.h" // NAME_LENGTH,SEX_*
 
 enum E_LOGINSERVER_ST
 {
diff --git a/src/login/loginlog.h b/src/login/loginlog.h
index 730fb6e62..a86ad431c 100644
--- a/src/login/loginlog.h
+++ b/src/login/loginlog.h
@@ -4,6 +4,7 @@
 #ifndef _LOGIN_LOGINLOG_H_
 #define _LOGIN_LOGINLOG_H_
 
+#include "../common/cbasetypes.h"
 
 unsigned long loginlog_failedattempts(uint32 ip, unsigned int minutes);
 void login_log(uint32 ip, const char* username, int rcode, const char* message);
@@ -11,5 +12,4 @@ bool loginlog_init(void);
 bool loginlog_final(void);
 bool loginlog_config_read(const char* w1, const char* w2);
 
-
 #endif /* _LOGIN_LOGINLOG_H_ */
diff --git a/src/login/loginlog_sql.c b/src/login/loginlog_sql.c
index 231ac783b..2cbc02c93 100644
--- a/src/login/loginlog_sql.c
+++ b/src/login/loginlog_sql.c
@@ -2,13 +2,18 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "loginlog.h"
+
+#include <string.h>
+#include <stdlib.h> // exit
+
 #include "../common/cbasetypes.h"
 #include "../common/mmo.h"
 #include "../common/socket.h"
 #include "../common/sql.h"
 #include "../common/strlib.h"
-#include <string.h>
-#include <stdlib.h> // exit
 
 // global sql settings (in ipban_sql.c)
 static char   global_db_hostname[32] = "127.0.0.1";
diff --git a/src/map/HPMmap.c b/src/map/HPMmap.c
index 061479d87..cb8c979c6 100644
--- a/src/map/HPMmap.c
+++ b/src/map/HPMmap.c
@@ -1,25 +1,15 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 
-#include "../common/cbasetypes.h"
-#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"
-
+#define HERCULES_CORE
 
 #include "HPMmap.h"
-#include "pc.h"
-#include "map.h"
 
-//
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
 #include "atcommand.h"
 #include "battle.h"
 #include "battleground.h"
@@ -37,12 +27,14 @@
 #include "itemdb.h"
 #include "log.h"
 #include "mail.h"
+#include "map.h"
 #include "mapreg.h"
 #include "mercenary.h"
 #include "mob.h"
 #include "npc.h"
 #include "party.h"
 #include "path.h"
+#include "pc.h"
 #include "pc_groups.h"
 #include "pet.h"
 #include "quest.h"
@@ -54,11 +46,19 @@
 #include "trade.h"
 #include "unit.h"
 #include "vending.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
+#include "../common/HPM.h"
+#include "../common/cbasetypes.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"
 
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 5fd0faf86..df3be40a5 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -2,57 +2,60 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/mmo.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/core.h"
-#include "../common/showmsg.h"
-#include "../common/malloc.h"
-#include "../common/random.h"
-#include "../common/socket.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
-#include "../common/conf.h"
-#include "../common/sysinfo.h"
+#define HERCULES_CORE
 
+#include "../config/core.h" // AUTOLOOTITEM_SIZE, AUTOTRADE_PERSISTENCY, MAX_CARTS, MAX_SUGGESTIONS, MOB_FLEE(), MOB_HIT(), RENEWAL, RENEWAL_DROP, RENEWAL_EXP
 #include "atcommand.h"
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "battle.h"
 #include "chat.h"
-#include "clif.h"
 #include "chrif.h"
+#include "clif.h"
 #include "duel.h"
+#include "elemental.h"
+#include "guild.h"
+#include "homunculus.h"
 #include "intif.h"
 #include "itemdb.h"
 #include "log.h"
+#include "mail.h"
 #include "map.h"
-#include "pc.h"
-#include "pc_groups.h" // groupid2name
-#include "status.h"
-#include "skill.h"
+#include "mapreg.h"
+#include "mercenary.h"
 #include "mob.h"
 #include "npc.h"
-#include "pet.h"
-#include "homunculus.h"
-#include "mail.h"
-#include "mercenary.h"
-#include "elemental.h"
 #include "party.h"
-#include "guild.h"
+#include "pc.h"
+#include "pc_groups.h" // groupid2name
+#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 "mapreg.h"
-#include "quest.h"
-#include "searchstore.h"
+#include "../common/cbasetypes.h"
+#include "../common/conf.h"
+#include "../common/core.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/sysinfo.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 #include "HPMmap.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-
 struct atcommand_interface atcommand_s;
 
 static char atcmd_output[CHAT_SIZE_MAX];
diff --git a/src/map/atcommand.h b/src/map/atcommand.h
index bc4ab30a3..c8a1863af 100644
--- a/src/map/atcommand.h
+++ b/src/map/atcommand.h
@@ -5,9 +5,9 @@
 #ifndef _MAP_ATCOMMAND_H_
 #define _MAP_ATCOMMAND_H_
 
+#include "pc_groups.h"
 #include "../common/conf.h"
 #include "../common/db.h"
-#include "pc_groups.h"
 
 /**
  * Declarations
diff --git a/src/map/battle.c b/src/map/battle.c
index 9089b7102..0865ee4ba 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2,41 +2,44 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/malloc.h"
-#include "../common/showmsg.h"
-#include "../common/ers.h"
-#include "../common/random.h"
-#include "../common/socket.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
-#include "../common/sysinfo.h"
-#include "../common/HPM.h"
+#define HERCULES_CORE
 
-#include "map.h"
-#include "path.h"
-#include "pc.h"
-#include "status.h"
-#include "skill.h"
-#include "homunculus.h"
-#include "mercenary.h"
-#include "elemental.h"
-#include "mob.h"
-#include "itemdb.h"
-#include "clif.h"
-#include "pet.h"
-#include "guild.h"
-#include "party.h"
+#include "../config/core.h" // CELL_NOSTACK, CIRCULAR_AREA, CONSOLE_INPUT, HMAP_ZONE_DAMAGE_CAP_TYPE, OFFICIAL_WALKPATH, RENEWAL, RENEWAL_ASPD, RENEWAL_CAST, RENEWAL_DROP, RENEWAL_EDP, RENEWAL_EXP, RENEWAL_LVDMG, RE_LVL_DMOD(), RE_LVL_MDMOD(), RE_LVL_TMDMOD(), RE_SKILL_REDUCTION(), SCRIPT_CALLFUNC_CHECK, SECURE_NPCTIMEOUT, STATS_OPT_OUT
 #include "battle.h"
-#include "battleground.h"
-#include "chrif.h"
 
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
+
+#include "battleground.h"
+#include "chrif.h"
+#include "clif.h"
+#include "elemental.h"
+#include "guild.h"
+#include "homunculus.h"
+#include "itemdb.h"
+#include "map.h"
+#include "mercenary.h"
+#include "mob.h"
+#include "party.h"
+#include "path.h"
+#include "pc.h"
+#include "pet.h"
+#include "skill.h"
+#include "status.h"
+#include "../common/HPM.h"
+#include "../common/cbasetypes.h"
+#include "../common/ers.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/sysinfo.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 struct Battle_Config battle_config;
 struct battle_interface battle_s;
diff --git a/src/map/battle.h b/src/map/battle.h
index 88038ddb4..fbe097c78 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -5,8 +5,8 @@
 #ifndef _MAP_BATTLE_H_
 #define _MAP_BATTLE_H_
 
-#include "../common/cbasetypes.h"
 #include "map.h" //ELE_MAX
+#include "../common/cbasetypes.h"
 
 /**
  * Declarations
diff --git a/src/map/battleground.c b/src/map/battleground.c
index 68539e25d..a7169de0e 100644
--- a/src/map/battleground.c
+++ b/src/map/battleground.c
@@ -2,29 +2,32 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/timer.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/strlib.h"
-#include "../common/conf.h"
+#define HERCULES_CORE
 
 #include "battleground.h"
+
+#include <string.h>
+#include <stdio.h>
+
 #include "battle.h"
 #include "clif.h"
+#include "homunculus.h"
 #include "map.h"
+#include "mapreg.h"
+#include "mercenary.h"
+#include "mob.h" // struct mob_data
 #include "npc.h"
-#include "pc.h"
 #include "party.h"
+#include "pc.h"
 #include "pet.h"
-#include "homunculus.h"
-#include "mercenary.h"
-#include "mapreg.h"
-
-#include <string.h>
-#include <stdio.h>
+#include "../common/cbasetypes.h"
+#include "../common/conf.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
 
 struct battleground_interface bg_s;
 
diff --git a/src/map/battleground.h b/src/map/battleground.h
index 05c4eb060..ec0a86f14 100644
--- a/src/map/battleground.h
+++ b/src/map/battleground.h
@@ -5,9 +5,9 @@
 #ifndef _MAP_BATTLEGROUND_H_
 #define _MAP_BATTLEGROUND_H_
 
-#include "../common/mmo.h" // struct party
 #include "clif.h"
 #include "guild.h"
+#include "../common/mmo.h" // struct party
 
 /**
  * Defines
diff --git a/src/map/buyingstore.c b/src/map/buyingstore.c
index 2a15e66fc..80264b30d 100644
--- a/src/map/buyingstore.c
+++ b/src/map/buyingstore.c
@@ -2,18 +2,21 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/db.h"  // ARR_FIND
-#include "../common/showmsg.h"  // ShowWarning
-#include "../common/socket.h"  // RBUF*
-#include "../common/strlib.h"  // safestrncpy
+#define HERCULES_CORE
+
+#include "buyingstore.h"  // struct s_buyingstore
+
 #include "atcommand.h"  // msg_txt
 #include "battle.h"  // battle_config.*
-#include "buyingstore.h"  // struct s_buyingstore
+#include "chrif.h"
 #include "clif.h"  // clif->buyingstore_*
 #include "log.h"  // log_pick_pc, log_zeny
 #include "pc.h"  // struct map_session_data
-#include "chrif.h"
+#include "../common/cbasetypes.h"
+#include "../common/db.h"  // ARR_FIND
+#include "../common/showmsg.h"  // ShowWarning
+#include "../common/socket.h"  // RBUF*
+#include "../common/strlib.h"  // safestrncpy
 
 struct buyingstore_interface buyingstore_s;
 
diff --git a/src/map/buyingstore.h b/src/map/buyingstore.h
index 5141a1013..914631872 100644
--- a/src/map/buyingstore.h
+++ b/src/map/buyingstore.h
@@ -5,6 +5,11 @@
 #ifndef _MAP_BUYINGSTORE_H_
 #define _MAP_BUYINGSTORE_H_
 
+#include "../common/cbasetypes.h"
+#include "../common/mmo.h" // MAX_SLOTS
+
+struct map_session_data;
+
 /**
  * Declarations
  **/
diff --git a/src/map/chat.c b/src/map/chat.c
index 08fc4a575..c9d3e6d46 100644
--- a/src/map/chat.c
+++ b/src/map/chat.c
@@ -2,12 +2,13 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/mmo.h"
+#define HERCULES_CORE
+
+#include "chat.h"
+
+#include <stdio.h>
+#include <string.h>
+
 #include "atcommand.h" // msg_txt()
 #include "battle.h" // struct battle_config
 #include "clif.h"
@@ -15,10 +16,12 @@
 #include "npc.h" // npc_event_do()
 #include "pc.h"
 #include "skill.h" // ext_skill_unit_onplace()
-#include "chat.h"
-
-#include <stdio.h>
-#include <string.h>
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
 
 struct chat_interface chat_s;
 
diff --git a/src/map/chat.h b/src/map/chat.h
index b0c6cd905..cbc2a391e 100644
--- a/src/map/chat.h
+++ b/src/map/chat.h
@@ -6,9 +6,12 @@
 #define _MAP_CHAT_H_
 
 #include "map.h" // struct block_list, CHATROOM_TITLE_SIZE
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
 
-struct map_session_data;
 struct chat_data;
+struct map_session_data;
+struct npc_data;
 
 #define MAX_CHAT_USERS 20
 
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 99a1935fd..81e2d387c 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -2,15 +2,16 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/ers.h"
-#include "../common/HPM.h"
+#define HERCULES_CORE
+
+#include "../config/core.h" // AUTOTRADE_PERSISTENCY, STATS_OPT_OUT
+#include "chrif.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <time.h>
 
 #include "map.h"
 #include "battle.h"
@@ -25,15 +26,17 @@
 #include "instance.h"
 #include "mercenary.h"
 #include "elemental.h"
-#include "chrif.h"
 #include "quest.h"
 #include "storage.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <time.h>
+#include "../common/HPM.h"
+#include "../common/cbasetypes.h"
+#include "../common/ers.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
 
 struct chrif_interface chrif_s;
 
diff --git a/src/map/chrif.h b/src/map/chrif.h
index 25e955604..84efc66d3 100644
--- a/src/map/chrif.h
+++ b/src/map/chrif.h
@@ -5,9 +5,11 @@
 #ifndef _MAP_CHRIF_H_
 #define _MAP_CHRIF_H_
 
-#include "../common/cbasetypes.h"
 #include <time.h>
+
 #include "map.h" //TBL_stuff
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
 
 struct status_change_entry;
 
diff --git a/src/map/clif.c b/src/map/clif.c
index 1a6665307..cb2474961 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -2,56 +2,59 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/grfio.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
-#include "../common/ers.h"
-#include "../common/conf.h"
-#include "../common/HPM.h"
+#define HERCULES_CORE
+
+#include "../config/core.h" // ANTI_MAYAP_CHEAT, NEW_CARTS, RENEWAL, SECURE_NPCTIMEOUT
+#include "clif.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <time.h>
 
-#include "map.h"
-#include "chrif.h"
-#include "pc.h"
-#include "status.h"
-#include "npc.h"
-#include "itemdb.h"
-#include "chat.h"
-#include "trade.h"
-#include "storage.h"
-#include "script.h"
-#include "skill.h"
 #include "atcommand.h"
-#include "intif.h"
 #include "battle.h"
 #include "battleground.h"
-#include "mob.h"
-#include "party.h"
-#include "unit.h"
+#include "chat.h"
+#include "chrif.h"
+#include "elemental.h"
 #include "guild.h"
-#include "vending.h"
-#include "pet.h"
 #include "homunculus.h"
 #include "instance.h"
-#include "mercenary.h"
-#include "elemental.h"
+#include "intif.h"
+#include "irc-bot.h"
+#include "itemdb.h"
 #include "log.h"
-#include "clif.h"
 #include "mail.h"
+#include "map.h"
+#include "mercenary.h"
+#include "mob.h"
+#include "npc.h"
+#include "party.h"
+#include "pc.h"
+#include "pet.h"
 #include "quest.h"
-#include "irc-bot.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <time.h>
+#include "script.h"
+#include "skill.h"
+#include "status.h"
+#include "storage.h"
+#include "trade.h"
+#include "unit.h"
+#include "vending.h"
+#include "../common/HPM.h"
+#include "../common/cbasetypes.h"
+#include "../common/conf.h"
+#include "../common/ers.h"
+#include "../common/grfio.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 struct clif_interface clif_s;
 
diff --git a/src/map/clif.h b/src/map/clif.h
index 0f4a9e756..7b27e1fe6 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -5,13 +5,13 @@
 #ifndef _MAP_CLIF_H_
 #define _MAP_CLIF_H_
 
+#include <stdarg.h>
+
+#include "map.h"
+#include "packets_struct.h"
 #include "../common/cbasetypes.h"
 #include "../common/db.h"
 #include "../common/mmo.h"
-#include "../common/socket.h"
-#include "../map/map.h"
-#include "../map/packets_struct.h"
-#include <stdarg.h>
 
 /**
  * Declarations
@@ -20,7 +20,6 @@ struct item;
 struct item_data;
 struct storage_data;
 struct guild_storage;
-struct block_list;
 struct unit_data;
 struct map_session_data;
 struct homun_data;
diff --git a/src/map/date.c b/src/map/date.c
index f38ead858..975a00c50 100644
--- a/src/map/date.c
+++ b/src/map/date.c
@@ -1,10 +1,14 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#include "../common/cbasetypes.h"
+#define HERCULES_CORE
+
 #include "date.h"
+
 #include <time.h>
 
+#include "../common/cbasetypes.h"
+
 int date_get_year(void)
 {
 	time_t t;
diff --git a/src/map/date.h b/src/map/date.h
index 46f0d86c3..b3ed59b2f 100644
--- a/src/map/date.h
+++ b/src/map/date.h
@@ -4,6 +4,8 @@
 #ifndef _MAP_DATE_H_
 #define _MAP_DATE_H_
 
+#include "../common/cbasetypes.h"
+
 int date_get_year(void);
 int date_get_month(void);
 int date_get_day(void);
diff --git a/src/map/duel.c b/src/map/duel.c
index af2741f77..a423ef240 100644
--- a/src/map/duel.c
+++ b/src/map/duel.c
@@ -2,18 +2,20 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
+#define HERCULES_CORE
 
-#include "atcommand.h"  // msg_txt
-#include "clif.h"
 #include "duel.h"
-#include "pc.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
+#include "atcommand.h"  // msg_txt
+#include "clif.h"
+#include "pc.h"
+#include "../common/cbasetypes.h"
+
 /*==========================================
  * Duel organizing functions [LuzZza]
  *------------------------------------------*/
diff --git a/src/map/duel.h b/src/map/duel.h
index 5405d2eee..956aed36d 100644
--- a/src/map/duel.h
+++ b/src/map/duel.h
@@ -5,6 +5,10 @@
 #ifndef _MAP_DUEL_H_
 #define _MAP_DUEL_H_
 
+#include "../common/cbasetypes.h"
+
+struct map_session_data;
+
 struct duel {
 	int members_count;
 	int invites_count;
diff --git a/src/map/elemental.c b/src/map/elemental.c
index f335600d6..323df41e1 100644
--- a/src/map/elemental.c
+++ b/src/map/elemental.c
@@ -2,42 +2,44 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/mmo.h"
-#include "../common/showmsg.h"
-#include "../common/utils.h"
-#include "../common/random.h"
-#include "../common/strlib.h"
+#define HERCULES_CORE
 
-#include "log.h"
-#include "clif.h"
+#include "elemental.h"
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "atcommand.h"
+#include "battle.h"
 #include "chrif.h"
+#include "clif.h"
+#include "guild.h"
 #include "intif.h"
 #include "itemdb.h"
+#include "log.h"
 #include "map.h"
-#include "pc.h"
-#include "status.h"
-#include "skill.h"
 #include "mob.h"
-#include "pet.h"
-#include "battle.h"
+#include "npc.h"
 #include "party.h"
-#include "guild.h"
-#include "atcommand.h"
+#include "pc.h"
+#include "pet.h"
 #include "script.h"
-#include "npc.h"
+#include "skill.h"
+#include "status.h"
 #include "trade.h"
 #include "unit.h"
-#include "elemental.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 struct elemental_interface elemental_s;
 
diff --git a/src/map/elemental.h b/src/map/elemental.h
index 6d04a41a5..aa27aadc9 100644
--- a/src/map/elemental.h
+++ b/src/map/elemental.h
@@ -7,6 +7,7 @@
 
 #include "status.h" // struct status_data, struct status_change
 #include "unit.h" // struct unit_data
+#include "../common/mmo.h" // NAME_LENGTH
 
 /**
  * Defines
diff --git a/src/map/guild.c b/src/map/guild.c
index fa5805c8b..69f67238d 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -2,35 +2,38 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/malloc.h"
-#include "../common/mapindex.h"
-#include "../common/showmsg.h"
-#include "../common/ers.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
-#include "../common/HPM.h"
+#define HERCULES_CORE
 
-#include "map.h"
+#include "../config/core.h" // GP_BOUND_ITEMS
 #include "guild.h"
-#include "storage.h"
-#include "battle.h"
-#include "npc.h"
-#include "pc.h"
-#include "status.h"
-#include "mob.h"
-#include "intif.h"
-#include "clif.h"
-#include "skill.h"
-#include "log.h"
-#include "instance.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "battle.h"
+#include "clif.h"
+#include "instance.h"
+#include "intif.h"
+#include "log.h"
+#include "map.h"
+#include "mob.h"
+#include "npc.h"
+#include "pc.h"
+#include "skill.h"
+#include "status.h"
+#include "storage.h"
+#include "../common/HPM.h"
+#include "../common/cbasetypes.h"
+#include "../common/ers.h"
+#include "../common/malloc.h"
+#include "../common/mapindex.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
+
 struct guild_interface guild_s;
 
 /*==========================================
diff --git a/src/map/guild.h b/src/map/guild.h
index b03bd664d..34e27a56c 100644
--- a/src/map/guild.h
+++ b/src/map/guild.h
@@ -5,18 +5,10 @@
 #ifndef _MAP_GUILD_H_
 #define _MAP_GUILD_H_
 
-//#include "../common/mmo.h"
-#include "map.h" // NAME_LENGTH
-
-/**
- * Declarations
- **/
-struct guild;
-struct guild_member;
-struct guild_position;
-struct guild_castle;
-struct map_session_data;
-struct mob_data;
+#include "map.h" // EVENT_NAME_LENGTH, TBL_PC
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+#include "../common/mmo.h"
 
 /**
  * Defines
diff --git a/src/map/homunculus.c b/src/map/homunculus.c
index ff9f7a5b1..b6a83d1cb 100644
--- a/src/map/homunculus.c
+++ b/src/map/homunculus.c
@@ -2,43 +2,45 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/mmo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
+#define HERCULES_CORE
 
-#include "log.h"
-#include "clif.h"
+#include "../config/core.h" // DBPATH
+#include "homunculus.h"
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "atcommand.h"
+#include "battle.h"
 #include "chrif.h"
+#include "clif.h"
+#include "guild.h"
 #include "intif.h"
 #include "itemdb.h"
+#include "log.h"
 #include "map.h"
-#include "pc.h"
-#include "status.h"
-#include "skill.h"
 #include "mob.h"
-#include "pet.h"
-#include "battle.h"
+#include "npc.h"
 #include "party.h"
-#include "guild.h"
-#include "atcommand.h"
+#include "pc.h"
+#include "pet.h"
 #include "script.h"
-#include "npc.h"
+#include "skill.h"
+#include "status.h"
 #include "trade.h"
 #include "unit.h"
-
-#include "homunculus.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 struct homunculus_interface homunculus_s;
 
diff --git a/src/map/homunculus.h b/src/map/homunculus.h
index e6d59e30e..9eef6af5b 100644
--- a/src/map/homunculus.h
+++ b/src/map/homunculus.h
@@ -5,9 +5,10 @@
 #ifndef _MAP_HOMUNCULUS_H_
 #define _MAP_HOMUNCULUS_H_
 
+#include "pc.h"
 #include "status.h" // struct status_data, struct status_change
 #include "unit.h" // struct unit_data
-#include "pc.h"
+#include "../common/mmo.h"
 
 #define MAX_HOM_SKILL_REQUIRE 5
 #define homdb_checkid(id) ((id) >=  HM_CLASS_BASE && (id) <= HM_CLASS_MAX)
diff --git a/src/map/instance.c b/src/map/instance.c
index caf622b3d..5789d7dd6 100644
--- a/src/map/instance.c
+++ b/src/map/instance.c
@@ -2,30 +2,32 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
-#include "../common/db.h"
-#include "../common/HPM.h"
+#define HERCULES_CORE
 
-#include "clif.h"
 #include "instance.h"
-#include "map.h"
-#include "npc.h"
-#include "party.h"
-#include "pc.h"
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdarg.h>
 #include <time.h>
 
+#include "clif.h"
+#include "map.h"
+#include "npc.h"
+#include "party.h"
+#include "pc.h"
+#include "../common/HPM.h"
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
+
 struct instance_interface instance_s;
 
 /// Checks whether given instance id is valid or not.
diff --git a/src/map/instance.h b/src/map/instance.h
index 712a0f141..ae649eda7 100644
--- a/src/map/instance.h
+++ b/src/map/instance.h
@@ -6,8 +6,11 @@
 #define _MAP_INSTANCE_H_
 
 #include "script.h" // struct reg_db
+#include "../common/cbasetypes.h"
 #include "../common/mmo.h" // struct point
+
 struct block_list;
+struct map_session_data;
 
 #define INSTANCE_NAME_LENGTH (60+1)
 
diff --git a/src/map/intif.c b/src/map/intif.c
index 6bd24368a..383150fbc 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -1,37 +1,40 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/malloc.h"
-#include "../common/strlib.h"
-#include "map.h"
+#define HERCULES_CORE
+
+#include "../config/core.h" // GP_BOUND_ITEMS
+#include "intif.h"
+
+#include <fcntl.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+
+#include "atcommand.h"
 #include "battle.h"
 #include "chrif.h"
 #include "clif.h"
-#include "pc.h"
-#include "intif.h"
-#include "log.h"
-#include "storage.h"
-#include "party.h"
+#include "elemental.h"
 #include "guild.h"
-#include "pet.h"
-#include "atcommand.h"
-#include "mercenary.h"
 #include "homunculus.h"
-#include "elemental.h"
+#include "log.h"
 #include "mail.h"
+#include "map.h"
+#include "mercenary.h"
+#include "party.h"
+#include "pc.h"
+#include "pet.h"
 #include "quest.h"
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <fcntl.h>
-#include <string.h>
-
+#include "storage.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
 
 struct intif_interface intif_s;
 
diff --git a/src/map/intif.h b/src/map/intif.h
index 290dcfcdc..b6ee727f3 100644
--- a/src/map/intif.h
+++ b/src/map/intif.h
@@ -5,19 +5,22 @@
 #ifndef _MAP_INTIF_H_
 #define _MAP_INTIF_H_
 
+#include "../common/cbasetypes.h"
 
 /**
  * Declarations
  **/
-struct party_member;
+struct auction_data;
 struct guild_member;
 struct guild_position;
-struct s_pet;
+struct guild_storage;
+struct mail_message;
+struct map_session_data;
+struct party_member;
+struct s_elemental;
 struct s_homunculus;
 struct s_mercenary;
-struct s_elemental;
-struct mail_message;
-struct auction_data;
+struct s_pet;
 
 /**
  * Defines
diff --git a/src/map/irc-bot.c b/src/map/irc-bot.c
index ff28082e7..6f016697f 100644
--- a/src/map/irc-bot.c
+++ b/src/map/irc-bot.c
@@ -2,23 +2,25 @@
 // See the LICENSE file
 // Base Author: shennetsind @ http://hercules.ws
 
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/strlib.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/random.h"
+#define HERCULES_CORE
 
-#include "map.h"
-#include "pc.h"
-#include "clif.h"
 #include "irc-bot.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "clif.h"
+#include "map.h"
+#include "pc.h"
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+
 //#define IRCBOT_DEBUG
 
 struct irc_bot_interface irc_bot_s;
diff --git a/src/map/irc-bot.h b/src/map/irc-bot.h
index c15a5d46a..60f03fca5 100644
--- a/src/map/irc-bot.h
+++ b/src/map/irc-bot.h
@@ -6,6 +6,8 @@
 #ifndef _MAP_IRC_BOT_H_
 #define _MAP_IRC_BOT_H_
 
+#include "../common/cbasetypes.h"
+
 #define IRC_NICK_LENGTH 40
 #define IRC_IDENT_LENGTH 40
 #define IRC_HOST_LENGTH 63
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index 5eeb90be5..1981f435c 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -2,23 +2,28 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/nullpo.h"
-#include "../common/malloc.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
-#include "../common/conf.h"
+#define HERCULES_CORE
+
+#include "../config/core.h" // DBPATH, RENEWAL
 #include "itemdb.h"
-#include "map.h"
-#include "battle.h" // struct battle_config
-#include "script.h" // item script processing
-#include "pc.h"     // W_MUSICAL, W_WHIP
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "battle.h" // struct battle_config
+#include "map.h"
+#include "mob.h"    // MAX_MOB_DB
+#include "pc.h"     // W_MUSICAL, W_WHIP
+#include "script.h" // item script processing
+#include "../common/conf.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
+
 struct itemdb_interface itemdb_s;
 
 /**
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index 77fb2e2ec..12766b288 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -5,9 +5,12 @@
 #ifndef _MAP_ITEMDB_H_
 #define _MAP_ITEMDB_H_
 
+#include "map.h"
+#include "../common/cbasetypes.h"
+#include "../common/conf.h"
 #include "../common/db.h"
 #include "../common/mmo.h" // ITEM_NAME_LENGTH
-#include "map.h"
+#include "../common/sql.h"
 
 /**
  * Declarations
diff --git a/src/map/log.c b/src/map/log.c
index 19a98f34b..523ef1d65 100644
--- a/src/map/log.c
+++ b/src/map/log.c
@@ -2,22 +2,25 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/sql.h" // SQL_INNODB
-#include "../common/strlib.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
-#include "battle.h"
-#include "itemdb.h"
+#define HERCULES_CORE
+
 #include "log.h"
-#include "map.h"
-#include "mob.h"
-#include "pc.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "battle.h"
+#include "itemdb.h"
+#include "map.h"
+#include "mob.h"
+#include "pc.h"
+#include "../common/cbasetypes.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/sql.h" // SQL_INNODB
+#include "../common/strlib.h"
+
 struct log_interface log_s;
 
 /// obtain log type character for item/zeny logs
diff --git a/src/map/log.h b/src/map/log.h
index b2cb92c20..ecfedeac2 100644
--- a/src/map/log.h
+++ b/src/map/log.h
@@ -11,11 +11,10 @@
 /**
  * Declarations
  **/
-struct block_list;
-struct map_session_data;
-struct mob_data;
 struct item;
 struct item_data;
+struct map_session_data;
+struct mob_data;
 
 /**
  * Defines
diff --git a/src/map/mail.c b/src/map/mail.c
index 371aa892f..7ba7d7470 100644
--- a/src/map/mail.c
+++ b/src/map/mail.c
@@ -2,19 +2,21 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
+#define HERCULES_CORE
 
 #include "mail.h"
-#include "atcommand.h"
-#include "itemdb.h"
-#include "clif.h"
-#include "pc.h"
-#include "log.h"
 
 #include <time.h>
 #include <string.h>
 
+#include "atcommand.h"
+#include "clif.h"
+#include "itemdb.h"
+#include "log.h"
+#include "pc.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+
 struct mail_interface mail_s;
 
 void mail_clear(struct map_session_data *sd)
diff --git a/src/map/mail.h b/src/map/mail.h
index 8df537ff3..30b032ef4 100644
--- a/src/map/mail.h
+++ b/src/map/mail.h
@@ -5,7 +5,11 @@
 #ifndef _MAP_MAIL_H_
 #define _MAP_MAIL_H_
 
-#include "../common/mmo.h"
+#include "../common/cbasetypes.h"
+
+struct item;
+struct mail_message;
+struct map_session_data;
 
 struct mail_interface {
 	void (*clear) (struct map_session_data *sd);
diff --git a/src/map/map.c b/src/map/map.c
index 315924e2e..01d3dbb9f 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -2,62 +2,66 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/core.h"
-#include "../common/timer.h"
-#include "../common/ers.h"
-#include "../common/grfio.h"
-#include "../common/malloc.h"
-#include "../common/socket.h" // WFIFO*()
-#include "../common/showmsg.h"
-#include "../common/nullpo.h"
-#include "../common/random.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
-#include "../common/conf.h"
-#include "../common/console.h"
-#include "../common/HPM.h"
+#define HERCULES_CORE
 
+#include "../config/core.h" // CELL_NOSTACK, CIRCULAR_AREA, CONSOLE_INPUT, DBPATH, RENEWAL
 #include "map.h"
-#include "path.h"
+
+#include <math.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "HPMmap.h"
+#include "atcommand.h"
+#include "battle.h"
+#include "battleground.h"
+#include "chat.h"
 #include "chrif.h"
 #include "clif.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 "npc.h" // npc_setcells(), npc_unsetcells()
+#include "party.h"
+#include "path.h"
 #include "pc.h"
+#include "pet.h"
+#include "quest.h"
+#include "script.h"
+#include "skill.h"
 #include "status.h"
-#include "mob.h"
-#include "npc.h" // npc_setcells(), npc_unsetcells()
-#include "chat.h"
-#include "itemdb.h"
 #include "storage.h"
-#include "skill.h"
 #include "trade.h"
-#include "party.h"
 #include "unit.h"
-#include "battle.h"
-#include "battleground.h"
-#include "quest.h"
-#include "script.h"
-#include "mapreg.h"
-#include "guild.h"
-#include "pet.h"
-#include "homunculus.h"
-#include "instance.h"
-#include "mercenary.h"
-#include "elemental.h"
-#include "atcommand.h"
-#include "log.h"
-#include "mail.h"
-#include "irc-bot.h"
-#include "HPMmap.h"
+#include "../common/HPM.h"
+#include "../common/cbasetypes.h"
+#include "../common/conf.h"
+#include "../common/console.h"
+#include "../common/core.h"
+#include "../common/ers.h"
+#include "../common/grfio.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h" // WFIFO*()
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <math.h>
 #ifndef _WIN32
 #include <unistd.h>
 #endif
@@ -5482,8 +5486,8 @@ void map_cp_defaults(void) {
 	map->cpsd->bl.y = MAP_DEFAULT_Y;
 	map->cpsd->bl.m = map->mapname2mapid(MAP_DEFAULT);
 
-	console->addCommand("gm:info",CPCMD_A(gm_position));
-	console->addCommand("gm:use",CPCMD_A(gm_use));
+	console->input->addCommand("gm:info",CPCMD_A(gm_position));
+	console->input->addCommand("gm:use",CPCMD_A(gm_use));
 #endif
 }
 /* Hercules Plugin Mananger */
@@ -5839,7 +5843,7 @@ int do_init(int argc, char *argv[])
 	Sql_HerculesUpdateCheck(map->mysql_handle);
 	
 #ifdef CONSOLE_INPUT
-	console->setSQL(map->mysql_handle);
+	console->input->setSQL(map->mysql_handle);
 #endif
 	
 	ShowStatus("Server is '"CL_GREEN"ready"CL_RESET"' and listening on port '"CL_WHITE"%d"CL_RESET"'.\n\n", map->port);
diff --git a/src/map/map.h b/src/map/map.h
index c61868b13..539b02ed8 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -5,18 +5,18 @@
 #ifndef _MAP_MAP_H_
 #define _MAP_MAP_H_
 
+#include <stdarg.h>
+
+#include "atcommand.h"
 #include "../common/cbasetypes.h"
 #include "../common/core.h" // CORE_ST_LAST
 #include "../common/mmo.h"
 #include "../common/mapindex.h"
 #include "../common/db.h"
-#include "../config/core.h"
 #include "../common/sql.h"
-#include "atcommand.h"
-#include <stdarg.h>
 
+struct mob_data;
 struct npc_data;
-struct item_data;
 struct hChSysCh;
 
 enum E_MAPSERVER_ST {
@@ -36,7 +36,6 @@ enum E_MAPSERVER_ST {
 #define NATURAL_HEAL_INTERVAL 500
 #define MIN_FLOORITEM 2
 #define MAX_FLOORITEM START_ACCOUNT_NUM
-#define MAX_LEVEL 175
 #define MAX_IGNORE_LIST 20 // official is 14
 #define MAX_VENDING 12
 #define MAX_MAP_SIZE (512*512) // Wasn't there something like this already? Can't find it.. [Shinryo]
diff --git a/src/map/mapreg_sql.c b/src/map/mapreg_sql.c
index 61c25f24e..f026fde00 100644
--- a/src/map/mapreg_sql.c
+++ b/src/map/mapreg_sql.c
@@ -2,6 +2,15 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "mapreg.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "map.h" // map->mysql_handle
+#include "script.h"
 #include "../common/cbasetypes.h"
 #include "../common/db.h"
 #include "../common/ers.h"
@@ -10,11 +19,6 @@
 #include "../common/sql.h"
 #include "../common/strlib.h"
 #include "../common/timer.h"
-#include "map.h" // map->mysql_handle
-#include "script.h"
-#include "mapreg.h"
-#include <stdlib.h>
-#include <string.h>
 
 struct mapreg_interface mapreg_s;
 
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 495621014..26bc8c188 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -2,42 +2,44 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/mmo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
+#define HERCULES_CORE
 
-#include "log.h"
-#include "clif.h"
+#include "mercenary.h"
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "atcommand.h"
+#include "battle.h"
 #include "chrif.h"
+#include "clif.h"
+#include "guild.h"
 #include "intif.h"
 #include "itemdb.h"
+#include "log.h"
 #include "map.h"
-#include "pc.h"
-#include "status.h"
-#include "skill.h"
 #include "mob.h"
-#include "pet.h"
-#include "battle.h"
+#include "npc.h"
 #include "party.h"
-#include "guild.h"
-#include "atcommand.h"
+#include "pc.h"
+#include "pet.h"
 #include "script.h"
-#include "npc.h"
+#include "skill.h"
+#include "status.h"
 #include "trade.h"
 #include "unit.h"
-#include "mercenary.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 struct mercenary_interface mercenary_s;
 
diff --git a/src/map/mercenary.h b/src/map/mercenary.h
index dd9266b2e..b998ac006 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.h
@@ -6,6 +6,7 @@
 
 #include "status.h" // struct status_data, struct status_change
 #include "unit.h" // struct unit_data
+#include "../common/cbasetypes.h"
 
 // number of cells that a mercenary can walk to from it's master before being warped
 #define MAX_MER_DISTANCE 15
diff --git a/src/map/mob.c b/src/map/mob.c
index 8f12d4b1b..11ac74621 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2,46 +2,49 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/timer.h"
-#include "../common/db.h"
-#include "../common/nullpo.h"
-#include "../common/malloc.h"
-#include "../common/showmsg.h"
-#include "../common/ers.h"
-#include "../common/random.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
-#include "../common/socket.h"
+#define HERCULES_CORE
 
-#include "map.h"
-#include "path.h"
-#include "clif.h"
-#include "intif.h"
-#include "pc.h"
-#include "pet.h"
-#include "status.h"
+#include "../config/core.h" // AUTOLOOT_DISTANCE, DBPATH, DEFTYPE_MAX, DEFTYPE_MIN, RENEWAL_DROP, RENEWAL_EXP
 #include "mob.h"
-#include "homunculus.h"
-#include "mercenary.h"
+
+#include <math.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "atcommand.h"
+#include "battle.h"
+#include "clif.h"
+#include "date.h"
 #include "elemental.h"
 #include "guild.h"
+#include "homunculus.h"
+#include "intif.h"
 #include "itemdb.h"
-#include "skill.h"
-#include "battle.h"
-#include "party.h"
-#include "npc.h"
 #include "log.h"
-#include "script.h"
-#include "atcommand.h"
-#include "date.h"
+#include "map.h"
+#include "mercenary.h"
+#include "npc.h"
+#include "party.h"
+#include "path.h"
+#include "pc.h"
+#include "pet.h"
 #include "quest.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <math.h>
+#include "script.h"
+#include "skill.h"
+#include "status.h"
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+#include "../common/ers.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 struct mob_interface mob_s;
 
diff --git a/src/map/mob.h b/src/map/mob.h
index 80175b1db..d07f78c77 100644
--- a/src/map/mob.h
+++ b/src/map/mob.h
@@ -5,12 +5,11 @@
 #ifndef _MAP_MOB_H_
 #define _MAP_MOB_H_
 
-#include "../common/mmo.h" // struct item
-#include "guild.h" // struct guardian_data
 #include "map.h" // struct status_data, struct view_data, struct mob_skill
-#include "status.h" // struct status data, struct status_change
-#include "unit.h" // unit_stop_walking(), unit_stop_attack()
-#include "npc.h"
+#include "status.h" // struct status_data, struct status_change
+#include "unit.h" // struct unit_data
+#include "../common/cbasetypes.h"
+#include "../common/mmo.h" // struct item
 
 #define MAX_RANDOMMONSTER 5
 
diff --git a/src/map/npc.c b/src/map/npc.c
index 20b500630..8e5854dbf 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -2,41 +2,44 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/malloc.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
-#include "../common/ers.h"
-#include "../common/db.h"
-#include "../common/socket.h"
-#include "../common/HPM.h"
+#define HERCULES_CORE
 
-#include "map.h"
-#include "log.h"
+#include "../config/core.h" // NPC_SECURE_TIMEOUT_INPUT, NPC_SECURE_TIMEOUT_MENU, NPC_SECURE_TIMEOUT_NEXT, SECURE_NPCTIMEOUT, SECURE_NPCTIMEOUT_INTERVAL
+#include "npc.h"
+
+#include <errno.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include "battle.h"
+#include "chat.h"
 #include "clif.h"
+#include "instance.h"
 #include "intif.h"
-#include "pc.h"
-#include "status.h"
 #include "itemdb.h"
-#include "script.h"
+#include "log.h"
+#include "map.h"
 #include "mob.h"
+#include "pc.h"
 #include "pet.h"
-#include "instance.h"
-#include "battle.h"
+#include "script.h"
 #include "skill.h"
+#include "status.h"
 #include "unit.h"
-#include "npc.h"
-#include "chat.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <time.h>
-#include <errno.h>
+#include "../common/HPM.h"
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+#include "../common/ers.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 struct npc_interface npc_s;
 
diff --git a/src/map/npc.h b/src/map/npc.h
index c154b14d0..6e9686d33 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -8,10 +8,10 @@
 #include "map.h" // struct block_list
 #include "status.h" // struct status_change
 #include "unit.h" // struct unit_data
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
 
 struct HPluginData;
-struct block_list;
-struct npc_data;
 struct view_data;
 
 enum npc_parse_options {
diff --git a/src/map/npc_chat.c b/src/map/npc_chat.c
index 9d5639efc..f245ffea5 100644
--- a/src/map/npc_chat.c
+++ b/src/map/npc_chat.c
@@ -2,25 +2,27 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifdef PCRE_SUPPORT
+#define HERCULES_CORE
 
-#include "../common/timer.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
+#ifdef PCRE_SUPPORT
 
-#include "mob.h" // struct mob_data
 #include "npc.h" // struct npc_data
-#include "pc.h" // struct map_session_data
-#include "script.h" // set_var()
-
-#include "../../3rdparty/pcre/include/pcre.h"
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdarg.h>
+
+#include "../../3rdparty/pcre/include/pcre.h"
+
+#include "mob.h" // struct mob_data
+#include "pc.h" // struct map_session_data
+#include "script.h" // set_var()
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
 
 /**
  * interface sources
diff --git a/src/map/party.c b/src/map/party.c
index cf5e7bbe3..7c49e241c 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -2,34 +2,37 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/timer.h"
-#include "../common/socket.h" // last_tick
-#include "../common/nullpo.h"
-#include "../common/malloc.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/utils.h"
-#include "../common/strlib.h"
-#include "../common/HPM.h"
+#define HERCULES_CORE
 
+#include "../config/core.h" // GP_BOUND_ITEMS, RENEWAL_EXP
 #include "party.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "atcommand.h"	//msg_txt()
-#include "pc.h"
-#include "map.h"
-#include "instance.h"
 #include "battle.h"
-#include "intif.h"
 #include "clif.h"
+#include "instance.h"
+#include "intif.h"
+#include "itemdb.h"
 #include "log.h"
+#include "map.h"
+#include "mob.h" // struct mob_data
+#include "pc.h"
 #include "skill.h"
 #include "status.h"
-#include "itemdb.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
+#include "../common/HPM.h"
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h" // last_tick
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 struct party_interface party_s;
 
diff --git a/src/map/party.h b/src/map/party.h
index ed8289af6..3bad22b13 100644
--- a/src/map/party.h
+++ b/src/map/party.h
@@ -5,11 +5,12 @@
 #ifndef _MAP_PARTY_H_
 #define _MAP_PARTY_H_
 
-#include "../common/mmo.h" // struct party
-#include "../config/core.h"
 #include <stdarg.h>
 
-#include "map.h"
+#include "map.h" // TBL_PC
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+#include "../common/mmo.h" // struct party
 
 #define PARTY_BOOKING_JOBS 6
 #define PARTY_BOOKING_RESULTS 10
diff --git a/src/map/path.c b/src/map/path.c
index ae9fc389d..d02e9ee4a 100644
--- a/src/map/path.c
+++ b/src/map/path.c
@@ -2,20 +2,23 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/db.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
+#define HERCULES_CORE
 
+#include "../config/core.h" // CELL_NOSTACK, CIRCULAR_AREA
 #include "path.h"
-#include "map.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "map.h"
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+
 #define SET_OPEN 0
 #define SET_CLOSED 1
 
diff --git a/src/map/path.h b/src/map/path.h
index 0b67a0120..b48ff05fb 100644
--- a/src/map/path.h
+++ b/src/map/path.h
@@ -6,6 +6,7 @@
 #define _MAP_PATH_H_
 
 #include "map.h" // enum cell_chk
+#include "../common/cbasetypes.h"
 
 #define MOVE_COST 10
 #define MOVE_DIAGONAL_COST 14
diff --git a/src/map/pc.c b/src/map/pc.c
index c8fb14e55..45adfe22a 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -2,21 +2,16 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/core.h" // get_svn_revision()
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h" // session[]
-#include "../common/strlib.h" // safestrncpy()
-#include "../common/timer.h"
-#include "../common/utils.h"
-#include "../common/conf.h"
-#include "../common/mmo.h" //NAME_LENGTH
-#include "../common/sysinfo.h"
+#define HERCULES_CORE
 
+#include "../config/core.h" // DBPATH, GP_BOUND_ITEMS, MAX_CARTS, MAX_SPIRITBALL, NEW_CARTS, RENEWAL, RENEWAL_ASPD, RENEWAL_CAST, RENEWAL_DROP, RENEWAL_EXP, SECURE_NPCTIMEOUT
 #include "pc.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
 #include "atcommand.h" // get_atcommand_level()
 #include "battle.h" // battle_config
 #include "battleground.h"
@@ -25,32 +20,40 @@
 #include "clif.h"
 #include "date.h" // is_day_of_*()
 #include "duel.h"
+#include "elemental.h"
+#include "guild.h" // guild->search(), guild_request_info()
+#include "homunculus.h"
+#include "instance.h"
 #include "intif.h"
 #include "itemdb.h"
 #include "log.h"
 #include "mail.h"
 #include "map.h"
-#include "path.h"
-#include "homunculus.h"
-#include "instance.h"
 #include "mercenary.h"
-#include "elemental.h"
+#include "mob.h" // struct mob_data
 #include "npc.h" // fake_nd
-#include "pet.h" // pet_unlocktarget()
 #include "party.h" // party->search()
-#include "guild.h" // guild->search(), guild_request_info()
+#include "path.h"
+#include "pc_groups.h"
+#include "pet.h" // pet_unlocktarget()
+#include "quest.h"
 #include "script.h" // script_config
 #include "skill.h"
 #include "status.h" // struct status_data
 #include "storage.h"
-#include "pc_groups.h"
-#include "quest.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
+#include "../common/cbasetypes.h"
+#include "../common/conf.h"
+#include "../common/core.h" // get_svn_revision()
+#include "../common/malloc.h"
+#include "../common/mmo.h" //NAME_LENGTH
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h" // session[]
+#include "../common/strlib.h" // safestrncpy()
+#include "../common/sysinfo.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 struct pc_interface pc_s;
 
@@ -10651,9 +10654,7 @@ void pc_defaults(void) {
 	memset(pc->exp_table, 0, sizeof(pc->exp_table)
 		   + sizeof(pc->max_level)
 		   + sizeof(pc->statp)
-#if defined(RENEWAL_DROP) || defined(RENEWAL_EXP)
 		   + sizeof(pc->level_penalty)
-#endif
 		   + sizeof(pc->skill_tree)
 		   + sizeof(pc->smith_fame_list)
 		   + sizeof(pc->chemist_fame_list)
diff --git a/src/map/pc.h b/src/map/pc.h
index 70df9ca56..c4026a48d 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -5,23 +5,23 @@
 #ifndef _MAP_PC_H_
 #define _MAP_PC_H_
 
-#include "../common/mmo.h" // JOB_*, MAX_FAME_LIST, struct fame_list, struct mmo_charstatus
-#include "../common/ers.h"
-#include "../common/timer.h" // INVALID_TIMER
-#include "atcommand.h" // AtCommandType
+#include "../config/core.h" // AUTOLOOTITEM_SIZE, RENEWAL, SECURE_NPCTIMEOUT
+
 #include "battle.h" // battle_config
-#include "battleground.h"
+#include "battleground.h" // enum bg_queue_types
 #include "buyingstore.h"  // struct s_buyingstore
-#include "itemdb.h"
-#include "log.h"
-#include "map.h" // RC_MAX
-#include "mob.h"
-#include "pc_groups.h"
-#include "script.h" // struct script_reg, struct script_regstr
+#include "itemdb.h" // MAX_ITEMDELAYS
+#include "log.h" // struct e_log_pick_type
+#include "map.h" // RC_MAX, ELE_MAX
+#include "pc_groups.h" // GroupSettings
+#include "script.h" // struct reg_db
 #include "searchstore.h"  // struct s_search_store_info
-#include "status.h" // OPTION_*, struct weapon_atk
-#include "unit.h" // unit_stop_attack(), unit_stop_walking()
+#include "status.h" // enum sc_type, OPTION_*
+#include "unit.h" // struct unit_data, struct view_data
 #include "vending.h" // struct s_vending
+#include "../common/cbasetypes.h"
+#include "../common/ers.h" // struct eri
+#include "../common/mmo.h" // JOB_*, MAX_FAME_LIST, struct fame_list, struct mmo_charstatus
 
 /**
  * Defines
@@ -742,9 +742,8 @@ struct pc_interface {
 	unsigned int exp_table[CLASS_COUNT][2][MAX_LEVEL];
 	unsigned int max_level[CLASS_COUNT][2];
 	unsigned int statp[MAX_LEVEL+1];
-#if defined(RENEWAL_DROP) || defined(RENEWAL_EXP)
 	unsigned int level_penalty[3][RC_MAX][MAX_LEVEL*2+1];
-#endif
+
 	unsigned int equip_pos[EQI_MAX];
 	/* */
 	struct skill_tree_entry skill_tree[CLASS_COUNT][MAX_SKILL_TREE];
diff --git a/src/map/pc_groups.c b/src/map/pc_groups.c
index 906462c7e..a917ef409 100644
--- a/src/map/pc_groups.c
+++ b/src/map/pc_groups.c
@@ -2,6 +2,14 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "pc_groups.h"
+
+#include "atcommand.h" // atcommand->exists(), atcommand->load_groups()
+#include "clif.h"      // clif->GM_kick()
+#include "map.h"       // mapiterator
+#include "pc.h"        // pc->set_group()
 #include "../common/cbasetypes.h"
 #include "../common/conf.h"
 #include "../common/db.h"
@@ -10,12 +18,6 @@
 #include "../common/showmsg.h"
 #include "../common/strlib.h" // strcmp
 
-#include "pc_groups.h"
-#include "atcommand.h" // atcommand->exists(), atcommand->load_groups()
-#include "clif.h"      // clif->GM_kick()
-#include "map.h"       // mapiterator
-#include "pc.h"        // pc->set_group()
-
 static GroupSettings dummy_group; ///< dummy group used in dummy map sessions @see pc_get_dummy_sd()
 
 struct pc_groups_interface pcg_s;
diff --git a/src/map/pc_groups.h b/src/map/pc_groups.h
index 5c03f999f..7c8cdd82a 100644
--- a/src/map/pc_groups.h
+++ b/src/map/pc_groups.h
@@ -5,6 +5,10 @@
 #ifndef _MAP_PC_GROUPS_H_
 #define _MAP_PC_GROUPS_H_
 
+#include "../common/cbasetypes.h"
+#include "../common/conf.h"
+#include "../common/db.h"
+
 /// PC permissions
 enum e_pc_permission {
 	PC_PERM_NONE                = 0,        //  #0
diff --git a/src/map/pet.c b/src/map/pet.c
index 993497434..aa2be4473 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -2,37 +2,39 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/db.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/malloc.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
-#include "../common/ers.h"
+#define HERCULES_CORE
 
-#include "pc.h"
-#include "status.h"
-#include "map.h"
-#include "path.h"
-#include "intif.h"
-#include "clif.h"
-#include "chrif.h"
 #include "pet.h"
-#include "itemdb.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "atcommand.h" // msg_txt()
 #include "battle.h"
+#include "chrif.h"
+#include "clif.h"
+#include "intif.h"
+#include "itemdb.h"
+#include "log.h"
+#include "map.h"
 #include "mob.h"
 #include "npc.h"
+#include "path.h"
+#include "pc.h"
 #include "script.h"
 #include "skill.h"
+#include "status.h"
 #include "unit.h"
-#include "atcommand.h" // msg_txt()
-#include "log.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "../common/db.h"
+#include "../common/ers.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 struct pet_interface pet_s;
 
diff --git a/src/map/pet.h b/src/map/pet.h
index 4ec30b3fb..8dde0fac2 100644
--- a/src/map/pet.h
+++ b/src/map/pet.h
@@ -5,8 +5,14 @@
 #ifndef _MAP_PET_H_
 #define _MAP_PET_H_
 
-#define MAX_PET_DB	300
-#define MAX_PETLOOT_SIZE	30
+#include "map.h" // struct block_list
+#include "status.h" // enum sc_type
+#include "unit.h" // struct unit_data
+#include "../common/cbasetypes.h"
+#include "../common/mmo.h" // NAME_LENGTH, struct s_pet
+
+#define MAX_PET_DB       300
+#define MAX_PETLOOT_SIZE 30
 
 struct s_pet_db {
 	short class_;
diff --git a/src/map/quest.c b/src/map/quest.c
index bde276f9d..b76d6bc82 100644
--- a/src/map/quest.c
+++ b/src/map/quest.c
@@ -2,36 +2,37 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
+#define HERCULES_CORE
 
-#include "map.h"
-#include "pc.h"
-#include "npc.h"
-#include "itemdb.h"
-#include "script.h"
-#include "intif.h"
-#include "battle.h"
-#include "mob.h"
-#include "party.h"
-#include "unit.h"
-#include "log.h"
-#include "clif.h"
 #include "quest.h"
-#include "chrif.h"
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdarg.h>
 #include <time.h>
 
+#include "battle.h"
+#include "chrif.h"
+#include "clif.h"
+#include "intif.h"
+#include "itemdb.h"
+#include "log.h"
+#include "map.h"
+#include "mob.h"
+#include "npc.h"
+#include "party.h"
+#include "pc.h"
+#include "script.h"
+#include "unit.h"
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 struct quest_interface quest_s;
 
diff --git a/src/map/quest.h b/src/map/quest.h
index e01e35619..87894d639 100644
--- a/src/map/quest.h
+++ b/src/map/quest.h
@@ -5,6 +5,10 @@
 #ifndef _MAP_QUEST_H_
 #define _MAP_QUEST_H_
 
+#include "map.h" // TBL_PC
+#include "../common/cbasetypes.h"
+#include "../common/mmo.h" // MAX_QUEST_OBJECTIVES
+
 #define MAX_QUEST_DB (60355+1) // Highest quest ID + 1
 
 struct quest_db {
diff --git a/src/map/script.c b/src/map/script.c
index 4d77c506b..068be8524 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -2,6 +2,46 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "../config/core.h" // NEW_CARTS, RENEWAL, RENEWAL_ASPD, RENEWAL_CAST, RENEWAL_DROP, RENEWAL_EDP, RENEWAL_EXP, RENEWAL_LVDMG, SCRIPT_CALLFUNC_CHECK, SECURE_NPCTIMEOUT, SECURE_NPCTIMEOUT_INTERVAL
+#include "script.h"
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "atcommand.h"
+#include "battle.h"
+#include "battleground.h"
+#include "chat.h"
+#include "chrif.h"
+#include "clif.h"
+#include "elemental.h"
+#include "guild.h"
+#include "homunculus.h"
+#include "instance.h"
+#include "intif.h"
+#include "itemdb.h"
+#include "log.h"
+#include "mail.h"
+#include "map.h"
+#include "mapreg.h"
+#include "mercenary.h"
+#include "mob.h"
+#include "npc.h"
+#include "party.h"
+#include "path.h"
+#include "pc.h"
+#include "pet.h"
+#include "pet.h"
+#include "quest.h"
+#include "skill.h"
+#include "status.h"
+#include "status.h"
+#include "storage.h"
+#include "unit.h"
 #include "../common/cbasetypes.h"
 #include "../common/malloc.h"
 #include "../common/md5calc.h"
@@ -10,47 +50,10 @@
 #include "../common/showmsg.h"
 #include "../common/socket.h" // usage: getcharip
 #include "../common/strlib.h"
+#include "../common/sysinfo.h"
 #include "../common/timer.h"
 #include "../common/utils.h"
-#include "../common/sysinfo.h"
-
-#include "map.h"
-#include "path.h"
-#include "clif.h"
-#include "chrif.h"
-#include "itemdb.h"
-#include "pc.h"
-#include "status.h"
-#include "storage.h"
-#include "mob.h"
-#include "npc.h"
-#include "pet.h"
-#include "mapreg.h"
-#include "homunculus.h"
-#include "instance.h"
-#include "mercenary.h"
-#include "intif.h"
-#include "skill.h"
-#include "status.h"
-#include "chat.h"
-#include "battle.h"
-#include "battleground.h"
-#include "party.h"
-#include "guild.h"
-#include "atcommand.h"
-#include "log.h"
-#include "unit.h"
-#include "pet.h"
-#include "mail.h"
-#include "script.h"
-#include "quest.h"
-#include "elemental.h"
-#include "../config/core.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
 #ifndef WIN32
 	#include <sys/time.h>
 #endif
diff --git a/src/map/script.h b/src/map/script.h
index 90b18d87f..899c745da 100644
--- a/src/map/script.h
+++ b/src/map/script.h
@@ -5,17 +5,19 @@
 #ifndef _MAP_SCRIPT_H_
 #define _MAP_SCRIPT_H_
 
-#include "../common/strlib.h" //StringBuf
-#include "../common/cbasetypes.h"
-#include "map.h" //EVENT_NAME_LENGTH
-
 #include <setjmp.h>
 #include <errno.h>
 
+#include "map.h" //EVENT_NAME_LENGTH
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+#include "../common/mmo.h" // struct item
+#include "../common/sql.h" // Sql
+#include "../common/strlib.h" //StringBuf
+
 /**
  * Declarations
  **/
-struct map_session_data;
 struct eri;
 
 /**
diff --git a/src/map/searchstore.c b/src/map/searchstore.c
index 0144aea93..72b28aacd 100644
--- a/src/map/searchstore.c
+++ b/src/map/searchstore.c
@@ -2,14 +2,17 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#define HERCULES_CORE
+
+#include "searchstore.h"  // struct s_search_store_info
+
+#include "battle.h"  // battle_config.*
+#include "clif.h"  // clif->open_search_store_info, clif->search_store_info_*
+#include "pc.h"  // struct map_session_data
 #include "../common/cbasetypes.h"
 #include "../common/malloc.h"  // aMalloc, aRealloc, aFree
 #include "../common/showmsg.h"  // ShowError, ShowWarning
 #include "../common/strlib.h"  // safestrncpy
-#include "battle.h"  // battle_config.*
-#include "clif.h"  // clif->open_search_store_info, clif->search_store_info_*
-#include "pc.h"  // struct map_session_data
-#include "searchstore.h"  // struct s_search_store_info
 
 struct searchstore_interface searchstore_s;
 
diff --git a/src/map/searchstore.h b/src/map/searchstore.h
index 827e39053..c9b93ba54 100644
--- a/src/map/searchstore.h
+++ b/src/map/searchstore.h
@@ -5,6 +5,12 @@
 #ifndef _MAP_SEARCHSTORE_H_
 #define _MAP_SEARCHSTORE_H_
 
+#include <time.h>
+
+#include "map.h" // MESSAGE_SIZE
+#include "../common/cbasetypes.h"
+#include "../common/mmo.h" // MAX_SLOTS
+
 /**
  * Defines
  **/
diff --git a/src/map/skill.c b/src/map/skill.c
index c8388770a..b2e94ec79 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -2,46 +2,48 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/malloc.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
-#include "../common/ers.h"
+#define HERCULES_CORE
 
-#include "map.h"
-#include "path.h"
-#include "clif.h"
-#include "pc.h"
-#include "status.h"
+#include "../config/core.h" // DBPATH, MAGIC_REFLECTION_TYPE, OFFICIAL_WALKPATH, RENEWAL, RENEWAL_CAST, VARCAST_REDUCTION()
 #include "skill.h"
-#include "pet.h"
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include "battle.h"
+#include "battleground.h"
+#include "chrif.h"
+#include "clif.h"
+#include "date.h"
+#include "elemental.h"
+#include "guild.h"
 #include "homunculus.h"
+#include "intif.h"
+#include "itemdb.h"
+#include "log.h"
+#include "map.h"
 #include "mercenary.h"
-#include "elemental.h"
 #include "mob.h"
 #include "npc.h"
-#include "battle.h"
-#include "battleground.h"
 #include "party.h"
-#include "itemdb.h"
+#include "path.h"
+#include "pc.h"
+#include "pet.h"
 #include "script.h"
-#include "intif.h"
-#include "log.h"
-#include "chrif.h"
-#include "guild.h"
-#include "date.h"
+#include "status.h"
 #include "unit.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <math.h>
-
+#include "../common/cbasetypes.h"
+#include "../common/ers.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 #define SKILLUNITTIMER_INTERVAL	100
 
diff --git a/src/map/skill.h b/src/map/skill.h
index dda310bd4..b6dbb1fcb 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -5,19 +5,23 @@
 #ifndef _MAP_SKILL_H_
 #define _MAP_SKILL_H_
 
-#include "../common/mmo.h" // MAX_SKILL, struct square
-#include "../common/db.h"
+#include "../config/core.h" // RENEWAL_CAST
+
 #include "map.h" // struct block_list
+#include "status.h" // enum sc_type
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+#include "../common/mmo.h" // MAX_SKILL, struct square
 
 /**
  * Declarations
  **/
-struct map_session_data;
 struct homun_data;
+struct map_session_data;
+struct mercenary_data;
 struct skill_unit;
-struct skill_unit_group;
-struct status_change_entry;
 struct square;
+struct status_change_entry;
 
 /**
  * Defines
diff --git a/src/map/status.c b/src/map/status.c
index 4c2bc6d22..eb06138da 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -2,43 +2,46 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/malloc.h"
-#include "../common/utils.h"
-#include "../common/ers.h"
-#include "../common/strlib.h"
+#define HERCULES_CORE
+
+#include "../config/core.h" // ANTI_MAYAP_CHEAT, DBPATH, DEFTYPE_MAX, DEFTYPE_MIN, DEVOTION_REFLECT_DAMAGE, RENEWAL, RENEWAL_ASPD, RENEWAL_EDP
+#include "status.h"
 
+#include <math.h>
+#include <memory.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include "battle.h"
+#include "chrif.h"
+#include "clif.h"
+#include "elemental.h"
+#include "guild.h"
+#include "homunculus.h"
+#include "itemdb.h"
 #include "map.h"
+#include "mercenary.h"
+#include "mob.h"
+#include "npc.h"
 #include "path.h"
 #include "pc.h"
 #include "pet.h"
-#include "npc.h"
-#include "mob.h"
-#include "clif.h"
-#include "guild.h"
+#include "script.h"
 #include "skill.h"
-#include "itemdb.h"
-#include "battle.h"
-#include "chrif.h"
 #include "skill.h"
-#include "status.h"
-#include "script.h"
 #include "unit.h"
-#include "homunculus.h"
-#include "mercenary.h"
-#include "elemental.h"
 #include "vending.h"
-
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <memory.h>
-#include <string.h>
-#include <math.h>
+#include "../common/cbasetypes.h"
+#include "../common/ers.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 struct status_interface status_s;
 
diff --git a/src/map/status.h b/src/map/status.h
index e47c2b365..baa586297 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -5,14 +5,18 @@
 #ifndef _MAP_STATUS_H_
 #define _MAP_STATUS_H_
 
+#include "../config/core.h" // defType, NEW_CARTS, RENEWAL, RENEWAL_ASPD
+
+#include "../common/cbasetypes.h"
 #include "../common/mmo.h"
 
 struct block_list;
-struct mob_data;
-struct pet_data;
+struct elemental_data;
 struct homun_data;
 struct mercenary_data;
-struct status_change;
+struct mob_data;
+struct npc_data;
+struct pet_data;
 
 //Change the equation when the values are high enough to discard the
 //imprecision in exchange of overflow protection [Skotlex]
@@ -1878,11 +1882,7 @@ struct status_interface {
 	int hp_coefficient2[CLASS_COUNT];
 	int hp_sigma_val[CLASS_COUNT][MAX_LEVEL+1];
 	int sp_coefficient[CLASS_COUNT];
-#ifdef RENEWAL_ASPD
-	int aspd_base[CLASS_COUNT][MAX_WEAPON_TYPE+1];
-#else
-	int aspd_base[CLASS_COUNT][MAX_WEAPON_TYPE]; //[blackhole89]
-#endif
+	int aspd_base[CLASS_COUNT][MAX_WEAPON_TYPE+1]; // +1 for RENEWAL_ASPD
 	sc_type Skill2SCTable[MAX_SKILL];  // skill  -> status
 	int IconChangeTable[SC_MAX];          // status -> "icon" (icon is a bit of a misnomer, since there exist values with no icon associated)
 	unsigned int ChangeFlagTable[SC_MAX]; // status -> flags
diff --git a/src/map/storage.c b/src/map/storage.c
index e65ed7b80..2db5fff3d 100644
--- a/src/map/storage.c
+++ b/src/map/storage.c
@@ -2,28 +2,30 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/db.h"
-#include "../common/nullpo.h"
-#include "../common/malloc.h"
-#include "../common/showmsg.h"
+#define HERCULES_CORE
 
-#include "map.h" // struct map_session_data
 #include "storage.h"
-#include "chrif.h"
-#include "itemdb.h"
-#include "clif.h"
-#include "intif.h"
-#include "pc.h"
-#include "guild.h"
-#include "battle.h"
-#include "atcommand.h"
-#include "log.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "atcommand.h"
+#include "battle.h"
+#include "chrif.h"
+#include "clif.h"
+#include "guild.h"
+#include "intif.h"
+#include "itemdb.h"
+#include "log.h"
+#include "map.h" // struct map_session_data
+#include "pc.h"
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+
 struct storage_interface storage_s;
 struct guild_storage_interface gstorage_s;
 
diff --git a/src/map/storage.h b/src/map/storage.h
index 8f9f904f6..5edb68cfc 100644
--- a/src/map/storage.h
+++ b/src/map/storage.h
@@ -5,11 +5,12 @@
 #ifndef _MAP_STORAGE_H_
 #define _MAP_STORAGE_H_
 
-struct storage_data;
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+
 struct guild_storage;
 struct item;
 struct map_session_data;
-struct DBMap;
 
 struct storage_interface {
 	/* */
diff --git a/src/map/trade.c b/src/map/trade.c
index 44b669ebd..83426c407 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -2,25 +2,27 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/nullpo.h"
-#include "../common/socket.h"
+#define HERCULES_CORE
 
 #include "trade.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#include "atcommand.h"
+#include "battle.h"
+#include "chrif.h"
 #include "clif.h"
+#include "intif.h"
 #include "itemdb.h"
+#include "log.h"
 #include "map.h"
+#include "npc.h"
 #include "path.h"
 #include "pc.h"
-#include "npc.h"
-#include "battle.h"
-#include "chrif.h"
 #include "storage.h"
-#include "intif.h"
-#include "atcommand.h"
-#include "log.h"
-
-#include <stdio.h>
-#include <string.h>
+#include "../common/nullpo.h"
+#include "../common/socket.h"
 
 struct trade_interface trade_s;
 
diff --git a/src/map/unit.c b/src/map/unit.c
index 151d4bad5..0ad770e80 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -2,45 +2,48 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/showmsg.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/db.h"
-#include "../common/malloc.h"
-#include "../common/random.h"
-#include "../common/HPM.h"
+#define HERCULES_CORE
 
+#include "../config/core.h" // RENEWAL_CAST
+#include "unit.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "battle.h"
+#include "battleground.h"
+#include "chat.h"
+#include "chrif.h"
+#include "clif.h"
+#include "duel.h"
+#include "elemental.h"
+#include "guild.h"
+#include "homunculus.h"
+#include "instance.h"
+#include "intif.h"
 #include "map.h"
+#include "mercenary.h"
+#include "mob.h"
+#include "npc.h"
+#include "party.h"
 #include "path.h"
 #include "pc.h"
-#include "mob.h"
 #include "pet.h"
-#include "homunculus.h"
-#include "instance.h"
-#include "mercenary.h"
-#include "elemental.h"
+#include "script.h"
 #include "skill.h"
-#include "clif.h"
-#include "duel.h"
-#include "npc.h"
-#include "guild.h"
 #include "status.h"
-#include "unit.h"
-#include "battle.h"
-#include "battleground.h"
-#include "chat.h"
+#include "storage.h"
 #include "trade.h"
 #include "vending.h"
-#include "party.h"
-#include "intif.h"
-#include "chrif.h"
-#include "script.h"
-#include "storage.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
+#include "../common/HPM.h"
+#include "../common/db.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/timer.h"
 
 const short dirx[8]={0,-1,-1,-1,0,1,1,1};
 const short diry[8]={1,1,0,-1,-1,-1,0,1};
diff --git a/src/map/unit.h b/src/map/unit.h
index 33fa4e052..9e05647b1 100644
--- a/src/map/unit.h
+++ b/src/map/unit.h
@@ -5,15 +5,13 @@
 #ifndef _MAP_UNIT_H_
 #define _MAP_UNIT_H_
 
-//#include "map.h"
-struct block_list;
-struct unit_data;
-struct map_session_data;
-
 #include "clif.h"  // clr_type
-#include "map.h" // struct block_list
 #include "path.h" // struct walkpath_data
-#include "skill.h" // struct skill_timerskill, struct skill_unit_group, struct skill_unit_group_tickset
+#include "skill.h" // 'MAX_SKILLTIMERSKILL, struct skill_timerskill, struct skill_unit_group, struct skill_unit_group_tickset
+#include "../common/cbasetypes.h"
+
+struct map_session_data;
+struct block_list;
 
 struct unit_data {
 	struct block_list *bl;
diff --git a/src/map/vending.c b/src/map/vending.c
index 9462975b3..c8ac814db 100644
--- a/src/map/vending.c
+++ b/src/map/vending.c
@@ -2,24 +2,27 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/nullpo.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
+#define HERCULES_CORE
+
+#include "vending.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#include "atcommand.h"
+#include "battle.h"
+#include "chrif.h"
 #include "clif.h"
 #include "itemdb.h"
-#include "atcommand.h"
+#include "log.h"
 #include "map.h"
+#include "npc.h"
 #include "path.h"
-#include "chrif.h"
-#include "vending.h"
 #include "pc.h"
-#include "npc.h"
 #include "skill.h"
-#include "battle.h"
-#include "log.h"
-
-#include <stdio.h>
-#include <string.h>
+#include "../common/nullpo.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
 
 struct vending_interface vending_s;
 
diff --git a/src/map/vending.h b/src/map/vending.h
index a212f8385..a70726374 100644
--- a/src/map/vending.h
+++ b/src/map/vending.h
@@ -7,6 +7,7 @@
 
 #include "../common/cbasetypes.h"
 #include "../common/db.h"
+
 struct map_session_data;
 struct s_search_store_search;
 
diff --git a/src/tool/mapcache.c b/src/tool/mapcache.c
index 85d5fb548..96d51aec6 100644
--- a/src/tool/mapcache.c
+++ b/src/tool/mapcache.c
@@ -1,6 +1,14 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
+#define HERCULES_CORE
+
+#include "../config/core.h" // RENEWAL
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "../common/cbasetypes.h"
 #include "../common/grfio.h"
 #include "../common/malloc.h"
@@ -8,12 +16,6 @@
 #include "../common/showmsg.h"
 #include "../common/utils.h"
 
-#include "../config/renewal.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #ifndef _WIN32
 #include <unistd.h>
 #endif
-- 
cgit v1.2.3-70-g09d2


From 68e7f53f05dd80e8b4ab9d84c9931df22a6b060c Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Thu, 10 Jul 2014 16:59:55 +0200
Subject: Fixed reserved __identifier violations

- Complies with CERT DCL37-C
- Fixes issue #293 (special thanks to elfring)

Signed-off-by: Haru <haru@dotalux.com>
---
 src/char/char.h                     |   6 +-
 src/char/int_auction.h              |   6 +-
 src/char/int_elemental.h            |   6 +-
 src/char/int_guild.h                |   6 +-
 src/char/int_homun.h                |   6 +-
 src/char/int_mail.h                 |   6 +-
 src/char/int_mercenary.h            |   6 +-
 src/char/int_party.h                |   6 +-
 src/char/int_pet.h                  |   6 +-
 src/char/int_quest.h                |   6 +-
 src/char/int_storage.h              |   6 +-
 src/char/inter.h                    |   6 +-
 src/char/pincode.h                  |   6 +-
 src/common/HPM.h                    |   6 +-
 src/common/HPMDataCheck.h           | 144 ++++++++++++++++++------------------
 src/common/HPMi.h                   |   6 +-
 src/common/atomic.h                 |   6 +-
 src/common/cbasetypes.h             |  10 +--
 src/common/conf.h                   |   6 +-
 src/common/console.h                |   6 +-
 src/common/core.h                   |   6 +-
 src/common/db.h                     |   6 +-
 src/common/des.h                    |   6 +-
 src/common/ers.h                    |   6 +-
 src/common/grfio.c                  |   2 +-
 src/common/grfio.h                  |   6 +-
 src/common/malloc.c                 |  33 ++++-----
 src/common/malloc.h                 |   6 +-
 src/common/mapindex.h               |   6 +-
 src/common/md5calc.h                |   6 +-
 src/common/mmo.h                    |   6 +-
 src/common/mutex.h                  |   6 +-
 src/common/nullpo.h                 |   6 +-
 src/common/random.h                 |   6 +-
 src/common/showmsg.c                |  30 ++++----
 src/common/showmsg.h                |   8 +-
 src/common/socket.c                 |  12 +--
 src/common/socket.h                 |  10 +--
 src/common/spinlock.h               |   6 +-
 src/common/sql.h                    |   6 +-
 src/common/strlib.c                 |   6 +-
 src/common/strlib.h                 |  14 ++--
 src/common/sysinfo.h                |   6 +-
 src/common/thread.c                 |  10 +--
 src/common/thread.h                 |   6 +-
 src/common/timer.c                  |  10 +--
 src/common/timer.h                  |   6 +-
 src/common/utils.h                  |   6 +-
 src/config/classes/general.h        |   6 +-
 src/config/const.h                  |   6 +-
 src/config/core.h                   |   6 +-
 src/config/renewal.h                |   6 +-
 src/config/secure.h                 |   6 +-
 src/login/account.h                 |   6 +-
 src/login/ipban.h                   |   6 +-
 src/login/login.h                   |   6 +-
 src/login/loginlog.h                |   6 +-
 src/map/HPMmap.h                    |   6 +-
 src/map/atcommand.c                 |   2 +-
 src/map/atcommand.h                 |   6 +-
 src/map/battle.c                    |   2 +-
 src/map/battle.h                    |   6 +-
 src/map/battleground.h              |   6 +-
 src/map/buyingstore.h               |   6 +-
 src/map/chat.h                      |   6 +-
 src/map/chrif.h                     |   6 +-
 src/map/clif.c                      |   2 +-
 src/map/clif.h                      |   6 +-
 src/map/date.h                      |   6 +-
 src/map/duel.h                      |   6 +-
 src/map/elemental.h                 |   6 +-
 src/map/guild.c                     |   6 +-
 src/map/guild.h                     |   6 +-
 src/map/homunculus.h                |   6 +-
 src/map/instance.h                  |   6 +-
 src/map/intif.c                     |   2 +-
 src/map/intif.h                     |   6 +-
 src/map/irc-bot.h                   |   6 +-
 src/map/itemdb.h                    |   6 +-
 src/map/log.h                       |   6 +-
 src/map/mail.h                      |   6 +-
 src/map/map.h                       |  10 +--
 src/map/mapreg.h                    |   6 +-
 src/map/mercenary.h                 |   6 +-
 src/map/mob.h                       |   6 +-
 src/map/npc.c                       |   2 +-
 src/map/npc.h                       |   6 +-
 src/map/packets.h                   |   6 +-
 src/map/packets_struct.h            |   6 +-
 src/map/party.h                     |   6 +-
 src/map/path.h                      |   6 +-
 src/map/pc.c                        |   4 +-
 src/map/pc.h                        |   6 +-
 src/map/pc_groups.h                 |   6 +-
 src/map/pet.h                       |   6 +-
 src/map/quest.h                     |   6 +-
 src/map/script.c                    |  48 ++++++------
 src/map/script.h                    |   6 +-
 src/map/searchstore.h               |   6 +-
 src/map/skill.h                     |   6 +-
 src/map/status.h                    |   6 +-
 src/map/storage.c                   |   6 +-
 src/map/storage.h                   |   8 +-
 src/map/trade.h                     |   6 +-
 src/map/unit.h                      |   6 +-
 src/map/vending.h                   |   6 +-
 tools/HPMHookGen/HPMDataCheckGen.pl |   8 +-
 107 files changed, 441 insertions(+), 446 deletions(-)

(limited to 'src/common/utils.h')

diff --git a/src/char/char.h b/src/char/char.h
index 09a78f6b9..5a70d2ca7 100644
--- a/src/char/char.h
+++ b/src/char/char.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _COMMON_CHAR_H_
-#define _COMMON_CHAR_H_
+#ifndef COMMON_CHAR_H
+#define COMMON_CHAR_H
 
 #include "../common/core.h" // CORE_ST_LAST
 #include "../common/db.h"
@@ -123,4 +123,4 @@ void global_accreg_to_login_start (int account_id, int char_id);
 void global_accreg_to_login_send (void);
 void global_accreg_to_login_add (const char *key, unsigned int index, intptr_t val, bool is_string);
 
-#endif /* _COMMON_CHAR_H_ */
+#endif /* COMMON_CHAR_H */
diff --git a/src/char/int_auction.h b/src/char/int_auction.h
index f10794f73..17fd75a58 100644
--- a/src/char/int_auction.h
+++ b/src/char/int_auction.h
@@ -1,12 +1,12 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _CHAR_INT_AUCTION_H_
-#define _CHAR_INT_AUCTION_H_
+#ifndef CHAR_INT_AUCTION_H
+#define CHAR_INT_AUCTION_H
 
 int inter_auction_parse_frommap(int fd);
 
 int inter_auction_sql_init(void);
 void inter_auction_sql_final(void);
 
-#endif /* _CHAR_INT_AUCTION_H_ */
+#endif /* CHAR_INT_AUCTION_H */
diff --git a/src/char/int_elemental.h b/src/char/int_elemental.h
index c869e6fc2..e28cfedea 100644
--- a/src/char/int_elemental.h
+++ b/src/char/int_elemental.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _CHAR_INT_ELEMENTAL_H_
-#define _CHAR_INT_ELEMENTAL_H_
+#ifndef CHAR_INT_ELEMENTAL_H
+#define CHAR_INT_ELEMENTAL_H
 
 #include "../common/cbasetypes.h"
 
@@ -12,4 +12,4 @@ int inter_elemental_parse_frommap(int fd);
 
 bool mapif_elemental_delete(int ele_id);
 
-#endif /* _CHAR_INT_ELEMENTAL_H_ */
+#endif /* CHAR_INT_ELEMENTAL_H */
diff --git a/src/char/int_guild.h b/src/char/int_guild.h
index 5e657ff06..bc457d86b 100644
--- a/src/char/int_guild.h
+++ b/src/char/int_guild.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _CHAR_INT_GUILD_H_
-#define _CHAR_INT_GUILD_H_
+#ifndef CHAR_INT_GUILD_H
+#define CHAR_INT_GUILD_H
 
 enum {
 	GS_BASIC = 0x0001,
@@ -31,4 +31,4 @@ int inter_guild_charname_changed(int guild_id,int account_id, int char_id, char
 int inter_guild_CharOnline(int char_id, int guild_id);
 int inter_guild_CharOffline(int char_id, int guild_id);
 
-#endif /* _CHAR_INT_GUILD_H_ */
+#endif /* CHAR_INT_GUILD_H */
diff --git a/src/char/int_homun.h b/src/char/int_homun.h
index 9477f4f03..6fa4f9dc7 100644
--- a/src/char/int_homun.h
+++ b/src/char/int_homun.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _CHAR_INT_HOMUN_H_
-#define _CHAR_INT_HOMUN_H_
+#ifndef CHAR_INT_HOMUN_H
+#define CHAR_INT_HOMUN_H
 
 #include "../common/cbasetypes.h"
 
@@ -17,4 +17,4 @@ bool mapif_homunculus_load(int homun_id, struct s_homunculus* hd);
 bool mapif_homunculus_delete(int homun_id);
 bool mapif_homunculus_rename(char *name);
 
-#endif /* _CHAR_INT_HOMUN_H_ */
+#endif /* CHAR_INT_HOMUN_H */
diff --git a/src/char/int_mail.h b/src/char/int_mail.h
index 824ba48a3..8800061d7 100644
--- a/src/char/int_mail.h
+++ b/src/char/int_mail.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _CHAR_INT_MAIL_H_
-#define _CHAR_INT_MAIL_H_
+#ifndef CHAR_INT_MAIL_H
+#define CHAR_INT_MAIL_H
 
 struct item;
 struct mail_message;
@@ -16,4 +16,4 @@ void inter_mail_sql_final(void);
 int mail_savemessage(struct mail_message* msg);
 void mapif_Mail_new(struct mail_message *msg);
 
-#endif /* _CHAR_INT_MAIL_H_ */
+#endif /* CHAR_INT_MAIL_H */
diff --git a/src/char/int_mercenary.h b/src/char/int_mercenary.h
index 195a83b34..b03c20de3 100644
--- a/src/char/int_mercenary.h
+++ b/src/char/int_mercenary.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _CHAR_INT_MERCENARY_H_
-#define _CHAR_INT_MERCENARY_H_
+#ifndef CHAR_INT_MERCENARY_H
+#define CHAR_INT_MERCENARY_H
 
 #include "../common/cbasetypes.h"
 
@@ -19,4 +19,4 @@ bool mercenary_owner_delete(int char_id);
 
 bool mapif_mercenary_delete(int merc_id);
 
-#endif /* _CHAR_INT_MERCENARY_H_ */
+#endif /* CHAR_INT_MERCENARY_H */
diff --git a/src/char/int_party.h b/src/char/int_party.h
index 33325b46b..2b24b1d1a 100644
--- a/src/char/int_party.h
+++ b/src/char/int_party.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _CHAR_INT_PARTY_H_
-#define _CHAR_INT_PARTY_H_
+#ifndef CHAR_INT_PARTY_H
+#define CHAR_INT_PARTY_H
 
 //Party Flags on what to save/delete.
 enum {
@@ -21,4 +21,4 @@ int inter_party_leave(int party_id,int account_id, int char_id);
 int inter_party_CharOnline(int char_id, int party_id);
 int inter_party_CharOffline(int char_id, int party_id);
 
-#endif /* _CHAR_INT_PARTY_H_ */
+#endif /* CHAR_INT_PARTY_H */
diff --git a/src/char/int_pet.h b/src/char/int_pet.h
index a16cb7a37..52642fc54 100644
--- a/src/char/int_pet.h
+++ b/src/char/int_pet.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _CHAR_INT_PET_H_
-#define _CHAR_INT_PET_H_
+#ifndef CHAR_INT_PET_H
+#define CHAR_INT_PET_H
 
 struct s_pet;
 
@@ -18,4 +18,4 @@ int inter_pet_sql_init(void);
 //Exported for use in the TXT-SQL converter.
 int inter_pet_tosql(int pet_id, struct s_pet *p);
 
-#endif /* _CHAR_INT_PET_H_ */
+#endif /* CHAR_INT_PET_H */
diff --git a/src/char/int_quest.h b/src/char/int_quest.h
index 6267c74ad..f0dd370ea 100644
--- a/src/char/int_quest.h
+++ b/src/char/int_quest.h
@@ -1,10 +1,10 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _CHAR_QUEST_H_
-#define _CHAR_QUEST_H_
+#ifndef CHAR_QUEST_H
+#define CHAR_QUEST_H
 
 int inter_quest_parse_frommap(int fd);
 
-#endif /* _CHAR_QUEST_H_ */
+#endif /* CHAR_QUEST_H */
 
diff --git a/src/char/int_storage.h b/src/char/int_storage.h
index 1693499a5..1cef94d98 100644
--- a/src/char/int_storage.h
+++ b/src/char/int_storage.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _CHAR_INT_STORAGE_H_
-#define _CHAR_INT_STORAGE_H_
+#ifndef CHAR_INT_STORAGE_H
+#define CHAR_INT_STORAGE_H
 
 struct storage_data;
 struct guild_storage;
@@ -19,4 +19,4 @@ int storage_fromsql(int account_id, struct storage_data* p);
 int storage_tosql(int account_id,struct storage_data *p);
 int guild_storage_tosql(int guild_id, struct guild_storage *p);
 
-#endif /* _CHAR_INT_STORAGE_H_ */
+#endif /* CHAR_INT_STORAGE_H */
diff --git a/src/char/inter.h b/src/char/inter.h
index 5e655237e..ab2478ae6 100644
--- a/src/char/inter.h
+++ b/src/char/inter.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _CHAR_INTER_H_
-#define _CHAR_INTER_H_
+#ifndef CHAR_INTER_H
+#define CHAR_INTER_H
 
 #include "char.h"
 #include "../common/sql.h"
@@ -30,4 +30,4 @@ extern Sql* lsql_handle;
 
 int inter_accreg_tosql(int account_id, int char_id, struct accreg *reg, int type);
 
-#endif /* _CHAR_INTER_H_ */
+#endif /* CHAR_INTER_H */
diff --git a/src/char/pincode.h b/src/char/pincode.h
index 3b71eec7c..1ed05095e 100644
--- a/src/char/pincode.h
+++ b/src/char/pincode.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _CHAR_PINCODE_H_
-#define _CHAR_PINCODE_H_
+#ifndef CHAR_PINCODE_H
+#define CHAR_PINCODE_H
 
 #include "char.h"
 
@@ -40,4 +40,4 @@ struct pincode_interface *pincode;
 
 void pincode_defaults(void);
 
-#endif /* _CHAR_PINCODE_H_ */
+#endif /* CHAR_PINCODE_H */
diff --git a/src/common/HPM.h b/src/common/HPM.h
index 5667f605a..fe8d45066 100644
--- a/src/common/HPM.h
+++ b/src/common/HPM.h
@@ -1,8 +1,8 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 
-#ifndef _COMMON_HPM_H_
-#define _COMMON_HPM_H_
+#ifndef COMMON_HPM_H
+#define COMMON_HPM_H
 
 #ifndef HERCULES_CORE
 #error You should never include HPM.h from a plugin.
@@ -158,4 +158,4 @@ struct HPM_interface *HPM;
 
 void hpm_defaults(void);
 
-#endif /* _COMMON_HPM_H_ */
+#endif /* COMMON_HPM_H */
diff --git a/src/common/HPMDataCheck.h b/src/common/HPMDataCheck.h
index c5ec3771d..79ec36472 100644
--- a/src/common/HPMDataCheck.h
+++ b/src/common/HPMDataCheck.h
@@ -3,140 +3,140 @@
 //
 // NOTE: This file was auto-generated and should never be manually edited,
 //       as it will get overwritten.
-#ifndef _HPM_DATA_CHECK_H_
-#define _HPM_DATA_CHECK_H_
+#ifndef HPM_DATA_CHECK_H
+#define HPM_DATA_CHECK_H
 
 
 HPExport const struct s_HPMDataCheck HPMDataCheck[] = {
-	#ifdef _COMMON_CONF_H_
+	#ifdef COMMON_CONF_H
 		{ "libconfig_interface", sizeof(struct libconfig_interface) },
 	#else
-		#define _COMMON_CONF_H_
-	#endif // _COMMON_CONF_H_
-	#ifdef _COMMON_DB_H_
+		#define COMMON_CONF_H
+	#endif // COMMON_CONF_H
+	#ifdef COMMON_DB_H
 		{ "DBData", sizeof(struct DBData) },
 		{ "DBIterator", sizeof(struct DBIterator) },
 		{ "DBMap", sizeof(struct DBMap) },
 	#else
-		#define _COMMON_DB_H_
-	#endif // _COMMON_DB_H_
-	#ifdef _COMMON_DES_H_
+		#define COMMON_DB_H
+	#endif // COMMON_DB_H
+	#ifdef COMMON_DES_H
 		{ "BIT64", sizeof(struct BIT64) },
 	#else
-		#define _COMMON_DES_H_
-	#endif // _COMMON_DES_H_
-	#ifdef _COMMON_ERS_H_
+		#define COMMON_DES_H
+	#endif // COMMON_DES_H
+	#ifdef COMMON_ERS_H
 		{ "eri", sizeof(struct eri) },
 	#else
-		#define _COMMON_ERS_H_
-	#endif // _COMMON_ERS_H_
-	#ifdef _COMMON_MAPINDEX_H_
+		#define COMMON_ERS_H
+	#endif // COMMON_ERS_H
+	#ifdef COMMON_MAPINDEX_H
 		{ "mapindex_interface", sizeof(struct mapindex_interface) },
 	#else
-		#define _COMMON_MAPINDEX_H_
-	#endif // _COMMON_MAPINDEX_H_
-	#ifdef _COMMON_MMO_H_
+		#define COMMON_MAPINDEX_H
+	#endif // COMMON_MAPINDEX_H
+	#ifdef COMMON_MMO_H
 		{ "quest", sizeof(struct quest) },
 	#else
-		#define _COMMON_MMO_H_
-	#endif // _COMMON_MMO_H_
-	#ifdef _COMMON_SOCKET_H_
+		#define COMMON_MMO_H
+	#endif // COMMON_MMO_H
+	#ifdef COMMON_SOCKET_H
 		{ "socket_interface", sizeof(struct socket_interface) },
 	#else
-		#define _COMMON_SOCKET_H_
-	#endif // _COMMON_SOCKET_H_
-	#ifdef _COMMON_STRLIB_H_
+		#define COMMON_SOCKET_H
+	#endif // COMMON_SOCKET_H
+	#ifdef COMMON_STRLIB_H
 		{ "StringBuf", sizeof(struct StringBuf) },
 		{ "s_svstate", sizeof(struct s_svstate) },
 	#else
-		#define _COMMON_STRLIB_H_
-	#endif // _COMMON_STRLIB_H_
-	#ifdef _COMMON_SYSINFO_H_
+		#define COMMON_STRLIB_H
+	#endif // COMMON_STRLIB_H
+	#ifdef COMMON_SYSINFO_H
 		{ "sysinfo_interface", sizeof(struct sysinfo_interface) },
 	#else
-		#define _COMMON_SYSINFO_H_
-	#endif // _COMMON_SYSINFO_H_
-	#ifdef _MAP_ATCOMMAND_H_
+		#define COMMON_SYSINFO_H
+	#endif // COMMON_SYSINFO_H
+	#ifdef MAP_ATCOMMAND_H
 		{ "AliasInfo", sizeof(struct AliasInfo) },
 		{ "atcommand_interface", sizeof(struct atcommand_interface) },
 	#else
-		#define _MAP_ATCOMMAND_H_
-	#endif // _MAP_ATCOMMAND_H_
-	#ifdef _MAP_BATTLE_H_
+		#define MAP_ATCOMMAND_H
+	#endif // MAP_ATCOMMAND_H
+	#ifdef MAP_BATTLE_H
 		{ "Damage", sizeof(struct Damage) },
 		{ "battle_interface", sizeof(struct battle_interface) },
 	#else
-		#define _MAP_BATTLE_H_
-	#endif // _MAP_BATTLE_H_
-	#ifdef _MAP_BUYINGSTORE_H_
+		#define MAP_BATTLE_H
+	#endif // MAP_BATTLE_H
+	#ifdef MAP_BUYINGSTORE_H
 		{ "buyingstore_interface", sizeof(struct buyingstore_interface) },
 		{ "s_buyingstore_item", sizeof(struct s_buyingstore_item) },
 	#else
-		#define _MAP_BUYINGSTORE_H_
-	#endif // _MAP_BUYINGSTORE_H_
-	#ifdef _MAP_CHRIF_H_
+		#define MAP_BUYINGSTORE_H
+	#endif // MAP_BUYINGSTORE_H
+	#ifdef MAP_CHRIF_H
 		{ "auth_node", sizeof(struct auth_node) },
 	#else
-		#define _MAP_CHRIF_H_
-	#endif // _MAP_CHRIF_H_
-	#ifdef _MAP_CLIF_H_
+		#define MAP_CHRIF_H
+	#endif // MAP_CHRIF_H
+	#ifdef MAP_CLIF_H
 		{ "clif_interface", sizeof(struct clif_interface) },
 	#else
-		#define _MAP_CLIF_H_
-	#endif // _MAP_CLIF_H_
-	#ifdef _MAP_ELEMENTAL_H_
+		#define MAP_CLIF_H
+	#endif // MAP_CLIF_H
+	#ifdef MAP_ELEMENTAL_H
 		{ "elemental_skill", sizeof(struct elemental_skill) },
 	#else
-		#define _MAP_ELEMENTAL_H_
-	#endif // _MAP_ELEMENTAL_H_
-	#ifdef _MAP_GUILD_H_
+		#define MAP_ELEMENTAL_H
+	#endif // MAP_ELEMENTAL_H
+	#ifdef MAP_GUILD_H
 		{ "eventlist", sizeof(struct eventlist) },
 		{ "guardian_data", sizeof(struct guardian_data) },
 	#else
-		#define _MAP_GUILD_H_
-	#endif // _MAP_GUILD_H_
-	#ifdef _MAP_MAPREG_H_
+		#define MAP_GUILD_H
+	#endif // MAP_GUILD_H
+	#ifdef MAP_MAPREG_H
 		{ "mapreg_save", sizeof(struct mapreg_save) },
 	#else
-		#define _MAP_MAPREG_H_
-	#endif // _MAP_MAPREG_H_
-	#ifdef _MAP_MAP_H_
+		#define MAP_MAPREG_H
+	#endif // MAP_MAPREG_H
+	#ifdef MAP_MAP_H
 		{ "map_data_other_server", sizeof(struct map_data_other_server) },
 	#else
-		#define _MAP_MAP_H_
-	#endif // _MAP_MAP_H_
-	#ifdef _MAP_PACKETS_STRUCT_H_
+		#define MAP_MAP_H
+	#endif // MAP_MAP_H
+	#ifdef MAP_PACKETS_STRUCT_H
 		{ "EQUIPSLOTINFO", sizeof(struct EQUIPSLOTINFO) },
 	#else
-		#define _MAP_PACKETS_STRUCT_H_
-	#endif // _MAP_PACKETS_STRUCT_H_
-	#ifdef _MAP_PC_H_
+		#define MAP_PACKETS_STRUCT_H
+	#endif // MAP_PACKETS_STRUCT_H
+	#ifdef MAP_PC_H
 		{ "autotrade_vending", sizeof(struct autotrade_vending) },
 		{ "item_cd", sizeof(struct item_cd) },
 	#else
-		#define _MAP_PC_H_
-	#endif // _MAP_PC_H_
-	#ifdef _MAP_SCRIPT_H_
+		#define MAP_PC_H
+	#endif // MAP_PC_H
+	#ifdef MAP_SCRIPT_H
 		{ "Script_Config", sizeof(struct Script_Config) },
 		{ "reg_db", sizeof(struct reg_db) },
 		{ "script_interface", sizeof(struct script_interface) },
 	#else
-		#define _MAP_SCRIPT_H_
-	#endif // _MAP_SCRIPT_H_
-	#ifdef _MAP_SEARCHSTORE_H_
+		#define MAP_SCRIPT_H
+	#endif // MAP_SCRIPT_H
+	#ifdef MAP_SEARCHSTORE_H
 		{ "searchstore_interface", sizeof(struct searchstore_interface) },
 	#else
-		#define _MAP_SEARCHSTORE_H_
-	#endif // _MAP_SEARCHSTORE_H_
-	#ifdef _MAP_SKILL_H_
+		#define MAP_SEARCHSTORE_H
+	#endif // MAP_SEARCHSTORE_H
+	#ifdef MAP_SKILL_H
 		{ "skill_cd", sizeof(struct skill_cd) },
 		{ "skill_condition", sizeof(struct skill_condition) },
 		{ "skill_interface", sizeof(struct skill_interface) },
 		{ "skill_unit_save", sizeof(struct skill_unit_save) },
 	#else
-		#define _MAP_SKILL_H_
-	#endif // _MAP_SKILL_H_
+		#define MAP_SKILL_H
+	#endif // MAP_SKILL_H
 };
 HPExport unsigned int HPMDataCheckLen = ARRAYLENGTH(HPMDataCheck);
 
-#endif /* _HPM_DATA_CHECK_H_ */
+#endif /* HPM_DATA_CHECK_H */
diff --git a/src/common/HPMi.h b/src/common/HPMi.h
index b98e87d90..478cfbdd9 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/console.h"
@@ -184,4 +184,4 @@ HPExport struct HPMi_interface {
 HPExport struct HPMi_interface *HPMi;
 #endif
 
-#endif /* _COMMON_HPMI_H_ */
+#endif /* COMMON_HPMI_H */
diff --git a/src/common/atomic.h b/src/common/atomic.h
index 526811a09..e73b1c464 100644
--- a/src/common/atomic.h
+++ b/src/common/atomic.h
@@ -1,8 +1,8 @@
 // Copyright (c) rAthena Project (www.rathena.org) - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _COMMON_ATOMIC_H_
-#define _COMMON_ATOMIC_H_
+#ifndef COMMON_ATOMIC_H
+#define COMMON_ATOMIC_H
 
 // Atomic Operations
 // (Interlocked CompareExchange, Add .. and so on ..)
@@ -146,4 +146,4 @@ static forceinline int32 InterlockedExchange(volatile int32 *target, int32 val){
 #endif //endif compiler decision
 
 
-#endif /* _COMMON_ATOMIC_H_ */
+#endif /* COMMON_ATOMIC_H */
diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h
index ac65b08a8..42075de8e 100644
--- a/src/common/cbasetypes.h
+++ b/src/common/cbasetypes.h
@@ -1,5 +1,5 @@
-#ifndef _COMMON_CBASETYPES_H_
-#define _COMMON_CBASETYPES_H_
+#ifndef COMMON_CBASETYPES_H
+#define COMMON_CBASETYPES_H
 
 /*              +--------+-----------+--------+---------+
  *              | ILP32  |   LP64    |  ILP64 | (LL)P64 |
@@ -444,9 +444,9 @@ void SET_FUNCPOINTER(T1& var, T2 p)
 
 /* pointer size fix which fixes several gcc warnings */
 #ifdef __64BIT__
-	#define __64BPTRSIZE(y) ((intptr)(y))
+	#define h64BPTRSIZE(y) ((intptr)(y))
 #else
-	#define __64BPTRSIZE(y) (y)
+	#define h64BPTRSIZE(y) (y)
 #endif
 
-#endif /* _COMMON_CBASETYPES_H_ */
+#endif /* COMMON_CBASETYPES_H */
diff --git a/src/common/conf.h b/src/common/conf.h
index 7c275bec2..c232a035c 100644
--- a/src/common/conf.h
+++ b/src/common/conf.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _COMMON_CONF_H_
-#define _COMMON_CONF_H_
+#ifndef COMMON_CONF_H
+#define COMMON_CONF_H
 
 #include "../common/cbasetypes.h"
 
@@ -95,4 +95,4 @@ struct libconfig_interface *libconfig;
 
 void libconfig_defaults(void);
 
-#endif // _COMMON_CONF_H_
+#endif // COMMON_CONF_H
diff --git a/src/common/console.h b/src/common/console.h
index 55a9a767c..062d48bbe 100644
--- a/src/common/console.h
+++ b/src/common/console.h
@@ -1,8 +1,8 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 
-#ifndef _COMMON_CONSOLE_H_
-#define _COMMON_CONSOLE_H_
+#ifndef COMMON_CONSOLE_H
+#define COMMON_CONSOLE_H
 
 #include "../config/core.h" // MAX_CONSOLE_INPUT
 
@@ -93,4 +93,4 @@ struct console_interface *console;
 
 void console_defaults(void);
 
-#endif /* _COMMON_CONSOLE_H_ */
+#endif /* COMMON_CONSOLE_H */
diff --git a/src/common/core.h b/src/common/core.h
index ba75e6b01..a8337e1b9 100644
--- a/src/common/core.h
+++ b/src/common/core.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _COMMON_CORE_H_
-#define _COMMON_CORE_H_
+#ifndef COMMON_CORE_H
+#define COMMON_CORE_H
 
 #include "../common/db.h"
 #include "../common/mmo.h"
@@ -47,4 +47,4 @@ enum E_CORE_ST {
 /// If NULL, runflag is set to CORE_ST_STOP instead.
 extern void (*shutdown_callback)(void);
 
-#endif /* _COMMON_CORE_H_ */
+#endif /* COMMON_CORE_H */
diff --git a/src/common/db.h b/src/common/db.h
index 4f8d6be79..ed87e474b 100644
--- a/src/common/db.h
+++ b/src/common/db.h
@@ -39,8 +39,8 @@
  * @encoding US-ASCII                                                        *
  * @see common#db.c                                                          *
 \*****************************************************************************/
-#ifndef _COMMON_DB_H_
-#define _COMMON_DB_H_
+#ifndef COMMON_DB_H
+#define COMMON_DB_H
 
 #include <stdarg.h>
 
@@ -1549,4 +1549,4 @@ void  linkdb_foreach (struct linkdb_node** head, LinkDBFunc func, ...);
 
 
 
-#endif /* _COMMON_DB_H_ */
+#endif /* COMMON_DB_H */
diff --git a/src/common/des.h b/src/common/des.h
index 0f908a15b..2c7190f23 100644
--- a/src/common/des.h
+++ b/src/common/des.h
@@ -1,7 +1,7 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
-#ifndef _COMMON_DES_H_
-#define _COMMON_DES_H_
+#ifndef COMMON_DES_H
+#define COMMON_DES_H
 
 #include "../common/cbasetypes.h"
 
@@ -13,4 +13,4 @@ void des_decrypt_block(BIT64* block);
 void des_decrypt(unsigned char* data, size_t size);
 
 
-#endif // _COMMON_DES_H_
+#endif // COMMON_DES_H
diff --git a/src/common/ers.h b/src/common/ers.h
index e11f7f37e..904f7fb81 100644
--- a/src/common/ers.h
+++ b/src/common/ers.h
@@ -37,8 +37,8 @@
  * @author Flavio @ Amazon Project                                           *
  * @encoding US-ASCII                                                        *
 \*****************************************************************************/
-#ifndef _COMMON_ERS_H_
-#define _COMMON_ERS_H_
+#ifndef COMMON_ERS_H
+#define COMMON_ERS_H
 
 #include "../common/cbasetypes.h"
 
@@ -175,4 +175,4 @@ void ers_report(void);
 void ers_final(void);
 #endif /* DISABLE_ERS / not DISABLE_ERS */
 
-#endif /* _COMMON_ERS_H_ */
+#endif /* COMMON_ERS_H */
diff --git a/src/common/grfio.c b/src/common/grfio.c
index f592812f6..6e628a512 100644
--- a/src/common/grfio.c
+++ b/src/common/grfio.c
@@ -23,7 +23,7 @@
 //----------------------------
 //	file entry table struct
 //----------------------------
-typedef struct _FILELIST {
+typedef struct FILELIST {
 	int srclen;         ///< compressed size
 	int srclen_aligned;
 	int declen;         ///< original size
diff --git a/src/common/grfio.h b/src/common/grfio.h
index 930ed7e36..15659c17c 100644
--- a/src/common/grfio.h
+++ b/src/common/grfio.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _COMMON_GRFIO_H_
-#define _COMMON_GRFIO_H_
+#ifndef COMMON_GRFIO_H
+#define COMMON_GRFIO_H
 
 void grfio_init(const char* fname);
 void grfio_final(void);
@@ -14,4 +14,4 @@ unsigned long grfio_crc32(const unsigned char *buf, unsigned int len);
 int decode_zip(void* dest, unsigned long* destLen, const void* source, unsigned long sourceLen);
 int encode_zip(void* dest, unsigned long* destLen, const void* source, unsigned long sourceLen);
 
-#endif /* _COMMON_GRFIO_H_ */
+#endif /* COMMON_GRFIO_H */
diff --git a/src/common/malloc.c b/src/common/malloc.c
index fbe8e2d9d..3c9fa9c54 100644
--- a/src/common/malloc.c
+++ b/src/common/malloc.c
@@ -235,14 +235,13 @@ static size_t hash2size( unsigned short hash )
 	}
 }
 
-void* _mmalloc(size_t size, const char *file, int line, const char *func )
-{
+void *mmalloc_(size_t size, const char *file, int line, const char *func) {
 	struct block *block;
 	short size_hash = size2hash( size );
 	struct unit_head *head;
 
 	if (((long) size) < 0) {
-		ShowError("_mmalloc: %d\n", size);
+		ShowError("mmalloc_: %d\n", size);
 		return NULL;
 	}
 
@@ -341,15 +340,13 @@ void* _mmalloc(size_t size, const char *file, int line, const char *func )
 	return (char *)head + sizeof(struct unit_head) - sizeof(long);
 }
 
-void* _mcalloc(size_t num, size_t size, const char *file, int line, const char *func )
-{
+void *mcalloc_(size_t num, size_t size, const char *file, int line, const char *func) {
 	void *p = iMalloc->malloc(num * size,file,line,func);
 	memset(p,0,num * size);
 	return p;
 }
 
-void* _mrealloc(void *memblock, size_t size, const char *file, int line, const char *func )
-{
+void *mrealloc_(void *memblock, size_t size, const char *file, int line, const char *func) {
 	size_t old_size;
 	if(memblock == NULL) {
 		return iMalloc->malloc(size,file,line,func);
@@ -373,8 +370,8 @@ void* _mrealloc(void *memblock, size_t size, const char *file, int line, const c
 	}
 }
 
-/* a _mrealloc clone with the difference it 'z'eroes the newly created memory */
-void* _mreallocz(void *memblock, size_t size, const char *file, int line, const char *func ) {
+/* a mrealloc_ clone with the difference it 'z'eroes the newly created memory */
+void *mreallocz_(void *memblock, size_t size, const char *file, int line, const char *func) {
 	size_t old_size;
 	void *p = NULL;
 	
@@ -404,8 +401,7 @@ void* _mreallocz(void *memblock, size_t size, const char *file, int line, const
 }
 
 
-char* _mstrdup(const char *p, const char *file, int line, const char *func )
-{
+char *mstrdup_(const char *p, const char *file, int line, const char *func) {
 	if(p == NULL) {
 		return NULL;
 	} else {
@@ -416,8 +412,7 @@ char* _mstrdup(const char *p, const char *file, int line, const char *func )
 	}
 }
 
-void _mfree(void *ptr, const char *file, int line, const char *func )
-{
+void mfree_(void *ptr, const char *file, int line, const char *func) {
 	struct unit_head *head;
 
 	if (ptr == NULL)
@@ -852,12 +847,12 @@ void malloc_defaults(void) {
 
 // Athena's built-in Memory Manager
 #ifdef USE_MEMMGR
-	iMalloc->malloc  =	 _mmalloc;
-	iMalloc->calloc  =	 _mcalloc;
-	iMalloc->realloc =	 _mrealloc;
-	iMalloc->reallocz=	 _mreallocz;
-	iMalloc->astrdup =	 _mstrdup;
-	iMalloc->free    =	 _mfree;
+	iMalloc->malloc  =	 mmalloc_;
+	iMalloc->calloc  =	 mcalloc_;
+	iMalloc->realloc =	 mrealloc_;
+	iMalloc->reallocz=	 mreallocz_;
+	iMalloc->astrdup =	 mstrdup_;
+	iMalloc->free    =	 mfree_;
 #else
 	iMalloc->malloc  =	aMalloc_;
 	iMalloc->calloc  =	aCalloc_;
diff --git a/src/common/malloc.h b/src/common/malloc.h
index 7309bb0f7..8dace2d68 100644
--- a/src/common/malloc.h
+++ b/src/common/malloc.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _COMMON_MALLOC_H_
-#define _COMMON_MALLOC_H_
+#ifndef COMMON_MALLOC_H
+#define COMMON_MALLOC_H
 
 #include "../common/cbasetypes.h"
 
@@ -88,4 +88,4 @@ struct malloc_interface {
 void memmgr_report (int extra);
 
 struct malloc_interface *iMalloc;
-#endif /* _COMMON_MALLOC_H_ */
+#endif /* COMMON_MALLOC_H */
diff --git a/src/common/mapindex.h b/src/common/mapindex.h
index fa9b9e920..446a2422d 100644
--- a/src/common/mapindex.h
+++ b/src/common/mapindex.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _COMMON_MAPINDEX_H_
-#define _COMMON_MAPINDEX_H_
+#ifndef COMMON_MAPINDEX_H
+#define COMMON_MAPINDEX_H
 
 #include "../common/db.h"
 #include "../common/mmo.h"
@@ -90,4 +90,4 @@ struct mapindex_interface *mapindex;
 
 void mapindex_defaults(void);
 
-#endif /* _COMMON_MAPINDEX_H_ */
+#endif /* COMMON_MAPINDEX_H */
diff --git a/src/common/md5calc.h b/src/common/md5calc.h
index d0caf6787..740e2edcc 100644
--- a/src/common/md5calc.h
+++ b/src/common/md5calc.h
@@ -1,8 +1,8 @@
-#ifndef _COMMON_MD5CALC_H_
-#define _COMMON_MD5CALC_H_
+#ifndef COMMON_MD5CALC_H
+#define COMMON_MD5CALC_H
 
 void MD5_String(const char * string, char * output);
 void MD5_Binary(const char * string, unsigned char * output);
 void MD5_Salt(unsigned int len, char * output);
 
-#endif /* _COMMON_MD5CALC_H_ */
+#endif /* COMMON_MD5CALC_H */
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 8e57eee85..feeb06524 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _COMMON_MMO_H_
-#define _COMMON_MMO_H_
+#ifndef COMMON_MMO_H
+#define COMMON_MMO_H
 
 #include <time.h>
 
@@ -932,4 +932,4 @@ enum e_pc_reg_loading {
 #error MAX_ZENY is too big
 #endif
 
-#endif /* _COMMON_MMO_H_ */
+#endif /* COMMON_MMO_H */
diff --git a/src/common/mutex.h b/src/common/mutex.h
index ced91ab8e..d298c05af 100644
--- a/src/common/mutex.h
+++ b/src/common/mutex.h
@@ -1,8 +1,8 @@
 // Copyright (c) rAthena Project (www.rathena.org) - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _COMMON_MUTEX_H_
-#define _COMMON_MUTEX_H_
+#ifndef COMMON_MUTEX_H
+#define COMMON_MUTEX_H
 
 #include "../common/cbasetypes.h"
 
@@ -90,4 +90,4 @@ void racond_signal(racond *c);
 void racond_broadcast(racond *c);
 
 
-#endif /* _COMMON_MUTEX_H_ */
+#endif /* COMMON_MUTEX_H */
diff --git a/src/common/nullpo.h b/src/common/nullpo.h
index fb1cf0feb..581252cca 100644
--- a/src/common/nullpo.h
+++ b/src/common/nullpo.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _COMMON_NULLPO_H_
-#define _COMMON_NULLPO_H_
+#ifndef COMMON_NULLPO_H
+#define COMMON_NULLPO_H
 
 #include "../common/cbasetypes.h"
 
@@ -125,4 +125,4 @@
 
 void assert_report(const char *file, int line, const char *func, const char *targetname, const char *title);
 
-#endif /* _COMMON_NULLPO_H_ */
+#endif /* COMMON_NULLPO_H */
diff --git a/src/common/random.h b/src/common/random.h
index ab83fb4d4..15d7f8ab1 100644
--- a/src/common/random.h
+++ b/src/common/random.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _COMMON_RANDOM_H_
-#define _COMMON_RANDOM_H_
+#ifndef COMMON_RANDOM_H
+#define COMMON_RANDOM_H
 
 #include "../common/cbasetypes.h"
 
@@ -15,4 +15,4 @@ int32 rnd_value(int32 min, int32 max);// [min, max]
 double rnd_uniform(void);// [0.0, 1.0)
 double rnd_uniform53(void);// [0.0, 1.0)
 
-#endif /* _COMMON_RANDOM_H_ */
+#endif /* COMMON_RANDOM_H */
diff --git a/src/common/showmsg.c b/src/common/showmsg.c
index ece10c1a8..b9bcef9b2 100644
--- a/src/common/showmsg.c
+++ b/src/common/showmsg.c
@@ -654,7 +654,7 @@ int	FPRINTF(FILE *file, const char *fmt, ...)
 
 char timestamp_format[20] = ""; //For displaying Timestamps
 
-int _vShowMessage(enum msg_type flag, const char *string, va_list ap)
+int vShowMessage_(enum msg_type flag, const char *string, va_list ap)
 {
 	va_list apcopy;
 	char prefix[100];
@@ -663,7 +663,7 @@ int _vShowMessage(enum msg_type flag, const char *string, va_list ap)
 #endif
 	
 	if (!string || *string == '\0') {
-		ShowError("Empty string passed to _vShowMessage().\n");
+		ShowError("Empty string passed to vShowMessage_().\n");
 		return 1;
 	}
 	if(
@@ -734,7 +734,7 @@ int _vShowMessage(enum msg_type flag, const char *string, va_list ap)
 			strcat(prefix,CL_RED"[Fatal Error]"CL_RESET":");
 			break;
 		default:
-			ShowError("In function _vShowMessage() -> Invalid flag passed.\n");
+			ShowError("In function vShowMessage_() -> Invalid flag passed.\n");
 			return 1;
 	}
 
@@ -782,12 +782,12 @@ void ClearScreen(void)
 	ShowMessage(CL_CLS);	// to prevent empty string passed messages
 #endif
 }
-int _ShowMessage(enum msg_type flag, const char *string, ...)
+int ShowMessage_(enum msg_type flag, const char *string, ...)
 {
 	int ret;
 	va_list ap;
 	va_start(ap, string);
-	ret = _vShowMessage(flag, string, ap);
+	ret = vShowMessage_(flag, string, ap);
 	va_end(ap);
 	return ret;
 }
@@ -796,37 +796,37 @@ int _ShowMessage(enum msg_type flag, const char *string, ...)
 void ShowMessage(const char *string, ...) {
 	va_list ap;
 	va_start(ap, string);
-	_vShowMessage(MSG_NONE, string, ap);
+	vShowMessage_(MSG_NONE, string, ap);
 	va_end(ap);
 }
 void ShowStatus(const char *string, ...) {
 	va_list ap;
 	va_start(ap, string);
-	_vShowMessage(MSG_STATUS, string, ap);
+	vShowMessage_(MSG_STATUS, string, ap);
 	va_end(ap);
 }
 void ShowSQL(const char *string, ...) {
 	va_list ap;
 	va_start(ap, string);
-	_vShowMessage(MSG_SQL, string, ap);
+	vShowMessage_(MSG_SQL, string, ap);
 	va_end(ap);
 }
 void ShowInfo(const char *string, ...) {
 	va_list ap;
 	va_start(ap, string);
-	_vShowMessage(MSG_INFORMATION, string, ap);
+	vShowMessage_(MSG_INFORMATION, string, ap);
 	va_end(ap);
 }
 void ShowNotice(const char *string, ...) {
 	va_list ap;
 	va_start(ap, string);
-	_vShowMessage(MSG_NOTICE, string, ap);
+	vShowMessage_(MSG_NOTICE, string, ap);
 	va_end(ap);
 }
 void ShowWarning(const char *string, ...) {
 	va_list ap;
 	va_start(ap, string);
-	_vShowMessage(MSG_WARNING, string, ap);
+	vShowMessage_(MSG_WARNING, string, ap);
 	va_end(ap);
 }
 void ShowConfigWarning(config_setting_t *config, const char *string, ...)
@@ -837,25 +837,25 @@ void ShowConfigWarning(config_setting_t *config, const char *string, ...)
 	StrBuf->AppendStr(&buf, string);
 	StrBuf->Printf(&buf, " (%s:%d)\n", config_setting_source_file(config), config_setting_source_line(config));
 	va_start(ap, string);
-	_vShowMessage(MSG_WARNING, StrBuf->Value(&buf), ap);
+	vShowMessage_(MSG_WARNING, StrBuf->Value(&buf), ap);
 	va_end(ap);
 	StrBuf->Destroy(&buf);
 }
 void ShowDebug(const char *string, ...) {
 	va_list ap;
 	va_start(ap, string);
-	_vShowMessage(MSG_DEBUG, string, ap);
+	vShowMessage_(MSG_DEBUG, string, ap);
 	va_end(ap);
 }
 void ShowError(const char *string, ...) {
 	va_list ap;
 	va_start(ap, string);
-	_vShowMessage(MSG_ERROR, string, ap);
+	vShowMessage_(MSG_ERROR, string, ap);
 	va_end(ap);
 }
 void ShowFatalError(const char *string, ...) {
 	va_list ap;
 	va_start(ap, string);
-	_vShowMessage(MSG_FATALERROR, string, ap);
+	vShowMessage_(MSG_FATALERROR, string, ap);
 	va_end(ap);
 }
diff --git a/src/common/showmsg.h b/src/common/showmsg.h
index 8008acf5a..83eb0ad89 100644
--- a/src/common/showmsg.h
+++ b/src/common/showmsg.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _COMMON_SHOWMSG_H_
-#define _COMMON_SHOWMSG_H_
+#ifndef COMMON_SHOWMSG_H
+#define COMMON_SHOWMSG_H
 
 #include <stdarg.h>
 
@@ -115,6 +115,6 @@ extern void ClearScreen(void);
 	HPExport void (*ShowFatalError) (const char *, ...);
 #endif
 
-extern int _vShowMessage(enum msg_type flag, const char *string, va_list ap);
+extern int vShowMessage_(enum msg_type flag, const char *string, va_list ap);
 
-#endif /* _COMMON_SHOWMSG_H_ */
+#endif /* COMMON_SHOWMSG_H */
diff --git a/src/common/socket.c b/src/common/socket.c
index 58c2d5bf9..85f0aa0ce 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -5,9 +5,9 @@
 #define HERCULES_CORE
 
 #include "../config/core.h" // SHOW_SERVER_STATS
-#define _H_SOCKET_C_
+#define H_SOCKET_C
 #include "socket.h"
-#undef _H_SOCKET_C_
+#undef H_SOCKET_C
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -909,20 +909,20 @@ int do_sockets(int next)
 //////////////////////////////
 // IP rules and DDoS protection
 
-typedef struct _connect_history {
-	struct _connect_history* next;
+typedef struct connect_history {
+	struct connect_history* next;
 	uint32 ip;
 	int64 tick;
 	int count;
 	unsigned ddos : 1;
 } ConnectHistory;
 
-typedef struct _access_control {
+typedef struct access_control {
 	uint32 ip;
 	uint32 mask;
 } AccessControl;
 
-enum _aco {
+enum aco {
 	ACO_DENY_ALLOW,
 	ACO_ALLOW_DENY,
 	ACO_MUTUAL_FAILURE
diff --git a/src/common/socket.h b/src/common/socket.h
index 804b9284f..42b0efe3b 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _COMMON_SOCKET_H_
-#define _COMMON_SOCKET_H_
+#ifndef COMMON_SOCKET_H
+#define COMMON_SOCKET_H
 
 #include <time.h>
 
@@ -174,7 +174,7 @@ struct socket_interface *sockt;
 void socket_defaults(void);
 
 /* the purpose of these macros is simply to not make calling them be an annoyance */
-#ifndef _H_SOCKET_C_
+#ifndef H_SOCKET_C
 	#define make_listen_bind(ip, port) ( sockt->make_listen_bind(ip, port) )
 	#define make_connection(ip, port, opt) ( sockt->make_connection(ip, port, opt) )
 	#define realloc_fifo(fd, rfifo_size, wfifo_size) ( sockt->realloc_fifo(fd, rfifo_size, wfifo_size) )
@@ -194,6 +194,6 @@ void socket_defaults(void);
 	#define ntows(netshort) ( sockt->ntows(netshort) )
 	#define getips(ips, max) ( sockt->getips(ips, max) )
 	#define set_eof(fd) ( sockt->set_eof(fd) )
-#endif /* _H_SOCKET_C_ */
+#endif /* H_SOCKET_C */
 
-#endif /* _COMMON_SOCKET_H_ */
+#endif /* COMMON_SOCKET_H */
diff --git a/src/common/spinlock.h b/src/common/spinlock.h
index 5d57c6462..bde36b8e5 100644
--- a/src/common/spinlock.h
+++ b/src/common/spinlock.h
@@ -1,5 +1,5 @@
-#ifndef _COMMON_SPINLOCK_H_
-#define _COMMON_SPINLOCK_H_
+#ifndef COMMON_SPINLOCK_H
+#define COMMON_SPINLOCK_H
 
 //
 // CAS based Spinlock Implementation
@@ -100,4 +100,4 @@ static forceinline void LeaveSpinLock(SPIN_LOCK *lck){
 
 
 
-#endif /* _COMMON_SPINLOCK_H_ */
+#endif /* COMMON_SPINLOCK_H */
diff --git a/src/common/sql.h b/src/common/sql.h
index 3bdb76c74..f9593978c 100644
--- a/src/common/sql.h
+++ b/src/common/sql.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _COMMON_SQL_H_
-#define _COMMON_SQL_H_
+#ifndef COMMON_SQL_H
+#define COMMON_SQL_H
 
 #include <stdarg.h>// va_list
 
@@ -291,4 +291,4 @@ void Sql_HerculesUpdateSkip(Sql* self,const char *filename);
 
 void Sql_Init(void);
 
-#endif /* _COMMON_SQL_H_ */
+#endif /* COMMON_SQL_H */
diff --git a/src/common/strlib.c b/src/common/strlib.c
index 2ce8fd347..e2382e6fc 100644
--- a/src/common/strlib.c
+++ b/src/common/strlib.c
@@ -4,9 +4,9 @@
 
 #define HERCULES_CORE
 
-#define _H_STRLIB_C_
+#define H_STRLIB_C
 #include "strlib.h"
-#undef _H_STRLIB_C_
+#undef H_STRLIB_C
 
 #include <errno.h>
 #include <stdio.h>
@@ -224,7 +224,7 @@ const char* stristr(const char* haystack, const char* needle)
 }
 
 #ifdef __WIN32
-char* _strtok_r(char *s1, const char *s2, char **lasts) {
+char* strtok_r_(char *s1, const char *s2, char **lasts) {
 	char *ret;
 
 	if (s1 == NULL)
diff --git a/src/common/strlib.h b/src/common/strlib.h
index f39f27789..7f84d2893 100644
--- a/src/common/strlib.h
+++ b/src/common/strlib.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _COMMON_STRLIB_H_
-#define _COMMON_STRLIB_H_
+#ifndef COMMON_STRLIB_H
+#define COMMON_STRLIB_H
 
 #include <stdarg.h>
 #include <string.h>
@@ -12,8 +12,8 @@
 
 #ifdef WIN32
 	#define HAVE_STRTOK_R
-	#define strtok_r(s,delim,save_ptr) _strtok_r((s),(delim),(save_ptr))
-	char *_strtok_r(char* s1, const char* s2, char** lasts);
+	#define strtok_r(s,delim,save_ptr) strtok_r_((s),(delim),(save_ptr))
+	char *strtok_r_(char* s1, const char* s2, char** lasts);
 #endif
 
 /// Bitfield determining the behavior of sv_parse and sv_split.
@@ -159,7 +159,7 @@ struct sv_interface *sv;
 void strlib_defaults(void);
 
 /* the purpose of these macros is simply to not make calling them be an annoyance */
-#ifndef _H_STRLIB_C_
+#ifndef H_STRLIB_C
 	#define jstrescape(pt)             (strlib->jstrescape(pt))
 	#define jstrescapecpy(pt,spt)      (strlib->jstrescapecpy((pt),(spt)))
 	#define jmemescapecpy(pt,spt,size) (strlib->jmemescapecpy((pt),(spt),(size)))
@@ -183,6 +183,6 @@ void strlib_defaults(void);
 	#define safesnprintf(buf,sz,fmt,...) (strlib->safesnprintf((buf),(sz),(fmt),##__VA_ARGS__))
 	#define strline(str,pos)             (strlib->strline((str),(pos)))
 	#define bin2hex(output,input,count)  (strlib->bin2hex((output),(input),(count)))
-#endif /* _H_STRLIB_C_ */
+#endif /* H_STRLIB_C */
 
-#endif /* _COMMON_STRLIB_H_ */
+#endif /* COMMON_STRLIB_H */
diff --git a/src/common/sysinfo.h b/src/common/sysinfo.h
index 24f794cb4..600206a21 100644
--- a/src/common/sysinfo.h
+++ b/src/common/sysinfo.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Base Author: Haru @ http://hercules.ws
 
-#ifndef _COMMON_SYSINFO_H_
-#define _COMMON_SYSINFO_H_
+#ifndef COMMON_SYSINFO_H
+#define COMMON_SYSINFO_H
 
 /**
  * Provides various bits of information about the system Hercules is running on
@@ -48,4 +48,4 @@ struct sysinfo_interface *sysinfo;
 
 void sysinfo_defaults(void);
 
-#endif /* _COMMON_SYSINFO_H_ */
+#endif /* COMMON_SYSINFO_H */
diff --git a/src/common/thread.c b/src/common/thread.c
index d8e0dbf0a..d680d0347 100644
--- a/src/common/thread.c
+++ b/src/common/thread.c
@@ -106,9 +106,9 @@ static void rat_thread_terminated(rAthread *handle) {
 }//end: rat_thread_terminated()
 
 #ifdef WIN32
-DWORD WINAPI _raThreadMainRedirector(LPVOID p){
+DWORD WINAPI raThreadMainRedirector(LPVOID p){
 #else
-static void *_raThreadMainRedirector( void *p ){
+static void *raThreadMainRedirector( void *p ){
 	sigset_t set; // on Posix Thread platforms
 #endif
 	void *ret;
@@ -145,7 +145,7 @@ static void *_raThreadMainRedirector( void *p ){
 #else
 	return ret;
 #endif
-}//end: _raThreadMainRedirector()
+}//end: raThreadMainRedirector()
 
 
 
@@ -193,12 +193,12 @@ rAthread *rathread_createEx(rAthreadProc entryPoint, void *param, size_t szStack
 	handle->param = param;
 
 #ifdef WIN32
-	handle->hThread = CreateThread(NULL, szStack, _raThreadMainRedirector, (void*)handle, 0, NULL);
+	handle->hThread = CreateThread(NULL, szStack, raThreadMainRedirector, (void*)handle, 0, NULL);
 #else
 	pthread_attr_init(&attr);
 	pthread_attr_setstacksize(&attr, szStack);
 	
-	if(pthread_create(&handle->hThread, &attr, _raThreadMainRedirector, (void*)handle) != 0){
+	if(pthread_create(&handle->hThread, &attr, raThreadMainRedirector, (void*)handle) != 0){
 		handle->proc = NULL;
 		handle->param = NULL;
 		return NULL;
diff --git a/src/common/thread.h b/src/common/thread.h
index 3b5ce7476..f781cfbd0 100644
--- a/src/common/thread.h
+++ b/src/common/thread.h
@@ -1,8 +1,8 @@
 // Copyright (c) rAthena Project (www.rathena.org) - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _COMMON_THREAD_H_
-#define _COMMON_THREAD_H_
+#ifndef COMMON_THREAD_H
+#define COMMON_THREAD_H
 
 #include "../common/cbasetypes.h"
 
@@ -115,4 +115,4 @@ void rathread_init();
 void rathread_final();
 
 
-#endif /* _COMMON_THREAD_H_ */
+#endif /* COMMON_THREAD_H */
diff --git a/src/common/timer.c b/src/common/timer.c
index ab0471d51..128fc4daf 100644
--- a/src/common/timer.c
+++ b/src/common/timer.c
@@ -107,7 +107,7 @@ char* search_timer_func_list(TimerFunc func)
 #if defined(ENABLE_RDTSC)
 static uint64 RDTSC_BEGINTICK = 0,   RDTSC_CLOCK = 0;
 
-static __inline uint64 _rdtsc(){
+static __inline uint64 rdtsc_() {
 	register union{
 		uint64	qw;
 		uint32 	dw[2];
@@ -127,14 +127,14 @@ static void rdtsc_calibrate(){
 	RDTSC_CLOCK = 0;
 	
 	for(i = 0; i < 5; i++){
-		t1 = _rdtsc();
+		t1 = rdtsc_();
 		usleep(1000000); //1000 MS
-		t2 = _rdtsc();
+		t2 = rdtsc_();
 		RDTSC_CLOCK += (t2 - t1) / 1000;
 	}
 	RDTSC_CLOCK /= 5;
 	
-	RDTSC_BEGINTICK = _rdtsc();
+	RDTSC_BEGINTICK = rdtsc_();
 	
 	ShowMessage(" done. (Frequency: %u Mhz)\n", (uint32)(RDTSC_CLOCK/1000) );
 }
@@ -175,7 +175,7 @@ static int64 sys_tick(void) {
 #elif defined(ENABLE_RDTSC)
 	// RDTSC: Returns the number of CPU cycles since reset. Unreliable if
 	//   the CPU frequency is variable.
-	return (int64)((_rdtsc() - RDTSC_BEGINTICK) / RDTSC_CLOCK);
+	return (int64)((rdtsc_() - RDTSC_BEGINTICK) / RDTSC_CLOCK);
 #elif defined(HAVE_MONOTONIC_CLOCK)
 	// Monotonic clock: Implementation-defined.
 	//   Clock that cannot be set and represents monotonic time since some
diff --git a/src/common/timer.h b/src/common/timer.h
index a07f81612..d0927adde 100644
--- a/src/common/timer.h
+++ b/src/common/timer.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _COMMON_TIMER_H_
-#define _COMMON_TIMER_H_
+#ifndef COMMON_TIMER_H
+#define COMMON_TIMER_H
 
 #include "../common/cbasetypes.h"
 
@@ -67,4 +67,4 @@ struct timer_interface *timer;
 
 void timer_defaults(void);
 
-#endif /* _COMMON_TIMER_H_ */
+#endif /* COMMON_TIMER_H */
diff --git a/src/common/utils.h b/src/common/utils.h
index 823651163..421698d95 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _COMMON_UTILS_H_
-#define _COMMON_UTILS_H_
+#ifndef COMMON_UTILS_H
+#define COMMON_UTILS_H
 
 #include <stdio.h> // FILE*
 #include <time.h>
@@ -65,4 +65,4 @@ struct HCache_interface *HCache;
 
 void HCache_defaults(void);
 
-#endif /* _COMMON_UTILS_H_ */
+#endif /* COMMON_UTILS_H */
diff --git a/src/config/classes/general.h b/src/config/classes/general.h
index 147fddb55..b3da4a475 100644
--- a/src/config/classes/general.h
+++ b/src/config/classes/general.h
@@ -1,8 +1,8 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
-#ifndef _CONFIG_GENERAL_H_
-#define _CONFIG_GENERAL_H_
+#ifndef CONFIG_GENERAL_H
+#define CONFIG_GENERAL_H
 
 /**
  * Hercules configuration file (http://hercules.ws)
@@ -31,4 +31,4 @@
  * No settings past this point
  **/
 
-#endif // _CONFIG_GENERAL_H_
+#endif // CONFIG_GENERAL_H
diff --git a/src/config/const.h b/src/config/const.h
index 23467bfa6..2b5b180c4 100644
--- a/src/config/const.h
+++ b/src/config/const.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _CONFIG_CONSTANTS_H_
-#define _CONFIG_CONSTANTS_H_
+#ifndef CONFIG_CONSTANTS_H
+#define CONFIG_CONSTANTS_H
 
 /**
  * Hercules configuration file (http://hercules.ws)
@@ -103,4 +103,4 @@
 /**
  * End of File
  **/
-#endif /* _CONFIG_CONSTANTS_H_ */
+#endif /* CONFIG_CONSTANTS_H */
diff --git a/src/config/core.h b/src/config/core.h
index 24e9de710..ac59563b5 100644
--- a/src/config/core.h
+++ b/src/config/core.h
@@ -1,8 +1,8 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
-#ifndef _CONFIG_CORE_H_
-#define _CONFIG_CORE_H_
+#ifndef CONFIG_CORE_H
+#define CONFIG_CORE_H
 
 /// Max number of items on @autolootid list
 #define AUTOLOOTITEM_SIZE 10
@@ -79,4 +79,4 @@
  **/
 #include "./const.h"
 
-#endif // _CONFIG_CORE_H_
+#endif // CONFIG_CORE_H
diff --git a/src/config/renewal.h b/src/config/renewal.h
index 1c48b9f8a..939ad9b73 100644
--- a/src/config/renewal.h
+++ b/src/config/renewal.h
@@ -1,8 +1,8 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
-#ifndef _CONFIG_RENEWAL_H_
-#define _CONFIG_RENEWAL_H_
+#ifndef CONFIG_RENEWAL_H
+#define CONFIG_RENEWAL_H
 
 /**
  * Hercules configuration file (http://hercules.ws)
@@ -86,4 +86,4 @@
 #endif // DISABLE_RENEWAL
 #undef DISABLE_RENEWAL
 
-#endif // _CONFIG_RENEWAL_H_
+#endif // CONFIG_RENEWAL_H
diff --git a/src/config/secure.h b/src/config/secure.h
index 1a89e36cf..418d24751 100644
--- a/src/config/secure.h
+++ b/src/config/secure.h
@@ -1,8 +1,8 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
-#ifndef _CONFIG_SECURE_H_
-#define _CONFIG_SECURE_H_
+#ifndef CONFIG_SECURE_H
+#define CONFIG_SECURE_H
 
 /**
  * Hercules configuration file (http://hercules.ws)
@@ -58,4 +58,4 @@
  **/
 #define ANTI_MAYAP_CHEAT
 
-#endif // _CONFIG_SECURE_H_
+#endif // CONFIG_SECURE_H
diff --git a/src/login/account.h b/src/login/account.h
index a14595519..e15143ce9 100644
--- a/src/login/account.h
+++ b/src/login/account.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _LOGIN_ACCOUNT_H_
-#define _LOGIN_ACCOUNT_H_
+#ifndef LOGIN_ACCOUNT_H
+#define LOGIN_ACCOUNT_H
 
 #include "../common/cbasetypes.h"
 #include "../common/mmo.h" // ACCOUNT_REG2_NUM
@@ -140,4 +140,4 @@ Sql *account_db_sql_up(AccountDB* self);
 void mmo_send_accreg2(AccountDB* self, int fd, int account_id, int char_id);
 void mmo_save_accreg2(AccountDB* self, int fd, int account_id, int char_id);
 
-#endif /* _LOGIN_ACCOUNT_H_ */
+#endif /* LOGIN_ACCOUNT_H */
diff --git a/src/login/ipban.h b/src/login/ipban.h
index e6851d8dd..b4f3ac51b 100644
--- a/src/login/ipban.h
+++ b/src/login/ipban.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _LOGIN_IPBAN_H_
-#define _LOGIN_IPBAN_H_
+#ifndef LOGIN_IPBAN_H
+#define LOGIN_IPBAN_H
 
 #include "../common/cbasetypes.h"
 
@@ -22,4 +22,4 @@ void ipban_log(uint32 ip);
 bool ipban_config_read(const char* key, const char* value);
 
 
-#endif /* _LOGIN_IPBAN_H_ */
+#endif /* LOGIN_IPBAN_H */
diff --git a/src/login/login.h b/src/login/login.h
index 447301ea4..9b9d1e82c 100644
--- a/src/login/login.h
+++ b/src/login/login.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _LOGIN_LOGIN_H_
-#define _LOGIN_LOGIN_H_
+#ifndef LOGIN_LOGIN_H
+#define LOGIN_LOGIN_H
 
 #include "../common/core.h" // CORE_ST_LAST
 #include "../common/mmo.h" // NAME_LENGTH,SEX_*
@@ -100,4 +100,4 @@ extern struct mmo_char_server server[MAX_SERVERS];
 extern struct Login_Config login_config;
 
 
-#endif /* _LOGIN_LOGIN_H_ */
+#endif /* LOGIN_LOGIN_H */
diff --git a/src/login/loginlog.h b/src/login/loginlog.h
index a86ad431c..52e18f3d1 100644
--- a/src/login/loginlog.h
+++ b/src/login/loginlog.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _LOGIN_LOGINLOG_H_
-#define _LOGIN_LOGINLOG_H_
+#ifndef LOGIN_LOGINLOG_H
+#define LOGIN_LOGINLOG_H
 
 #include "../common/cbasetypes.h"
 
@@ -12,4 +12,4 @@ bool loginlog_init(void);
 bool loginlog_final(void);
 bool loginlog_config_read(const char* w1, const char* w2);
 
-#endif /* _LOGIN_LOGINLOG_H_ */
+#endif /* LOGIN_LOGINLOG_H */
diff --git a/src/map/HPMmap.h b/src/map/HPMmap.h
index f291575fb..99c4224ff 100644
--- a/src/map/HPMmap.h
+++ b/src/map/HPMmap.h
@@ -1,8 +1,8 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 
-#ifndef _MAP_HPMMAP_H_
-#define _MAP_HPMMAP_H_
+#ifndef MAP_HPMMAP_H
+#define MAP_HPMMAP_H
 
 #include "../common/cbasetypes.h"
 #include "../map/atcommand.h"
@@ -26,4 +26,4 @@ bool HPM_map_DataCheck(struct s_HPMDataCheck *src, unsigned int size, char *name
 
 void HPM_map_do_init(void);
 
-#endif /* _MAP_HPMMAP_H_ */
+#endif /* MAP_HPMMAP_H */
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index d36e98c41..e22e2101c 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -8434,7 +8434,7 @@ ACMD(set) {
 		if( is_str )
 			script->set_var(sd, reg, (void*) val);
 		else
-			script->set_var(sd, reg, (void*)__64BPTRSIZE((atoi(val))));
+			script->set_var(sd, reg, (void*)h64BPTRSIZE((atoi(val))));
 		
 	}
 	
diff --git a/src/map/atcommand.h b/src/map/atcommand.h
index c8a1863af..356487bd1 100644
--- a/src/map/atcommand.h
+++ b/src/map/atcommand.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_ATCOMMAND_H_
-#define _MAP_ATCOMMAND_H_
+#ifndef MAP_ATCOMMAND_H
+#define MAP_ATCOMMAND_H
 
 #include "pc_groups.h"
 #include "../common/conf.h"
@@ -121,4 +121,4 @@ void atcommand_defaults(void);
 /* stay here */
 #define ACMD(x) static bool atcommand_ ## x (const int fd, struct map_session_data* sd, const char* command, const char* message, struct AtCommandInfo *info)
 
-#endif /* _MAP_ATCOMMAND_H_ */
+#endif /* MAP_ATCOMMAND_H */
diff --git a/src/map/battle.c b/src/map/battle.c
index e40d44549..7610d97b2 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -6357,7 +6357,7 @@ bool battle_check_range(struct block_list *src, struct block_list *bl, int range
 	return path->search_long(NULL,src->m,src->x,src->y,bl->x,bl->y,CELL_CHKWALL);
 }
 
-static const struct _battle_data {
+static const struct battle_data {
 	const char* str;
 	int* val;
 	int defval;
diff --git a/src/map/battle.h b/src/map/battle.h
index fc916597d..aab94420a 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_BATTLE_H_
-#define _MAP_BATTLE_H_
+#ifndef MAP_BATTLE_H
+#define MAP_BATTLE_H
 
 #include "map.h" //ELE_MAX
 #include "../common/cbasetypes.h"
@@ -603,4 +603,4 @@ struct battle_interface {
 struct battle_interface *battle;
 
 void battle_defaults(void);
-#endif /* _MAP_BATTLE_H_ */
+#endif /* MAP_BATTLE_H */
diff --git a/src/map/battleground.h b/src/map/battleground.h
index ec0a86f14..c1d3be054 100644
--- a/src/map/battleground.h
+++ b/src/map/battleground.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_BATTLEGROUND_H_
-#define _MAP_BATTLEGROUND_H_
+#ifndef MAP_BATTLEGROUND_H
+#define MAP_BATTLEGROUND_H
 
 #include "clif.h"
 #include "guild.h"
@@ -122,4 +122,4 @@ struct battleground_interface *bg;
 
 void battleground_defaults(void);
 
-#endif /* _MAP_BATTLEGROUND_H_ */
+#endif /* MAP_BATTLEGROUND_H */
diff --git a/src/map/buyingstore.h b/src/map/buyingstore.h
index 914631872..c981cc444 100644
--- a/src/map/buyingstore.h
+++ b/src/map/buyingstore.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_BUYINGSTORE_H_
-#define _MAP_BUYINGSTORE_H_
+#ifndef MAP_BUYINGSTORE_H
+#define MAP_BUYINGSTORE_H
 
 #include "../common/cbasetypes.h"
 #include "../common/mmo.h" // MAX_SLOTS
@@ -75,4 +75,4 @@ struct buyingstore_interface *buyingstore;
 
 void buyingstore_defaults (void);
 
-#endif  // _MAP_BUYINGSTORE_H_
+#endif  // MAP_BUYINGSTORE_H
diff --git a/src/map/chat.h b/src/map/chat.h
index 6e4fae1c0..e055c04ed 100644
--- a/src/map/chat.h
+++ b/src/map/chat.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_CHAT_H_
-#define _MAP_CHAT_H_
+#ifndef MAP_CHAT_H
+#define MAP_CHAT_H
 
 #include "map.h" // struct block_list, CHATROOM_TITLE_SIZE
 #include "../common/cbasetypes.h"
@@ -60,4 +60,4 @@ struct chat_interface *chat;
 
 void chat_defaults(void);
 
-#endif /* _MAP_CHAT_H_ */
+#endif /* MAP_CHAT_H */
diff --git a/src/map/chrif.h b/src/map/chrif.h
index 51ab0e9b9..11baaf5ff 100644
--- a/src/map/chrif.h
+++ b/src/map/chrif.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_CHRIF_H_
-#define _MAP_CHRIF_H_
+#ifndef MAP_CHRIF_H
+#define MAP_CHRIF_H
 
 #include <time.h>
 
@@ -154,4 +154,4 @@ void chrif_defaults(void);
 // There's no need for another function when a simple macro can do exactly the same effect
 #define chrif_char_offline(x) chrif->char_offline_nsd((x)->status.account_id,(x)->status.char_id)
 
-#endif /* _MAP_CHRIF_H_ */
+#endif /* MAP_CHRIF_H */
diff --git a/src/map/clif.c b/src/map/clif.c
index 750689816..9e105e4a9 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -5651,7 +5651,7 @@ void clif_displaymessage_sprintf(const int fd, const char* mes, ...) {
 	if( map->cpsd_active && fd == 0 ) {
 		ShowInfo("HCP: ");
 		va_start(ap,mes);
-		_vShowMessage(MSG_NONE,mes,ap);
+		vShowMessage_(MSG_NONE,mes,ap);
 		va_end(ap);
 		ShowMessage("\n");
 	} else if ( fd > 0 ) {
diff --git a/src/map/clif.h b/src/map/clif.h
index e1af44881..48316427f 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_CLIF_H_
-#define _MAP_CLIF_H_
+#ifndef MAP_CLIF_H
+#define MAP_CLIF_H
 
 #include <stdarg.h>
 
@@ -1290,4 +1290,4 @@ struct clif_interface *clif;
 
 void clif_defaults(void);
 
-#endif /* _MAP_CLIF_H_ */
+#endif /* MAP_CLIF_H */
diff --git a/src/map/date.h b/src/map/date.h
index b3ed59b2f..c3f353f64 100644
--- a/src/map/date.h
+++ b/src/map/date.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _MAP_DATE_H_
-#define _MAP_DATE_H_
+#ifndef MAP_DATE_H
+#define MAP_DATE_H
 
 #include "../common/cbasetypes.h"
 
@@ -17,4 +17,4 @@ bool is_day_of_sun(void);
 bool is_day_of_moon(void);
 bool is_day_of_star(void);
 
-#endif /* _MAP_DATE_H_ */
+#endif /* MAP_DATE_H */
diff --git a/src/map/duel.h b/src/map/duel.h
index 91dfa8f83..de2bd1bf6 100644
--- a/src/map/duel.h
+++ b/src/map/duel.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_DUEL_H_
-#define _MAP_DUEL_H_
+#ifndef MAP_DUEL_H
+#define MAP_DUEL_H
 
 #include "../common/cbasetypes.h"
 
@@ -46,4 +46,4 @@ struct duel_interface *duel;
 
 void duel_defaults(void);
 
-#endif /* _MAP_DUEL_H_ */
+#endif /* MAP_DUEL_H */
diff --git a/src/map/elemental.h b/src/map/elemental.h
index beddd3ea1..0c8fff8b3 100644
--- a/src/map/elemental.h
+++ b/src/map/elemental.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_ELEMENTAL_H_
-#define _MAP_ELEMENTAL_H_
+#ifndef MAP_ELEMENTAL_H
+#define MAP_ELEMENTAL_H
 
 #include "status.h" // struct status_data, struct status_change
 #include "unit.h" // struct unit_data
@@ -121,4 +121,4 @@ struct elemental_interface *elemental;
 
 void elemental_defaults(void);
 
-#endif /* _MAP_ELEMENTAL_H_ */
+#endif /* MAP_ELEMENTAL_H */
diff --git a/src/map/guild.c b/src/map/guild.c
index 642c8993c..af29dc64e 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -2015,8 +2015,8 @@ int guild_castledatasave(int castle_id, int index, int value)
 
 void guild_castle_reconnect_sub(void *key, void *data, va_list ap)
 {
-	int castle_id = GetWord((int)__64BPTRSIZE(key), 0);
-	int index = GetWord((int)__64BPTRSIZE(key), 1);
+	int castle_id = GetWord((int)h64BPTRSIZE(key), 0);
+	int index = GetWord((int)h64BPTRSIZE(key), 1);
 	intif->guild_castle_datasave(castle_id, index, *(int *)data);
 	aFree(data);
 }
@@ -2037,7 +2037,7 @@ void guild_castle_reconnect(int castle_id, int index, int value)
 		int *data;
 		CREATE(data, int, 1);
 		*data = value;
-		linkdb_replace(&gc_save_pending, (void*)__64BPTRSIZE((MakeDWord(castle_id, index))), data);
+		linkdb_replace(&gc_save_pending, (void*)h64BPTRSIZE((MakeDWord(castle_id, index))), data);
 	}
 }
 
diff --git a/src/map/guild.h b/src/map/guild.h
index f9d97241d..126325eef 100644
--- a/src/map/guild.h
+++ b/src/map/guild.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_GUILD_H_
-#define _MAP_GUILD_H_
+#ifndef MAP_GUILD_H
+#define MAP_GUILD_H
 
 #include "map.h" // EVENT_NAME_LENGTH, TBL_PC
 #include "../common/cbasetypes.h"
@@ -167,4 +167,4 @@ struct guild_interface *guild;
 
 void guild_defaults(void);
 
-#endif /* _MAP_GUILD_H_ */
+#endif /* MAP_GUILD_H */
diff --git a/src/map/homunculus.h b/src/map/homunculus.h
index 9eef6af5b..25ccabf48 100644
--- a/src/map/homunculus.h
+++ b/src/map/homunculus.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_HOMUNCULUS_H_
-#define _MAP_HOMUNCULUS_H_
+#ifndef MAP_HOMUNCULUS_H
+#define MAP_HOMUNCULUS_H
 
 #include "pc.h"
 #include "status.h" // struct status_data, struct status_change
@@ -148,4 +148,4 @@ struct homunculus_interface *homun;
 
 void homunculus_defaults(void);
 
-#endif /* _MAP_HOMUNCULUS_H_ */
+#endif /* MAP_HOMUNCULUS_H */
diff --git a/src/map/instance.h b/src/map/instance.h
index ae649eda7..2ee77d3e3 100644
--- a/src/map/instance.h
+++ b/src/map/instance.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_INSTANCE_H_
-#define _MAP_INSTANCE_H_
+#ifndef MAP_INSTANCE_H
+#define MAP_INSTANCE_H
 
 #include "script.h" // struct reg_db
 #include "../common/cbasetypes.h"
@@ -88,4 +88,4 @@ struct instance_interface *instance;
 
 void instance_defaults(void);
 
-#endif /* _MAP_INSTANCE_H_ */
+#endif /* MAP_INSTANCE_H */
diff --git a/src/map/intif.c b/src/map/intif.c
index 4dd0fa448..432154f04 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -1067,7 +1067,7 @@ void intif_parse_Registers(int fd)
 				ival = RFIFOL(fd, cursor);
 				cursor += 4;
 								
-				script->set_reg(NULL,sd,reference_uid(script->add_str(key), index), key, (void*)__64BPTRSIZE(ival), NULL);
+				script->set_reg(NULL,sd,reference_uid(script->add_str(key), index), key, (void*)h64BPTRSIZE(ival), NULL);
 			}
 		}
 		
diff --git a/src/map/intif.h b/src/map/intif.h
index 42a38ad41..fe47d6537 100644
--- a/src/map/intif.h
+++ b/src/map/intif.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_INTIF_H_
-#define _MAP_INTIF_H_
+#ifndef MAP_INTIF_H
+#define MAP_INTIF_H
 
 #include "../common/cbasetypes.h"
 
@@ -186,4 +186,4 @@ struct intif_interface *intif;
 
 void intif_defaults(void);
 
-#endif /* _MAP_INTIF_H_ */
+#endif /* MAP_INTIF_H */
diff --git a/src/map/irc-bot.h b/src/map/irc-bot.h
index 60f03fca5..0c26c3cd8 100644
--- a/src/map/irc-bot.h
+++ b/src/map/irc-bot.h
@@ -3,8 +3,8 @@
 // Base Author: shennetsind @ http://hercules.ws
 
 
-#ifndef _MAP_IRC_BOT_H_
-#define _MAP_IRC_BOT_H_
+#ifndef MAP_IRC_BOT_H
+#define MAP_IRC_BOT_H
 
 #include "../common/cbasetypes.h"
 
@@ -63,4 +63,4 @@ struct irc_bot_interface *ircbot;
 
 void ircbot_defaults(void);
 
-#endif /* _MAP_IRC_BOT_H_ */
+#endif /* MAP_IRC_BOT_H */
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index 246ca1f54..2ad596ce1 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_ITEMDB_H_
-#define _MAP_ITEMDB_H_
+#ifndef MAP_ITEMDB_H
+#define MAP_ITEMDB_H
 
 #include "map.h"
 #include "../common/cbasetypes.h"
@@ -609,4 +609,4 @@ struct itemdb_interface *itemdb;
 
 void itemdb_defaults(void);
 
-#endif /* _MAP_ITEMDB_H_ */
+#endif /* MAP_ITEMDB_H */
diff --git a/src/map/log.h b/src/map/log.h
index ecfedeac2..6ab142f87 100644
--- a/src/map/log.h
+++ b/src/map/log.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_LOG_H_
-#define _MAP_LOG_H_
+#ifndef MAP_LOG_H
+#define MAP_LOG_H
 
 #include "../common/cbasetypes.h"
 #include "../common/sql.h"
@@ -133,4 +133,4 @@ struct log_interface *logs;
 
 void log_defaults(void);
 
-#endif /* _MAP_LOG_H_ */
+#endif /* MAP_LOG_H */
diff --git a/src/map/mail.h b/src/map/mail.h
index 30b032ef4..64b0f9779 100644
--- a/src/map/mail.h
+++ b/src/map/mail.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_MAIL_H_
-#define _MAP_MAIL_H_
+#ifndef MAP_MAIL_H
+#define MAP_MAIL_H
 
 #include "../common/cbasetypes.h"
 
@@ -27,4 +27,4 @@ struct mail_interface *mail;
 
 void mail_defaults(void);
 
-#endif /* _MAP_MAIL_H_ */
+#endif /* MAP_MAIL_H */
diff --git a/src/map/map.h b/src/map/map.h
index 38167597a..35fe0d7e1 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_MAP_H_
-#define _MAP_MAP_H_
+#ifndef MAP_MAP_H
+#define MAP_MAP_H
 
 #include <stdarg.h>
 
@@ -342,7 +342,7 @@ struct flooritem_data {
 	struct item item_data;
 };
 
-enum _sp {
+enum status_point_types {
 	SP_SPEED,SP_BASEEXP,SP_JOBEXP,SP_KARMA,SP_MANNER,SP_HP,SP_MAXHP,SP_SP,	// 0-7
 	SP_MAXSP,SP_STATUSPOINT,SP_0a,SP_BASELEVEL,SP_SKILLPOINT,SP_STR,SP_AGI,SP_VIT,	// 8-15
 	SP_INT,SP_DEX,SP_LUK,SP_CLASS,SP_ZENY,SP_SEX,SP_NEXTBASEEXP,SP_NEXTJOBEXP,	// 16-23
@@ -415,7 +415,7 @@ enum _sp {
 	SP_LAST_KNOWN,
 };
 
-enum _look {
+enum look {
 	LOOK_BASE,
 	LOOK_HAIR,
 	LOOK_WEAPON,
@@ -1071,4 +1071,4 @@ struct map_interface *map;
 
 void map_defaults(void);
 
-#endif /* _MAP_MAP_H_ */
+#endif /* MAP_MAP_H */
diff --git a/src/map/mapreg.h b/src/map/mapreg.h
index 2aa2943a2..59d226cda 100644
--- a/src/map/mapreg.h
+++ b/src/map/mapreg.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_MAPREG_H_
-#define _MAP_MAPREG_H_
+#ifndef MAP_MAPREG_H
+#define MAP_MAPREG_H
 
 #include "script.h" // struct reg_db
 #include "../common/cbasetypes.h"
@@ -50,4 +50,4 @@ struct mapreg_interface *mapreg;
 
 void mapreg_defaults(void);
 
-#endif /* _MAP_MAPREG_H_ */
+#endif /* MAP_MAPREG_H */
diff --git a/src/map/mercenary.h b/src/map/mercenary.h
index 22399e289..270245e96 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.h
@@ -1,8 +1,8 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
-#ifndef _MAP_MERCENARY_H_
-#define _MAP_MERCENARY_H_
+#ifndef MAP_MERCENARY_H
+#define MAP_MERCENARY_H
 
 #include "status.h" // struct status_data, struct status_change
 #include "unit.h" // struct unit_data
@@ -99,4 +99,4 @@ struct mercenary_interface *mercenary;
 
 void mercenary_defaults(void);
 
-#endif /* _MAP_MERCENARY_H_ */
+#endif /* MAP_MERCENARY_H */
diff --git a/src/map/mob.h b/src/map/mob.h
index 7e222fa74..c8d43dbb2 100644
--- a/src/map/mob.h
+++ b/src/map/mob.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_MOB_H_
-#define _MAP_MOB_H_
+#ifndef MAP_MOB_H
+#define MAP_MOB_H
 
 #include "map.h" // struct status_data, struct view_data, struct mob_skill
 #include "status.h" // struct status_data, struct status_change
@@ -363,4 +363,4 @@ struct mob_interface *mob;
 
 void mob_defaults(void);
 
-#endif /* _MAP_MOB_H_ */
+#endif /* MAP_MOB_H */
diff --git a/src/map/npc.c b/src/map/npc.c
index bfac2b9d5..417aa6c61 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -3368,7 +3368,7 @@ int npc_do_atcmd_event(struct map_session_data* sd, const char* command, const c
 		}
 	}
 
-	script->setd_sub(st, NULL, ".@atcmd_numparameters", 0, (void *)__64BPTRSIZE(j), NULL);
+	script->setd_sub(st, NULL, ".@atcmd_numparameters", 0, (void *)h64BPTRSIZE(j), NULL);
 	aFree(temp);
 
 	script->run_main(st);
diff --git a/src/map/npc.h b/src/map/npc.h
index 06a9312b5..4c904e1ac 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_NPC_H_
-#define _MAP_NPC_H_
+#ifndef MAP_NPC_H
+#define MAP_NPC_H
 
 #include "map.h" // struct block_list
 #include "status.h" // struct status_change
@@ -347,4 +347,4 @@ struct pcre_interface *libpcre;
 void npc_chat_defaults(void);
 #endif
 
-#endif /* _MAP_NPC_H_ */
+#endif /* MAP_NPC_H */
diff --git a/src/map/packets.h b/src/map/packets.h
index e995643d4..810f341d4 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -3,8 +3,8 @@
 
 //Included directly by clif.h in packet_loaddb()
 
-#ifndef _MAP_PACKETS_H_
-#define _MAP_PACKETS_H_
+#ifndef MAP_PACKETS_H
+#define MAP_PACKETS_H
 
 #ifndef packet
 	#define packet(a,b,...)
@@ -3002,4 +3002,4 @@ packet(0x020d,-1);
 	packetKeys(OBFUSCATIONKEY1,OBFUSCATIONKEY2,OBFUSCATIONKEY3);
 #endif
 
-#endif /* _MAP_PACKETS_H_ */
+#endif /* MAP_PACKETS_H */
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index 403ab6fa3..55ab0c66a 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -3,8 +3,8 @@
 
 /* Hercules Renewal: Phase Two http://hercules.ws/board/topic/383-hercules-renewal-phase-two/ */
 
-#ifndef _MAP_PACKETS_STRUCT_H_
-#define _MAP_PACKETS_STRUCT_H_
+#ifndef MAP_PACKETS_STRUCT_H
+#define MAP_PACKETS_STRUCT_H
 
 #include "../common/mmo.h"
 
@@ -962,4 +962,4 @@ struct packet_wis_end {
 #pragma pack(pop)
 #endif // not NetBSD < 6 / Solaris
 
-#endif /* _MAP_PACKETS_STRUCT_H_ */
+#endif /* MAP_PACKETS_STRUCT_H */
diff --git a/src/map/party.h b/src/map/party.h
index 1c58301d1..d62db23a7 100644
--- a/src/map/party.h
+++ b/src/map/party.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_PARTY_H_
-#define _MAP_PARTY_H_
+#ifndef MAP_PARTY_H
+#define MAP_PARTY_H
 
 #include <stdarg.h>
 
@@ -143,4 +143,4 @@ struct party_interface *party;
 
 void party_defaults(void);
 
-#endif /* _MAP_PARTY_H_ */
+#endif /* MAP_PARTY_H */
diff --git a/src/map/path.h b/src/map/path.h
index b48ff05fb..8d02e6558 100644
--- a/src/map/path.h
+++ b/src/map/path.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_PATH_H_
-#define _MAP_PATH_H_
+#ifndef MAP_PATH_H
+#define MAP_PATH_H
 
 #include "map.h" // enum cell_chk
 #include "../common/cbasetypes.h"
@@ -47,4 +47,4 @@ struct path_interface *path;
 
 void path_defaults(void);
 
-#endif /* _MAP_PATH_H_ */
+#endif /* MAP_PATH_H */
diff --git a/src/map/pc.c b/src/map/pc.c
index b8b6cda46..104a3cde0 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -6230,7 +6230,7 @@ int pc_maxparameterincrease(struct map_session_data* sd, int type) {
  * Subtracts status points according to the cost of the increased stat points.
  *
  * @param sd       The target character.
- * @param type     The stat to change (see enum _sp)
+ * @param type     The stat to change (see enum status_point_types)
  * @param increase The stat increase (strictly positive) amount.
  * @retval true  if the stat was increased by any amount.
  * @retval false if there were no changes.
@@ -6289,7 +6289,7 @@ bool pc_statusup(struct map_session_data* sd, int type, int increase) {
  * Does not subtract status points for the cost of the modified stat points.
  *
  * @param sd   The target character.
- * @param type The stat to change (see enum _sp)
+ * @param type The stat to change (see enum status_point_types)
  * @param val  The stat increase (or decrease) amount.
  * @return the stat increase amount.
  * @retval 0 if no changes were made.
diff --git a/src/map/pc.h b/src/map/pc.h
index 1789a8a7b..f33127036 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_PC_H_
-#define _MAP_PC_H_
+#ifndef MAP_PC_H
+#define MAP_PC_H
 
 #include "../config/core.h" // AUTOLOOTITEM_SIZE, RENEWAL, SECURE_NPCTIMEOUT
 
@@ -1026,4 +1026,4 @@ struct pc_interface *pc;
 
 void pc_defaults(void);
 
-#endif /* _MAP_PC_H_ */
+#endif /* MAP_PC_H */
diff --git a/src/map/pc_groups.h b/src/map/pc_groups.h
index 7c8cdd82a..f52e2ba22 100644
--- a/src/map/pc_groups.h
+++ b/src/map/pc_groups.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_PC_GROUPS_H_
-#define _MAP_PC_GROUPS_H_
+#ifndef MAP_PC_GROUPS_H
+#define MAP_PC_GROUPS_H
 
 #include "../common/cbasetypes.h"
 #include "../common/conf.h"
@@ -96,4 +96,4 @@ struct pc_groups_interface *pcg;
 
 void pc_groups_defaults(void);
 
-#endif /* _MAP_PC_GROUPS_H_ */
+#endif /* MAP_PC_GROUPS_H */
diff --git a/src/map/pet.h b/src/map/pet.h
index 8dde0fac2..5c890ef85 100644
--- a/src/map/pet.h
+++ b/src/map/pet.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_PET_H_
-#define _MAP_PET_H_
+#ifndef MAP_PET_H
+#define MAP_PET_H
 
 #include "map.h" // struct block_list
 #include "status.h" // enum sc_type
@@ -158,4 +158,4 @@ struct pet_interface *pet;
 
 void pet_defaults(void);
 
-#endif /* _MAP_PET_H_ */
+#endif /* MAP_PET_H */
diff --git a/src/map/quest.h b/src/map/quest.h
index 87894d639..9d617e369 100644
--- a/src/map/quest.h
+++ b/src/map/quest.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_QUEST_H_
-#define _MAP_QUEST_H_
+#ifndef MAP_QUEST_H
+#define MAP_QUEST_H
 
 #include "map.h" // TBL_PC
 #include "../common/cbasetypes.h"
@@ -52,4 +52,4 @@ struct quest_interface *quest;
 
 void quest_defaults(void);
 
-#endif /* _MAP_QUEST_H_ */
+#endif /* MAP_QUEST_H */
diff --git a/src/map/script.c b/src/map/script.c
index c7e1dc1d2..8fb3975f8 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -1502,9 +1502,9 @@ const char* parse_syntax(const char* p)
 					script->set_label(l,script->pos,p);
 				}
 				// check duplication of case label [Rayce]
-				if(linkdb_search(&script->syntax.curly[pos].case_label, (void*)__64BPTRSIZE(v)) != NULL)
+				if(linkdb_search(&script->syntax.curly[pos].case_label, (void*)h64BPTRSIZE(v)) != NULL)
 					disp_error_message("parse_syntax: dup 'case'",p);
-				linkdb_insert(&script->syntax.curly[pos].case_label, (void*)__64BPTRSIZE(v), (void*)1);
+				linkdb_insert(&script->syntax.curly[pos].case_label, (void*)h64BPTRSIZE(v), (void*)1);
 
 				sprintf(label,"set $@__SW%x_VAL,0;",script->syntax.curly[pos].index);
 				script->syntax.curly[script->syntax.curly_count++].type = TYPE_NULL;
@@ -2627,7 +2627,7 @@ void* get_val2(struct script_state* st, int64 uid, struct reg_db *ref) {
 	script->push_val(st->stack, C_NAME, uid, ref);
 	data = script_getdatatop(st, -1);
 	script->get_val(st, data);
-	return (data->type == C_INT ? (void*)__64BPTRSIZE((int32)data->u.num) : (void*)__64BPTRSIZE(data->u.str)); // u.num is int32 because it comes from script->get_val
+	return (data->type == C_INT ? (void*)h64BPTRSIZE((int32)data->u.num) : (void*)h64BPTRSIZE(data->u.str)); // u.num is int32 because it comes from script->get_val
 }
 /**
  * Because, currently, array members with key 0 are indifferenciable from normal variables, we should ensure its actually in
@@ -2648,7 +2648,7 @@ void script_array_ensure_zero(struct script_state *st, struct map_session_data *
 				insert = true;
 			script_removetop(st, -1, 0);
 		} else {
-			int32 num = (int32)__64BPTRSIZE(script->get_val2(st, uid, ref));
+			int32 num = (int32)h64BPTRSIZE(script->get_val2(st, uid, ref));
 			if( num )
 				insert = true;
 			script_removetop(st, -1, 0);
@@ -2917,7 +2917,7 @@ int set_reg(struct script_state* st, TBL_PC* sd, int64 num, const char* name, co
 	} else {// integer variable
 		// FIXME: This isn't safe, in 32bits systems we're converting a 64bit pointer
 		// to a 32bit int, this will lead to overflows! [Panikon]
-		int val = (int)__64BPTRSIZE(value);
+		int val = (int)h64BPTRSIZE(value);
 
 		if(script->str_data[script_getvarid(num)].type == C_PARAM) {
 			if( pc->setparam(sd, script->str_data[script_getvarid(num)].val, val) == 0 ) {
@@ -5665,7 +5665,7 @@ BUILDIN(input)
 		else
 		{
 			int amount = sd->npc_amount;
-			script->set_reg(st, sd, uid, name, (void*)__64BPTRSIZE(cap_value(amount,min,max)), script_getref(st,2));
+			script->set_reg(st, sd, uid, name, (void*)h64BPTRSIZE(cap_value(amount,min,max)), script_getref(st,2));
 			script_pushint(st, (amount > max ? 1 : amount < min ? -1 : 0));
 		}
 		st->state = RUN;
@@ -5753,7 +5753,7 @@ BUILDIN(setr) {
 	if( is_string_variable(name) )
 		script->set_reg(st,sd,num,name,(void*)script_getstr(st,3),script_getref(st,2));
 	else
-		script->set_reg(st,sd,num,name,(void*)__64BPTRSIZE(script_getnum(st,3)),script_getref(st,2));
+		script->set_reg(st,sd,num,name,(void*)h64BPTRSIZE(script_getnum(st,3)),script_getref(st,2));
 
 	return true;
 }
@@ -5808,7 +5808,7 @@ BUILDIN(setarray)
 	else
 	{// int array
 		for( i = 3; start < end; ++start, ++i )
-			script->set_reg(st, sd, reference_uid(id, start), name, (void*)__64BPTRSIZE(script_getnum(st,i)), reference_getref(data));
+			script->set_reg(st, sd, reference_uid(id, start), name, (void*)h64BPTRSIZE(script_getnum(st,i)), reference_getref(data));
 	}
 	return true;
 }
@@ -5850,7 +5850,7 @@ BUILDIN(cleararray)
 	if( is_string_variable(name) )
 		v = (void*)script_getstr(st, 3);
 	else
-		v = (void*)__64BPTRSIZE(script_getnum(st, 3));
+		v = (void*)h64BPTRSIZE(script_getnum(st, 3));
 
 	end = start + script_getnum(st, 4);
 	if( end > SCRIPT_MAX_ARRAYSIZE )
@@ -6425,9 +6425,9 @@ BUILDIN(checkweight2)
 
 	slots = pc->inventoryblank(sd);
 	for(i=0; i<nb_it; i++) {
-		nameid = (int32)__64BPTRSIZE(script->get_val2(st,reference_uid(id_it,idx_it+i),reference_getref(data_it)));
+		nameid = (int32)h64BPTRSIZE(script->get_val2(st,reference_uid(id_it,idx_it+i),reference_getref(data_it)));
 		script_removetop(st, -1, 0);
-		amount = (int32)__64BPTRSIZE(script->get_val2(st,reference_uid(id_nb,idx_nb+i),reference_getref(data_nb)));
+		amount = (int32)h64BPTRSIZE(script->get_val2(st,reference_uid(id_nb,idx_nb+i),reference_getref(data_nb)));
 		script_removetop(st, -1, 0);
 		if(fail) continue; //cpntonie to depop rest
 
@@ -12412,18 +12412,18 @@ BUILDIN(undisguise)
 }
 
 /*==========================================
- * Transform a bl to another _class,
+ * Transform a bl to another class,
  * @type unused
  *------------------------------------------*/
 BUILDIN(classchange) {
-	int _class,type;
+	int class_,type;
 	struct block_list *bl=map->id2bl(st->oid);
 
 	if(bl==NULL) return true;
 
-	_class=script_getnum(st,2);
+	class_=script_getnum(st,2);
 	type=script_getnum(st,3);
-	clif->class_change(bl,_class,type);
+	clif->class_change(bl,class_,type);
 	return true;
 }
 
@@ -13439,7 +13439,7 @@ BUILDIN(getmapxy)
 		sd=script->rid2sd(st);
 	else
 		sd=NULL;
-	script->set_reg(st,sd,num,name,(void*)__64BPTRSIZE(x),script_getref(st,3));
+	script->set_reg(st,sd,num,name,(void*)h64BPTRSIZE(x),script_getref(st,3));
 
 	//Set MapY
 	num=st->stack->stack_data[st->start+4].u.num;
@@ -13450,7 +13450,7 @@ BUILDIN(getmapxy)
 		sd=script->rid2sd(st);
 	else
 		sd=NULL;
-	script->set_reg(st,sd,num,name,(void*)__64BPTRSIZE(y),script_getref(st,4));
+	script->set_reg(st,sd,num,name,(void*)h64BPTRSIZE(y),script_getref(st,4));
 
 	//Return Success value
 	script_pushint(st,0);
@@ -13476,7 +13476,7 @@ BUILDIN(logmes)
 
 BUILDIN(summon)
 {
-	int _class, timeout=0;
+	int class_, timeout=0;
 	const char *str,*event="";
 	TBL_PC *sd;
 	struct mob_data *md;
@@ -13486,7 +13486,7 @@ BUILDIN(summon)
 	if (!sd) return true;
 
 	str    = script_getstr(st,2);
-	_class = script_getnum(st,3);
+	class_ = script_getnum(st,3);
 	if( script_hasdata(st,4) )
 		timeout=script_getnum(st,4);
 	if( script_hasdata(st,5) ) {
@@ -13496,7 +13496,7 @@ BUILDIN(summon)
 
 	clif->skill_poseffect(&sd->bl,AM_CALLHOMUN,1,sd->bl.x,sd->bl.y,tick);
 
-	md = mob->once_spawn_sub(&sd->bl, sd->bl.m, sd->bl.x, sd->bl.y, str, _class, event, SZ_MEDIUM, AI_NONE);
+	md = mob->once_spawn_sub(&sd->bl, sd->bl.m, sd->bl.x, sd->bl.y, str, class_, event, SZ_MEDIUM, AI_NONE);
 	if (md) {
 		md->master_id=sd->bl.id;
 		md->special_state.ai = AI_ATTACK;
@@ -14400,7 +14400,7 @@ BUILDIN(sscanf) {
 			if(sscanf(str, buf, &ref_int)==0) {
 				break;
 			}
-			script->set_reg(st, sd, reference_uid( reference_getid(data), reference_getindex(data) ), buf_p, (void *)__64BPTRSIZE(ref_int), reference_getref(data));
+			script->set_reg(st, sd, reference_uid( reference_getid(data), reference_getindex(data) ), buf_p, (void *)h64BPTRSIZE(ref_int), reference_getref(data));
 		}
 		arg++;
 
@@ -14767,7 +14767,7 @@ BUILDIN(setd)
 	if( is_string_variable(varname) ) {
 		script->setd_sub(st, sd, varname, elem, (void *)script_getstr(st, 3), NULL);
 	} else {
-		script->setd_sub(st, sd, varname, elem, (void *)__64BPTRSIZE(script_getnum(st, 3)), NULL);
+		script->setd_sub(st, sd, varname, elem, (void *)h64BPTRSIZE(script_getnum(st, 3)), NULL);
 	}
 
 	return true;
@@ -14841,7 +14841,7 @@ int buildin_query_sql_sub(struct script_state* st, Sql* handle)
 			if( is_string_variable(name) )
 				script->setd_sub(st, sd, name, i, (void *)(str?str:""), reference_getref(data));
 			else
-				script->setd_sub(st, sd, name, i, (void *)__64BPTRSIZE((str?atoi(str):0)), reference_getref(data));
+				script->setd_sub(st, sd, name, i, (void *)h64BPTRSIZE((str?atoi(str):0)), reference_getref(data));
 		}
 	}
 	if( i == max_rows && max_rows < SQL->NumRows(handle) ) {
@@ -15395,7 +15395,7 @@ BUILDIN(searchitem)
 
 	for( i = 0; i < count; ++start, ++i )
 	{// Set array
-		void* v = (void*)__64BPTRSIZE((int)items[i]->nameid);
+		void* v = (void*)h64BPTRSIZE((int)items[i]->nameid);
 		script->set_reg(st, sd, reference_uid(id, start), name, v, reference_getref(data));
 	}
 
diff --git a/src/map/script.h b/src/map/script.h
index bb6cd6e11..48abf1487 100644
--- a/src/map/script.h
+++ b/src/map/script.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_SCRIPT_H_
-#define _MAP_SCRIPT_H_
+#ifndef MAP_SCRIPT_H
+#define MAP_SCRIPT_H
 
 #include <errno.h>
 #include <setjmp.h>
@@ -715,4 +715,4 @@ struct script_interface *script;
 
 void script_defaults(void);
 
-#endif /* _MAP_SCRIPT_H_ */
+#endif /* MAP_SCRIPT_H */
diff --git a/src/map/searchstore.h b/src/map/searchstore.h
index c9b93ba54..d8abde615 100644
--- a/src/map/searchstore.h
+++ b/src/map/searchstore.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_SEARCHSTORE_H_
-#define _MAP_SEARCHSTORE_H_
+#ifndef MAP_SEARCHSTORE_H
+#define MAP_SEARCHSTORE_H
 
 #include <time.h>
 
@@ -99,4 +99,4 @@ struct searchstore_interface *searchstore;
 
 void searchstore_defaults (void);
 
-#endif /* _MAP_SEARCHSTORE_H_ */
+#endif /* MAP_SEARCHSTORE_H */
diff --git a/src/map/skill.h b/src/map/skill.h
index 6666fbbf2..70e5f4911 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_SKILL_H_
-#define _MAP_SKILL_H_
+#ifndef MAP_SKILL_H
+#define MAP_SKILL_H
 
 #include "../config/core.h" // RENEWAL_CAST
 
@@ -2021,4 +2021,4 @@ struct skill_interface *skill;
 
 void skill_defaults(void);
 
-#endif /* _MAP_SKILL_H_ */
+#endif /* MAP_SKILL_H */
diff --git a/src/map/status.h b/src/map/status.h
index 13d0a7841..bed0d9fbf 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_STATUS_H_
-#define _MAP_STATUS_H_
+#ifndef MAP_STATUS_H
+#define MAP_STATUS_H
 
 #include "../config/core.h" // defType, RENEWAL, RENEWAL_ASPD
 
@@ -2047,4 +2047,4 @@ struct status_interface *status;
 
 void status_defaults(void);
 
-#endif /* _MAP_STATUS_H_ */
+#endif /* MAP_STATUS_H */
diff --git a/src/map/storage.c b/src/map/storage.c
index f2f0d8986..217f14a3a 100644
--- a/src/map/storage.c
+++ b/src/map/storage.c
@@ -31,10 +31,10 @@ struct guild_storage_interface gstorage_s;
 /*==========================================
  * Sort items in the warehouse
  *------------------------------------------*/
-int storage_comp_item(const void *_i1, const void *_i2)
+int storage_comp_item(const void *i1_, const void *i2_)
 {
-	struct item *i1 = (struct item *)_i1;
-	struct item *i2 = (struct item *)_i2;
+	struct item *i1 = (struct item *)i1_;
+	struct item *i2 = (struct item *)i2_;
 
 	if (i1->nameid == i2->nameid)
 		return 0;
diff --git a/src/map/storage.h b/src/map/storage.h
index 5edb68cfc..186f21263 100644
--- a/src/map/storage.h
+++ b/src/map/storage.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_STORAGE_H_
-#define _MAP_STORAGE_H_
+#ifndef MAP_STORAGE_H
+#define MAP_STORAGE_H
 
 #include "../common/cbasetypes.h"
 #include "../common/db.h"
@@ -25,7 +25,7 @@ struct storage_interface {
 	int (*gettocart) (struct map_session_data *sd,int index,int amount);
 	void (*close) (struct map_session_data *sd);
 	void (*pc_quit) (struct map_session_data *sd, int flag);
-	int (*comp_item) (const void *_i1, const void *_i2);
+	int (*comp_item) (const void *i1_, const void *i2_);
 	void (*sortitem) (struct item* items, unsigned int size);
 	int (*reconnect_sub) (DBKey key, DBData *data, va_list ap);
 };
@@ -60,4 +60,4 @@ struct guild_storage_interface *gstorage;
 void storage_defaults(void);
 void gstorage_defaults(void);
 
-#endif /* _MAP_STORAGE_H_ */
+#endif /* MAP_STORAGE_H */
diff --git a/src/map/trade.h b/src/map/trade.h
index 143f26d74..f91ccd4a2 100644
--- a/src/map/trade.h
+++ b/src/map/trade.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_TRADE_H_
-#define _MAP_TRADE_H_
+#ifndef MAP_TRADE_H
+#define MAP_TRADE_H
 
 //Max distance from traders to enable a trade to take place.
 //TODO: battle_config candidate?
@@ -27,4 +27,4 @@ struct trade_interface *trade;
 
 void trade_defaults(void);
 
-#endif /* _MAP_TRADE_H_ */
+#endif /* MAP_TRADE_H */
diff --git a/src/map/unit.h b/src/map/unit.h
index f29a6903a..9b95bae41 100644
--- a/src/map/unit.h
+++ b/src/map/unit.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_UNIT_H_
-#define _MAP_UNIT_H_
+#ifndef MAP_UNIT_H
+#define MAP_UNIT_H
 
 #include "clif.h"  // clr_type
 #include "path.h" // struct walkpath_data
@@ -124,4 +124,4 @@ struct unit_interface *unit;
 
 void unit_defaults(void);
 
-#endif /* _MAP_UNIT_H_ */
+#endif /* MAP_UNIT_H */
diff --git a/src/map/vending.h b/src/map/vending.h
index b65e888e3..63cb632a9 100644
--- a/src/map/vending.h
+++ b/src/map/vending.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _MAP_VENDING_H_
-#define _MAP_VENDING_H_
+#ifndef MAP_VENDING_H
+#define MAP_VENDING_H
 
 #include "../common/cbasetypes.h"
 #include "../common/db.h"
@@ -36,4 +36,4 @@ struct vending_interface *vending;
 
 void vending_defaults(void);
 
-#endif /* _MAP_VENDING_H_ */
+#endif /* MAP_VENDING_H */
diff --git a/tools/HPMHookGen/HPMDataCheckGen.pl b/tools/HPMHookGen/HPMDataCheckGen.pl
index a79811c47..7ec1ba7e4 100644
--- a/tools/HPMHookGen/HPMDataCheckGen.pl
+++ b/tools/HPMHookGen/HPMDataCheckGen.pl
@@ -24,7 +24,7 @@ foreach my $file (@files) {
 	my @filepath = split(/[\/\\]/, $data->{compounddef}->{location}->{file});
 	my $foldername = uc($filepath[-2]);
 	my $filename = uc($filepath[-1]); $filename =~ s/-/_/g; $filename =~ s/\.[^.]*$//;
-	my $name = "_${foldername}_${filename}_H_";
+	my $name = "${foldername}_${filename}_H";
 	push @{ $out{$name} }, $data->{compounddef}->{compoundname};
 }
 
@@ -37,8 +37,8 @@ print FH <<"EOF";
 //
 // NOTE: This file was auto-generated and should never be manually edited,
 //       as it will get overwritten.
-#ifndef _HPM_DATA_CHECK_H_
-#define _HPM_DATA_CHECK_H_
+#ifndef HPM_DATA_CHECK_H
+#define HPM_DATA_CHECK_H
 
 
 HPExport const struct s_HPMDataCheck HPMDataCheck[] = {
@@ -63,6 +63,6 @@ print FH <<"EOF";
 };
 HPExport unsigned int HPMDataCheckLen = ARRAYLENGTH(HPMDataCheck);
 
-#endif /* _HPM_DATA_CHECK_H_ */
+#endif /* HPM_DATA_CHECK_H */
 EOF
 close(FH);
-- 
cgit v1.2.3-70-g09d2