From 918b1123963ac2f91a4d074b092ceef1db71b4e8 Mon Sep 17 00:00:00 2001
From: shennetsind <ind@henn.et>
Date: Fri, 28 Jun 2013 18:45:38 -0300
Subject: BG Queue Testing

http://hercules.ws/board/topic/1302-bg-queue-debug/
Signed-off-by: shennetsind <ind@henn.et>
---
 src/common/socket.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/common/socket.h b/src/common/socket.h
index b58cbdccf..82f8b84c3 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -50,7 +50,7 @@
 	} while(0)
 
 /* [Ind/Hercules] */
-#define RFIFO2PTR(fd,len) (void*)(session[fd]->rdata + len)
+#define RFIFO2PTR(fd) (void*)(session[fd]->rdata + session[fd]->rdata_pos)
 
 // buffer I/O macros
 #define RBUFP(p,pos) (((uint8*)(p)) + (pos))
-- 
cgit v1.2.3-70-g09d2


From ea5a413cdf7eec37141a7fe124cad38d66464ac4 Mon Sep 17 00:00:00 2001
From: Matheus Macabu <mkbu95@gmail.com>
Date: Fri, 5 Jul 2013 14:02:21 -0300
Subject: Implemented real-time server stats (in and out data and ram usage),
 made by Ai4rei; thanks!

Another follow up, now to fix maximum value of chatdori setting;
And fixed a bug where warping to a disable map would cause the map-server to crash.

Signed-off-by: Matheus Macabu <mkbu95@gmail.com>
---
 src/common/socket.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/common/socket.h |  1 +
 src/config/core.h   |  3 +++
 src/map/atcommand.c |  2 +-
 src/map/battle.c    |  2 +-
 5 files changed, 59 insertions(+), 2 deletions(-)

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

diff --git a/src/common/socket.c b/src/common/socket.c
index 15b20b16f..a039006f0 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -221,6 +221,13 @@ int naddr_ = 0;   // # of ip addresses
 // Larger packets cause a buffer overflow and stack corruption.
 static size_t socket_max_client_packet = 24576;
 
+#ifdef SHOW_SERVER_STATS
+// Data I/O statistics
+static size_t socket_data_i = 0, socket_data_ci = 0, socket_data_qi = 0;
+static size_t socket_data_o = 0, socket_data_co = 0, socket_data_qo = 0;
+static time_t socket_data_last_tick = 0;
+#endif
+
 // initial recv buffer size (this will also be the max. size)
 // biggest known packet: S 0153 <len>.w <emblem data>.?B -> 24x24 256 color .bmp (0153 + len.w + 1618/1654/1756 bytes)
 #define RFIFO_SIZE (2*1024)
@@ -357,6 +364,14 @@ int recv_to_fifo(int fd)
 
 	session[fd]->rdata_size += len;
 	session[fd]->rdata_tick = last_tick;
+#ifdef SHOW_SERVER_STATS
+	socket_data_i += len;
+	socket_data_qi += len;
+	if (!session[fd]->flag.server)
+	{
+		socket_data_ci += len;
+	}
+#endif
 	return 0;
 }
 
@@ -376,6 +391,9 @@ int send_from_fifo(int fd)
 	{//An exception has occured
 		if( sErrno != S_EWOULDBLOCK ) {
 			//ShowDebug("send_from_fifo: %s, ending connection #%d\n", error_msg(), fd);
+#ifdef SHOW_SERVER_STATS
+			socket_data_qo -= session[fd]->wdata_size;
+#endif
 			session[fd]->wdata_size = 0; //Clear the send queue as we can't send anymore. [Skotlex]
 			set_eof(fd);
 		}
@@ -390,6 +408,14 @@ int send_from_fifo(int fd)
 			memmove(session[fd]->wdata, session[fd]->wdata + len, session[fd]->wdata_size - len);
 
 		session[fd]->wdata_size -= len;
+#ifdef SHOW_SERVER_STATS
+		socket_data_o += len;
+		socket_data_qo -= len;
+		if (!session[fd]->flag.server)
+		{
+			socket_data_co += len;
+		}
+#endif
 	}
 
 	return 0;
@@ -573,6 +599,10 @@ static void delete_session(int fd)
 {
 	if( session_isValid(fd) )
 	{
+#ifdef SHOW_SERVER_STATS
+		socket_data_qi -= session[fd]->rdata_size - session[fd]->rdata_pos;
+		socket_data_qo -= session[fd]->wdata_size;
+#endif
 		aFree(session[fd]->rdata);
 		aFree(session[fd]->wdata);
 		aFree(session[fd]->session_data);
@@ -641,6 +671,9 @@ int RFIFOSKIP(int fd, size_t len)
 	}
 
 	s->rdata_pos = s->rdata_pos + len;
+#ifdef SHOW_SERVER_STATS
+	socket_data_qi -= len;
+#endif
 	return 0;
 }
 
@@ -694,6 +727,9 @@ int WFIFOSET(int fd, size_t len)
 
 	}
 	s->wdata_size += len;
+#ifdef SHOW_SERVER_STATS
+	socket_data_qo += len;
+#endif
 	//If the interserver has 200% of its normal size full, flush the data.
 	if( s->flag.server && s->wdata_size >= 2*FIFOSIZE_SERVERLINK )
 		flush_fifo(fd);
@@ -820,6 +856,23 @@ int do_sockets(int next)
 		RFIFOFLUSH(i);
 	}
 
+#ifdef SHOW_SERVER_STATS
+	if (last_tick != socket_data_last_tick)
+	{
+		char buf[1024];
+		
+		sprintf(buf, "In: %.03f kB/s (%.03f kB/s, Q: %.03f kB) | Out: %.03f kB/s (%.03f kB/s, Q: %.03f kB) | RAM: %.03f MB", socket_data_i/1024., socket_data_ci/1024., socket_data_qi/1024., socket_data_o/1024., socket_data_co/1024., socket_data_qo/1024., iMalloc->usage()/1024.);
+#ifdef _WIN32
+		SetConsoleTitle(buf);
+#else
+		ShowMessage("\033[s\033[1;1H\033[2K%s\033[u", buf);
+#endif
+		socket_data_last_tick = last_tick;
+		socket_data_i = socket_data_ci = 0;
+		socket_data_o = socket_data_co = 0;
+	}
+#endif
+
 	return 0;
 }
 
diff --git a/src/common/socket.h b/src/common/socket.h
index 82f8b84c3..0870c9d4e 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -6,6 +6,7 @@
 #define _SOCKET_H_
 
 #include "../common/cbasetypes.h"
+#include "../config/core.h"
 
 #ifdef WIN32
 	#include "../common/winapi.h"
diff --git a/src/config/core.h b/src/config/core.h
index bec6cb507..b5ad1b794 100644
--- a/src/config/core.h
+++ b/src/config/core.h
@@ -61,6 +61,9 @@
 /// By enabling it, the system will create an unique id for each new non stackable item created
 //#define NSI_UNIQUE_ID
 
+/// Uncomment to enable real-time server stats (in and out data and ram usage). [Ai4rei]
+//#define SHOW_SERVER_STATS
+
 /**
  * No settings past this point
  **/
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 8423467c6..2aaf89107 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -407,7 +407,7 @@ ACMD(mapmove)
 	if (mapindex)
 		m = iMap->mapindex2mapid(mapindex);
 	
-	if (!mapindex) { // m < 0 means on different server! [Kevin]
+	if (!mapindex || m < 0) { // m < 0 means on different server or that map is disabled! [Kevin]
 		clif->message(fd, msg_txt(1)); // Map not found.
 		return false;
 	}
diff --git a/src/map/battle.c b/src/map/battle.c
index d03afc431..aeed4c2b0 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -6461,7 +6461,7 @@ static const struct _battle_data {
 	{ "item_enabled_npc",					&battle_config.item_enabled_npc,				1,      0,      1,				},
 	{ "gm_ignore_warpable_area",			&battle_config.gm_ignore_warpable_area,			0,		2,		100,			},
 	{ "packet_obfuscation",					&battle_config.packet_obfuscation,				1,		0,		3,				},
-	{ "client_accept_chatdori",             &battle_config.client_accept_chatdori,          0,      0,      1,         		},
+	{ "client_accept_chatdori",             &battle_config.client_accept_chatdori,          0,      0,      INT_MAX,		},
 };
 #ifndef STATS_OPT_OUT
 /**
-- 
cgit v1.2.3-70-g09d2


From 713bc4da082e8b240ca6e0d9551c21c2931eece5 Mon Sep 17 00:00:00 2001
From: malufett <malufett.eat.my.binaries@gmail.com>
Date: Mon, 8 Jul 2013 07:12:58 -0700
Subject: Follow up ea5a413cdf7eec37141a7fe124cad38d66464ac4 -where it breaks
 some skills & in game behaviors.

---
 src/common/socket.c | 1 +
 src/common/socket.h | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/common/socket.c b/src/common/socket.c
index ea8a2cfcc..f6d5849be 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -8,6 +8,7 @@
 #include "../common/malloc.h"
 #include "../common/showmsg.h"
 #include "../common/strlib.h"
+#include "../config/core.h"
 #include "socket.h"
 
 #include <stdio.h>
diff --git a/src/common/socket.h b/src/common/socket.h
index 0870c9d4e..82f8b84c3 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -6,7 +6,6 @@
 #define _SOCKET_H_
 
 #include "../common/cbasetypes.h"
-#include "../config/core.h"
 
 #ifdef WIN32
 	#include "../common/winapi.h"
-- 
cgit v1.2.3-70-g09d2


From 6b9f58446c46877ecfc5fe40847636145acf5af8 Mon Sep 17 00:00:00 2001
From: shennetsind <ind@henn.et>
Date: Sun, 4 Aug 2013 12:19:25 -0300
Subject: HPM Update

- Custom Packet Support
- Custom Data Struct Support (currently append-able to map_session_data and socket_data)
- Char Server Support
- Login Server Support
http://hercules.ws/board/topic/1934-hercules-plugin-manager-update/
Documentation will soon be updated in http://hercules.ws/wiki/HPM

Signed-off-by: shennetsind <ind@henn.et>
---
 src/char/char.c         |  34 ++++++
 src/common/HPM.c        | 267 +++++++++++++++++++++++++++++++++++++++++++-----
 src/common/HPM.h        |  32 +++++-
 src/common/HPMi.h       |  29 +++++-
 src/common/malloc.c     |   7 +-
 src/common/malloc.h     |  11 +-
 src/common/socket.c     |  26 ++++-
 src/common/socket.h     |   7 +-
 src/login/account.h     |   2 +-
 src/login/account_sql.c |   3 +-
 src/login/login.c       |  49 ++++++---
 src/map/HPMmap.c        |  89 ++++++++++++++++
 src/map/HPMmap.h        |  18 ++++
 src/map/Makefile.in     |   4 +-
 src/map/chrif.c         |  14 ++-
 src/map/clif.c          |   9 ++
 src/map/map.c           |   5 +
 src/map/pc.h            |   3 +
 src/map/pc_groups.c     |   1 +
 src/map/unit.c          |  11 ++
 src/plugins/sample.c    |  82 ++++++++++++++-
 21 files changed, 639 insertions(+), 64 deletions(-)
 create mode 100644 src/map/HPMmap.c
 create mode 100644 src/map/HPMmap.h

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

diff --git a/src/char/char.c b/src/char/char.c
index b6ea8e2f6..e6e8732db 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -14,6 +14,7 @@
 #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"
@@ -2150,6 +2151,14 @@ int parse_fromlogin(int fd) {
 
 	while(RFIFOREST(fd) >= 2) {
 		uint16 command = RFIFOW(fd,0);
+		
+		if( HPM->packetsc[hpParse_FromLogin] ) {
+			if( (i = HPM->parse_packets(fd,hpParse_FromLogin)) ) {
+				if( i == 1 ) continue;
+				if( i == 2 ) return 0;
+			}
+		}
+		
 		switch( command ) {
 
 			// acknowledgement of connect-to-loginserver request
@@ -2704,6 +2713,14 @@ int parse_frommap(int fd)
 	}
 
 	while(RFIFOREST(fd) >= 2) {
+		
+		if( HPM->packetsc[hpParse_FromMap] ) {
+			if( (i = HPM->parse_packets(fd,hpParse_FromMap)) ) {
+				if( i == 1 ) continue;
+				if( i == 2 ) return 0;
+			}
+		}
+		
 		switch(RFIFOW(fd,0)) {
 
 			case 0x2b0a:
@@ -3752,6 +3769,13 @@ int parse_char(int fd)
 		//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; } }
 
+		if( HPM->packetsc[hpParse_Char] ) {
+			if( (i = HPM->parse_packets(fd,hpParse_Char)) ) {
+				if( i == 1 ) continue;
+				if( i == 2 ) return 0;
+			}
+		}
+		
 		cmd = RFIFOW(fd,0);
 
 		switch( cmd ) {
@@ -4874,8 +4898,11 @@ int char_config_read(const char* cfgName)
 
 void do_final(void) {
 	int i;
+	
 	ShowStatus("Terminating...\n");
 
+	HPM->event(HPET_FINAL);
+	
 	set_all_offline(-1);
 	set_all_offline_sql();
 
@@ -4967,6 +4994,11 @@ int do_init(int argc, char **argv) {
 
 	auth_db = idb_alloc(DB_OPT_RELEASE_DATA);
 	online_char_db = idb_alloc(DB_OPT_RELEASE_DATA);
+
+	HPM->share(sql_handle,"sql_handle");
+	HPM->config_read();
+	HPM->event(HPET_INIT);
+	
 	mmo_char_sql_init();
 	char_read_fame_list(); //Read fame lists.
 
@@ -5034,5 +5066,7 @@ int do_init(int argc, char **argv) {
 		runflag = CHARSERVER_ST_RUNNING;
 	}
 
+	HPM->event(HPET_READY);
+	
 	return 0;
 }
diff --git a/src/common/HPM.c b/src/common/HPM.c
index 53059d224..3b79febd7 100644
--- a/src/common/HPM.c
+++ b/src/common/HPM.c
@@ -22,6 +22,9 @@
 #include <unistd.h>
 #endif
 
+struct malloc_interface iMalloc_HPM;
+struct malloc_interface *HPMiMalloc;
+
 void hplugin_trigger_event(enum hp_event_types type) {
 	unsigned int i;
 	for( i = 0; i < HPM->plugin_count; i++ ) {
@@ -189,12 +192,17 @@ void hplugin_load(const char* filename) {
 	
 	if( !HPM->populate(plugin,filename) )
 		return;
-	
-	if( SERVER_TYPE == SERVER_TYPE_MAP ) {
-		plugin->hpi->addCommand		= HPM->import_symbol("addCommand");
-		plugin->hpi->addScript		= HPM->import_symbol("addScript");
-		plugin->hpi->addCPCommand	= HPM->import_symbol("addCPCommand");
-	}
+	/* id */
+	plugin->hpi->pid				= plugin->idx;
+	/* core */
+	plugin->hpi->addCPCommand		= HPM->import_symbol("addCPCommand");
+	plugin->hpi->addPacket			= HPM->import_symbol("addPacket");
+	plugin->hpi->addToSession		= HPM->import_symbol("addToSession");
+	plugin->hpi->getFromSession		= HPM->import_symbol("getFromSession");
+	plugin->hpi->removeFromSession	= HPM->import_symbol("removeFromSession");
+	/* server specific */
+	if( HPM->load_sub )
+		HPM->load_sub(plugin);
 	
 	plugin->info = info;
 	plugin->filename = aStrdup(filename);
@@ -209,7 +217,8 @@ void hplugin_unload(struct hplugin* plugin) {
 		aFree(plugin->filename);
 	if( plugin->dll )
 		plugin_close(plugin->dll);
-	
+	/* TODO: for manual packet unload */
+	/* - Go thru known packets and unlink any belonging to the plugin being removed */
 	aFree(plugin);
 	if( !HPM->off ) {
 		HPM->plugins[i] = NULL;
@@ -253,11 +262,191 @@ void hplugins_config_read(void) {
 	if( HPM->plugin_count )
 		ShowStatus("HPM: There are '"CL_WHITE"%d"CL_RESET"' plugins loaded, type '"CL_WHITE"plugins"CL_RESET"' to list them\n", HPM->plugin_count);
 }
+CPCMD(plugins) {
+	if( HPM->plugin_count == 0 ) {
+		ShowInfo("HPC: there are no plugins loaded\n");
+	} else {
+		unsigned int i;
+		
+		ShowInfo("HPC: There are '"CL_WHITE"%d"CL_RESET"' plugins loaded\n",HPM->plugin_count);
+		
+		for(i = 0; i < HPM->plugin_count; i++) {
+			ShowInfo("HPC: - '"CL_WHITE"%s"CL_RESET"' (%s)\n",HPM->plugins[i]->info->name,HPM->plugins[i]->filename);
+		}
+	}
+}
+
+void hplugins_addToSession(struct socket_data *sess, void *data, unsigned int id, unsigned int type, bool autofree) {
+	struct HPluginData *HPData;
+	unsigned int i;
+	
+	for(i = 0; i < sess->hdatac; i++) {
+		if( sess->hdata[i]->pluginID == id && sess->hdata[i]->type == type ) {
+			ShowError("HPM->addToSession:%s: error! attempting to insert duplicate struct of id %u and type %u\n",HPM->pid2name(id),id,type);
+			return;
+		}
+	}
+	
+	//HPluginData is always same size, probably better to use the ERS
+	CREATE(HPData, struct HPluginData, 1);
+	
+	HPData->pluginID = id;
+	HPData->type = type;
+	HPData->flag.free = autofree ? 1 : 0;
+	HPData->data = data;
+	
+	RECREATE(sess->hdata,struct HPluginData *,++sess->hdatac);
+	sess->hdata[sess->hdatac - 1] = HPData;
+}
+void *hplugins_getFromSession(struct socket_data *sess, unsigned int id, unsigned int type) {
+	unsigned int i;
+	
+	for(i = 0; i < sess->hdatac; i++) {
+		if( sess->hdata[i]->pluginID == id && sess->hdata[i]->type == type ) {
+			break;
+		}
+	}
+	
+	if( i != sess->hdatac )
+		return sess->hdata[i]->data;
+	
+	return NULL;
+}
+void hplugins_removeFromSession(struct socket_data *sess, unsigned int id, unsigned int type) {
+	unsigned int i;
+	
+	for(i = 0; i < sess->hdatac; i++) {
+		if( sess->hdata[i]->pluginID == id && sess->hdata[i]->type == type ) {
+			break;
+		}
+	}
+	
+	if( i != sess->hdatac ) {
+		unsigned int cursor;
+
+		aFree(sess->hdata[i]->data);
+		aFree(sess->hdata[i]);
+		sess->hdata[i] = NULL;
+		
+		for(i = 0, cursor = 0; i < sess->hdatac; i++) {
+			if( sess->hdata[i] == NULL )
+				continue;
+			if( i != cursor )
+				sess->hdata[cursor] = sess->hdata[i];
+			cursor++;
+		}
+		sess->hdatac = cursor;
+	}
+	
+}
+
+bool hplugins_addpacket(unsigned short cmd, short length,void (*receive) (int fd),unsigned int point,unsigned int pluginID) {
+	struct HPluginPacket *packet;
+	unsigned int i;
+	
+	if( point >= hpPHP_MAX ) {
+		ShowError("HPM->addPacket:%s: unknown point '%u' specified for packet 0x%04x (len %d)\n",HPM->pid2name(pluginID),point,cmd,length);
+		return false;
+	}
+
+	for(i = 0; i < HPM->packetsc[point]; i++) {
+		if( HPM->packets[point][i].cmd == cmd ) {
+			ShowError("HPM->addPacket:%s: can't add packet 0x%04x, already in use by '%s'!",HPM->pid2name(pluginID),cmd,HPM->pid2name(HPM->packets[point][i].pluginID));
+			return false;
+		}
+	}
+	
+	RECREATE(HPM->packets[point], struct HPluginPacket, ++HPM->packetsc[point]);
+	packet = &HPM->packets[point][HPM->packetsc[point] - 1];
+	
+	packet->pluginID = pluginID;
+	packet->cmd = cmd;
+	packet->len = length;
+	packet->receive = receive;
+	
+	return true;
+}
+/* 
+ 0 = unknown
+ 1 = OK
+ 2 = incomplete
+ */
+unsigned char hplugins_parse_packets(int fd, enum HPluginPacketHookingPoints point) {
+	unsigned int i;
+		
+	for(i = 0; i < HPM->packetsc[point]; i++) {
+		if( HPM->packets[point][i].cmd == RFIFOW(fd,0) )
+			break;
+	}
+	
+	if( i != HPM->packetsc[point] ) {
+		struct HPluginPacket *packet = &HPM->packets[point][i];
+		short length;
+		
+		if( (length = packet->len) == -1 ) {
+			if( (length = RFIFOW(fd, 2)) < (int)RFIFOREST(fd) )
+			   return 2;
+		}
+		
+		packet->receive(fd);
+		RFIFOSKIP(fd, length);
+		return 1;
+	}
+	
+	return 0;
+}
+
+char *hplugins_id2name (unsigned int pid) {
+	unsigned int i;
+	
+	for( i = 0; i < HPM->plugin_count; i++ ) {
+		if( HPM->plugins[i]->idx == pid )
+			return HPM->plugins[i]->info->name;
+	}
+	
+	return "UnknownPlugin";
+}
+char* HPM_file2ptr(const char *file) {
+	unsigned int i;
+	
+	for(i = 0; i < HPM->fnamec; i++) {
+		if( HPM->fnames[i].addr == file )
+			return HPM->fnames[i].name;
+	}
+	
+	i = HPM->fnamec;
+	
+	/* we handle this memory outside of the server's memory manager because we need it to exist after the memory manager goes down */
+	HPM->fnames = realloc(HPM->fnames,(++HPM->fnamec)*sizeof(struct HPMFileNameCache));
+		
+	HPM->fnames[i].addr = file;
+	HPM->fnames[i].name = strdup(file);
+
+	return HPM->fnames[i].name;
+}
+void* HPM_mmalloc(size_t size, const char *file, int line, const char *func) {
+	return iMalloc->malloc(size,HPM_file2ptr(file),line,func);
+}
+void* HPM_calloc(size_t num, size_t size, const char *file, int line, const char *func) {
+	return iMalloc->calloc(num,size,HPM_file2ptr(file),line,func);
+}
+void* HPM_realloc(void *p, size_t size, const char *file, int line, const char *func) {
+	return iMalloc->realloc(p,size,HPM_file2ptr(file),line,func);
+}
+char* HPM_astrdup(const char *p, const char *file, int line, const char *func) {
+	return iMalloc->astrdup(p,HPM_file2ptr(file),line,func);
+}
+
 void hplugins_share_defaults(void) {
 	/* console */
 #ifdef CONSOLE_INPUT
 	HPM->share(console->addCommand,"addCPCommand");
 #endif
+	/* our own */
+	HPM->share(hplugins_addpacket,"addPacket");
+	HPM->share(hplugins_addToSession,"addToSession");
+	HPM->share(hplugins_getFromSession,"getFromSession");
+	HPM->share(hplugins_removeFromSession,"removeFromSession");
 	/* core */
 	HPM->share(&runflag,"runflag");
 	HPM->share(arg_v,"arg_v");
@@ -267,15 +456,13 @@ void hplugins_share_defaults(void) {
 	HPM->share((void*)get_svn_revision,"get_svn_revision");
 	HPM->share((void*)get_git_hash,"get_git_hash");
 	HPM->share(DB, "DB");
-	HPM->share(iMalloc, "iMalloc");
+	HPM->share(HPMiMalloc, "iMalloc");
 	/* socket */
 	HPM->share(RFIFOSKIP,"RFIFOSKIP");
 	HPM->share(WFIFOSET,"WFIFOSET");
 	HPM->share(do_close,"do_close");
 	HPM->share(make_connection,"make_connection");
-	HPM->share(session,"session");
-	HPM->share(&fd_max,"fd_max");
-	HPM->share(addr_,"addr");
+	//session,fd_max and addr_ are shared from within socket.c
 	/* strlib */
 	HPM->share(strlib,"strlib");
 	HPM->share(sv,"sv");
@@ -286,31 +473,34 @@ void hplugins_share_defaults(void) {
 	HPM->share(iTimer,"iTimer");
 	
 }
-CPCMD(plugins) {
-	if( HPM->plugin_count == 0 ) {
-		ShowInfo("HPC: there are no plugins loaded\n");
-	} else {
-		unsigned int i;
-		
-		ShowInfo("HPC: There are '"CL_WHITE"%d"CL_RESET"' plugins loaded\n",HPM->plugin_count);
-		
-		for(i = 0; i < HPM->plugin_count; i++) {
-			ShowInfo("HPC: - '"CL_WHITE"%s"CL_RESET"' (%s)\n",HPM->plugins[i]->info->name,HPM->plugins[i]->filename);
-		}
-	}
-}
+
 void hpm_init(void) {
+	unsigned int i;
+	
 	HPM->symbols = NULL;
 	HPM->plugins = NULL;
 	HPM->plugin_count = HPM->symbol_count = 0;
 	HPM->off = false;
 	
+	memcpy(&iMalloc_HPM, iMalloc, sizeof(struct malloc_interface));
+	HPMiMalloc = &iMalloc_HPM;
+	HPMiMalloc->malloc = HPM_mmalloc;
+	HPMiMalloc->calloc = HPM_calloc;
+	HPMiMalloc->realloc = HPM_realloc;
+	HPMiMalloc->astrdup = HPM_astrdup;
+
 	sscanf(HPM_VERSION, "%d.%d", &HPM->version[0], &HPM->version[1]);
 	
 	if( HPM->version[0] == 0 && HPM->version[1] == 0 ) {
 		ShowError("HPM:init:failed to retrieve HPM version!!\n");
 		return;
 	}
+	
+	for(i = 0; i < hpPHP_MAX; i++) {
+		HPM->packets[i] = NULL;
+		HPM->packetsc[i] = 0;
+	}
+	
 	HPM->symbol_defaults();
 	
 #ifdef CONSOLE_INPUT
@@ -318,7 +508,18 @@ void hpm_init(void) {
 #endif
 	return;
 }
-
+void hpm_memdown(void) {
+	unsigned int i;
+	
+	/* this memory is handled outside of the server's memory manager and thus cleared after memory manager goes down */
+	
+	for( i = 0; i < HPM->fnamec; i++ ) {
+		free(HPM->fnames[i].name);
+	}
+	
+	if( HPM->fnames )
+		free(HPM->fnames);
+}
 void hpm_final(void) {
 	unsigned int i;
 	
@@ -337,12 +538,23 @@ void hpm_final(void) {
 	
 	if( HPM->symbols )
 		aFree(HPM->symbols);
-			
+	
+	for( i = 0; i < hpPHP_MAX; i++ ) {
+		if( HPM->packets[i] )
+			aFree(HPM->packets[i]);
+	}
+	
+	/* HPM->fnames is cleared after the memory manager goes down */
+	iMalloc->post_shutdown = hpm_memdown;
+	
 	return;
 }
 void hpm_defaults(void) {
 	HPM = &HPM_s;
 	
+	HPM->fnames = NULL;
+	HPM->fnamec = 0;
+	
 	HPM->init = hpm_init;
 	HPM->final = hpm_final;
 	
@@ -358,4 +570,7 @@ void hpm_defaults(void) {
 	HPM->config_read = hplugins_config_read;
 	HPM->populate = hplugin_populate;
 	HPM->symbol_defaults_sub = NULL;
+	HPM->pid2name = hplugins_id2name;
+	HPM->parse_packets = hplugins_parse_packets;
+	HPM->load_sub = NULL;
 }
diff --git a/src/common/HPM.h b/src/common/HPM.h
index 10b1f0e79..d2a1308f2 100644
--- a/src/common/HPM.h
+++ b/src/common/HPM.h
@@ -49,6 +49,27 @@ struct hpm_symbol {
 	void *ptr;
 };
 
+struct HPluginData {
+	unsigned int pluginID;
+	unsigned int type;
+	struct {
+		unsigned int free : 1;
+	} flag;
+	void *data;
+};
+
+struct HPluginPacket {
+	unsigned int pluginID;
+	unsigned short cmd;
+	short len;
+	void (*receive) (int fd);
+};
+
+struct HPMFileNameCache {
+	const char *addr;
+	char *name;
+};
+
 /* Hercules Plugin Manager Interface */
 struct HPM_interface {
 	/* vars */
@@ -59,6 +80,12 @@ struct HPM_interface {
 	unsigned int plugin_count;
 	struct hpm_symbol **symbols;
 	unsigned int symbol_count;
+	/* packet hooking points */
+	struct HPluginPacket *packets[hpPHP_MAX];
+	unsigned int packetsc[hpPHP_MAX];
+	/* plugin file ptr caching */
+	struct HPMFileNameCache *fnames;
+	unsigned int fnamec;
 	/* funcs */
 	void (*init) (void);
 	void (*final) (void);
@@ -73,7 +100,10 @@ struct HPM_interface {
 	void (*symbol_defaults) (void);
 	void (*config_read) (void);
 	bool (*populate) (struct hplugin *plugin,const char *filename);
-	void (*symbol_defaults_sub) (void);
+	void (*symbol_defaults_sub) (void);//TODO drop
+	char *(*pid2name) (unsigned int pid);
+	unsigned char (*parse_packets) (int fd, enum HPluginPacketHookingPoints point);
+	void (*load_sub) (struct hplugin *plugin);
 } HPM_s;
 
 struct HPM_interface *HPM;
diff --git a/src/common/HPMi.h b/src/common/HPMi.h
index 3cdb804e0..5e44b80c7 100644
--- a/src/common/HPMi.h
+++ b/src/common/HPMi.h
@@ -11,6 +11,8 @@
 
 struct script_state;
 struct AtCommandInfo;
+struct socket_data;
+struct map_session_data;
 
 #ifdef WIN32
 	#define HPExport __declspec(dllexport)
@@ -33,7 +35,7 @@ struct AtCommandInfo;
 /* after */
 #include "../common/showmsg.h"
 
-#define HPM_VERSION "0.1"
+#define HPM_VERSION "0.2"
 
 struct hplugin_info {
 	char* name;
@@ -56,12 +58,37 @@ enum hp_event_types {
 	HPET_MAX,
 };
 
+enum HPluginPacketHookingPoints {
+	hpClif_Parse,		/* map-server (client-map) */
+	hpChrif_Parse,		/* map-server (char-map) */
+	hpParse_FromMap,	/* char-server (map-char) */
+	hpParse_FromLogin,	/* char-server (login-char) */
+	hpParse_Char,		/* char-server (client-char) */
+	hpParse_FromChar,	/* login-server (char-login) */
+	hpParse_Login,		/* login-server (client-login) */
+	/* */
+	hpPHP_MAX,
+};
+
 /* Hercules Plugin Mananger Include Interface */
 HPExport struct HPMi_interface {
+	/* */
+	unsigned int pid;
+	/* */
 	void (*event[HPET_MAX]) (void);
 	bool (*addCommand) (char *name, bool (*func)(const int fd, struct map_session_data* sd, const char* command, const char* message,struct AtCommandInfo *info));
 	bool (*addScript) (char *name, char *args, bool (*func)(struct script_state *st));
 	void (*addCPCommand) (char *name, CParseFunc func);
+	/* map_session_data */
+	void (*addToMSD) (struct map_session_data *sd, void *data, unsigned int id, unsigned int type, bool autofree);
+	void *(*getFromMSD) (struct map_session_data *sd, unsigned int id, unsigned int type);
+	void (*removeFromMSD) (struct map_session_data *sd, unsigned int id, unsigned int type);
+	/* session[] */
+	void (*addToSession) (struct socket_data *sess, void *data, unsigned int id, unsigned int type, bool autofree);
+	void *(*getFromSession) (struct socket_data *sess, unsigned int id, unsigned int type);
+	void (*removeFromSession) (struct socket_data *sess, unsigned int id, unsigned int type);
+	/* packet */
+	bool (*addPacket) (unsigned short cmd, unsigned short length, void (*receive)(int fd), unsigned int point, unsigned int pluginID);
 } HPMi_s;
 #ifndef _HPM_H_
 	HPExport struct HPMi_interface *HPMi;
diff --git a/src/common/malloc.c b/src/common/malloc.c
index d629aa63f..4d2c93b77 100644
--- a/src/common/malloc.c
+++ b/src/common/malloc.c
@@ -11,6 +11,8 @@
 #include <string.h>
 #include <time.h>
 
+struct malloc_interface iMalloc_s;
+
 ////////////// Memory Libraries //////////////////
 
 #if defined(MEMWATCH)
@@ -672,7 +674,7 @@ void memmgr_report (int extra) {
 	
 	if( extra != 0 )
 		msize = extra;
-	
+
 	while (block) {
 		if (block->unit_used) {
 			int i;
@@ -784,6 +786,8 @@ void malloc_final (void) {
 	memmgr_final ();
 #endif
 	MEMORY_CHECK();
+	if( iMalloc->post_shutdown )
+		iMalloc->post_shutdown();
 }
 
 void malloc_init (void) {
@@ -825,4 +829,5 @@ void malloc_defaults(void) {
 	iMalloc->astrdup =	aStrdup_;
 	iMalloc->free    =	aFree_;
 #endif
+	iMalloc->post_shutdown = NULL;
 }
diff --git a/src/common/malloc.h b/src/common/malloc.h
index 834781905..bc8aa9a20 100644
--- a/src/common/malloc.h
+++ b/src/common/malloc.h
@@ -67,18 +67,21 @@
 void malloc_defaults(void);
 
 struct malloc_interface {
+	void	(*init) (void);
+	void	(*final) (void);
+	/* */
 	void* (*malloc	)(size_t size, const char *file, int line, const char *func);
 	void* (*calloc	)(size_t num, size_t size, const char *file, int line, const char *func);
 	void* (*realloc	)(void *p, size_t size, const char *file, int line, const char *func);
 	char* (*astrdup	)(const char *p, const char *file, int line, const char *func);
 	void  (*free	)(void *p, const char *file, int line, const char *func);
-
+	/* */
 	void	(*memory_check)(void);
 	bool	(*verify_ptr)(void* ptr);
 	size_t	(*usage) (void);
-	void	(*init) (void);
-	void	(*final) (void);
-} iMalloc_s;
+	/* */
+	void (*post_shutdown) (void);
+};
 
 void memmgr_report (int extra);
 
diff --git a/src/common/socket.c b/src/common/socket.c
index f6d5849be..4f2e386ec 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -9,6 +9,7 @@
 #include "../common/showmsg.h"
 #include "../common/strlib.h"
 #include "../config/core.h"
+#include "../common/HPM.h"
 #include "socket.h"
 
 #include <stdio.h>
@@ -239,8 +240,6 @@ static time_t socket_data_last_tick = 0;
 // The connection is closed if it goes over the limit.
 #define WFIFO_MAX (1*1024*1024)
 
-struct socket_data* session[FD_SETSIZE];
-
 #ifdef SEND_SHORTLIST
 int send_shortlist_array[FD_SETSIZE];// we only support FD_SETSIZE sockets, limit the array to that
 int send_shortlist_count = 0;// how many fd's are in the shortlist
@@ -594,13 +593,15 @@ static int create_session(int fd, RecvFunc func_recv, SendFunc func_send, ParseF
 	session[fd]->func_parse = func_parse;
 	session[fd]->rdata_tick = last_tick;
 	session[fd]->session_data = NULL;
+	session[fd]->hdata = NULL;
+	session[fd]->hdatac = 0;
 	return 0;
 }
 
 static void delete_session(int fd)
 {
-	if( session_isValid(fd) )
-	{
+	if( session_isValid(fd) ) {
+		unsigned int i;
 #ifdef SHOW_SERVER_STATS
 		socket_data_qi -= session[fd]->rdata_size - session[fd]->rdata_pos;
 		socket_data_qo -= session[fd]->wdata_size;
@@ -609,6 +610,14 @@ static void delete_session(int fd)
 		aFree(session[fd]->wdata);
 		if( session[fd]->session_data )
 			aFree(session[fd]->session_data);
+		for(i = 0; i < session[fd]->hdatac; i++) {
+			if( session[fd]->hdata[i]->flag.free ) {
+				aFree(session[fd]->hdata[i]->data);
+				aFree(session[fd]->hdata[i]);
+			}
+		}
+		if( session[fd]->hdata )
+			aFree(session[fd]->hdata);
 		aFree(session[fd]);
 		session[fd] = NULL;
 	}
@@ -1214,6 +1223,8 @@ void socket_final(void)
 	aFree(session[0]->rdata);
 	aFree(session[0]->wdata);
 	aFree(session[0]);
+	
+	aFree(session);
 }
 
 /// Closes a socket.
@@ -1375,6 +1386,8 @@ void socket_init(void)
 	memset(send_shortlist_set, 0, sizeof(send_shortlist_set));
 #endif
 
+	CREATE(session, struct socket_data *, FD_SETSIZE);
+	
 	socket_config_read(SOCKET_CONF_FILENAME);
 
 	// initialise last send-receive tick
@@ -1392,6 +1405,11 @@ void socket_init(void)
 #endif
 
 	ShowInfo("Server supports up to '"CL_WHITE"%u"CL_RESET"' concurrent connections.\n", rlim_cur);
+	
+	/* Hercules Plugin Manager */
+	HPM->share(session,"session");
+	HPM->share(&fd_max,"fd_max");
+	HPM->share(addr_,"addr");
 }
 
 bool session_isValid(int fd)
diff --git a/src/common/socket.h b/src/common/socket.h
index 82f8b84c3..0e34da660 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -18,6 +18,8 @@
 
 #include <time.h>
 
+struct HPluginData;
+
 #define FIFOSIZE_SERVERLINK 256*1024
 
 // socket I/O macros
@@ -96,6 +98,9 @@ struct socket_data
 	ParseFunc func_parse;
 
 	void* session_data; // stores application-specific data related to the session
+	
+	struct HPluginData **hdata;
+	unsigned int hdatac;
 };
 
 struct hSockOpt {
@@ -105,7 +110,7 @@ struct hSockOpt {
 
 // Data prototype declaration
 
-extern struct socket_data* session[FD_SETSIZE];
+struct socket_data **session;
 
 extern int fd_max;
 
diff --git a/src/login/account.h b/src/login/account.h
index 999c93075..f55e38b0c 100644
--- a/src/login/account.h
+++ b/src/login/account.h
@@ -135,6 +135,6 @@ struct AccountDB
 	AccountDBIterator* (*iterator)(AccountDB* self);
 };
 
-void account_db_sql_up(AccountDB* self);
+Sql *account_db_sql_up(AccountDB* self);
 
 #endif // __ACCOUNT_H_INCLUDED__
diff --git a/src/login/account_sql.c b/src/login/account_sql.c
index 218248c82..533b3d860 100644
--- a/src/login/account_sql.c
+++ b/src/login/account_sql.c
@@ -687,10 +687,11 @@ static bool mmo_auth_tosql(AccountDB_SQL* db, const struct mmo_account* acc, boo
 
 	return result;
 }
-void account_db_sql_up(AccountDB* self) {
+Sql* account_db_sql_up(AccountDB* self) {
 	AccountDB_SQL* db = (AccountDB_SQL*)self;
 	Sql_HerculesUpdateCheck(db->accounts);
 #ifdef CONSOLE_INPUT
 	console->setSQL(db->accounts);
 #endif
+	return db->accounts;
 }
diff --git a/src/login/login.c b/src/login/login.c
index a17faa058..f92f0094d 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/HPM.h"
 #include "account.h"
 #include "ipban.h"
 #include "login.h"
@@ -372,12 +373,17 @@ int parse_fromchar(int fd)
 	ipl = server[id].ip;
 	ip2str(ipl, ip);
 
-	while( RFIFOREST(fd) >= 2 )
-	{
+	while( RFIFOREST(fd) >= 2 ) {
 		uint16 command = RFIFOW(fd,0);
 
-		switch( command )
-		{
+		if( HPM->packetsc[hpParse_FromChar] ) {
+			if( (j = HPM->parse_packets(fd,hpParse_FromChar)) ) {
+				if( j == 1 ) continue;
+				if( j == 2 ) return 0;
+			}
+		}
+		
+		switch( command ) {
 
 		case 0x2712: // request from char-server to authenticate an account
 			if( RFIFOREST(fd) < 23 )
@@ -1324,12 +1330,17 @@ int parse_login(int fd)
 		sd->fd = fd;
 	}
 
-	while( RFIFOREST(fd) >= 2 )
-	{
+	while( RFIFOREST(fd) >= 2 ) {
 		uint16 command = RFIFOW(fd,0);
 
-		switch( command )
-		{
+		if( HPM->packetsc[hpParse_Login] ) {
+			if( (result = HPM->parse_packets(fd,hpParse_Login)) ) {
+				if( result == 1 ) continue;
+				if( result == 2 ) return 0;
+			}
+		}
+		
+		switch( command ) {
 
 		case 0x0200:		// New alive packet: structure: 0x200 <account.userid>.24B. used to verify if client is always alive.
 			if (RFIFOREST(fd) < 26)
@@ -1688,15 +1699,17 @@ void do_final(void)
 	int i;
 	struct client_hash_node *hn = login_config.client_hash_nodes;
 
-	while (hn)
-	{
+	ShowStatus("Terminating...\n");
+	
+	HPM->event(HPET_FINAL);
+	
+	while (hn) {
 		struct client_hash_node *tmp = hn;
 		hn = hn->next;
 		aFree(tmp);
 	}
 
 	login_log(0, "login server", 100, "login server shutdown");
-	ShowStatus("Terminating...\n");
 
 	if( login_config.log_login )
 		loginlog_final();
@@ -1770,7 +1783,7 @@ int do_init(int argc, char** argv)
 	login_lan_config_read((argc > 2) ? argv[2] : LAN_CONF_NAME);
 
 	rnd_init();
-	
+		
 	for( i = 0; i < ARRAYLENGTH(server); ++i )
 		chrif_server_init(i);
 
@@ -1780,7 +1793,7 @@ int do_init(int argc, char** argv)
 
 	// initialize static and dynamic ipban system
 	ipban_init();
-
+	
 	// Online user database init
 	online_db = idb_alloc(DB_OPT_RELEASE_DATA);
 	iTimer->add_timer_func_list(waiting_disconnect_timer, "waiting_disconnect_timer");
@@ -1814,6 +1827,10 @@ int do_init(int argc, char** argv)
 		}
 	}
 
+	HPM->share(account_db_sql_up(accounts),"sql_handle");
+	HPM->config_read();
+	HPM->event(HPET_INIT);
+	
 	// server port open & binding	
 	if( (login_fd = make_listen_bind(login_config.login_ip,login_config.login_port)) == -1 ) {
 		ShowFatalError("Failed to bind to port '"CL_WHITE"%d"CL_RESET"'\n",login_config.login_port);
@@ -1824,11 +1841,11 @@ int do_init(int argc, char** argv)
 		shutdown_callback = do_shutdown;
 		runflag = LOGINSERVER_ST_RUNNING;
 	}
-
-	account_db_sql_up(accounts);
 	
 	ShowStatus("The login-server is "CL_GREEN"ready"CL_RESET" (Server is listening on the port %u).\n\n", login_config.login_port);
 	login_log(0, "login server", 100, "login server started");
-		
+	
+	HPM->event(HPET_READY);
+	
 	return 0;
 }
diff --git a/src/map/HPMmap.c b/src/map/HPMmap.c
new file mode 100644
index 000000000..17d72bc98
--- /dev/null
+++ b/src/map/HPMmap.c
@@ -0,0 +1,89 @@
+// 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 "HPMmap.h"
+#include "pc.h"
+#include "map.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+
+void HPM_map_addToMSD(struct map_session_data *sd, void *data, unsigned int id, unsigned int type, bool autofree) {
+	struct HPluginData *HPData;
+	unsigned int i;
+	
+	for(i = 0; i < sd->hdatac; i++) {
+		if( sd->hdata[i]->pluginID == id && sd->hdata[i]->type == type ) {
+			ShowError("HPMi->addToMSD:%s: error! attempting to insert duplicate struct of type %u on '%s'\n",HPM->pid2name(id),type,sd->status.name);
+			return;
+		}
+	}
+	
+	CREATE(HPData, struct HPluginData, 1);
+
+	HPData->pluginID = id;
+	HPData->type = type;
+	HPData->flag.free = autofree ? 1 : 0;
+	HPData->data = data;
+	
+	RECREATE(sd->hdata,struct HPluginData *,++sd->hdatac);
+	sd->hdata[sd->hdatac - 1] = HPData;
+}
+void *HPM_map_getFromMSD(struct map_session_data *sd, unsigned int id, unsigned int type) {
+	unsigned int i;
+	
+	for(i = 0; i < sd->hdatac; i++) {
+		if( sd->hdata[i]->pluginID == id && sd->hdata[i]->type == type ) {
+			break;
+		}
+	}
+
+	if( i != sd->hdatac )
+		return sd->hdata[i]->data;
+	
+	return NULL;
+}
+void HPM_map_removeFromMSD(struct map_session_data *sd, unsigned int id, unsigned int type) {
+	unsigned int i;
+	
+	for(i = 0; i < sd->hdatac; i++) {
+		if( sd->hdata[i]->pluginID == id && sd->hdata[i]->type == type ) {
+			break;
+		}
+	}
+	
+	if( i != sd->hdatac ) {
+		unsigned int cursor;
+		
+		aFree(sd->hdata[i]->data);
+		aFree(sd->hdata[i]);
+		sd->hdata[i] = NULL;
+		
+		for(i = 0, cursor = 0; i < sd->hdatac; i++) {
+			if( sd->hdata[i] == NULL )
+				continue;
+			if( i != cursor )
+				sd->hdata[cursor] = sd->hdata[i];
+			cursor++;
+		}
+		
+		sd->hdatac = cursor;
+	}
+	
+}
+void HPM_map_plugin_load_sub(struct hplugin *plugin) {
+	plugin->hpi->addCommand		= HPM->import_symbol("addCommand");
+	plugin->hpi->addScript		= HPM->import_symbol("addScript");
+	/* */
+	plugin->hpi->addToMSD		= HPM->import_symbol("addToMSD");
+	plugin->hpi->getFromMSD		= HPM->import_symbol("getFromMSD");
+	plugin->hpi->removeFromMSD	= HPM->import_symbol("removeFromMSD");
+}
diff --git a/src/map/HPMmap.h b/src/map/HPMmap.h
new file mode 100644
index 000000000..a6cac4ace
--- /dev/null
+++ b/src/map/HPMmap.h
@@ -0,0 +1,18 @@
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+
+#ifndef _HPM_MAP_
+#define _HPM_MAP_
+
+#include "../common/cbasetypes.h"
+
+struct hplugin;
+struct map_session_data;
+
+void HPM_map_addToMSD(struct map_session_data *sd, void *data, unsigned int id, unsigned int type, bool autofree);
+void *HPM_map_getFromMSD(struct map_session_data *sd, unsigned int id, unsigned int type);
+void HPM_map_removeFromMSD(struct map_session_data *sd, unsigned int id, unsigned int type);
+
+void HPM_map_plugin_load_sub(struct hplugin *plugin);
+
+#endif /* _HPM_MAP_ */
diff --git a/src/map/Makefile.in b/src/map/Makefile.in
index 70c0cd900..588d19eae 100644
--- a/src/map/Makefile.in
+++ b/src/map/Makefile.in
@@ -17,7 +17,7 @@ MAP_OBJ = map.o chrif.o clif.o pc.o status.o npc.o \
 	storage.o skill.o atcommand.o battle.o battleground.o \
 	intif.o trade.o party.o vending.o guild.o pet.o \
 	log.o mail.o date.o unit.o homunculus.o mercenary.o quest.o instance.o \
-	buyingstore.o searchstore.o duel.o pc_groups.o elemental.o irc-bot.o
+	buyingstore.o searchstore.o duel.o pc_groups.o elemental.o irc-bot.o HPMmap.o
 MAP_SQL_OBJ = $(MAP_OBJ:%=obj_sql/%) \
 	obj_sql/mapreg_sql.o
 MAP_H = map.h chrif.h clif.h pc.h status.h npc.h \
@@ -27,7 +27,7 @@ MAP_H = map.h chrif.h clif.h pc.h status.h npc.h \
 	log.h mail.h date.h unit.h homunculus.h mercenary.h quest.h instance.h mapreg.h \
 	buyingstore.h searchstore.h duel.h pc_groups.h \
 	../config/core.h ../config/renewal.h ../config/secure.h ../config/const.h \
-	../config/classes/general.h elemental.h packets.h packets_struct.h irc-bot.h
+	../config/classes/general.h elemental.h packets.h packets_struct.h irc-bot.h HPMmap.h
 
 HAVE_MYSQL=@HAVE_MYSQL@
 ifeq ($(HAVE_MYSQL),yes)
diff --git a/src/map/chrif.c b/src/map/chrif.c
index d44ccf721..6b0397b56 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -10,6 +10,7 @@
 #include "../common/showmsg.h"
 #include "../common/strlib.h"
 #include "../common/ers.h"
+#include "../common/HPM.h"
 
 #include "map.h"
 #include "battle.h"
@@ -1396,7 +1397,7 @@ void chrif_skillid2idx(int fd) {
  *
  *------------------------------------------*/
 int chrif_parse(int fd) {
-	int packet_len, cmd;
+	int packet_len, cmd, r;
 
 	// only process data from the char-server
 	if ( fd != char_fd ) {
@@ -1421,9 +1422,18 @@ int chrif_parse(int fd) {
 	}
 
 	while ( RFIFOREST(fd) >= 2 ) {
+
+		if( HPM->packetsc[hpChrif_Parse] ) {
+			if( (r = HPM->parse_packets(fd,hpChrif_Parse)) ) {
+				if( r == 1 ) continue;
+				if( r == 2 ) return 0;
+			}
+		}
+
 		cmd = RFIFOW(fd,0);
+		
 		if (cmd < 0x2af8 || cmd >= 0x2af8 + ARRAYLENGTH(packet_len_table) || packet_len_table[cmd-0x2af8] == 0) {
-			int r = intif->parse(fd); // Passed on to the intif
+			r = intif->parse(fd); // Passed on to the intif
 
 			if (r == 1) continue;	// Treated in intif 
 			if (r == 2) return 0;	// Didn't have enough data (len==-1)
diff --git a/src/map/clif.c b/src/map/clif.c
index 44df5b607..7171a48be 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -14,6 +14,7 @@
 #include "../common/utils.h"
 #include "../common/ers.h"
 #include "../common/conf.h"
+#include "../common/HPM.h"
 
 #include "map.h"
 #include "chrif.h"
@@ -17621,6 +17622,14 @@ int clif_parse(int fd) {
 		
 		if (RFIFOREST(fd) < 2)
 			return 0;
+
+		if( HPM->packetsc[hpClif_Parse] ) {
+			int r;
+			if( (r = HPM->parse_packets(fd,hpClif_Parse)) ) {
+				if( r == 1 ) continue;
+				if( r == 2 ) return 0;
+			}
+		}
 		
 		if( sd )
 			parse_cmd_func = sd->parse_cmd_func;
diff --git a/src/map/map.c b/src/map/map.c
index 713577495..5753fbc1d 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -51,6 +51,7 @@
 #include "log.h"
 #include "mail.h"
 #include "irc-bot.h"
+#include "HPMmap.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -5172,6 +5173,9 @@ void map_hp_symbols(void) {
 	/* specific */
 	HPM->share(atcommand->create,"addCommand");
 	HPM->share(script->addScript,"addScript");
+	HPM->share(HPM_map_addToMSD,"addToMSD");
+	HPM->share(HPM_map_getFromMSD,"getFromMSD");
+	HPM->share(HPM_map_removeFromMSD,"removeFromMSD");
 	/* vars */
 	HPM->share(map,"map");
 }
@@ -5379,6 +5383,7 @@ int do_init(int argc, char *argv[])
 	iTimer->add_timer_func_list(map_removemobs_timer, "map_removemobs_timer");
 	iTimer->add_timer_interval(iTimer->gettick()+1000, map_freeblock_timer, 0, 0, 60*1000);
 
+	HPM->load_sub = HPM_map_plugin_load_sub;
 	HPM->symbol_defaults_sub = map_hp_symbols;
 	HPM->config_read();
 	HPM->event(HPET_INIT);
diff --git a/src/map/pc.h b/src/map/pc.h
index 1f1538e1f..c2e834d1c 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -507,6 +507,9 @@ struct map_session_data {
 	
 	unsigned char delayed_damage;//ref. counter bugreport:7307 [Ind/Hercules]
 	
+	struct HPluginData **hdata;
+	unsigned int hdatac;
+	
 	// temporary debugging of bug #3504
 	const char* delunit_prevfile;
 	int delunit_prevline;
diff --git a/src/map/pc_groups.c b/src/map/pc_groups.c
index 9ca0fd17a..be02b5f15 100644
--- a/src/map/pc_groups.c
+++ b/src/map/pc_groups.c
@@ -2,6 +2,7 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
+#include "../common/cbasetypes.h"
 #include "../common/conf.h"
 #include "../common/db.h"
 #include "../common/malloc.h"
diff --git a/src/map/unit.c b/src/map/unit.c
index 9becb128e..41d661169 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -8,6 +8,7 @@
 #include "../common/db.h"
 #include "../common/malloc.h"
 #include "../common/random.h"
+#include "../common/HPM.h"
 
 #include "map.h"
 #include "path.h"
@@ -2330,6 +2331,7 @@ int unit_free(struct block_list *bl, clr_type clrtype)
 		{
 			struct map_session_data *sd = (struct map_session_data*)bl;
 			int i;
+			unsigned int k;
 
 			if( iStatus->isdead(bl) )
 				pc->setrestartvalue(sd,2);
@@ -2397,6 +2399,15 @@ int unit_free(struct block_list *bl, clr_type clrtype)
 				aFree(sd->queues);
 				sd->queues = NULL;
 			}
+			
+			for( k = 0; k < sd->hdatac; k++ ) {
+				if( sd->hdata[k]->flag.free ) {
+					aFree(sd->hdata[k]->data);
+					aFree(sd->hdata[k]);
+				}
+			}
+			if( sd->hdata )
+				aFree(sd->hdata);
 			break;
 		}
 		case BL_PET:
diff --git a/src/plugins/sample.c b/src/plugins/sample.c
index 7f7528cb7..4a8402560 100644
--- a/src/plugins/sample.c
+++ b/src/plugins/sample.c
@@ -4,9 +4,15 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
+
 #include "../common/HPMi.h"
+#include "../common/mmo.h"
+#include "../common/socket.h"
+#include "../common/malloc.h"
 #include "../map/script.h"
 #include "../map/pc.h"
+#include "../map/clif.h"
 
 HPExport struct hplugin_info pinfo = {
 	"Sample",		// Plugin name
@@ -26,18 +32,81 @@ BUILDIN(sample) {//script command 'sample(num);' - 1 param: struct script_state*
 CPCMD(sample) {//console command 'sample' - 1 param: char *line
 	ShowInfo("I'm being run! arg -> '%s'\n",line?line:"NONE");
 }
-struct script_interface *script;/* used by script commands */
+struct sample_data_struct {
+	struct point lastMSGPosition;
+	unsigned int someNumber;
+};
+/* sample packet implementation */
+/* cmd 0xf3 - it is a client-server existent id, for clif_parse_GlobalMessage */
+/* in this sample we do nothing and simply redirect */
+void sample_packet0f3(int fd) {
+	struct map_session_data *sd = session[fd]->session_data;
+	struct sample_data_struct *data;
+	
+	if( !sd ) return;/* socket didn't fully log-in? this packet shouldn't do anything then! */
+	
+	ShowInfo("sample_packet0f3: Hello World! received 0xf3 for '%s', redirecting!\n",sd->status.name);
+	
+	/* sample usage of appending data to a socket_data (session[]) entry */
+	if( !(data = HPMi->getFromSession(session[fd],HPMi->pid,0)) ) {
+		CREATE(data,struct sample_data_struct,1);
+		
+		data->lastMSGPosition.map = sd->status.last_point.map;
+		data->lastMSGPosition.x = sd->status.last_point.x;
+		data->lastMSGPosition.y = sd->status.last_point.y;
+		data->someNumber = rand()%777;
+		
+		ShowInfo("Created Appended session[] data, %d %d %d %d\n",data->lastMSGPosition.map,data->lastMSGPosition.x,data->lastMSGPosition.y,data->someNumber);
+		HPMi->addToSession(session[fd],data,HPMi->pid,0,true);
+	} else {
+		ShowInfo("Existent Appended session[] data, %d %d %d %d\n",data->lastMSGPosition.map,data->lastMSGPosition.x,data->lastMSGPosition.y,data->someNumber);
+		if( rand()%4 == 2 ) {
+			ShowInfo("Removing Appended session[] data\n");
+			HPMi->removeFromSession(session[fd],HPMi->pid,0);
+		}
+	}
+	
+	/* sample usage of appending data to a map_session_data (sd) entry */
+	if( !(data = HPMi->getFromMSD(sd,HPMi->pid,0)) ) {
+		CREATE(data,struct sample_data_struct,1);
+		
+		data->lastMSGPosition.map = sd->status.last_point.map;
+		data->lastMSGPosition.x = sd->status.last_point.x;
+		data->lastMSGPosition.y = sd->status.last_point.y;
+		data->someNumber = rand()%777;
+		
+		ShowInfo("Created Appended map_session_data data, %d %d %d %d\n",data->lastMSGPosition.map,data->lastMSGPosition.x,data->lastMSGPosition.y,data->someNumber);
+		HPMi->addToMSD(sd,data,HPMi->pid,0,true);
+	} else {
+		ShowInfo("Existent Appended map_session_data data, %d %d %d %d\n",data->lastMSGPosition.map,data->lastMSGPosition.x,data->lastMSGPosition.y,data->someNumber);
+		if( rand()%4 == 2 ) {
+			ShowInfo("Removing Appended map_session_data data\n");
+			HPMi->removeFromMSD(sd,HPMi->pid,0);
+		}
+	}
+
+	
+	clif->pGlobalMessage(fd,sd);
+}
 /* run when server starts */
 HPExport void plugin_init (void) {
 	char *server_type;
 	char *server_name;
-	
-	//get the symbols from the server
+		
+	/* core vars */
 	server_type = GET_SYMBOL("SERVER_TYPE");
 	server_name = GET_SYMBOL("SERVER_NAME");
 
+	/* core interfaces */
+	iMalloc = GET_SYMBOL("iMalloc");
+
+	/* map-server interfaces */
 	script = GET_SYMBOL("script");
-		
+	clif = GET_SYMBOL("clif");
+	
+	/* session[] */
+	session = GET_SYMBOL("session");
+
 	ShowInfo ("Server type is ");
 	
 	switch (*server_type) {
@@ -59,6 +128,11 @@ HPExport void plugin_init (void) {
 	if( HPMi->addCPCommand != NULL ) {//link our 'sample' console command
 		HPMi->addCPCommand("this:is:a:sample",CPCMD_A(sample));
 	}
+	
+	if( HPMi->addPacket != NULL ) {//link our 'sample' packet to map-server
+		HPMi->addPacket(0xf3,-1,sample_packet0f3,hpClif_Parse,HPMi->pid);
+	}
+
 }
 /* run when server is ready (online) */
 HPExport void server_online (void) {
-- 
cgit v1.2.3-70-g09d2


From 44c33fda3614d588e6bf6cee1cf884e98f1531f0 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Fri, 11 Oct 2013 05:07:45 +0200
Subject: Changed 'tick' variables to 64 bit

- This fixes an issue with timers that stop working after about 24-49
  days when the tick overflows (note that this may happen much earlier
  than that, and at hard to predict times, on some systems)
- Updated the RDTSC help message in the configure script to also warn
  users about issues with SpeedStep enabled systems.
- On Windows, tick() still has a resolution of 10~15ms (or even as low
  as 100ms on some systems). A TODO comment (thanks, Ai4rei) was added
  for a follow-up patch, as I want this one to be as small as possible)
- Note: on Windows versions earlier than 6.x (Vista, Server 2008), the
  tick overflow issue is NOT fixed, since they don't support the
  function used to retrieve a 64 bit tick. This isn't a big issue, since
  those platforms are already - or going soon to be - out of their
  extended support period, and it's already advisable to upgrade, for
  other reasons. If you're the unfortunate user of such a system, it is
  recommended that you reboot your machine at least once every 49 days
  for Hercules to work reliably.
- Note: To clear some doubts, since I've already been asked, this has
  absolutely NOTHING to do with 32/64 bit CPUs or OSes. It's all about
  a variable's size, not the size of registers of your CPU, and your
  32bit CPU will be able to handle this just fine.

Signed-off-by: Haru <haru@dotalux.com>
---
 configure              |  14 ++-
 configure.in           |   8 +-
 src/char/char.c        |  22 ++---
 src/char/int_auction.c |  11 ++-
 src/char/int_guild.c   |   5 +-
 src/char/inter.c       |   8 +-
 src/common/console.c   |   2 +-
 src/common/console.h   |   2 +-
 src/common/random.c    |  12 +--
 src/common/socket.c    |   5 +-
 src/common/socket.h    |   3 +-
 src/common/sql.c       |   2 +-
 src/common/timer.c     |  86 +++++++++++++-----
 src/common/timer.h     |  21 ++---
 src/login/ipban_sql.c  |   5 +-
 src/login/login.c      |  15 ++--
 src/map/atcommand.c    |  30 ++++---
 src/map/battle.c       |  18 ++--
 src/map/battle.h       |   8 +-
 src/map/battleground.c |   6 +-
 src/map/battleground.h |   6 +-
 src/map/chrif.c        |  10 +--
 src/map/chrif.h        |  16 ++--
 src/map/clif.c         |  72 +++++++--------
 src/map/clif.h         |  28 +++---
 src/map/elemental.c    |  14 +--
 src/map/elemental.h    |  10 +--
 src/map/guild.c        |   6 +-
 src/map/guild.h        |   4 +-
 src/map/homunculus.c   |   2 +-
 src/map/homunculus.h   |   2 +-
 src/map/instance.c     |   2 +-
 src/map/instance.h     |   2 +-
 src/map/irc-bot.c      |   6 +-
 src/map/irc-bot.h      |   8 +-
 src/map/map.c          |  10 +--
 src/map/map.h          |  10 +--
 src/map/mapreg.h       |   2 +-
 src/map/mapreg_sql.c   |   2 +-
 src/map/mercenary.c    |   4 +-
 src/map/mercenary.h    |   4 +-
 src/map/mob.c          |  81 ++++++++---------
 src/map/mob.h          |  30 +++----
 src/map/npc.c          |  23 +++--
 src/map/npc.h          |  12 +--
 src/map/party.c        |   3 +-
 src/map/party.h        |   2 +-
 src/map/pc.c           |  41 +++++----
 src/map/pc.h           |  54 ++++++------
 src/map/pet.c          |  27 +++---
 src/map/pet.h          |  20 ++---
 src/map/script.c       |  12 +--
 src/map/script.h       |   2 +-
 src/map/skill.c        | 231 ++++++++++++++++++++++++-------------------------
 src/map/skill.h        |  58 ++++++-------
 src/map/status.c       |  37 +++++---
 src/map/status.h       |   9 +-
 src/map/unit.c         |  30 +++----
 src/map/unit.h         |  24 ++---
 59 files changed, 609 insertions(+), 590 deletions(-)

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

diff --git a/configure b/configure
index abba75ea1..919d6f883 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in d26927e.
+# From configure.in c4af60e.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
 #
@@ -1333,9 +1333,15 @@ Optional Features:
                           in conjunction with XEN or Other Virtualization
                           mechanisms) Note: Please ensure that you've disabled
                           dynamic CPU-Frequencys, such as power saving
-                          options. (On the most modern Dedicated Servers
-                          cpufreq is preconfigured, see your distribution's
-                          manual how to disable it)
+                          options. (On most modern Dedicated Servers cpufreq
+                          is preconfigured, see your distribution's manual how
+                          to disable it). Furthermore, If your CPU has
+                          built-in CPU-Frequency scaling features (such as
+                          Intel's SpeedStep(R)), do not enable this option.
+                          Recent CPUs (Intel Core or newer) guarantee a fixed
+                          increment rate for their TSC, so it should be safe
+                          to use, but please doublecheck the documentation of
+                          both your CPU and OS before enabling this option.
   --enable-profiler=ARG   Profilers: no, gprof (disabled by default)
   --disable-64bit         Enforce 32bit output on x86_64 systems.
   --enable-lto            Enables or Disables Linktime Code Optimization (LTO
diff --git a/configure.in b/configure.in
index bd80bd43f..b79e51f6d 100644
--- a/configure.in
+++ b/configure.in
@@ -112,8 +112,12 @@ AC_ARG_ENABLE(
 		
 			Note:
 				Please ensure that you've disabled dynamic CPU-Frequencys, such as power saving options.
-				(On the most modern Dedicated Servers cpufreq is preconfigured, see your distribution's manual
-				 how to disable it)
+				(On most modern Dedicated Servers cpufreq is preconfigured, see your distribution's
+				 manual how to disable it).
+				Furthermore, If your CPU has built-in CPU-Frequency scaling features (such as Intel's
+				 SpeedStep(R)), do not enable this option. Recent CPUs (Intel Core or newer) guarantee
+				 a fixed increment rate for their TSC, so it should be safe to use, but please doublecheck
+				 the documentation of both your CPU and OS before enabling this option.
 		]
 	),
 	[
diff --git a/src/char/char.c b/src/char/char.c
index 0b35c0143..2c126836c 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -179,7 +179,7 @@ static DBMap* auth_db; // int account_id -> struct auth_node*
 // Online User Database
 //-----------------------------------------------------
 
-static int chardb_waiting_disconnect(int tid, unsigned int tick, int id, intptr_t data);
+static int chardb_waiting_disconnect(int tid, int64 tick, int id, intptr_t data);
 int delete_char_sql(int char_id);
 
 /**
@@ -2097,7 +2097,7 @@ static void char_auth_ok(int fd, struct char_session_data *sd)
 	// continues when account data is received...
 }
 
-int send_accounts_tologin(int tid, unsigned int tick, int id, intptr_t data);
+int send_accounts_tologin(int tid, int64 tick, int id, intptr_t data);
 void mapif_server_reset(int id);
 
 
@@ -2491,8 +2491,7 @@ int parse_fromlogin(int fd) {
 	return 0;
 }
 
-int check_connect_login_server(int tid, unsigned int tick, int id, intptr_t data);
-int send_accounts_tologin(int tid, unsigned int tick, int id, intptr_t data);
+int check_connect_login_server(int tid, int64 tick, int id, intptr_t data);
 
 void do_init_loginif(void)
 {
@@ -4488,8 +4487,7 @@ int mapif_send(int fd, unsigned char *buf, unsigned int len)
 	return 0;
 }
 
-int broadcast_user_count(int tid, unsigned int tick, int id, intptr_t data)
-{
+int broadcast_user_count(int tid, int64 tick, int id, intptr_t data) {
 	uint8 buf[6];
 	int users = count_users();
 
@@ -4534,8 +4532,7 @@ static int send_accounts_tologin_sub(DBKey key, DBData *data, va_list ap)
 	return 0;
 }
 
-int send_accounts_tologin(int tid, unsigned int tick, int id, intptr_t data)
-{
+int send_accounts_tologin(int tid, int64 tick, int id, intptr_t data) {
 	if (login_fd > 0 && session[login_fd])
 	{
 		// send account list to login server
@@ -4552,8 +4549,7 @@ int send_accounts_tologin(int tid, unsigned int tick, int id, intptr_t data)
 	return 0;
 }
 
-int check_connect_login_server(int tid, unsigned int tick, int id, intptr_t data)
-{
+int check_connect_login_server(int tid, int64 tick, int id, intptr_t data) {
 	if (login_fd > 0 && session[login_fd] != NULL)
 		return 0;
 
@@ -4588,8 +4584,7 @@ int check_connect_login_server(int tid, unsigned int tick, int id, intptr_t data
 //Invoked 15 seconds after mapif_disconnectplayer in case the map server doesn't
 //replies/disconnect the player we tried to kick. [Skotlex]
 //------------------------------------------------
-static int chardb_waiting_disconnect(int tid, unsigned int tick, int id, intptr_t data)
-{
+static int chardb_waiting_disconnect(int tid, int64 tick, int id, intptr_t data) {
 	struct online_char_data* character;
 	if ((character = (struct online_char_data*)idb_get(online_char_db, id)) != NULL && character->waiting_disconnect == tid)
 	{	//Mark it offline due to timeout.
@@ -4615,8 +4610,7 @@ static int online_data_cleanup_sub(DBKey key, DBData *data, va_list ap)
 	return 0;
 }
 
-static int online_data_cleanup(int tid, unsigned int tick, int id, intptr_t data)
-{
+static int online_data_cleanup(int tid, int64 tick, int id, intptr_t data) {
 	online_char_db->foreach(online_char_db, online_data_cleanup_sub);
 	return 0;
 }
diff --git a/src/char/int_auction.c b/src/char/int_auction.c
index 0dad9d2de..47f3421c3 100644
--- a/src/char/int_auction.c
+++ b/src/char/int_auction.c
@@ -22,7 +22,7 @@
 static DBMap* auction_db_ = NULL; // int auction_id -> struct auction_data*
 
 void auction_delete(struct auction_data *auction);
-static int auction_end_timer(int tid, unsigned int tick, int id, intptr_t data);
+static int auction_end_timer(int tid, int64 tick, int id, intptr_t data);
 
 static int auction_count(int char_id, bool buy)
 {
@@ -108,7 +108,7 @@ unsigned int auction_create(struct auction_data *auction)
 	else
 	{
 		struct auction_data *auction_;
-		unsigned int tick = auction->hours * 3600000;
+		int64 tick = auction->hours * 3600000;
 
 		auction->item.amount = 1;
 		auction->item.identify = 1;
@@ -139,8 +139,7 @@ static void mapif_Auction_message(int char_id, unsigned char result)
 	mapif_sendall(buf,7);
 }
 
-static int auction_end_timer(int tid, unsigned int tick, int id, intptr_t data)
-{
+static int auction_end_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct auction_data *auction;
 	if( (auction = (struct auction_data *)idb_get(auction_db_, id)) != NULL )
 	{
@@ -182,7 +181,7 @@ void inter_auctions_fromsql(void)
 	struct item *item;
 	char *data;
 	StringBuf buf;
-	unsigned int tick = timer->gettick(), endtick;
+	int64 tick = timer->gettick(), endtick;
 	time_t now = time(NULL);
 
 	StrBuf->Init(&buf);
@@ -230,7 +229,7 @@ void inter_auctions_fromsql(void)
 		}
 
 		if( auction->timestamp > now )
-			endtick = ((unsigned int)(auction->timestamp - now) * 1000) + tick;
+			endtick = ((int64)(auction->timestamp - now) * 1000) + tick;
 		else
 			endtick = tick + 10000; // 10 Second's to process ended auctions
 
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index fab63894e..5f033f4d7 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -46,8 +46,7 @@ int mapif_guild_info(int fd,struct guild *g);
 int guild_break_sub(int key,void *data,va_list ap);
 int inter_guild_tosql(struct guild *g,int flag);
 
-static int guild_save_timer(int tid, unsigned int tick, int id, intptr_t data)
-{
+static int guild_save_timer(int tid, int64 tick, int id, intptr_t data) {
 	static int last_id = 0; //To know in which guild we were.
 	int state = 0; //0: Have not reached last guild. 1: Reached last guild, ready for save. 2: Some guild saved, don't do further saving.
 	DBIterator *iter = db_iterator(guild_db_);
@@ -86,7 +85,7 @@ static int guild_save_timer(int tid, unsigned int tick, int id, intptr_t data)
 
 	state = guild_db_->size(guild_db_);
 	if( state < 1 ) state = 1; //Calculate the time slot for the next save.
-	timer->add(tick  + autosave_interval/state, guild_save_timer, 0, 0);
+	timer->add(tick + autosave_interval/state, guild_save_timer, 0, 0);
 	return 0;
 }
 
diff --git a/src/char/inter.c b/src/char/inter.c
index 2dc15933b..040246c31 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -61,7 +61,7 @@ int inter_recv_packet_length[] = {
 
 struct WisData {
 	int id, fd, count, len;
-	unsigned long tick;
+	int64 tick;
 	unsigned char src[24], dst[24], msg[512];
 };
 static DBMap* wis_db = NULL; // int wis_id -> struct WisData*
@@ -974,9 +974,9 @@ int mapif_disconnectplayer(int fd, int account_id, int char_id, int reason)
  */
 int check_ttl_wisdata_sub(DBKey key, DBData *data, va_list ap)
 {
-	unsigned long tick;
+	int64 tick;
 	struct WisData *wd = DB->data2ptr(data);
-	tick = va_arg(ap, unsigned long);
+	tick = va_arg(ap, int64);
 
 	if (DIFF_TICK(tick, wd->tick) > WISDATA_TTL && wis_delnum < WISDELLIST_MAX)
 		wis_dellist[wis_delnum++] = wd->id;
@@ -986,7 +986,7 @@ int check_ttl_wisdata_sub(DBKey key, DBData *data, va_list ap)
 
 int check_ttl_wisdata(void)
 {
-	unsigned long tick = timer->gettick();
+	int64 tick = timer->gettick();
 	int i;
 
 	do {
diff --git a/src/common/console.c b/src/common/console.c
index b25de84b3..cb8ed5917 100644
--- a/src/common/console.c
+++ b/src/common/console.c
@@ -344,7 +344,7 @@ void *cThread_main(void *x) {
 		
 	return NULL;
 }
-int console_parse_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int console_parse_timer(int tid, int64 tick, int id, intptr_t data) {
 	int i;
 	EnterSpinLock(&console->ptlock);
 	for(i = 0; i < cinput.count; i++) {
diff --git a/src/common/console.h b/src/common/console.h
index cef898f17..1beed964a 100644
--- a/src/common/console.h
+++ b/src/common/console.h
@@ -56,7 +56,7 @@ struct console_interface {
 	/* */
 	void (*parse_init) (void);
 	void (*parse_final) (void);
-	int (*parse_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*parse_timer) (int tid, int64 tick, int id, intptr_t data);
 	void *(*pthread_main) (void *x);
 	void (*parse) (char* line);
 	void (*parse_sub) (char* line);
diff --git a/src/common/random.c b/src/common/random.c
index 2f1b62934..e46c52cad 100644
--- a/src/common/random.c
+++ b/src/common/random.c
@@ -17,17 +17,17 @@
 /// Initializes the random number generator with an appropriate seed.
 void rnd_init(void)
 {
-	uint32 seed = timer->gettick();
-	seed += (uint32)time(NULL);
+	unsigned long seed = (unsigned long)timer->gettick();
+	seed += (unsigned long)time(NULL);
 #if defined(WIN32)
-	seed += GetCurrentProcessId();
-	seed += GetCurrentThreadId();
+	seed += (unsigned long)GetCurrentProcessId();
+	seed += (unsigned long)GetCurrentThreadId();
 #else
 #if defined(HAVE_GETPID)
-	seed += (uint32)getpid();
+	seed += (unsigned long)getpid();
 #endif // HAVE_GETPID
 #if defined(HAVE_GETTID)
-	seed += (uint32)gettid();
+	seed += (unsigned long)gettid();
 #endif // HAVE_GETTID
 #endif
 	init_genrand(seed);
diff --git a/src/common/socket.c b/src/common/socket.c
index 7c8b3738b..c66153550 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -896,7 +896,7 @@ int do_sockets(int next)
 typedef struct _connect_history {
 	struct _connect_history* next;
 	uint32 ip;
-	uint32 tick;
+	int64 tick;
 	int count;
 	unsigned ddos : 1;
 } ConnectHistory;
@@ -1043,8 +1043,7 @@ static int connect_check_(uint32 ip)
 
 /// Timer function.
 /// Deletes old connection history records.
-static int connect_check_clear(int tid, unsigned int tick, int id, intptr_t data)
-{
+static int connect_check_clear(int tid, int64 tick, int id, intptr_t data) {
 	int i;
 	int clear = 0;
 	int list  = 0;
diff --git a/src/common/socket.h b/src/common/socket.h
index 0e34da660..923fa2515 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -77,8 +77,7 @@ typedef int (*RecvFunc)(int fd);
 typedef int (*SendFunc)(int fd);
 typedef int (*ParseFunc)(int fd);
 
-struct socket_data
-{
+struct socket_data {
 	struct {
 		unsigned char eof : 1;
 		unsigned char server : 1;
diff --git a/src/common/sql.c b/src/common/sql.c
index 9b7fe4108..dc6c4c569 100644
--- a/src/common/sql.c
+++ b/src/common/sql.c
@@ -180,7 +180,7 @@ int Sql_Ping(Sql* self)
 /// Wrapper function for Sql_Ping.
 ///
 /// @private
-static int Sql_P_KeepaliveTimer(int tid, unsigned int tick, int id, intptr_t data)
+static int Sql_P_KeepaliveTimer(int tid, int64 tick, int id, intptr_t data)
 {
 	Sql* self = (Sql*)data;
 	ShowInfo("Pinging SQL server to keep connection alive...\n");
diff --git a/src/common/timer.c b/src/common/timer.c
index a2378a5aa..ccd91f9c7 100644
--- a/src/common/timer.c
+++ b/src/common/timer.c
@@ -65,8 +65,7 @@ struct timer_func_list {
 } *tfl_root = NULL;
 
 /// Sets the name of a timer function.
-int timer_add_func_list(TimerFunc func, char* name)
-{
+int timer_add_func_list(TimerFunc func, char* name) {
 	struct timer_func_list* tfl;
 
 	if (name) {
@@ -139,22 +138,62 @@ static void rdtsc_calibrate(){
 
 #endif
 
-/// platform-abstracted tick retrieval
-static unsigned int tick(void) {
+/**
+ * platform-abstracted tick retrieval
+ * @return server's current tick
+ */
+static int64 tick(void) {
 #if defined(WIN32)
-	return GetTickCount();
+	// Windows: GetTickCount/GetTickCount64: Return the number of
+	//   milliseconds that have elapsed since the system was started.
+
+	// TODO: GetTickCount/GetTickCount64 has a resolution of only 10~15ms.
+	//       Ai4rei recommends that we replace it with either performance
+	//       counters or multimedia timers if we want it to be more accurate.
+	//       I'm leaving this for a future follow-up patch.
+
+	// GetTickCount64 is only available in Windows Vista / Windows Server
+	//   2008 or newer. Since we still support older versions, this runtime
+	//   check is required in order not to crash.
+	// http://msdn.microsoft.com/en-us/library/windows/desktop/ms724411%28v=vs.85%29.aspx
+	static bool first = true;
+	static ULONGLONG (WINAPI *pGetTickCount64)(void) = NULL;
+
+	if( first ) {
+		HMODULE hlib = GetModuleHandle(TEXT("KERNEL32.DLL"));
+		if( hlib != NULL )
+			pGetTickCount64 = (ULONGLONG (WINAPI *)(void))GetProcAddress(hlib, "GetTickCount64");
+		first = false;
+	}
+	if (pGetTickCount64)
+		return (int64)pGetTickCount64();
+	// 32-bit fallback. Note: This will wrap around every ~49 days since system startup!!!
+	return (int64)GetTickCount();
 #elif defined(ENABLE_RDTSC)
-	//
-		return (unsigned int)((_rdtsc() - RDTSC_BEGINTICK) / RDTSC_CLOCK);
-	//
+	// RDTSC: Returns the number of CPU cycles since reset. Unreliable if
+	//   the CPU frequency is variable.
+	return (int64)((_rdtsc() - RDTSC_BEGINTICK) / RDTSC_CLOCK);
 #elif defined(HAVE_MONOTONIC_CLOCK)
+	// Monotinic clock: Implementation-defined.
+	//   Clock that cannot be set and represents monotonic time since some
+	//   unspecified starting point.  This clock is not affected by
+	//   discontin�uous jumps in the system time (e.g., if the system
+	//   administrator manually changes the  clock),  but  is  affected by
+	//   the  incremental adjustments performed by adjtime(3) and NTP.
 	struct timespec tval;
 	clock_gettime(CLOCK_MONOTONIC, &tval);
-	return tval.tv_sec * 1000 + tval.tv_nsec / 1000000;
+	// int64 cast to avoid overflows on platforms where time_t is 32 bit
+	return (int64)tval.tv_sec * 1000 + tval.tv_nsec / 1000000;
 #else
+	// Fallback, regular clock: Number of milliseconds since epoch.
+	//   The time returned by gettimeofday() is affected by discontinuous
+	//   jumps in the system time (e.g., if the system  administrator
+	//   manually  changes  the system time).  If you need a monotonically
+	//   increasing clock, see clock_gettime(2).
 	struct timeval tval;
 	gettimeofday(&tval, NULL);
-	return tval.tv_sec * 1000 + tval.tv_usec / 1000;
+	// int64 cast to avoid overflows on platforms where time_t is 32 bit
+	return (int64)tval.tv_sec * 1000 + tval.tv_usec / 1000;
 #endif
 }
 
@@ -162,28 +201,28 @@ static unsigned int tick(void) {
 #if defined(TICK_CACHE) && TICK_CACHE > 1
 //////////////////////////////////////////////////////////////////////////
 // tick is cached for TICK_CACHE calls
-static unsigned int gettick_cache;
+static int64 gettick_cache;
 static int gettick_count = 1;
 
-unsigned int timer_gettick_nocache(void) {
+int64 timer_gettick_nocache(void) {
 	gettick_count = TICK_CACHE;
 	gettick_cache = tick();
 	return gettick_cache;
 }
 
-unsigned int timer_gettick(void) {
+int64 timer_gettick(void) {
 	return ( --gettick_count == 0 ) ? gettick_nocache() : gettick_cache;
 }
 //////////////////////////////
 #else
 //////////////////////////////
 // tick doesn't get cached
-unsigned int timer_gettick_nocache(void)
+int64 timer_gettick_nocache(void)
 {
 	return tick();
 }
 
-unsigned int timer_gettick(void) {
+int64 timer_gettick(void) {
 	return tick();
 }
 //////////////////////////////////////////////////////////////////////////
@@ -237,7 +276,7 @@ static int acquire_timer(void) {
 
 /// Starts a new timer that is deleted once it expires (single-use).
 /// Returns the timer's id.
-int timer_add(unsigned int tick, TimerFunc func, int id, intptr_t data) {
+int timer_add(int64 tick, TimerFunc func, int id, intptr_t data) {
 	int tid;
 	
 	tid = acquire_timer();
@@ -254,12 +293,11 @@ int timer_add(unsigned int tick, TimerFunc func, int id, intptr_t data) {
 
 /// Starts a new timer that automatically restarts itself (infinite loop until manually removed).
 /// Returns the timer's id, or INVALID_TIMER if it fails.
-int timer_add_interval(unsigned int tick, TimerFunc func, int id, intptr_t data, int interval)
-{
+int timer_add_interval(int64 tick, TimerFunc func, int id, intptr_t data, int interval) {
 	int tid;
 
 	if( interval < 1 ) {
-		ShowError("timer_add_interval: invalid interval (tick=%u %p[%s] id=%d data=%d diff_tick=%d)\n", tick, func, search_timer_func_list(func), id, data, DIFF_TICK(tick, timer->gettick()));
+		ShowError("timer_add_interval: invalid interval (tick=%"PRId64" %p[%s] id=%d data=%d diff_tick=%"PRId64")\n", tick, func, search_timer_func_list(func), id, data, DIFF_TICK(tick, timer->gettick()));
 		return INVALID_TIMER;
 	}
 	
@@ -301,13 +339,13 @@ int timer_do_delete(int tid, TimerFunc func) {
 
 /// Adjusts a timer's expiration time.
 /// Returns the new tick value, or -1 if it fails.
-int timer_addtick(int tid, unsigned int tick) {
+int64 timer_addtick(int tid, int64 tick) {
 	return timer->settick(tid, timer_data[tid].tick+tick);
 }
 
 /// Modifies a timer's expiration time (an alternative to deleting a timer and starting a new one).
 /// Returns the new tick value, or -1 if it fails.
-int timer_settick(int tid, unsigned int tick) {
+int64 timer_settick(int tid, int64 tick) {
 	size_t i;
 	
 	// search timer position
@@ -332,8 +370,8 @@ int timer_settick(int tid, unsigned int tick) {
 
 /// Executes all expired timers.
 /// Returns the value of the smallest non-expired timer (or 1 second if there aren't any).
-int do_timer(unsigned int tick) {
-	int diff = TIMER_MAX_INTERVAL; // return value
+int do_timer(int64 tick) {
+	int64 diff = TIMER_MAX_INTERVAL; // return value
 
 	// process all timers one by one
 	while( BHEAP_LENGTH(timer_heap) ) {
@@ -381,7 +419,7 @@ int do_timer(unsigned int tick) {
 		}
 	}
 
-	return cap_value(diff, TIMER_MIN_INTERVAL, TIMER_MAX_INTERVAL);
+	return (int)cap_value(diff, TIMER_MIN_INTERVAL, TIMER_MAX_INTERVAL);
 }
 
 unsigned long timer_get_uptime(void) {
diff --git a/src/common/timer.h b/src/common/timer.h
index 600f9fd02..4a2bebe7d 100644
--- a/src/common/timer.h
+++ b/src/common/timer.h
@@ -5,7 +5,8 @@
 #define	_TIMER_H_
 #include "../common/cbasetypes.h"
 
-#define DIFF_TICK(a,b) ((int)((a)-(b)))
+#define DIFF_TICK(a,b) ((a)-(b))
+#define DIFF_TICK32(a,b) ((int32)((a)-(b)))
 
 #define INVALID_TIMER -1
 
@@ -18,10 +19,10 @@ enum {
 
 // Struct declaration
 
-typedef int (*TimerFunc)(int tid, unsigned int tick, int id, intptr_t data);
+typedef int (*TimerFunc)(int tid, int64 tick, int id, intptr_t data);
 
 struct TimerData {
-	unsigned int tick;
+	int64 tick;
 	TimerFunc func;
 	unsigned char type;
 	int interval;
@@ -40,22 +41,22 @@ struct TimerData {
 struct timer_interface {
 
 	/* funcs */
-	unsigned int (*gettick) (void);
-	unsigned int (*gettick_nocache) (void);
+	int64 (*gettick) (void);
+	int64 (*gettick_nocache) (void);
 
-	int (*add) (unsigned int tick, TimerFunc func, int id, intptr_t data);
-	int (*add_interval) (unsigned int tick, TimerFunc func, int id, intptr_t data, int interval);
+	int (*add) (int64 tick, TimerFunc func, int id, intptr_t data);
+	int (*add_interval) (int64 tick, TimerFunc func, int id, intptr_t data, int interval);
 	const struct TimerData *(*get) (int tid);
 	int (*delete) (int tid, TimerFunc func);
 
-	int (*addtick) (int tid, unsigned int tick);
-	int (*settick) (int tid, unsigned int tick);
+	int64 (*addtick) (int tid, int64 tick);
+	int64 (*settick) (int tid, int64 tick);
 
 	int (*add_func_list) (TimerFunc func, char* name);
 
 	unsigned long (*get_uptime) (void);
 
-	int (*do_timer) (unsigned int tick);
+	int (*do_timer) (int64 tick);
 	void (*init) (void);
 	void (*final) (void);
 };
diff --git a/src/login/ipban_sql.c b/src/login/ipban_sql.c
index 9b074b368..74f45e418 100644
--- a/src/login/ipban_sql.c
+++ b/src/login/ipban_sql.c
@@ -36,7 +36,7 @@ static Sql* sql_handle = NULL;
 static int cleanup_timer_id = INVALID_TIMER;
 static bool ipban_inited = false;
 
-int ipban_cleanup(int tid, unsigned int tick, int id, intptr_t data);
+int ipban_cleanup(int tid, int64 tick, int id, intptr_t data);
 
 
 // initialize
@@ -247,8 +247,7 @@ void ipban_log(uint32 ip)
 }
 
 // remove expired bans
-int ipban_cleanup(int tid, unsigned int tick, int id, intptr_t data)
-{
+int ipban_cleanup(int tid, int64 tick, int id, intptr_t data) {
 	if( !login_config.ipban )
 		return 0;// ipban disabled
 
diff --git a/src/login/login.c b/src/login/login.c
index 7de5dbb76..f47f1519c 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -81,7 +81,7 @@ struct online_login_data {
 };
 
 static DBMap* online_db; // int account_id -> struct online_login_data*
-static int waiting_disconnect_timer(int tid, unsigned int tick, int id, intptr_t data);
+static int waiting_disconnect_timer(int tid, int64 tick, int id, intptr_t data);
 
 /**
  * @see DBCreateData
@@ -121,8 +121,7 @@ void remove_online_user(int account_id)
 	idb_remove(online_db, account_id);
 }
 
-static int waiting_disconnect_timer(int tid, unsigned int tick, int id, intptr_t data)
-{
+static int waiting_disconnect_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct online_login_data* p = (struct online_login_data*)idb_get(online_db, id);
 	if( p != NULL && p->waiting_disconnect == tid && p->account_id == id )
 	{
@@ -165,8 +164,7 @@ static int online_data_cleanup_sub(DBKey key, DBData *data, va_list ap)
 	return 0;
 }
 
-static int online_data_cleanup(int tid, unsigned int tick, int id, intptr_t data)
-{
+static int online_data_cleanup(int tid, int64 tick, int id, intptr_t data) {
 	online_db->foreach(online_db, online_data_cleanup_sub);
 	return 0;
 } 
@@ -234,8 +232,7 @@ void chrif_on_disconnect(int id)
 //-----------------------------------------------------
 // periodic ip address synchronization
 //-----------------------------------------------------
-static int sync_ip_addresses(int tid, unsigned int tick, int id, intptr_t data)
-{
+static int sync_ip_addresses(int tid, int64 tick, int id, intptr_t data) {
 	uint8 buf[2];
 	ShowInfo("IP Sync in progress...\n");
 	WBUFW(buf,0) = 0x2735;
@@ -901,8 +898,8 @@ int parse_fromchar(int fd)
 //-------------------------------------
 int mmo_auth_new(const char* userid, const char* pass, const char sex, const char* last_ip) {
 	static int num_regs = 0; // registration counter
-	static unsigned int new_reg_tick = 0;
-	unsigned int tick = timer->gettick();
+	static int64 new_reg_tick = 0;
+	int64 tick = timer->gettick();
 	struct mmo_account acc;
 
 	//Account Registration Flood Protection by [Kevin]
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index c815967c2..7ec589956 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -4260,7 +4260,8 @@ ACMD(servertime) {
 	} else if (battle_config.night_duration == 0) {
 		if (map->night_flag == 1) { // we start with night
 			timer_data = timer->get(pc->day_timer_tid);
-			sprintf(temp, msg_txt(233), txt_time(DIFF_TICK(timer_data->tick,timer->gettick())/1000)); // Game time: The game is actualy in night for %s.
+			sprintf(temp, msg_txt(233), // Game time: The game is actually in night for %s.
+			        txt_time((unsigned int)(DIFF_TICK(timer_data->tick,timer->gettick())/1000)));
 			clif->message(fd, temp);
 			clif->message(fd, msg_txt(234)); // Game time: After, the game will be in permanent daylight.
 		} else
@@ -4268,7 +4269,8 @@ ACMD(servertime) {
 	} else if (battle_config.day_duration == 0) {
 		if (map->night_flag == 0) { // we start with day
 			timer_data = timer->get(pc->night_timer_tid);
-			sprintf(temp, msg_txt(235), txt_time(DIFF_TICK(timer_data->tick,timer->gettick())/1000)); // Game time: The game is actualy in daylight for %s.
+			sprintf(temp, msg_txt(235), // Game time: The game is actualy in daylight for %s.
+			        txt_time((unsigned int)(DIFF_TICK(timer_data->tick,timer->gettick())/1000)));
 			clif->message(fd, temp);
 			clif->message(fd, msg_txt(236)); // Game time: After, the game will be in permanent night.
 		} else
@@ -4277,22 +4279,28 @@ ACMD(servertime) {
 		if (map->night_flag == 0) {
 			timer_data = timer->get(pc->night_timer_tid);
 			timer_data2 = timer->get(pc->day_timer_tid);
-			sprintf(temp, msg_txt(235), txt_time(DIFF_TICK(timer_data->tick,timer->gettick())/1000)); // Game time: The game is actualy in daylight for %s.
+			sprintf(temp, msg_txt(235), // Game time: The game is actualy in daylight for %s.
+			        txt_time((unsigned int)(DIFF_TICK(timer_data->tick,timer->gettick())/1000)));
 			clif->message(fd, temp);
 			if (DIFF_TICK(timer_data->tick, timer_data2->tick) > 0)
-				sprintf(temp, msg_txt(237), txt_time(DIFF_TICK(timer_data->interval,DIFF_TICK(timer_data->tick,timer_data2->tick)) / 1000)); // Game time: After, the game will be in night for %s.
+				sprintf(temp, msg_txt(237), // Game time: After, the game will be in night for %s.
+				        txt_time((unsigned int)(DIFF_TICK(timer_data->interval,DIFF_TICK(timer_data->tick,timer_data2->tick)) / 1000)));
 			else
-				sprintf(temp, msg_txt(237), txt_time(DIFF_TICK(timer_data2->tick,timer_data->tick)/1000)); // Game time: After, the game will be in night for %s.
+				sprintf(temp, msg_txt(237), // Game time: After, the game will be in night for %s.
+				        txt_time((unsigned int)(DIFF_TICK(timer_data2->tick,timer_data->tick)/1000)));
 			clif->message(fd, temp);
 		} else {
 			timer_data = timer->get(pc->day_timer_tid);
 			timer_data2 = timer->get(pc->night_timer_tid);
-			sprintf(temp, msg_txt(233), txt_time(DIFF_TICK(timer_data->tick,timer->gettick()) / 1000)); // Game time: The game is actualy in night for %s.
+			sprintf(temp, msg_txt(233), // Game time: The game is actualy in night for %s.
+			        txt_time((unsigned int)(DIFF_TICK(timer_data->tick,timer->gettick()) / 1000)));
 			clif->message(fd, temp);
 			if (DIFF_TICK(timer_data->tick,timer_data2->tick) > 0)
-				sprintf(temp, msg_txt(239), txt_time((timer_data->interval - DIFF_TICK(timer_data->tick, timer_data2->tick)) / 1000)); // Game time: After, the game will be in daylight for %s.
+				sprintf(temp, msg_txt(239), // Game time: After, the game will be in daylight for %s.
+				        txt_time((unsigned int)((timer_data->interval - DIFF_TICK(timer_data->tick, timer_data2->tick)) / 1000)));
 			else
-				sprintf(temp, msg_txt(239), txt_time(DIFF_TICK(timer_data2->tick, timer_data->tick) / 1000)); // Game time: After, the game will be in daylight for %s.
+				sprintf(temp, msg_txt(239), // Game time: After, the game will be in daylight for %s.
+				        txt_time((unsigned int)(DIFF_TICK(timer_data2->tick, timer_data->tick) / 1000)));
 			clif->message(fd, temp);
 		}
 		sprintf(temp, msg_txt(238), txt_time(timer_data->interval / 1000)); // Game time: A day cycle has a normal duration of %s.
@@ -5250,7 +5258,7 @@ ACMD(useskill) {
  *------------------------------------------*/
 ACMD(displayskill) {
 	struct status_data *st;
-	unsigned int tick;
+	int64 tick;
 	uint16 skill_id;
 	uint16 skill_lv = 1;
 	
@@ -6086,8 +6094,8 @@ ACMD(summon)
 	int mob_id = 0;
 	int duration = 0;
 	struct mob_data *md;
-	unsigned int tick=timer->gettick();
-		
+	int64 tick=timer->gettick();
+	
 	if (!message || !*message || sscanf(message, "%23s %d", name, &duration) < 1)
 	{
 		clif->message(fd, msg_txt(1225)); // Please enter a monster name (usage: @summon <monster name> {duration}).
diff --git a/src/map/battle.c b/src/map/battle.c
index 050f3f26e..94222f663 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -196,7 +196,7 @@ struct block_list* battle_getenemyarea(struct block_list *src, int x, int y, int
 	return bl_list[rnd()%c];
 }
 
-int battle_delay_damage_sub(int tid, unsigned int tick, int id, intptr_t data) {
+int battle_delay_damage_sub(int tid, int64 tick, int id, intptr_t data) {
 	struct delay_damage *dat = (struct delay_damage *)data;
 
 	if ( dat ) {
@@ -244,7 +244,7 @@ int battle_delay_damage_sub(int tid, unsigned int tick, int id, intptr_t data) {
 	return 0;
 }
 
-int battle_delay_damage (unsigned int tick, int amotion, struct block_list *src, struct block_list *target, int attack_type, uint16 skill_id, uint16 skill_lv, int64 damage, enum damage_lv dmg_lv, int ddelay, bool additional_effects) {
+int battle_delay_damage(int64 tick, int amotion, struct block_list *src, struct block_list *target, int attack_type, uint16 skill_id, uint16 skill_lv, int64 damage, enum damage_lv dmg_lv, int ddelay, bool additional_effects) {
 	struct delay_damage *dat;
 	struct status_change *sc;
 	nullpo_ret(src);
@@ -349,7 +349,7 @@ int64 battle_attr_fix(struct block_list *src, struct block_list *target, int64 d
 				y = sg->val3 & 0xffff;
 				skill->unitsetting(src,su->group->skill_id,su->group->skill_lv,x,y,1);
 				sg->val3 = -1;
-				sg->limit = DIFF_TICK(timer->gettick(),sg->tick)+300;
+				sg->limit = DIFF_TICK32(timer->gettick(),sg->tick)+300;
 			}
 		}
 	}
@@ -5269,14 +5269,14 @@ void battle_drain(TBL_PC *sd, struct block_list *tbl, int64 rdamage, int64 ldama
 		status_zap(tbl, rhp, rsp);
 }
 // Deals the same damage to targets in area. [pakpil]
-int battle_damage_area( struct block_list *bl, va_list ap) {
-	unsigned int tick;
+int battle_damage_area(struct block_list *bl, va_list ap) {
+	int64 tick;
 	int amotion, dmotion, damage;
 	struct block_list *src;
 
 	nullpo_ret(bl);
 
-	tick=va_arg(ap, unsigned int);
+	tick = va_arg(ap, int64);
 	src=va_arg(ap,struct block_list *);
 	amotion=va_arg(ap,int);
 	dmotion=va_arg(ap,int);
@@ -5302,7 +5302,7 @@ int battle_damage_area( struct block_list *bl, va_list ap) {
 /*==========================================
  * Do a basic physical attack (call trough unit_attack_timer)
  *------------------------------------------*/
-enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* target, unsigned int tick, int flag) {
+enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* target, int64 tick, int flag) {
 	struct map_session_data *sd = NULL, *tsd = NULL;
 	struct status_data *sstatus, *tstatus;
 	struct status_change *sc, *tsc;
@@ -6617,7 +6617,7 @@ void Hercules_report(char* date, char *time_c) {
 
 #undef BFLAG_LENGTH
 }
-static int Hercules_report_timer(int tid, unsigned int tick, int id, intptr_t data) {
+static int Hercules_report_timer(int tid, int64 tick, int id, intptr_t data) {
 	if( chrif->isconnected() ) {/* char server relays it, so it must be online. */
 		Hercules_report(__DATE__,__TIME__);
 	}
@@ -6761,7 +6761,7 @@ int battle_config_read(const char* cfgName)
 
 void do_init_battle(void) {
 	battle->delay_damage_ers = ers_new(sizeof(struct delay_damage),"battle.c::delay_damage_ers",ERS_OPT_CLEAR);
-	timer->add_func_list(battle_delay_damage_sub, "battle_delay_damage_sub");
+	timer->add_func_list(battle->delay_damage_sub, "battle_delay_damage_sub");
 
 #ifndef STATS_OPT_OUT
 	timer->add_func_list(Hercules_report_timer, "Hercules_report_timer");
diff --git a/src/map/battle.h b/src/map/battle.h
index a2212a647..bf08ab8d6 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -518,11 +518,11 @@ struct battle_interface {
 	/* battlegrounds final damage calculation */
 	int64 (*calc_bg_damage) (struct block_list *src, struct block_list *bl, int64 damage, int div_, uint16 skill_id, uint16 skill_lv, int flag);
 	/* normal weapon attack */
-	enum damage_lv (*weapon_attack) (struct block_list *bl, struct block_list *target, unsigned int tick, int flag);
+	enum damage_lv (*weapon_attack) (struct block_list *bl, struct block_list *target, int64 tick, int flag);
 	/* calculate weapon attack */
 	struct Damage (*calc_weapon_attack) (struct block_list *src,struct block_list *target,uint16 skill_id,uint16 skill_lv,int wflag);
 	/* delays damage or skills by a timer */
-	int (*delay_damage) (unsigned int tick, int amotion, struct block_list *src, struct block_list *target, int attack_type, uint16 skill_id, uint16 skill_lv, int64 damage, enum damage_lv dmg_lv, int ddelay, bool additional_effects);
+	int (*delay_damage) (int64 tick, int amotion, struct block_list *src, struct block_list *target, int attack_type, uint16 skill_id, uint16 skill_lv, int64 damage, enum damage_lv dmg_lv, int ddelay, bool additional_effects);
 	/* drain damage */
 	void (*drain) (struct map_session_data *sd, struct block_list *tbl, int64 rdamage, int64 ldamage, int race, int boss);
 	/* damage return/reflect */
@@ -566,7 +566,7 @@ struct battle_interface {
 	int (*get_targeted_sub) (struct block_list *bl, va_list ap);
 	int (*get_enemy_sub) (struct block_list *bl, va_list ap);
 	int (*get_enemy_area_sub) (struct block_list *bl, va_list ap);
-	int (*delay_damage_sub) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*delay_damage_sub) (int tid, int64 tick, int id, intptr_t data);
 	int (*blewcount_bonus) (struct map_session_data *sd, uint16 skill_id);
 	/* skill range criteria */
 	int (*range_type) (struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv);
@@ -587,7 +587,7 @@ struct battle_interface {
 	/* picks a random enemy within the specified range */
 	struct block_list* (*get_enemy_area) (struct block_list *src, int x, int y, int range, int type, int ignore_id);
 	/* damages area, originally for royal guard's reflect damage */
-	int (*damage_area) ( struct block_list *bl, va_list ap);
+	int (*damage_area) (struct block_list *bl, va_list ap);
 };
 
 struct battle_interface *battle;
diff --git a/src/map/battleground.c b/src/map/battleground.c
index e7fe4085b..62688659e 100644
--- a/src/map/battleground.c
+++ b/src/map/battleground.c
@@ -249,7 +249,7 @@ int bg_send_xy_timer_sub(DBKey key, DBData *data, va_list ap) {
 	return 0;
 }
 
-int bg_send_xy_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int bg_send_xy_timer(int tid, int64 tick, int id, intptr_t data) {
 	bg->team_db->foreach(bg->team_db, bg->send_xy_timer_sub, tick);
 	return 0;
 }
@@ -534,7 +534,7 @@ void bg_begin(struct bg_arena *arena) {
 		/* currently running only on solo mode so we do it evenly */
 	}
 }
-int bg_begin_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int bg_begin_timer(int tid, int64 tick, int id, intptr_t data) {
 	bg->begin(bg->arena[id]);
 	bg->arena[id]->begin_timer = INVALID_TIMER;
 	return 0;
@@ -553,7 +553,7 @@ void bg_queue_pregame(struct bg_arena *arena) {
 	}
 	arena->begin_timer = timer->add( timer->gettick() + (arena->pregame_duration*1000), bg->begin_timer, arena->id, 0 );
 }
-int bg_fillup_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int bg_fillup_timer(int tid, int64 tick, int id, intptr_t data) {
 	bg->queue_pregame(bg->arena[id]);
 	bg->arena[id]->fillup_timer = INVALID_TIMER;
 	return 0;
diff --git a/src/map/battleground.h b/src/map/battleground.h
index 1c224e1c2..a5e540924 100644
--- a/src/map/battleground.h
+++ b/src/map/battleground.h
@@ -84,9 +84,9 @@ struct battleground_interface {
 	int (*id2pos) (int queue_id, int account_id);
 	void (*queue_pc_cleanup) (struct map_session_data *sd);
 	void (*begin) (struct bg_arena *arena);
-	int (*begin_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*begin_timer) (int tid, int64 tick, int id, intptr_t data);
 	void (*queue_pregame) (struct bg_arena *arena);
-	int (*fillup_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*fillup_timer) (int tid, int64 tick, int id, intptr_t data);
 	void (*queue_ready_ack) (struct bg_arena *arena, struct map_session_data *sd, bool response);
 	void (*match_over) (struct bg_arena *arena, bool canceled);
 	void (*queue_check) (struct bg_arena *arena);
@@ -102,7 +102,7 @@ struct battleground_interface {
 	int (*team_get_id) (struct block_list *bl);
 	int (*send_message) (struct map_session_data *sd, const char *mes, int len);
 	int (*send_xy_timer_sub) (DBKey key, DBData *data, va_list ap);
-	int (*send_xy_timer) (int tid, unsigned int tick, int id, intptr_t data);	
+	int (*send_xy_timer) (int tid, int64 tick, int id, intptr_t data);	
 	/* */
 	void (*config_read) (void);
 };
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 5308eada9..4efc5bce4 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -682,7 +682,7 @@ int auth_db_cleanup_sub(DBKey key, DBData *data, va_list ap) {
 	return 0;
 }
 
-int auth_db_cleanup(int tid, unsigned int tick, int id, intptr_t data) {
+int auth_db_cleanup(int tid, int64 tick, int id, intptr_t data) {
 	chrif_check(0);
 	chrif->auth_db->foreach(chrif->auth_db, chrif->auth_db_cleanup_sub);
 	return 0;
@@ -1139,7 +1139,7 @@ int chrif_save_scdata(struct map_session_data *sd) { //parses the sc_data of the
 
 #ifdef ENABLE_SC_SAVING
 	int i, count=0;
-	unsigned int tick;
+	int64 tick;
 	struct status_change_data data;
 	struct status_change *sc = &sd->sc;
 	const struct TimerData *td;
@@ -1159,7 +1159,7 @@ int chrif_save_scdata(struct map_session_data *sd) { //parses the sc_data of the
 			td = timer->get(sc->data[i]->timer);
 			if (td == NULL || td->func != status->change_timer || DIFF_TICK(td->tick,tick) < 0)
 				continue;
-			data.tick = DIFF_TICK(td->tick,tick); //Duration that is left before ending.
+			data.tick = DIFF_TICK32(td->tick,tick); //Duration that is left before ending.
 		} else
 			data.tick = -1; //Infinite duration
 		data.type = i;
@@ -1462,7 +1462,7 @@ int chrif_parse(int fd) {
 	return 0;
 }
 
-int send_usercount_tochar(int tid, unsigned int tick, int id, intptr_t data) {
+int send_usercount_tochar(int tid, int64 tick, int id, intptr_t data) {
 	chrif_check(-1);
 
 	WFIFOHEAD(chrif->fd,4);
@@ -1509,7 +1509,7 @@ int send_users_tochar(void) {
  * timerFunction
   * Chk the connection to char server, (if it down)
  *------------------------------------------*/
-int check_connect_char_server(int tid, unsigned int tick, int id, intptr_t data) {
+int check_connect_char_server(int tid, int64 tick, int id, intptr_t data) {
 	static int displayed = 0;
 	if ( chrif->fd <= 0 || session[chrif->fd] == NULL ) {
 		if ( !displayed ) {
diff --git a/src/map/chrif.h b/src/map/chrif.h
index 0617a6702..9df4b9931 100644
--- a/src/map/chrif.h
+++ b/src/map/chrif.h
@@ -30,11 +30,11 @@ enum sd_state { ST_LOGIN, ST_LOGOUT, ST_MAPCHANGE };
 struct auth_node {
 	int account_id, char_id;
 	int login_id1, login_id2, sex, fd;
-	time_t expiration_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited)
-	struct map_session_data *sd;	//Data from logged on char.
-	struct mmo_charstatus *char_dat;	//Data from char server.
-	unsigned int node_created; //timestamp for node timeouts
-	enum sd_state state; //To track whether player was login in/out or changing maps.
+	time_t expiration_time;          // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited)
+	struct map_session_data *sd;     //Data from logged on char.
+	struct mmo_charstatus *char_dat; //Data from char server.
+	int64 node_created;              //timestamp for node timeouts
+	enum sd_state state;             //To track whether player was login in/out or changing maps.
 };
 
 /*=====================================
@@ -109,15 +109,15 @@ struct chrif_interface {
 	void (*skillid2idx) (int fd);
 	
 	bool (*sd_to_auth) (TBL_PC* sd, enum sd_state state);
-	int (*check_connect_char_server) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*check_connect_char_server) (int tid, int64 tick, int id, intptr_t data);
 	bool (*auth_logout) (TBL_PC* sd, enum sd_state state);
 	void (*save_ack) (int fd);
 	int (*reconnect) (DBKey key, DBData *data, va_list ap);
 	int (*auth_db_cleanup_sub) (DBKey key, DBData *data, va_list ap);
 	void (*char_ask_name_answer) (int acc, const char* player_name, uint16 type, uint16 answer);
 	int (*auth_db_final) (DBKey key, DBData *data, va_list ap);
-	int (*send_usercount_tochar) (int tid, unsigned int tick, int id, intptr_t data);
-	int (*auth_db_cleanup) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*send_usercount_tochar) (int tid, int64 tick, int id, intptr_t data);
+	int (*auth_db_cleanup) (int tid, int64 tick, int id, intptr_t data);
 
 	int (*connect) (int fd);
 	int (*connectack) (int fd);
diff --git a/src/map/clif.c b/src/map/clif.c
index decdfc2ce..9810e2a17 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -595,7 +595,7 @@ void clif_authok(struct map_session_data *sd)
 	struct packet_authok p;
 	
 	p.PacketType = authokType;
-	p.startTime = timer->gettick();
+	p.startTime = (unsigned int)timer->gettick();
 	WBUFPOS(&p.PosDir[0],0,sd->bl.x,sd->bl.y,sd->ud.dir); /* do the stupid client math */
 	p.xSize = p.ySize = 5; /* not-used */
 	
@@ -787,14 +787,13 @@ void clif_clearunit_area(struct block_list* bl, clr_type type)
 /// Used to make monsters with player-sprites disappear after dying
 /// like normal monsters, because the client does not remove those
 /// automatically.
-int clif_clearunit_delayed_sub(int tid, unsigned int tick, int id, intptr_t data) {
+int clif_clearunit_delayed_sub(int tid, int64 tick, int id, intptr_t data) {
 	struct block_list *bl = (struct block_list *)data;
 	clif->clearunit_area(bl, (clr_type) id);
 	ers_free(clif->delay_clearunit_ers,bl);
 	return 0;
 }
-void clif_clearunit_delayed(struct block_list* bl, clr_type type, unsigned int tick)
-{
+void clif_clearunit_delayed(struct block_list* bl, clr_type type, int64 tick) {
 	struct block_list *tbl = ers_alloc(clif->delay_clearunit_ers, struct block_list);
 	memcpy (tbl, bl, sizeof (struct block_list));
 	timer->add(tick, clif->clearunit_delayed_sub, (int)type, (intptr_t)tbl);
@@ -1156,7 +1155,7 @@ void clif_set_unit_walking(struct block_list* bl, struct map_session_data *tsd,
 	p.head = vd->hair_style;
 	p.weapon = vd->weapon;
 	p.accessory = vd->head_bottom;
-	p.moveStartTime = timer->gettick();
+	p.moveStartTime = (unsigned int)timer->gettick();
 #if PACKETVER < 7
 	p.shield = vd->shield;
 #endif
@@ -1526,7 +1525,7 @@ void clif_walkok(struct map_session_data *sd)
 
 	WFIFOHEAD(fd, packet_len(0x87));
 	WFIFOW(fd,0)=0x87;
-	WFIFOL(fd,2)=timer->gettick();
+	WFIFOL(fd,2)=(unsigned int)timer->gettick();
 	WFIFOPOS2(fd,6,sd->bl.x,sd->bl.y,sd->ud.to_x,sd->ud.to_y,8,8);
 	WFIFOSET(fd,packet_len(0x87));
 }
@@ -1597,7 +1596,7 @@ void clif_move(struct unit_data *ud)
 	WBUFW(buf,0)=0x86;
 	WBUFL(buf,2)=bl->id;
 	WBUFPOS2(buf,6,bl->x,bl->y,ud->to_x,ud->to_y,8,8);
-	WBUFL(buf,12)=timer->gettick();
+	WBUFL(buf,12)=(unsigned int)timer->gettick();
 	clif->send(buf, packet_len(0x86), bl, AREA_WOS);
 	if (disguised(bl)) {
 		WBUFL(buf,2)=-bl->id;
@@ -1609,7 +1608,7 @@ void clif_move(struct unit_data *ud)
 /*==========================================
  * Delays the map->quit of a player after they are disconnected. [Skotlex]
  *------------------------------------------*/
-int clif_delayquit(int tid, unsigned int tick, int id, intptr_t data) {
+int clif_delayquit(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data *sd = NULL;
 
 	//Remove player from map server
@@ -4430,8 +4429,7 @@ int clif_calc_walkdelay(struct block_list *bl,int delay, int type, int damage, i
 ///     10 = critical hit
 ///     11 = lucky dodge
 ///     12 = (touch skill?)
-int clif_damage(struct block_list* src, struct block_list* dst, unsigned int tick, int sdelay, int ddelay, int64 in_damage, int div, int type, int64 in_damage2)
-{
+int clif_damage(struct block_list* src, struct block_list* dst, int64 tick, int sdelay, int ddelay, int64 in_damage, int div, int type, int64 in_damage2) {
 	unsigned char buf[33];
 	struct status_change *sc;
 	int damage,damage2;
@@ -4459,7 +4457,7 @@ int clif_damage(struct block_list* src, struct block_list* dst, unsigned int tic
 	WBUFW(buf,0)=cmd;
 	WBUFL(buf,2)=src->id;
 	WBUFL(buf,6)=dst->id;
-	WBUFL(buf,10)=tick;
+	WBUFL(buf,10)=(uint32)tick;
 	WBUFL(buf,14)=sdelay;
 	WBUFL(buf,18)=ddelay;
 #if PACKETVER < 20071113
@@ -4516,7 +4514,7 @@ int clif_damage(struct block_list* src, struct block_list* dst, unsigned int tic
  *------------------------------------------*/
 void clif_takeitem(struct block_list* src, struct block_list* dst)
 {
-	//clif_damage(src,dst,0,0,0,0,0,1,0);
+	//clif->damage(src,dst,0,0,0,0,0,1,0);
 	unsigned char buf[32];
 
 	nullpo_retv(src);
@@ -5097,7 +5095,7 @@ void clif_skill_fail(struct map_session_data *sd,uint16 skill_id,enum useskill_f
 
 /// Skill cooldown display icon (ZC_SKILL_POSTDELAY).
 /// 043d <skill ID>.W <tick>.L
-void clif_skill_cooldown(struct map_session_data *sd, uint16 skill_id, unsigned int tick)
+void clif_skill_cooldown(struct map_session_data *sd, uint16 skill_id, unsigned int duration)
 {
 #if PACKETVER>=20081112
 	int fd;
@@ -5108,7 +5106,7 @@ void clif_skill_cooldown(struct map_session_data *sd, uint16 skill_id, unsigned
 	WFIFOHEAD(fd,packet_len(0x43d));
 	WFIFOW(fd,0) = 0x43d;
 	WFIFOW(fd,2) = skill_id;
-	WFIFOL(fd,4) = tick;
+	WFIFOL(fd,4) = duration;
 	WFIFOSET(fd,packet_len(0x43d));
 #endif
 }
@@ -5117,7 +5115,7 @@ void clif_skill_cooldown(struct map_session_data *sd, uint16 skill_id, unsigned
 /// Skill attack effect and damage.
 /// 0114 <skill id>.W <src id>.L <dst id>.L <tick>.L <src delay>.L <dst delay>.L <damage>.W <level>.W <div>.W <type>.B (ZC_NOTIFY_SKILL)
 /// 01de <skill id>.W <src id>.L <dst id>.L <tick>.L <src delay>.L <dst delay>.L <damage>.L <level>.W <div>.W <type>.B (ZC_NOTIFY_SKILL2)
-int clif_skill_damage(struct block_list *src,struct block_list *dst,unsigned int tick,int sdelay,int ddelay,int64 in_damage,int div,uint16 skill_id,uint16 skill_lv,int type) {
+int clif_skill_damage(struct block_list *src, struct block_list *dst, int64 tick, int sdelay, int ddelay, int64 in_damage, int div, uint16 skill_id, uint16 skill_lv, int type) {
 	unsigned char buf[64];
 	struct status_change *sc;
 	int damage;
@@ -5138,7 +5136,7 @@ int clif_skill_damage(struct block_list *src,struct block_list *dst,unsigned int
 	WBUFW(buf,2)=skill_id;
 	WBUFL(buf,4)=src->id;
 	WBUFL(buf,8)=dst->id;
-	WBUFL(buf,12)=tick;
+	WBUFL(buf,12)=(uint32)tick;
 	WBUFL(buf,16)=sdelay;
 	WBUFL(buf,20)=ddelay;
 	if (battle_config.hide_woe_damage && map_flag_gvg2(src->m)) {
@@ -5169,7 +5167,7 @@ int clif_skill_damage(struct block_list *src,struct block_list *dst,unsigned int
 	WBUFW(buf,2)=skill_id;
 	WBUFL(buf,4)=src->id;
 	WBUFL(buf,8)=dst->id;
-	WBUFL(buf,12)=tick;
+	WBUFL(buf,12)=(uint32)tick;
 	WBUFL(buf,16)=sdelay;
 	WBUFL(buf,20)=ddelay;
 	if (battle_config.hide_woe_damage && map_flag_gvg2(src->m)) {
@@ -5205,7 +5203,7 @@ int clif_skill_damage(struct block_list *src,struct block_list *dst,unsigned int
 /// Ground skill attack effect and damage (ZC_NOTIFY_SKILL_POSITION).
 /// 0115 <skill id>.W <src id>.L <dst id>.L <tick>.L <src delay>.L <dst delay>.L <x>.W <y>.W <damage>.W <level>.W <div>.W <type>.B
 #if 0
-int clif_skill_damage2(struct block_list *src,struct block_list *dst,unsigned int tick,int sdelay,int ddelay,int damage,int div,uint16 skill_id,uint16 skill_lv,int type) {
+int clif_skill_damage2(struct block_list *src, struct block_list *dst, int64 tick, int sdelay, int ddelay, int damage, int div, uint16 skill_id, uint16 skill_lv, int type) {
 	unsigned char buf[64];
 	struct status_change *sc;
 
@@ -5225,7 +5223,7 @@ int clif_skill_damage2(struct block_list *src,struct block_list *dst,unsigned in
 	WBUFW(buf,2)=skill_id;
 	WBUFL(buf,4)=src->id;
 	WBUFL(buf,8)=dst->id;
-	WBUFL(buf,12)=tick;
+	WBUFL(buf,12)=(uint32)tick;
 	WBUFL(buf,16)=sdelay;
 	WBUFL(buf,20)=ddelay;
 	WBUFW(buf,24)=dst->x;
@@ -5295,8 +5293,7 @@ int clif_skill_nodamage(struct block_list *src,struct block_list *dst,uint16 ski
 
 /// Non-damaging ground skill effect (ZC_NOTIFY_GROUNDSKILL).
 /// 0117 <skill id>.W <src id>.L <level>.W <x>.W <y>.W <tick>.L
-void clif_skill_poseffect(struct block_list *src,uint16 skill_id,int val,int x,int y,int tick)
-{
+void clif_skill_poseffect(struct block_list *src, uint16 skill_id, int val, int x, int y, int64 tick) {
 	unsigned char buf[32];
 
 	nullpo_retv(src);
@@ -5307,7 +5304,7 @@ void clif_skill_poseffect(struct block_list *src,uint16 skill_id,int val,int x,i
 	WBUFW(buf,8)=val;
 	WBUFW(buf,10)=x;
 	WBUFW(buf,12)=y;
-	WBUFL(buf,14)=tick;
+	WBUFL(buf,14)=(uint32)tick;
 	if(disguised(src)) {
 		clif->send(buf,packet_len(0x117),src,AREA_WOS);
 		WBUFL(buf,4)=-src->id;
@@ -9431,7 +9428,7 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) {
 			clif->spawn(&sd->pd->bl);
 			clif->send_petdata(sd,sd->pd,0,0);
 			clif->send_petstatus(sd);
-//			skill->unit_move(&sd->pd->bl,gettick(),1);
+//			skill->unit_move(&sd->pd->bl,timer->gettick(),1);
 		}
 	}
 
@@ -9649,12 +9646,12 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) {
 
 /// Server's tick (ZC_NOTIFY_TIME).
 /// 007f <time>.L
-void clif_notify_time(struct map_session_data* sd, unsigned long time) {
+void clif_notify_time(struct map_session_data* sd, int64 time) {
 	int fd = sd->fd;
 
 	WFIFOHEAD(fd,packet_len(0x7f));
 	WFIFOW(fd,0) = 0x7f;
-	WFIFOL(fd,2) = time;
+	WFIFOL(fd,2) = (uint32)time;
 	WFIFOSET(fd,packet_len(0x7f));
 }
 
@@ -9750,7 +9747,7 @@ void clif_parse_progressbar(int fd, struct map_session_data * sd)
 	if( timer->gettick() < sd->progressbar.timeout && sd->st )
 		sd->st->state = END;
 
-	sd->state.workinprogress = sd->progressbar.npc_id = sd->progressbar.timeout = 0;
+	sd->progressbar.timeout = sd->state.workinprogress = sd->progressbar.npc_id = 0;
 	npc->scriptcont(sd, npc_id, false);
 }
 
@@ -9863,7 +9860,7 @@ void clif_parse_GetCharNameRequest(int fd, struct map_session_data *sd) {
 
 	clif->charnameack(fd, bl);
 }
-int clif_undisguise_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int clif_undisguise_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data * sd;
 	if( (sd = map->id2sd(id)) ) {
 		sd->fontcolor_tid = INVALID_TIMER;
@@ -10131,8 +10128,7 @@ void clif_parse_HowManyConnections(int fd, struct map_session_data *sd) {
 }
 
 
-void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type, int target_id, unsigned int tick)
-{
+void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type, int target_id, int64 tick) {
 	if (pc_isdead(sd)) {
 		clif->clearunit_area(&sd->bl, CLR_DEAD);
 		return;
@@ -11254,8 +11250,7 @@ void clif_parse_SkillUp(int fd,struct map_session_data *sd)
 	pc->skillup(sd,RFIFOW(fd,2));
 }
 
-void clif_parse_UseSkillToId_homun(struct homun_data *hd, struct map_session_data *sd, unsigned int tick, uint16 skill_id, uint16 skill_lv, int target_id)
-{
+void clif_parse_UseSkillToId_homun(struct homun_data *hd, struct map_session_data *sd, int64 tick, uint16 skill_id, uint16 skill_lv, int target_id) {
 	int lv;
 
 	if( !hd )
@@ -11276,8 +11271,7 @@ void clif_parse_UseSkillToId_homun(struct homun_data *hd, struct map_session_dat
 		unit->skilluse_id(&hd->bl, target_id, skill_id, skill_lv);
 }
 
-void clif_parse_UseSkillToPos_homun(struct homun_data *hd, struct map_session_data *sd, unsigned int tick, uint16 skill_id, uint16 skill_lv, short x, short y, int skillmoreinfo)
-{
+void clif_parse_UseSkillToPos_homun(struct homun_data *hd, struct map_session_data *sd, int64 tick, uint16 skill_id, uint16 skill_lv, short x, short y, int skillmoreinfo) {
 	int lv;
 	if( !hd )
 		return;
@@ -11297,8 +11291,7 @@ void clif_parse_UseSkillToPos_homun(struct homun_data *hd, struct map_session_da
 		unit->skilluse_pos(&hd->bl, x, y, skill_id, skill_lv);
 }
 
-void clif_parse_UseSkillToId_mercenary(struct mercenary_data *md, struct map_session_data *sd, unsigned int tick, uint16 skill_id, uint16 skill_lv, int target_id)
-{
+void clif_parse_UseSkillToId_mercenary(struct mercenary_data *md, struct map_session_data *sd, int64 tick, uint16 skill_id, uint16 skill_lv, int target_id) {
 	int lv;
 
 	if( !md )
@@ -11319,8 +11312,7 @@ void clif_parse_UseSkillToId_mercenary(struct mercenary_data *md, struct map_ses
 		unit->skilluse_id(&md->bl, target_id, skill_id, skill_lv);
 }
 
-void clif_parse_UseSkillToPos_mercenary(struct mercenary_data *md, struct map_session_data *sd, unsigned int tick, uint16 skill_id, uint16 skill_lv, short x, short y, int skillmoreinfo)
-{
+void clif_parse_UseSkillToPos_mercenary(struct mercenary_data *md, struct map_session_data *sd, int64 tick, uint16 skill_id, uint16 skill_lv, short x, short y, int skillmoreinfo) {
 	int lv;
 	if( !md )
 		return;
@@ -11351,7 +11343,7 @@ void clif_parse_UseSkillToId(int fd, struct map_session_data *sd)
 {
 	uint16 skill_id, skill_lv;
 	int tmp, target_id;
-	unsigned int tick = timer->gettick();
+	int64 tick = timer->gettick();
 
 	skill_lv = RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0]);
 	skill_id = RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[1]);
@@ -11452,7 +11444,7 @@ void clif_parse_UseSkillToId(int fd, struct map_session_data *sd)
  *------------------------------------------*/
 void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, uint16 skill_lv, uint16 skill_id, short x, short y, int skillmoreinfo)
 {
-	unsigned int tick = timer->gettick();
+	int64 tick = timer->gettick();
 
 	if( !(skill->get_inf(skill_id)&INF_GROUND_SKILL) )
 		return; //Using a target skill on the ground? WRONG.
@@ -15581,7 +15573,7 @@ void clif_bossmapinfo(int fd, struct mob_data *md, short flag)
 			unsigned int seconds;
 			int hours, minutes;
 
-			seconds = DIFF_TICK(timer_data->tick, timer->gettick()) / 1000 + 60;
+			seconds = (unsigned int)(DIFF_TICK(timer_data->tick, timer->gettick()) / 1000 + 60);
 			hours = seconds / (60 * 60);
 			seconds = seconds - (60 * 60 * hours);
 			minutes = seconds / 60;
diff --git a/src/map/clif.h b/src/map/clif.h
index 6d0fc0fc1..d7e0199bc 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -542,7 +542,7 @@ struct clif_interface {
 	/* unit-related */
 	void (*clearunit_single) (int id, clr_type type, int fd);
 	void (*clearunit_area) (struct block_list* bl, clr_type type);
-	void (*clearunit_delayed) (struct block_list* bl, clr_type type, unsigned int tick);
+	void (*clearunit_delayed) (struct block_list* bl, clr_type type, int64 tick);
 	void (*walkok) (struct map_session_data *sd);
 	void (*move) (struct unit_data *ud);
 	void (*move2) (struct block_list *bl, struct view_data *vd, struct unit_data *ud);
@@ -556,7 +556,7 @@ struct clif_interface {
 	void (*skill_setunit) (struct skill_unit *su);
 	void (*skill_delunit) (struct skill_unit *su);
 	void (*skillunit_update) (struct block_list* bl);
-	int (*clearunit_delayed_sub) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*clearunit_delayed_sub) (int tid, int64 tick, int id, intptr_t data);
 	void (*set_unit_idle) (struct block_list* bl, struct map_session_data *tsd,enum send_target target);
 	void (*spawn_unit) (struct block_list* bl, enum send_target target);
 	void (*spawn_unit2) (struct block_list* bl, enum send_target target);
@@ -600,7 +600,7 @@ struct clif_interface {
 	void (*scriptclear) (struct map_session_data *sd, int npcid);
 	/* client-user-interface-related */
 	void (*viewpoint) (struct map_session_data *sd, int npc_id, int type, int x, int y, int id, int color);
-	int (*damage) (struct block_list* src, struct block_list* dst, unsigned int tick, int sdelay, int ddelay, int64 damage, int div, int type, int64 damage2);
+	int (*damage) (struct block_list* src, struct block_list* dst, int64 tick, int sdelay, int ddelay, int64 damage, int div, int type, int64 damage2);
 	void (*sitting) (struct block_list* bl);
 	void (*standing) (struct block_list* bl);
 	void (*arrow_create_list) (struct map_session_data *sd);
@@ -616,7 +616,7 @@ struct clif_interface {
 	int (*outsight) (struct block_list *bl,va_list ap);
 	void (*skillcastcancel) (struct block_list* bl);
 	void (*skill_fail) (struct map_session_data *sd,uint16 skill_id,enum useskill_fail_cause cause,int btype);
-	void (*skill_cooldown) (struct map_session_data *sd, uint16 skill_id, unsigned int tick);
+	void (*skill_cooldown) (struct map_session_data *sd, uint16 skill_id, unsigned int duration);
 	void (*skill_memomessage) (struct map_session_data* sd, int type);
 	void (*skill_mapinfomessage) (struct map_session_data *sd, int type);
 	void (*skill_produce_mix_list) (struct map_session_data *sd, int skill_id, int trigger);
@@ -682,7 +682,7 @@ struct clif_interface {
 	void (*movetoattack) (struct map_session_data *sd,struct block_list *bl);
 	void (*solved_charname) (int fd, int charid, const char* name);
 	void (*charnameupdate) (struct map_session_data *ssd);
-	int (*delayquit) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*delayquit) (int tid, int64 tick, int id, intptr_t data);
 	void (*getareachar_pc) (struct map_session_data* sd,struct map_session_data* dstsd);
 	void (*disconnect_ack) (struct map_session_data* sd, short result);
 	void (*PVPInfo) (struct map_session_data* sd);
@@ -700,9 +700,9 @@ struct clif_interface {
 	void (*wedding_effect) (struct block_list *bl);
 	void (*divorced) (struct map_session_data* sd, const char* name);
 	void (*callpartner) (struct map_session_data *sd);
-	int (*skill_damage) (struct block_list *src,struct block_list *dst,unsigned int tick,int sdelay,int ddelay,int64 damage,int div,uint16 skill_id,uint16 skill_lv,int type);
+	int (*skill_damage) (struct block_list *src, struct block_list *dst, int64 tick, int sdelay, int ddelay, int64 damage, int div, uint16 skill_id, uint16 skill_lv, int type);
 	int (*skill_nodamage) (struct block_list *src,struct block_list *dst,uint16 skill_id,int heal,int fail);
-	void (*skill_poseffect) (struct block_list *src,uint16 skill_id,int val,int x,int y,int tick);
+	void (*skill_poseffect) (struct block_list *src, uint16 skill_id, int val, int x, int y, int64 tick);
 	void (*skill_estimation) (struct map_session_data *sd,struct block_list *dst);
 	void (*skill_warppoint) (struct map_session_data* sd, uint16 skill_id, uint16 skill_lv, unsigned short map1, unsigned short map2, unsigned short map3, unsigned short map4);
 	void (*skillcasting) (struct block_list* bl, int src_id, int dst_id, int dst_x, int dst_y, uint16 skill_id, int property, int casttime);
@@ -960,11 +960,11 @@ struct clif_interface {
 	void (*adopt_reply) (struct map_session_data *sd, int type);
 	void (*adopt_request) (struct map_session_data *sd, struct map_session_data *src, int p_id);
 	void (*readbook) (int fd, int book_id, int page);
-	void (*notify_time) (struct map_session_data* sd, unsigned long time);
+	void (*notify_time) (struct map_session_data* sd, int64 time);
 	void (*user_count) (struct map_session_data* sd, int count);
 	void (*noask_sub) (struct map_session_data *src, struct map_session_data *target, int type);
 	void (*bc_ready) (void);
-	int (*undisguise_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*undisguise_timer) (int tid, int64 tick, int id, intptr_t data);
 	/* Hercules Channel System */
 	void (*chsys_create) (struct hChSysCh *channel, char *name, char *pass, unsigned char color);
 	void (*chsys_msg) (struct hChSysCh *channel, struct map_session_data *sd, char *msg);
@@ -998,7 +998,7 @@ struct clif_interface {
 	void (*pEmotion) (int fd, struct map_session_data *sd);
 	void (*pHowManyConnections) (int fd, struct map_session_data *sd);
 	void (*pActionRequest) (int fd, struct map_session_data *sd);
-	void (*pActionRequest_sub) (struct map_session_data *sd, int action_type, int target_id, unsigned int tick);
+	void (*pActionRequest_sub) (struct map_session_data *sd, int action_type, int target_id, int64 tick);
 	void (*pRestart) (int fd, struct map_session_data *sd);
 	void (*pWisMessage) (int fd, struct map_session_data* sd);
 	void (*pBroadcast) (int fd, struct map_session_data* sd);
@@ -1032,12 +1032,12 @@ struct clif_interface {
 	void (*pStatusUp) (int fd,struct map_session_data *sd);
 	void (*pSkillUp) (int fd,struct map_session_data *sd);
 	void (*pUseSkillToId) (int fd, struct map_session_data *sd);
-	void (*pUseSkillToId_homun) (struct homun_data *hd, struct map_session_data *sd, unsigned int tick, uint16 skill_id, uint16 skill_lv, int target_id);
-	void (*pUseSkillToId_mercenary) (struct mercenary_data *md, struct map_session_data *sd, unsigned int tick, uint16 skill_id, uint16 skill_lv, int target_id);
+	void (*pUseSkillToId_homun) (struct homun_data *hd, struct map_session_data *sd, int64 tick, uint16 skill_id, uint16 skill_lv, int target_id);
+	void (*pUseSkillToId_mercenary) (struct mercenary_data *md, struct map_session_data *sd, int64 tick, uint16 skill_id, uint16 skill_lv, int target_id);
 	void (*pUseSkillToPos) (int fd, struct map_session_data *sd);
 	void (*pUseSkillToPosSub) (int fd, struct map_session_data *sd, uint16 skill_lv, uint16 skill_id, short x, short y, int skillmoreinfo);
-	void (*pUseSkillToPos_homun) (struct homun_data *hd, struct map_session_data *sd, unsigned int tick, uint16 skill_id, uint16 skill_lv, short x, short y, int skillmoreinfo);
-	void (*pUseSkillToPos_mercenary) (struct mercenary_data *md, struct map_session_data *sd, unsigned int tick, uint16 skill_id, uint16 skill_lv, short x, short y, int skillmoreinfo);
+	void (*pUseSkillToPos_homun) (struct homun_data *hd, struct map_session_data *sd, int64 tick, uint16 skill_id, uint16 skill_lv, short x, short y, int skillmoreinfo);
+	void (*pUseSkillToPos_mercenary) (struct mercenary_data *md, struct map_session_data *sd, int64 tick, uint16 skill_id, uint16 skill_lv, short x, short y, int skillmoreinfo);
 	void (*pUseSkillToPosMoreInfo) (int fd, struct map_session_data *sd);
 	void (*pUseSkillMap) (int fd, struct map_session_data* sd);
 	void (*pRequestMemo) (int fd,struct map_session_data *sd);
diff --git a/src/map/elemental.c b/src/map/elemental.c
index 3251ca992..f15b735b2 100644
--- a/src/map/elemental.c
+++ b/src/map/elemental.c
@@ -148,7 +148,7 @@ int elemental_get_lifetime(struct elemental_data *ed) {
 		return 0;
 
 	td = timer->get(ed->summon_timer);
-	return (td != NULL) ? DIFF_TICK(td->tick, timer->gettick()) : 0;
+	return (td != NULL) ? DIFF_TICK32(td->tick, timer->gettick()) : 0;
 }
 
 int elemental_save(struct elemental_data *ed) {
@@ -169,7 +169,7 @@ int elemental_save(struct elemental_data *ed) {
 	return 1;
 }
 
-int elemental_summon_end_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int elemental_summon_end_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data *sd;
 	struct elemental_data *ed;
 
@@ -388,7 +388,7 @@ int elemental_clean_effect(struct elemental_data *ed) {
 	return 1;
 }
 
-int elemental_action(struct elemental_data *ed, struct block_list *bl, unsigned int tick) {
+int elemental_action(struct elemental_data *ed, struct block_list *bl, int64 tick) {
 	struct skill_condition req;
 	uint16 skill_id, skill_lv;
 	int i;
@@ -636,7 +636,7 @@ int elemental_ai_sub_timer_activesearch(struct block_list *bl, va_list ap) {
 	return 0;
 }
 
-int elemental_ai_sub_timer(struct elemental_data *ed, struct map_session_data *sd, unsigned int tick) {
+int elemental_ai_sub_timer(struct elemental_data *ed, struct map_session_data *sd, int64 tick) {
 	struct block_list *target = NULL;
 	int master_dist, view_range, mode;
 
@@ -723,7 +723,7 @@ int elemental_ai_sub_timer(struct elemental_data *ed, struct map_session_data *s
 		}
 
 		if( battle->check_range(&ed->bl,target,view_range) && rnd()%100 < 2 ) { // 2% chance to cast attack skill.
-			if(	elemental->action(ed,target,tick) )
+			if( elemental->action(ed,target,tick) )
 				return 1;
 		}
 
@@ -746,14 +746,14 @@ int elemental_ai_sub_timer(struct elemental_data *ed, struct map_session_data *s
 }
 
 int elemental_ai_sub_foreachclient(struct map_session_data *sd, va_list ap) {
-	unsigned int tick = va_arg(ap,unsigned int);
+	int64 tick = va_arg(ap,int64);
 	if(sd->status.ele_id && sd->ed)
 		elemental->ai_sub_timer(sd->ed,sd,tick);
 
 	return 0;
 }
 
-int elemental_ai_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int elemental_ai_timer(int tid, int64 tick, int id, intptr_t data) {
 	map->foreachpc(elemental->ai_sub_foreachclient,tick);
 	return 0;
 }
diff --git a/src/map/elemental.h b/src/map/elemental.h
index b42d5c0b7..3cd819d53 100644
--- a/src/map/elemental.h
+++ b/src/map/elemental.h
@@ -57,7 +57,7 @@ struct elemental_data {
 	int summon_timer;
 	int skill_timer;
 
-	unsigned last_thinktime, last_linktime, last_spdrain_time;
+	int64 last_thinktime, last_linktime, last_spdrain_time;
 	short min_chase;
 	int target_id, attacked_id;
 };
@@ -99,7 +99,7 @@ struct elemental_interface {
 	int (*set_target) (struct map_session_data *sd, struct block_list *bl);
 	int (*clean_single_effect) (struct elemental_data *ed, uint16 skill_id);
 	int (*clean_effect) (struct elemental_data *ed);
-	int (*action) (struct elemental_data *ed, struct block_list *bl, unsigned int tick);
+	int (*action) (struct elemental_data *ed, struct block_list *bl, int64 tick);
 	struct skill_condition (*skill_get_requirements) (uint16 skill_id, uint16 skill_lv);
 	
 	int (*read_skilldb) (void);
@@ -108,11 +108,11 @@ struct elemental_interface {
 	
 	int (*search_index) (int class_);
 	void (*summon_init) (struct elemental_data *ed);
-	int (*summon_end_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*summon_end_timer) (int tid, int64 tick, int id, intptr_t data);
 	int (*ai_sub_timer_activesearch) (struct block_list *bl, va_list ap);
-	int (*ai_sub_timer) (struct elemental_data *ed, struct map_session_data *sd, unsigned int tick);
+	int (*ai_sub_timer) (struct elemental_data *ed, struct map_session_data *sd, int64 tick);
 	int (*ai_sub_foreachclient) (struct map_session_data *sd, va_list ap);
-	int (*ai_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*ai_timer) (int tid, int64 tick, int id, intptr_t data);
 	int (*read_db) (void);
 };
 
diff --git a/src/map/guild.c b/src/map/guild.c
index 9b3eaaff8..0ae45bede 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -279,8 +279,7 @@ int guild_payexp_timer_sub(DBKey key, DBData *data, va_list ap) {
 	return 0;
 }
 
-int guild_payexp_timer(int tid, unsigned int tick, int id, intptr_t data)
-{
+int guild_payexp_timer(int tid, int64 tick, int id, intptr_t data) {
 	guild->expcache_db->clear(guild->expcache_db,guild->payexp_timer_sub);
 	return 0;
 }
@@ -314,8 +313,7 @@ int guild_send_xy_timer_sub(DBKey key, DBData *data, va_list ap)
 }
 
 //Code from party_send_xy_timer [Skotlex]
-int guild_send_xy_timer(int tid, unsigned int tick, int id, intptr_t data)
-{
+int guild_send_xy_timer(int tid, int64 tick, int id, intptr_t data) {
 	guild->db->foreach(guild->db,guild->send_xy_timer_sub,tick);
 	return 0;
 }
diff --git a/src/map/guild.h b/src/map/guild.h
index 566ca7ce4..348a6c7e4 100644
--- a/src/map/guild.h
+++ b/src/map/guild.h
@@ -148,13 +148,13 @@ struct guild_interface {
 	/* guild aura */
 	void (*aura_refresh) (struct map_session_data *sd, uint16 skill_id, uint16 skill_lv);
 	/* */
-	int (*payexp_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*payexp_timer) (int tid, int64 tick, int id, intptr_t data);
 	TBL_PC* (*sd_check) (int guild_id, int account_id, int char_id);
 	bool (*read_guildskill_tree_db) (char* split[], int columns, int current);
 	bool (*read_castledb) (char* str[], int columns, int current);
 	int (*payexp_timer_sub) (DBKey key, DBData *data, va_list ap);
 	int (*send_xy_timer_sub) (DBKey key, DBData *data, va_list ap);
-	int (*send_xy_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*send_xy_timer) (int tid, int64 tick, int id, intptr_t data);
 	DBData (*create_expcache) (DBKey key, va_list args);
 	int (*eventlist_db_final) (DBKey key, DBData *data, va_list ap);
 	int (*expcache_db_final) (DBKey key, DBData *data, va_list ap);
diff --git a/src/map/homunculus.c b/src/map/homunculus.c
index 1e47053fe..52f0572c0 100644
--- a/src/map/homunculus.c
+++ b/src/map/homunculus.c
@@ -615,7 +615,7 @@ bool homunculus_feed(struct map_session_data *sd, struct homun_data *hd) {
 	return true;
 }
 
-int homunculus_hunger_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int homunculus_hunger_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data *sd;
 	struct homun_data *hd;
 
diff --git a/src/map/homunculus.h b/src/map/homunculus.h
index 2cb558930..e3ec38f7b 100644
--- a/src/map/homunculus.h
+++ b/src/map/homunculus.h
@@ -117,7 +117,7 @@ struct homunculus_interface {
 	void (*save) (struct homun_data *hd);
 	unsigned char (*menu) (struct map_session_data *sd,unsigned char menu_num);
 	bool (*feed) (struct map_session_data *sd, struct homun_data *hd);
-	int (*hunger_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*hunger_timer) (int tid, int64 tick, int id, intptr_t data);
 	void (*hunger_timer_delete) (struct homun_data *hd);
 	int (*change_name) (struct map_session_data *sd,char *name);
 	bool (*change_name_ack) (struct map_session_data *sd, char* name, int flag);
diff --git a/src/map/instance.c b/src/map/instance.c
index 83b538ffc..6b96c3112 100644
--- a/src/map/instance.c
+++ b/src/map/instance.c
@@ -480,7 +480,7 @@ void instance_del_map(int16 m) {
 /*--------------------------------------
  * Timer to destroy instance by process or idle
  *--------------------------------------*/
-int instance_destroy_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int instance_destroy_timer(int tid, int64 tick, int id, intptr_t data) {
 	instance->destroy(id);
 	return 0;
 }
diff --git a/src/map/instance.h b/src/map/instance.h
index 449ca42c6..27a9401b4 100644
--- a/src/map/instance.h
+++ b/src/map/instance.h
@@ -70,7 +70,7 @@ struct instance_interface {
 	void (*check_kick) (struct map_session_data *sd);
 	void (*set_timeout) (int instance_id, unsigned int progress_timeout, unsigned int idle_timeout);
 	bool (*valid) (int instance_id);
-	int (*destroy_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*destroy_timer) (int tid, int64 tick, int id, intptr_t data);
 };
 
 struct instance_interface *instance;
diff --git a/src/map/irc-bot.c b/src/map/irc-bot.c
index 5225672af..f67446629 100644
--- a/src/map/irc-bot.c
+++ b/src/map/irc-bot.c
@@ -29,7 +29,7 @@ char send_string[IRC_MESSAGE_LENGTH];
  * Timer callback to (re-)connect to an IRC server
  * @see timer->do_timer
  */
-int irc_connect_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int irc_connect_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct hSockOpt opt;
 	if( ircbot->isOn || ++ircbot->fails >= 3 )
 		return 0;
@@ -52,7 +52,7 @@ int irc_connect_timer(int tid, unsigned int tick, int id, intptr_t data) {
  * Timer callback to send identification commands to an IRC server
  * @see timer->do_timer
  */
-int irc_identify_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int irc_identify_timer(int tid, int64 tick, int id, intptr_t data) {
 	if( !ircbot->isOn )
 		return 0;
 	
@@ -70,7 +70,7 @@ int irc_identify_timer(int tid, unsigned int tick, int id, intptr_t data) {
  * Timer callback to join channels (and optionally send NickServ commands)
  * @see timer->do_timer
  */
-int irc_join_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int irc_join_timer(int tid, int64 tick, int id, intptr_t data) {
 	if( !ircbot->isOn )
 		return 0;
 	
diff --git a/src/map/irc-bot.h b/src/map/irc-bot.h
index aafbfccde..52ff0c9be 100644
--- a/src/map/irc-bot.h
+++ b/src/map/irc-bot.h
@@ -22,7 +22,7 @@ struct irc_func {
 struct irc_bot_interface {
 	int fd;
 	bool isIn, isOn;
-	unsigned int last_try;
+	int64 last_try;
 	unsigned char fails;
 	unsigned long ip;
 	unsigned short port;
@@ -43,9 +43,9 @@ struct irc_bot_interface {
 	/* */
 	struct irc_func* (*func_search) (char* function_name);
 	/* */
-	int (*connect_timer) (int tid, unsigned int tick, int id, intptr_t data);
-	int (*identify_timer) (int tid, unsigned int tick, int id, intptr_t data);
-	int (*join_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*connect_timer) (int tid, int64 tick, int id, intptr_t data);
+	int (*identify_timer) (int tid, int64 tick, int id, intptr_t data);
+	int (*join_timer) (int tid, int64 tick, int id, intptr_t data);
 	/* */
 	void (*send)(char *str);
 	void (*relay) (char *name, const char *msg);
diff --git a/src/map/map.c b/src/map/map.c
index 81bd732df..b50297ca6 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -134,7 +134,7 @@ int map_freeblock_unlock (void) {
 
 // Timer function to check if there some remaining lock and remove them if so.
 // Called each 1s
-int map_freeblock_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int map_freeblock_timer(int tid, int64 tick, int id, intptr_t data) {
 	if (map->block_free_lock > 0) {
 		ShowError("map_freeblock_timer: block_free_lock(%d) is invalid.\n", map->block_free_lock);
 		map->block_free_lock = 1;
@@ -266,8 +266,7 @@ int map_delblock(struct block_list* bl)
  * Pass flag as 1 to prevent doing skill->unit_move checks
  * (which are executed by default on BL_CHAR types)
  *------------------------------------------*/
-int map_moveblock(struct block_list *bl, int x1, int y1, unsigned int tick)
-{
+int map_moveblock(struct block_list *bl, int x1, int y1, int64 tick) {
 	int x0 = bl->x, y0 = bl->y;
 	struct status_change *sc = NULL;
 	int moveblock = ( x0/BLOCK_SIZE != x1/BLOCK_SIZE || y0/BLOCK_SIZE != y1/BLOCK_SIZE);
@@ -1312,7 +1311,7 @@ int map_get_new_object_id(void)
  * Timered function to clear the floor (remove remaining item)
  * Called each flooritem_lifetime ms
  *------------------------------------------*/
-int map_clearflooritem_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int map_clearflooritem_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct flooritem_data* fitem = (struct flooritem_data*)idb_get(map->id_db, id);
 
 	if (fitem == NULL || fitem->bl.type != BL_ITEM || (fitem->cleartimer != tid)) {
@@ -2296,8 +2295,7 @@ int map_removemobs_sub(struct block_list *bl, va_list ap)
 	return 1;
 }
 
-int map_removemobs_timer(int tid, unsigned int tick, int id, intptr_t data)
-{
+int map_removemobs_timer(int tid, int64 tick, int id, intptr_t data) {
 	int count;
 	const int16 m = id;
 
diff --git a/src/map/map.h b/src/map/map.h
index 6e4878dfd..c8b043acb 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -339,7 +339,7 @@ struct flooritem_data {
 	unsigned char subx,suby;
 	int cleartimer;
 	int first_get_charid,second_get_charid,third_get_charid;
-	unsigned int first_get_tick,second_get_tick,third_get_tick;
+	int64 first_get_tick,second_get_tick,third_get_tick;
 	struct item item_data;
 };
 
@@ -900,7 +900,7 @@ struct map_interface {
 	// blocklist manipulation
 	int (*addblock) (struct block_list* bl);
 	int (*delblock) (struct block_list* bl);
-	int (*moveblock) (struct block_list *bl, int x1, int y1, unsigned int tick);
+	int (*moveblock) (struct block_list *bl, int x1, int y1, int64 tick);
 	//blocklist nb in one cell
 	int (*count_oncell) (int16 m,int16 x,int16 y,int type);
 	struct skill_unit * (*find_skill_unit_oncell) (struct block_list* target,int16 x,int16 y,uint16 skill_id,struct skill_unit* out_unit, int flag);
@@ -912,8 +912,8 @@ struct map_interface {
 	// npc
 	bool (*addnpc) (int16 m,struct npc_data *nd);
 	// map item
-	int (*clearflooritem_timer) (int tid, unsigned int tick, int id, intptr_t data);
-	int (*removemobs_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*clearflooritem_timer) (int tid, int64 tick, int id, intptr_t data);
+	int (*removemobs_timer) (int tid, int64 tick, int id, intptr_t data);
 	void (*clearflooritem) (struct block_list* bl);
 	int (*addflooritem) (struct item *item_data,int amount,int16 m,int16 x,int16 y,int first_charid,int second_charid,int third_charid,int flags);
 	// player to map session
@@ -1001,7 +1001,7 @@ struct map_interface {
 
 	void (*do_shutdown) (void);
 	
-	int (*freeblock_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*freeblock_timer) (int tid, int64 tick, int id, intptr_t data);
 	int (*searchrandfreecell) (int16 m, int16 *x, int16 *y, int stack);
 	int (*count_sub) (struct block_list *bl, va_list ap);
 	DBData (*create_charid2nick) (DBKey key, va_list args);
diff --git a/src/map/mapreg.h b/src/map/mapreg.h
index 3c1d0ba0e..c8f229cef 100644
--- a/src/map/mapreg.h
+++ b/src/map/mapreg.h
@@ -34,7 +34,7 @@ struct mapreg_interface {
 	bool (*setregstr) (int uid, const char *str);
 	void (*load) (void);
 	void (*save) (void);
-	int (*save_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*save_timer) (int tid, int64 tick, int id, intptr_t data);
 	void (*reload) (void);
 	bool (*config_read) (const char *w1, const char *w2);
 };
diff --git a/src/map/mapreg_sql.c b/src/map/mapreg_sql.c
index 902b7c39b..c94e42d5d 100644
--- a/src/map/mapreg_sql.c
+++ b/src/map/mapreg_sql.c
@@ -228,7 +228,7 @@ void script_save_mapreg(void) {
 	}
 }
 
-int script_autosave_mapreg(int tid, unsigned int tick, int id, intptr_t data) {
+int script_autosave_mapreg(int tid, int64 tick, int id, intptr_t data) {
 	mapreg->save();
 	return 0;
 }
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 8b8353f46..8c74a5e1e 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -94,7 +94,7 @@ int mercenary_get_lifetime(struct mercenary_data *md)
 		return 0;
 
 	td = timer->get(md->contract_timer);
-	return (td != NULL) ? DIFF_TICK(td->tick, timer->gettick()) : 0;
+	return (td != NULL) ? DIFF_TICK32(td->tick, timer->gettick()) : 0;
 }
 
 int mercenary_get_guild(struct mercenary_data *md)
@@ -217,7 +217,7 @@ int mercenary_save(struct mercenary_data *md)
 	return 1;
 }
 
-int merc_contract_end_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int merc_contract_end_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data *sd;
 	struct mercenary_data *md;
 
diff --git a/src/map/mercenary.h b/src/map/mercenary.h
index 47f37ac66..3245606cf 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.h
@@ -43,7 +43,7 @@ struct mercenary_data {
 	int contract_timer;
 	
 	unsigned devotion_flag : 1;
-	unsigned int masterteleport_timer;
+	int64 masterteleport_timer;
 };
 
 /*=====================================
@@ -89,7 +89,7 @@ struct mercenary_interface {
 	int (*killbonus) (struct mercenary_data *md);
 	int (*search_index) (int class_);
 	
-	int (*contract_end_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*contract_end_timer) (int tid, int64 tick, int id, intptr_t data);
 	bool (*read_db_sub) (char* str[], int columns, int current);
 	bool (*read_skill_db_sub) (char* str[], int columns, int current);
 };
diff --git a/src/map/mob.c b/src/map/mob.c
index 7023bcb9d..97f8ea6c1 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -332,8 +332,7 @@ int mob_get_random_id(int type, int flag, int lv)
 /*==========================================
  * Kill Steal Protection [Zephyrus]
  *------------------------------------------*/
-bool mob_ksprotected (struct block_list *src, struct block_list *target)
-{
+bool mob_ksprotected(struct block_list *src, struct block_list *target) {
 	struct block_list *s_bl, *t_bl;
 	struct map_session_data
 		*sd,    // Source
@@ -341,7 +340,7 @@ bool mob_ksprotected (struct block_list *src, struct block_list *target)
 		*t_sd;  // Mob Target
 	struct status_change_entry *sce;
 	struct mob_data *md;
-	unsigned int tick = timer->gettick();
+	int64 tick = timer->gettick();
 	char output[128];
 
 	if( !battle_config.ksprotection )
@@ -559,8 +558,8 @@ int mob_once_spawn_area(struct map_session_data* sd, int16 m, int16 x0, int16 y0
 /*==========================================
  * Set a Guardian's guild data [Skotlex]
  *------------------------------------------*/
-int mob_spawn_guardian_sub(int tid, unsigned int tick, int id, intptr_t data)
-{	//Needed because the guild_data may not be available at guardian spawn time.
+int mob_spawn_guardian_sub(int tid, int64 tick, int id, intptr_t data) {
+	//Needed because the guild_data may not be available at guardian spawn time.
 	struct block_list* bl = map->id2bl(id);
 	struct mob_data* md;
 	struct guild* g;
@@ -779,18 +778,17 @@ int mob_can_reach(struct mob_data *md,struct block_list *bl,int range, int state
 /*==========================================
  * Links nearby mobs (supportive mobs)
  *------------------------------------------*/
-int mob_linksearch(struct block_list *bl,va_list ap)
-{
+int mob_linksearch(struct block_list *bl,va_list ap) {
 	struct mob_data *md;
 	int class_;
 	struct block_list *target;
-	unsigned int tick;
+	int64 tick;
 
 	nullpo_ret(bl);
 	md=(struct mob_data *)bl;
 	class_ = va_arg(ap, int);
 	target = va_arg(ap, struct block_list *);
-	tick=va_arg(ap, unsigned int);
+	tick = va_arg(ap, int64);
 
 	if (md->class_ == class_ && DIFF_TICK(md->last_linktime, tick) < MIN_MOBLINKTIME
 		&& !md->target_id)
@@ -809,7 +807,7 @@ int mob_linksearch(struct block_list *bl,va_list ap)
 /*==========================================
  * mob spawn with delay (timer function)
  *------------------------------------------*/
-int mob_delayspawn(int tid, unsigned int tick, int id, intptr_t data) {
+int mob_delayspawn(int tid, int64 tick, int id, intptr_t data) {
 	struct block_list* bl = map->id2bl(id);
 	struct mob_data* md = BL_CAST(BL_MOB, bl);
 
@@ -884,8 +882,8 @@ int mob_count_sub(struct block_list *bl, va_list ap) {
 int mob_spawn (struct mob_data *md)
 {
 	int i=0;
-	unsigned int tick = timer->gettick();
-	int c =0;
+	int64 tick = timer->gettick();
+	int64 c = 0;
 
 	md->last_thinktime = tick;
 	if (md->bl.prev != NULL)
@@ -1185,7 +1183,7 @@ int mob_warpchase_sub(struct block_list *bl,va_list ap) {
 /*==========================================
  * Processing of slave monsters
  *------------------------------------------*/
-int mob_ai_sub_hard_slavemob(struct mob_data *md,unsigned int tick) {
+int mob_ai_sub_hard_slavemob(struct mob_data *md, int64 tick) {
 	struct block_list *bl;
 
 	bl=map->id2bl(md->master_id);
@@ -1268,8 +1266,7 @@ int mob_ai_sub_hard_slavemob(struct mob_data *md,unsigned int tick) {
  * when trying to pick new targets when the current chosen target is
  * unreachable.
  *------------------------------------------*/
-int mob_unlocktarget(struct mob_data *md, unsigned int tick)
-{
+int mob_unlocktarget(struct mob_data *md, int64 tick) {
 	nullpo_ret(md);
 
 	switch (md->state.skillstate) {
@@ -1308,8 +1305,7 @@ int mob_unlocktarget(struct mob_data *md, unsigned int tick)
 /*==========================================
  * Random walk
  *------------------------------------------*/
-int mob_randomwalk(struct mob_data *md,unsigned int tick)
-{
+int mob_randomwalk(struct mob_data *md, int64 tick) {
 	const int retrycount=20;
 	int i,x,y,c,d;
 	int speed;
@@ -1383,8 +1379,7 @@ int mob_warpchase(struct mob_data *md, struct block_list *target)
 /*==========================================
  * AI of MOB whose is near a Player
  *------------------------------------------*/
-bool mob_ai_sub_hard(struct mob_data *md, unsigned int tick)
-{
+bool mob_ai_sub_hard(struct mob_data *md, int64 tick) {
 	struct block_list *tbl = NULL, *abl = NULL;
 	int mode;
 	int view_range, can_move;
@@ -1645,10 +1640,9 @@ bool mob_ai_sub_hard(struct mob_data *md, unsigned int tick)
 	return true;
 }
 
-int mob_ai_sub_hard_timer(struct block_list *bl,va_list ap)
-{
+int mob_ai_sub_hard_timer(struct block_list *bl, va_list ap) {
 	struct mob_data *md = (struct mob_data*)bl;
-	unsigned int tick = va_arg(ap, unsigned int);
+	int64 tick = va_arg(ap, int64);
 	if (mob->ai_sub_hard(md, tick))
 	{	//Hard AI triggered.
 		if(!md->state.spotted)
@@ -1661,9 +1655,9 @@ int mob_ai_sub_hard_timer(struct block_list *bl,va_list ap)
 /*==========================================
  * Serious processing for mob in PC field of view (foreachclient)
  *------------------------------------------*/
-int mob_ai_sub_foreachclient(struct map_session_data *sd,va_list ap) {
-	unsigned int tick;
-	tick=va_arg(ap,unsigned int);
+int mob_ai_sub_foreachclient(struct map_session_data *sd, va_list ap) {
+	int64 tick;
+	tick=va_arg(ap, int64);
 	map->foreachinrange(mob->ai_sub_hard_timer,&sd->bl, AREA_SIZE+ACTIVE_AI_RANGE, BL_MOB,tick);
 
 	return 0;
@@ -1672,16 +1666,15 @@ int mob_ai_sub_foreachclient(struct map_session_data *sd,va_list ap) {
 /*==========================================
  * Negligent mode MOB AI (PC is not in near)
  *------------------------------------------*/
-int mob_ai_sub_lazy(struct mob_data *md, va_list args)
-{
-	unsigned int tick;
+int mob_ai_sub_lazy(struct mob_data *md, va_list args) {
+	int64 tick;
 
 	nullpo_ret(md);
 
 	if(md->bl.prev == NULL)
 		return 0;
 
-	tick = va_arg(args,unsigned int);
+	tick = va_arg(args, int64);
 
 	if (battle_config.mob_ai&0x20 && map->list[md->bl.m].users>0)
 		return (int)mob->ai_sub_hard(md, tick);
@@ -1715,7 +1708,7 @@ int mob_ai_sub_lazy(struct mob_data *md, va_list args)
 	md->last_thinktime=tick;
 
 	if (md->master_id) {
-		mob->ai_sub_hard_slavemob (md,tick);
+		mob->ai_sub_hard_slavemob(md,tick);
 		return 0;
 	}
 
@@ -1740,7 +1733,7 @@ int mob_ai_sub_lazy(struct mob_data *md, va_list args)
 /*==========================================
  * Negligent processing for mob outside PC field of view   (interval timer function)
  *------------------------------------------*/
-int mob_ai_lazy(int tid, unsigned int tick, int id, intptr_t data) {
+int mob_ai_lazy(int tid, int64 tick, int id, intptr_t data) {
 	map->foreachmob(mob->ai_sub_lazy,tick);
 	return 0;
 }
@@ -1748,7 +1741,7 @@ int mob_ai_lazy(int tid, unsigned int tick, int id, intptr_t data) {
 /*==========================================
  * Serious processing for mob in PC field of view   (interval timer function)
  *------------------------------------------*/
-int mob_ai_hard(int tid, unsigned int tick, int id, intptr_t data) {
+int mob_ai_hard(int tid, int64 tick, int id, intptr_t data) {
 
 	if (battle_config.mob_ai&0x20)
 		map->foreachmob(mob->ai_sub_lazy,tick);
@@ -1785,8 +1778,7 @@ struct item_drop* mob_setlootitem(struct item* item)
 /*==========================================
  * item drop with delay (timer function)
  *------------------------------------------*/
-int mob_delay_item_drop(int tid, unsigned int tick, int id, intptr_t data)
-{
+int mob_delay_item_drop(int tid, int64 tick, int id, intptr_t data) {
 	struct item_drop_list *list;
 	struct item_drop *ditem, *ditem_prev;
 	list=(struct item_drop_list *)data;
@@ -1840,7 +1832,7 @@ void mob_item_drop(struct mob_data *md, struct item_drop_list *dlist, struct ite
 	dlist->item = ditem;
 }
 
-int mob_timer_delete(int tid, unsigned int tick, int id, intptr_t data) {
+int mob_timer_delete(int tid, int64 tick, int id, intptr_t data) {
 	struct block_list* bl = map->id2bl(id);
 	struct mob_data* md = BL_CAST(BL_MOB, bl);
 
@@ -1885,7 +1877,7 @@ int mob_deleteslave(struct mob_data *md) {
 	return 0;
 }
 // Mob respawning through KAIZEL or NPC_REBIRTH [Skotlex]
-int mob_respawn(int tid, unsigned int tick, int id, intptr_t data) {
+int mob_respawn(int tid, int64 tick, int id, intptr_t data) {
 	struct block_list *bl = map->id2bl(id);
 
 	if(!bl) return 0;
@@ -2069,7 +2061,8 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) {
 	} pt[DAMAGELOG_SIZE];
 	int i, temp, count, m = md->bl.m, pnum = 0;
 	int dmgbltypes = 0;  // bitfield of all bl types, that caused damage to the mob and are elligible for exp distribution
-	unsigned int mvp_damage, tick = timer->gettick();
+	unsigned int mvp_damage;
+	int64 tick = timer->gettick();
 	bool rebirth, homkillonly;
 
 	mstatus = &md->status;
@@ -2610,7 +2603,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) {
 
 void mob_revive(struct mob_data *md, unsigned int hp)
 {
-	unsigned int tick = timer->gettick();
+	int64 tick = timer->gettick();
 	md->state.skillstate = MSS_IDLE;
 	md->last_thinktime = tick;
 	md->next_walktime = tick+rnd()%50+5000;
@@ -2695,8 +2688,8 @@ int mob_random_class (int *value, size_t count)
  *------------------------------------------*/
 int mob_class_change (struct mob_data *md, int class_)
 {
-	unsigned int tick = timer->gettick();
-	int i, c, hp_rate;
+	int64 tick = timer->gettick(), c = 0;
+	int i, hp_rate;
 
 	nullpo_ret(md);
 
@@ -3032,8 +3025,7 @@ struct mob_data *mob_getfriendstatus(struct mob_data *md,int cond1,int cond2) {
 /*==========================================
  * Skill use judging
  *------------------------------------------*/
-int mobskill_use(struct mob_data *md, unsigned int tick, int event)
-{
+int mobskill_use(struct mob_data *md, int64 tick, int event) {
 	struct mob_skill *ms;
 	struct block_list *fbl = NULL; //Friend bl, which can either be a BL_PC or BL_MOB depending on the situation. [Skotlex]
 	struct block_list *bl;
@@ -3249,8 +3241,7 @@ int mobskill_use(struct mob_data *md, unsigned int tick, int event)
 /*==========================================
  * Skill use event processing
  *------------------------------------------*/
-int mobskill_event(struct mob_data *md, struct block_list *src, unsigned int tick, int flag)
-{
+int mobskill_event(struct mob_data *md, struct block_list *src, int64 tick, int flag) {
 	int target_id, res = 0;
 
 	if(md->bl.prev == NULL || md->status.hp <= 0)
@@ -3487,7 +3478,7 @@ int mob_clone_spawn(struct map_session_data *sd, int16 m, int16 x, int16 y, cons
 		{
 			if( md->deletetimer != INVALID_TIMER )
 				timer->delete(md->deletetimer, mob->timer_delete);
-			md->deletetimer = timer->add (timer->gettick() + duration, mob->timer_delete, md->bl.id, 0);
+			md->deletetimer = timer->add(timer->gettick() + duration, mob->timer_delete, md->bl.id, 0);
 		}
 	}
 
diff --git a/src/map/mob.h b/src/map/mob.h
index 210983675..2f425e285 100644
--- a/src/map/mob.h
+++ b/src/map/mob.h
@@ -166,7 +166,7 @@ struct mob_data {
 	int areanpc_id; //Required in OnTouchNPC (to avoid multiple area touchs)
 	unsigned int bg_id; // BattleGround System
 
-	unsigned int next_walktime,last_thinktime,last_linktime,last_pcneartime,dmgtick;
+	int64 next_walktime, last_thinktime, last_linktime, last_pcneartime, dmgtick;
 	short move_fail_count;
 	short lootitem_count;
 	short min_chase;
@@ -175,7 +175,7 @@ struct mob_data {
 	int master_id,master_dist;
 
 	int8 skill_idx;// key of array
-	unsigned int skilldelay[MAX_MOBSKILL];
+	int64 skilldelay[MAX_MOBSKILL];
 	char npc_event[EVENT_NAME_LENGTH];
 	/**
 	 * Did this monster summon something?
@@ -266,7 +266,7 @@ struct mob_interface {
 	struct mob_db* (*db) (int index);
 	struct mob_chat* (*chat) (short id);
 	int (*makedummymobdb) (int);
-	int (*spawn_guardian_sub) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*spawn_guardian_sub) (int tid, int64 tick, int id, intptr_t data);
 	int (*skill_id2skill_idx) (int class_, uint16 skill_id);
 	int (*db_searchname) (const char *str);
 	int (*db_searchname_array_sub) (struct mob_db *mob, const char *str, int flag);
@@ -287,7 +287,7 @@ struct mob_interface {
 	int (*spawn_bg) (const char *mapname, short x, short y, const char *mobname, int class_, const char *event, unsigned int bg_id);
 	int (*can_reach) (struct mob_data *md, struct block_list *bl, int range, int state);
 	int (*linksearch) (struct block_list *bl, va_list ap);
-	int (*delayspawn) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*delayspawn) (int tid, int64 tick, int id, intptr_t data);
 	int (*setdelayspawn) (struct mob_data *md);
 	int (*count_sub) (struct block_list *bl, va_list ap);
 	int (*spawn) (struct mob_data *md);
@@ -298,24 +298,24 @@ struct mob_interface {
 	int (*ai_sub_hard_bg_ally) (struct block_list *bl, va_list ap);
 	int (*ai_sub_hard_lootsearch) (struct block_list *bl, va_list ap);
 	int (*warpchase_sub) (struct block_list *bl, va_list ap);
-	int (*ai_sub_hard_slavemob) (struct mob_data *md, unsigned int tick);
-	int (*unlocktarget) (struct mob_data *md, unsigned int tick);
-	int (*randomwalk) (struct mob_data *md, unsigned int tick);
+	int (*ai_sub_hard_slavemob) (struct mob_data *md, int64 tick);
+	int (*unlocktarget) (struct mob_data *md, int64 tick);
+	int (*randomwalk) (struct mob_data *md, int64 tick);
 	int (*warpchase) (struct mob_data *md, struct block_list *target);
-	bool (*ai_sub_hard) (struct mob_data *md, unsigned int tick);
+	bool (*ai_sub_hard) (struct mob_data *md, int64 tick);
 	int (*ai_sub_hard_timer) (struct block_list *bl, va_list ap);
 	int (*ai_sub_foreachclient) (struct map_session_data *sd, va_list ap);
 	int (*ai_sub_lazy) (struct mob_data *md, va_list args);
-	int (*ai_lazy) (int tid, unsigned int tick, int id, intptr_t data);
-	int (*ai_hard) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*ai_lazy) (int tid, int64 tick, int id, intptr_t data);
+	int (*ai_hard) (int tid, int64 tick, int id, intptr_t data);
 	struct item_drop* (*setdropitem) (int nameid, int qty, struct item_data *data);
 	struct item_drop* (*setlootitem) (struct item *item);
-	int (*delay_item_drop) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*delay_item_drop) (int tid, int64 tick, int id, intptr_t data);
 	void (*item_drop) (struct mob_data *md, struct item_drop_list *dlist, struct item_drop *ditem, int loot, int drop_rate, unsigned short flag);
-	int (*timer_delete) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*timer_delete) (int tid, int64 tick, int id, intptr_t data);
 	int (*deleteslave_sub) (struct block_list *bl, va_list ap);
 	int (*deleteslave) (struct mob_data *md);
-	int (*respawn) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*respawn) (int tid, int64 tick, int id, intptr_t data);
 	void (*log_damage) (struct mob_data *md, struct block_list *src, int damage);
 	void (*damage) (struct mob_data *md, struct block_list *src, int damage);
 	int (*dead) (struct mob_data *md, struct block_list *src, int type);
@@ -334,8 +334,8 @@ struct mob_interface {
 	struct block_list* (*getmasterhpltmaxrate) (struct mob_data *md, int rate);
 	int (*getfriendstatus_sub) (struct block_list *bl, va_list ap);
 	struct mob_data* (*getfriendstatus) (struct mob_data *md, int cond1, int cond2);
-	int (*skill_use) (struct mob_data *md, unsigned int tick, int event);
-	int (*skill_event) (struct mob_data *md, struct block_list *src, unsigned int tick, int flag);
+	int (*skill_use) (struct mob_data *md, int64 tick, int event);
+	int (*skill_event) (struct mob_data *md, struct block_list *src, int64 tick, int flag);
 	int (*is_clone) (int class_);
 	int (*clone_spawn) (struct map_session_data *sd, int16 m, int16 x, int16 y, const char *event, int master_id, int mode, int flag, unsigned int duration);
 	int (*clone_delete) (struct mob_data *md);
diff --git a/src/map/npc.c b/src/map/npc.c
index e4416c19f..ff95cf82d 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -215,7 +215,7 @@ struct npc_data* npc_name2id(const char* name)
 /**
  * Timer to check for idle time and timeout the dialog if necessary
  **/
-int npc_rr_secure_timeout_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int npc_rr_secure_timeout_timer(int tid, int64 tick, int id, intptr_t data) {
 #ifdef SECURE_NPCTIMEOUT
 	struct map_session_data* sd = NULL;
 	unsigned int timeout = NPC_SECURE_TIMEOUT_NEXT;
@@ -394,8 +394,7 @@ int npc_event_doall(const char* name)
  * Clock event execution
  * OnMinute/OnClock/OnHour/OnDay/OnDDHHMM
  *------------------------------------------*/
-int npc_event_do_clock(int tid, unsigned int tick, int id, intptr_t data)
-{
+int npc_event_do_clock(int tid, int64 tick, int id, intptr_t data) {
 	static struct tm ev_tm_b; // tracks previous execution time
 	time_t clock;
 	struct tm* t;
@@ -493,9 +492,9 @@ struct timer_event_data {
 /*==========================================
  * triger 'OnTimerXXXX' events
  *------------------------------------------*/
-int npc_timerevent(int tid, unsigned int tick, int id, intptr_t data) {
+int npc_timerevent(int tid, int64 tick, int id, intptr_t data) {
 	int old_rid, old_timer;
-	unsigned int old_tick;
+	int64 old_tick;
 	struct npc_data* nd=(struct npc_data *)map->id2bl(id);
 	struct npc_timerevent_list *te;
 	struct timer_event_data *ted = (struct timer_event_data*)data;
@@ -529,8 +528,7 @@ int npc_timerevent(int tid, unsigned int tick, int id, intptr_t data) {
 	ted->next++;
 	if( nd->u.scr.timeramount > ted->next )
 	{
-		int next;
-		next = nd->u.scr.timer_event[ ted->next ].timer - nd->u.scr.timer_event[ ted->next - 1 ].timer;
+		int next = nd->u.scr.timer_event[ ted->next ].timer - nd->u.scr.timer_event[ ted->next - 1 ].timer;
 		ted->time += next;
 		if( sd )
 			sd->npc_timer_id = timer->add(tick+next,npc->timerevent,id,(intptr_t)ted);
@@ -564,7 +562,7 @@ int npc_timerevent(int tid, unsigned int tick, int id, intptr_t data) {
  *------------------------------------------*/
 int npc_timerevent_start(struct npc_data* nd, int rid) {
 	int j;
-	unsigned int tick = timer->gettick();
+	int64 tick = timer->gettick();
 	struct map_session_data *sd = NULL; //Player to whom script is attached.
 
 	nullpo_ret(nd);
@@ -642,7 +640,7 @@ int npc_timerevent_stop(struct npc_data* nd)
 
 	if( !sd && nd->u.scr.timertick )
 	{
-		nd->u.scr.timer += DIFF_TICK(timer->gettick(),nd->u.scr.timertick); // Set 'timer' to the time that has passed since the beginning of the timers
+		nd->u.scr.timer += DIFF_TICK32(timer->gettick(),nd->u.scr.timertick); // Set 'timer' to the time that has passed since the beginning of the timers
 		nd->u.scr.timertick = 0; // Set 'tick' to zero so that we know it's off.
 	}
 
@@ -688,7 +686,7 @@ void npc_timerevent_quit(struct map_session_data* sd)
 		if( ev )
 		{
 			int old_rid,old_timer;
-			unsigned int old_tick;
+			int64 old_tick;
 
 			//Set timer related info.
 			old_rid = (nd->u.scr.rid == sd->bl.id ? 0 : nd->u.scr.rid); // Detach rid if the last attached player logged off.
@@ -715,9 +713,8 @@ void npc_timerevent_quit(struct map_session_data* sd)
  * Get the tick value of an NPC timer
  * If it's stopped, return stopped time
  *------------------------------------------*/
-int npc_gettimerevent_tick(struct npc_data* nd)
-{
-	int tick;
+int64 npc_gettimerevent_tick(struct npc_data* nd) {
+	int64 tick;
 	nullpo_ret(nd);
 
 	// TODO: Get player attached timer's tick. Now we can just get it by using 'getnpctimer' inside OnTimer event.
diff --git a/src/map/npc.h b/src/map/npc.h
index f809cb19c..e1ec6e5e4 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -35,7 +35,7 @@ struct npc_data {
 	char exname[NAME_LENGTH+1];// unique npc name
 	int chat_id;
 	int touching_id;
-	unsigned int next_walktime;
+	int64 next_walktime;
 	uint8 dir;
 	
 	unsigned size : 2;
@@ -54,7 +54,7 @@ struct npc_data {
 			short xs,ys; // OnTouch area radius
 			int guild_id;
 			int timer,timerid,timeramount,rid;
-			unsigned int timertick;
+			int64 timertick;
 			struct npc_timerevent_list *timer_event;
 			int label_list_num;
 			struct npc_label_list *label_list;
@@ -160,14 +160,14 @@ struct npc_interface {
 	int (*event_do) (const char *name);
 	int (*event_doall_id) (const char *name, int rid);
 	int (*event_doall) (const char *name);
-	int (*event_do_clock) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*event_do_clock) (int tid, int64 tick, int id, intptr_t data);
 	void (*event_do_oninit) (void);
 	int (*timerevent_export) (struct npc_data *nd, int i);
-	int (*timerevent) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*timerevent) (int tid, int64 tick, int id, intptr_t data);
 	int (*timerevent_start) (struct npc_data *nd, int rid);
 	int (*timerevent_stop) (struct npc_data *nd);
 	void (*timerevent_quit) (struct map_session_data *sd);
-	int (*gettimerevent_tick) (struct npc_data *nd);
+	int64 (*gettimerevent_tick) (struct npc_data *nd);
 	int (*settimerevent_tick) (struct npc_data *nd, int newtimer);
 	int (*event) (struct map_session_data *sd, const char *eventname, int ontouch);
 	int (*touch_areanpc_sub) (struct block_list *bl, va_list ap);
@@ -229,7 +229,7 @@ struct npc_interface {
 	/**
 	 * For the Secure NPC Timeout option (check config/Secure.h) [RR]
 	 **/
-	int (*secure_timeout_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*secure_timeout_timer) (int tid, int64 tick, int id, intptr_t data);
 };
 
 struct npc_interface *npc;
diff --git a/src/map/party.c b/src/map/party.c
index 904110452..ab05c23f7 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -831,8 +831,7 @@ int party_skill_check(struct map_session_data *sd, int party_id, uint16 skill_id
 	return 0;
 }
 
-int party_send_xy_timer(int tid, unsigned int tick, int id, intptr_t data)
-{
+int party_send_xy_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct party_data* p;
 
 	DBIterator *iter = db_iterator(party->db);
diff --git a/src/map/party.h b/src/map/party.h
index 208edb846..ab14d1a31 100644
--- a/src/map/party.h
+++ b/src/map/party.h
@@ -123,7 +123,7 @@ struct party_interface {
 	/* */
 	int (*vforeachsamemap) (int (*func)(struct block_list *,va_list),struct map_session_data *sd,int range, va_list ap);
 	int (*foreachsamemap) (int (*func)(struct block_list *,va_list),struct map_session_data *sd,int range,...);
-	int (*send_xy_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*send_xy_timer) (int tid, int64 tick, int id, intptr_t data);
 	void (*fill_member) (struct party_member* member, struct map_session_data* sd, unsigned int leader);
 	TBL_PC* (*sd_check) (int party_id, int account_id, int char_id);
 	void (*check_state) (struct party_data *p);
diff --git a/src/map/pc.c b/src/map/pc.c
index b39ae1c59..22413d567 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -117,7 +117,7 @@ bool pc_should_log_commands(struct map_session_data *sd)
 	return pc_group_should_log_commands(sd->group);
 }
 
-int pc_invincible_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int pc_invincible_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data *sd;
 
 	if( (sd=(struct map_session_data *)map->id2sd(id)) == NULL || sd->bl.type!=BL_PC )
@@ -155,7 +155,7 @@ void pc_delinvincibletimer(struct map_session_data* sd)
 	}
 }
 
-int pc_spiritball_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int pc_spiritball_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data *sd;
 	int i;
 
@@ -419,7 +419,7 @@ int pc_setrestartvalue(struct map_session_data *sd,int type) {
 /*==========================================
 	Rental System
  *------------------------------------------*/
-int pc_inventory_rental_end(int tid, unsigned int tick, int id, intptr_t data) {
+int pc_inventory_rental_end(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data *sd = map->id2sd(id);
 	if( sd == NULL )
 		return 0;
@@ -447,7 +447,7 @@ int pc_inventory_rental_clear(struct map_session_data *sd)
 void pc_inventory_rentals(struct map_session_data *sd)
 {
 	int i, c = 0;
-	unsigned int expire_tick, next_tick = UINT_MAX;
+	int64 expire_tick, next_tick = INT64_MAX;
 
 	for( i = 0; i < MAX_INVENTORY; i++ )
 	{ // Check for Rentals on Inventory
@@ -464,7 +464,7 @@ void pc_inventory_rentals(struct map_session_data *sd)
 			clif->rental_expired(sd->fd, i, sd->status.inventory[i].nameid);
 			pc->delitem(sd, i, sd->status.inventory[i].amount, 0, 0, LOG_TYPE_OTHER);
 		} else {
-			expire_tick = (unsigned int)(sd->status.inventory[i].expire_time - time(NULL)) * 1000;
+			expire_tick = (int64)(sd->status.inventory[i].expire_time - time(NULL)) * 1000;
 			clif->rental_time(sd->fd, sd->status.inventory[i].nameid, (int)(expire_tick / 1000));
 			next_tick = min(expire_tick, next_tick);
 			c++;
@@ -927,7 +927,7 @@ int pc_isequip(struct map_session_data *sd,int n)
  *------------------------------------------*/
 bool pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_time, int group_id, struct mmo_charstatus *st, bool changing_mapservers) {
 	int i;
-	unsigned long tick = timer->gettick();
+	int64 tick = timer->gettick();
 	uint32 ip = session[sd->fd]->client_addr;
 
 	sd->login_id2 = login_id2;
@@ -1971,7 +1971,7 @@ int pc_exeautobonus(struct map_session_data *sd,struct s_autobonus *autobonus)
 	return 0;
 }
 
-int pc_endautobonus(int tid, unsigned int tick, int id, intptr_t data) {
+int pc_endautobonus(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data *sd = map->id2sd(id);
 	struct s_autobonus *autobonus = (struct s_autobonus *)data;
 
@@ -4026,7 +4026,7 @@ int pc_dropitem(struct map_session_data *sd,int n,int amount)
 int pc_takeitem(struct map_session_data *sd,struct flooritem_data *fitem)
 {
 	int flag=0;
-	unsigned int tick = timer->gettick();
+	int64 tick = timer->gettick();
 	struct map_session_data *first_sd = NULL,*second_sd = NULL,*third_sd = NULL;
 	struct party_data *p=NULL;
 
@@ -4276,7 +4276,7 @@ int pc_isUseitem(struct map_session_data *sd,int n)
  *	1 = success
  *------------------------------------------*/
 int pc_useitem(struct map_session_data *sd,int n) {
-	unsigned int tick = timer->gettick();
+	int64 tick = timer->gettick();
 	int amount, nameid, i;
 	struct script_code *item_script;
 
@@ -4343,7 +4343,7 @@ int pc_useitem(struct map_session_data *sd,int n) {
 		if( i < MAX_ITEMDELAYS ) {
 			if( sd->item_delay[i].nameid ) {// found
 				if( DIFF_TICK(sd->item_delay[i].tick, tick) > 0 ) {
-					int e_tick = DIFF_TICK(sd->item_delay[i].tick, tick)/1000;
+					int e_tick = (int)(DIFF_TICK(sd->item_delay[i].tick, tick)/1000);
 					clif->msgtable_num(sd->fd, 0x746, e_tick + 1); // [%d] seconds left until you can use
 					return 0; // Delay has not expired yet
 				}
@@ -5642,7 +5642,7 @@ const char* job_name(int class_)
 	}
 }
 
-int pc_follow_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int pc_follow_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data *sd;
 	struct block_list *tbl;
 
@@ -6600,7 +6600,7 @@ void pc_respawn(struct map_session_data* sd, clr_type clrtype)
 		clif->resurrection(&sd->bl, 1); //If warping fails, send a normal stand up packet.
 }
 
-int pc_respawn_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int pc_respawn_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data *sd = map->id2sd(id);
 	if( sd != NULL )
 	{
@@ -6647,7 +6647,7 @@ void pc_damage(struct map_session_data *sd,struct block_list *src,unsigned int h
  *------------------------------------------*/
 int pc_dead(struct map_session_data *sd,struct block_list *src) {
 	int i=0,j=0,k=0;
-	unsigned int tick = timer->gettick();
+	int64 tick = timer->gettick();
 
 	for(k = 0; k < 5; k++)
 		if (sd->devotion[k]){
@@ -8250,7 +8250,7 @@ int pc_setregistry_str(struct map_session_data *sd,const char *reg,const char *v
 /*==========================================
  * Exec eventtimer for player sd (retrieved from map_session (id))
  *------------------------------------------*/
-int pc_eventtimer(int tid, unsigned int tick, int id, intptr_t data) {
+int pc_eventtimer(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data *sd=map->id2sd(id);
 	char *p = (char *)data;
 	int i;
@@ -9011,7 +9011,7 @@ int pc_calc_pvprank(struct map_session_data *sd) {
 /*==========================================
  * Calculate next sd ranking calculation from config
  *------------------------------------------*/
-int pc_calc_pvprank_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int pc_calc_pvprank_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data *sd;
 
 	sd=map->id2sd(id);
@@ -9224,10 +9224,9 @@ int pc_setsavepoint(struct map_session_data *sd, short mapindex,int x,int y)
 }
 
 /*==========================================
- * Save 1 player data  at autosave intervalle
+ * Save 1 player data at autosave intervall
  *------------------------------------------*/
-int pc_autosave(int tid, unsigned int tick, int id, intptr_t data)
-{
+int pc_autosave(int tid, int64 tick, int id, intptr_t data) {
 	int interval;
 	struct s_mapiterator* iter;
 	struct map_session_data* sd;
@@ -9278,7 +9277,7 @@ int pc_daynight_timer_sub(struct map_session_data *sd,va_list ap) {
  * timer to do the day [Yor]
  * data: 0 = called by timer, 1 = gmcommand/script
  *------------------------------------------------*/
-int map_day_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int map_day_timer(int tid, int64 tick, int id, intptr_t data) {
 	char tmp_soutput[1024];
 
 	if (data == 0 && battle_config.day_duration <= 0) // if we want a day
@@ -9298,7 +9297,7 @@ int map_day_timer(int tid, unsigned int tick, int id, intptr_t data) {
  * timer to do the night [Yor]
  * data: 0 = called by timer, 1 = gmcommand/script
  *------------------------------------------------*/
-int map_night_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int map_night_timer(int tid, int64 tick, int id, intptr_t data) {
 	char tmp_soutput[1024];
 
 	if (data == 0 && battle_config.night_duration <= 0) // if we want a night
@@ -9370,7 +9369,7 @@ bool pc_can_use_command(struct map_session_data *sd, const char *command) {
 	return atcommand->can_use(sd,command);
 }
 
-int pc_charm_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int pc_charm_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data *sd;
 	int i, type;
 
diff --git a/src/map/pc.h b/src/map/pc.h
index ff6246b22..cdf4f9dce 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -210,10 +210,10 @@ struct map_session_data {
 	char npc_str[CHATBOX_SIZE]; // for passing npc input box text to script engine
 	int npc_timer_id; //For player attached npc timers. [Skotlex]
 	unsigned int chatID;
-	time_t idletime;
-	struct{
+	int64 idletime;
+	struct {
 		int npc_id;
-		unsigned int timeout;
+		int64 timeout;
 	} progressbar; //Progress Bar [Inkfish]
 	struct{
 		char name[NAME_LENGTH];
@@ -229,17 +229,17 @@ struct map_session_data {
 	int cloneskill_id, reproduceskill_id;
 	int menuskill_id, menuskill_val, menuskill_val2;
 	int invincible_timer;
-	unsigned int canlog_tick;
-	unsigned int canuseitem_tick;	// [Skotlex]
-	unsigned int canusecashfood_tick;
-	unsigned int canequip_tick;	// [Inkfish]
-	unsigned int cantalk_tick;
-	unsigned int canskill_tick; // used to prevent abuse from no-delay ACT files
-	unsigned int cansendmail_tick; // [Mail System Flood Protection]
-	unsigned int ks_floodprotect_tick; // [Kill Steal Protection]
+	int64 canlog_tick;
+	int64 canuseitem_tick; // [Skotlex]
+	int64 canusecashfood_tick;
+	int64 canequip_tick; // [Inkfish]
+	int64 cantalk_tick;
+	int64 canskill_tick;        /// used to prevent abuse from no-delay ACT files
+	int64 cansendmail_tick;     /// Mail System Flood Protection
+	int64 ks_floodprotect_tick; /// [Kill Steal Protection]
 	struct {
 		short nameid;
-		unsigned int tick;
+		int64 tick;
 	} item_delay[MAX_ITEMDELAYS]; // [Paradox924X]
 	short weapontype1,weapontype2;
 	short disguise; // [Valaris]
@@ -460,7 +460,7 @@ struct map_session_data {
 	 * @info
 	 * - It is updated on every NPC iteration as mentioned above
 	 **/
-	unsigned int npc_idle_tick;
+	int64 npc_idle_tick;
 	/* */
 	enum npc_timeout_type npc_idle_type;
 #endif
@@ -485,7 +485,7 @@ struct map_session_data {
 	bool stealth;
 	unsigned char fontcolor;
 	unsigned int fontcolor_tid;
-	unsigned int hchsysch_tick;
+	int64 hchsysch_tick;
 	
 	/* [Ind/Hercules] */
 	struct sc_display_entry **sc_display;
@@ -695,7 +695,7 @@ enum { ADDITEM_EXIST , ADDITEM_NEW , ADDITEM_OVERAMOUNT };
  * All cooldowns are reset when server is restarted.
  **/
 struct item_cd {
-	unsigned int tick[MAX_ITEMDELAYS];//tick
+	int64 tick[MAX_ITEMDELAYS];//tick
 	short nameid[MAX_ITEMDELAYS];//skill id
 };
 
@@ -796,7 +796,7 @@ struct pc_interface {
 	
 	int (*addautobonus) (struct s_autobonus *bonus,char max,const char *bonus_script,short rate,unsigned int dur,short atk_type,const char *o_script,unsigned short pos,bool onskill);
 	int (*exeautobonus) (struct map_session_data* sd,struct s_autobonus *bonus);
-	int (*endautobonus) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*endautobonus) (int tid, int64 tick, int id, intptr_t data);
 	int (*delautobonus) (struct map_session_data* sd,struct s_autobonus *bonus,char max,bool restore);
 	
 	int (*bonus) (struct map_session_data *sd,int type,int val);
@@ -878,7 +878,7 @@ struct pc_interface {
 	int (*addeventtimercount) (struct map_session_data *sd,const char *name,int tick);
 	
 	int (*calc_pvprank) (struct map_session_data *sd);
-	int (*calc_pvprank_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*calc_pvprank_timer) (int tid, int64 tick, int id, intptr_t data);
 	
 	int (*ismarried) (struct map_session_data *sd);
 	int (*marriage) (struct map_session_data *sd,struct map_session_data *dstsd);
@@ -909,8 +909,8 @@ struct pc_interface {
 	int (*set_hate_mob) (struct map_session_data *sd, int pos, struct block_list *bl);
 	
 	int (*readdb) (void);
-	int (*map_day_timer) (int tid, unsigned int tick, int id, intptr_t data); // by [yor]
-	int (*map_night_timer) (int tid, unsigned int tick, int id, intptr_t data); // by [yor]
+	int (*map_day_timer) (int tid, int64 tick, int id, intptr_t data); // by [yor]
+	int (*map_night_timer) (int tid, int64 tick, int id, intptr_t data); // by [yor]
 	// Rental System
 	void (*inventory_rentals) (struct map_session_data *sd);
 	int (*inventory_rental_clear) (struct map_session_data *sd);
@@ -934,10 +934,10 @@ struct pc_interface {
 	int (*level_penalty_mod) (int diff, unsigned char race, unsigned short mode, int type);
 	int (*calc_skillpoint) (struct map_session_data* sd);
 	
-	int (*invincible_timer) (int tid, unsigned int tick, int id, intptr_t data);
-	int (*spiritball_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*invincible_timer) (int tid, int64 tick, int id, intptr_t data);
+	int (*spiritball_timer) (int tid, int64 tick, int id, intptr_t data);
 	int (*check_banding) ( struct block_list *bl, va_list ap );
-	int (*inventory_rental_end) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*inventory_rental_end) (int tid, int64 tick, int id, intptr_t data);
 	void (*check_skilltree) (struct map_session_data *sd, int skill_id);
 	int (*bonus_autospell) (struct s_autospell *spell, int max, short id, short lv, short rate, short flag, short card_id);
 	int (*bonus_autospell_onskill) (struct s_autospell *spell, int max, short src_skill, short id, short lv, short rate, short card_id);
@@ -945,16 +945,16 @@ struct pc_interface {
 	int (*bonus_addeff_onskill) (struct s_addeffectonskill* effect, int max, enum sc_type id, short rate, short skill_id, unsigned char target);
 	int (*bonus_item_drop) (struct s_add_drop *drop, const short max, short id, short group, int race, int rate);
 	void (*calcexp) (struct map_session_data *sd, unsigned int *base_exp, unsigned int *job_exp, struct block_list *src);
-	int (*respawn_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*respawn_timer) (int tid, int64 tick, int id, intptr_t data);
 	int (*jobchange_killclone) (struct block_list *bl, va_list ap);
 	int (*getstat) (struct map_session_data* sd, int type);
 	int (*setstat) (struct map_session_data* sd, int type, int val);
-	int (*eventtimer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*eventtimer) (int tid, int64 tick, int id, intptr_t data);
 	int (*daynight_timer_sub) (struct map_session_data *sd,va_list ap);
-	int (*charm_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*charm_timer) (int tid, int64 tick, int id, intptr_t data);
 	bool (*readdb_levelpenalty) (char* fields[], int columns, int current);
-	int (*autosave) (int tid, unsigned int tick, int id, intptr_t data);
-	int (*follow_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*autosave) (int tid, int64 tick, int id, intptr_t data);
+	int (*follow_timer) (int tid, int64 tick, int id, intptr_t data);
 	void (*read_skill_tree) (void);
 	int (*isUseitem) (struct map_session_data *sd,int n);
 	int (*show_steal) (struct block_list *bl,va_list ap);
diff --git a/src/map/pet.c b/src/map/pet.c
index 023059a6b..a20cc0df0 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -186,7 +186,7 @@ int pet_sc_check(struct map_session_data *sd, int type)
 	return 0;
 }
 
-int pet_hungry(int tid, unsigned int tick, int id, intptr_t data) {
+int pet_hungry(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data *sd;
 	struct pet_data *pd;
 	int interval;
@@ -666,7 +666,7 @@ int pet_equipitem(struct map_session_data *sd,int index) {
 	clif->send_petdata(NULL, sd->pd, 3, sd->pd->vd.head_bottom);
 	if (battle_config.pet_equip_required) {
 		//Skotlex: start support timers if need
-		unsigned int tick = timer->gettick();
+		int64 tick = timer->gettick();
 		if (pd->s_skill && pd->s_skill->timer == INVALID_TIMER) {
 			if (pd->s_skill->id)
 				pd->s_skill->timer=timer->add(tick+pd->s_skill->delay*1000, pet->skill_support_timer, sd->bl.id, 0);
@@ -771,8 +771,7 @@ int pet_food(struct map_session_data *sd, struct pet_data *pd)
 	return 0;
 }
 
-int pet_randomwalk(struct pet_data *pd,unsigned int tick)
-{
+int pet_randomwalk(struct pet_data *pd, int64 tick) {
 	nullpo_ret(pd);
 
 	Assert((pd->msd == 0) || (pd->msd->pd == pd));
@@ -812,8 +811,7 @@ int pet_randomwalk(struct pet_data *pd,unsigned int tick)
 	return 0;
 }
 
-int pet_ai_sub_hard(struct pet_data *pd, struct map_session_data *sd, unsigned int tick)
-{
+int pet_ai_sub_hard(struct pet_data *pd, struct map_session_data *sd, int64 tick) {
 	struct block_list *target = NULL;
 
 	if(pd->bl.prev == NULL || sd == NULL || sd->bl.prev == NULL)
@@ -924,16 +922,15 @@ int pet_ai_sub_hard(struct pet_data *pd, struct map_session_data *sd, unsigned i
 	return 0;
 }
 
-int pet_ai_sub_foreachclient(struct map_session_data *sd,va_list ap)
-{
-	unsigned int tick = va_arg(ap,unsigned int);
+int pet_ai_sub_foreachclient(struct map_session_data *sd,va_list ap) {
+	int64 tick = va_arg(ap,int64);
 	if(sd->status.pet_id && sd->pd)
 		pet->ai_sub_hard(sd->pd,sd,tick);
 
 	return 0;
 }
 
-int pet_ai_hard(int tid, unsigned int tick, int id, intptr_t data) {
+int pet_ai_hard(int tid, int64 tick, int id, intptr_t data) {
 	map->foreachpc(pet->ai_sub_foreachclient,tick);
 
 	return 0;
@@ -966,7 +963,7 @@ int pet_ai_sub_hard_lootsearch(struct block_list *bl,va_list ap)
 	return 0;
 }
 
-int pet_delay_item_drop(int tid, unsigned int tick, int id, intptr_t data) {
+int pet_delay_item_drop(int tid, int64 tick, int id, intptr_t data) {
 	struct item_drop_list *list;
 	struct item_drop *ditem, *ditem_prev;
 	list=(struct item_drop_list *)data;
@@ -1034,7 +1031,7 @@ int pet_lootitem_drop(struct pet_data *pd,struct map_session_data *sd)
 /*==========================================
  * pet bonus giving skills [Valaris] / Rewritten by [Skotlex]
  *------------------------------------------*/ 
-int pet_skill_bonus_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int pet_skill_bonus_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data *sd=map->id2sd(id);
 	struct pet_data *pd;
 	int bonus;
@@ -1075,7 +1072,7 @@ int pet_skill_bonus_timer(int tid, unsigned int tick, int id, intptr_t data) {
 /*==========================================
  * pet recovery skills [Valaris] / Rewritten by [Skotlex]
  *------------------------------------------*/ 
-int pet_recovery_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int pet_recovery_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data *sd=map->id2sd(id);
 	struct pet_data *pd;
 	
@@ -1102,7 +1099,7 @@ int pet_recovery_timer(int tid, unsigned int tick, int id, intptr_t data) {
 	return 0;
 }
 
-int pet_heal_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int pet_heal_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data *sd=map->id2sd(id);
 	struct status_data *st;
 	struct pet_data *pd;
@@ -1139,7 +1136,7 @@ int pet_heal_timer(int tid, unsigned int tick, int id, intptr_t data) {
 /*==========================================
  * pet support skills [Skotlex]
  *------------------------------------------*/ 
-int pet_skill_support_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int pet_skill_support_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data *sd=map->id2sd(id);
 	struct pet_data *pd;
 	struct status_data *st;
diff --git a/src/map/pet.h b/src/map/pet.h
index 2f8e0b7c2..f95e860a2 100644
--- a/src/map/pet.h
+++ b/src/map/pet.h
@@ -86,7 +86,7 @@ struct pet_data {
 		unsigned skillbonus : 1;
 	} state;
 	int move_fail_count;
-	unsigned int next_walktime,last_thinktime;
+	int64 next_walktime, last_thinktime;
 	short rate_fix;	//Support rate as modified by intimacy (1000 = 100%) [Skotlex]
 
 	struct pet_recovery* recovery;
@@ -116,7 +116,7 @@ struct pet_interface {
 	int (*attackskill) (struct pet_data *pd, int target_id);
 	int (*target_check) (struct map_session_data *sd, struct block_list *bl, int type);
 	int (*sc_check) (struct map_session_data *sd, int type);
-	int (*hungry) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*hungry) (int tid, int64 tick, int id, intptr_t data);
 	int (*search_petDB_index) (int key, int type);
 	int (*hungry_timer_delete) (struct pet_data *pd);
 	int (*performance) (struct map_session_data *sd, struct pet_data *pd);
@@ -135,16 +135,16 @@ struct pet_interface {
 	int (*change_name) (struct map_session_data *sd, char *name);
 	int (*change_name_ack) (struct map_session_data *sd, char *name, int flag);
 	int (*equipitem) (struct map_session_data *sd, int index);
-	int (*randomwalk) (struct pet_data *pd, unsigned int tick);
-	int (*ai_sub_hard) (struct pet_data *pd, struct map_session_data *sd, unsigned int tick);
+	int (*randomwalk) (struct pet_data *pd, int64 tick);
+	int (*ai_sub_hard) (struct pet_data *pd, struct map_session_data *sd, int64 tick);
 	int (*ai_sub_foreachclient) (struct map_session_data *sd, va_list ap);
-	int (*ai_hard) (int tid, unsigned int tick, int id, intptr_t data);
-	int (*delay_item_drop) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*ai_hard) (int tid, int64 tick, int id, intptr_t data);
+	int (*delay_item_drop) (int tid, int64 tick, int id, intptr_t data);
 	int (*lootitem_drop) (struct pet_data *pd, struct map_session_data *sd);
-	int (*skill_bonus_timer) (int tid, unsigned int tick, int id, intptr_t data);
-	int (*recovery_timer) (int tid, unsigned int tick, int id, intptr_t data);
-	int (*heal_timer) (int tid, unsigned int tick, int id, intptr_t data);
-	int (*skill_support_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*skill_bonus_timer) (int tid, int64 tick, int id, intptr_t data);
+	int (*recovery_timer) (int tid, int64 tick, int id, intptr_t data);
+	int (*heal_timer) (int tid, int64 tick, int id, intptr_t data);
+	int (*skill_support_timer) (int tid, int64 tick, int id, intptr_t data);
 	int (*read_db) ();
 };
 
diff --git a/src/map/script.c b/src/map/script.c
index efc3e0264..6198f21da 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -3184,7 +3184,7 @@ void script_stop_instances(struct script_code *code) {
 /*==========================================
  * Timer function for sleep
  *------------------------------------------*/
-int run_script_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int run_script_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct script_state *st     = idb_get(script->st_db,(int)data);
 	if( st ) {
 		TBL_PC *sd = map->id2sd(st->rid);
@@ -7993,7 +7993,7 @@ BUILDIN(gettimetick) { /* Asgard Version */
 		case 0:
 		default:
 			//type 0:(System Ticks)
-			script_pushint(st,timer->gettick());
+			script_pushint(st,(int)timer->gettick()); // TODO: change this to int64 when we'll support 64 bit script values
 			break;
 	}
 	return true;
@@ -8821,7 +8821,7 @@ BUILDIN(getnpctimer) {
 	}
 	
 	switch( type ) {
-		case 0: val = npc->gettimerevent_tick(nd); break;
+		case 0: val = (int)npc->gettimerevent_tick(nd); break; // FIXME: change this to int64 when we'll support 64 bit script values
 		case 1:
 			if( nd->u.scr.rid ) {
 				sd = map->id2sd(nd->u.scr.rid);
@@ -9505,7 +9505,7 @@ BUILDIN(getstatus)
 			
 			if( td ) {
 				// return the amount of time remaining
-				script_pushint(st, td->tick - timer->gettick());
+				script_pushint(st, (int)(td->tick - timer->gettick())); // TODO: change this to int64 when we'll support 64 bit script values
 			}
 		}
 			break;
@@ -12688,7 +12688,7 @@ BUILDIN(summon)
 	const char *str,*event="";
 	TBL_PC *sd;
 	struct mob_data *md;
-	int tick = timer->gettick();
+	int64 tick = timer->gettick();
 	
 	sd=script->rid2sd(st);
 	if (!sd) return true;
@@ -14543,7 +14543,7 @@ BUILDIN(checkidle) {
 		sd = script->rid2sd(st);
 	
 	if (sd)
-		script_pushint(st, DIFF_TICK(last_tick, sd->idletime));
+		script_pushint(st, DIFF_TICK32(last_tick, sd->idletime)); // TODO: change this to int64 when we'll support 64 bit script values
 	else
 		script_pushint(st, 0);
 	
diff --git a/src/map/script.h b/src/map/script.h
index 400916af8..c6cb6070b 100644
--- a/src/map/script.h
+++ b/src/map/script.h
@@ -536,7 +536,7 @@ struct script_interface {
 	void (*label_add)(int key, int pos);
 	void (*run) (struct script_code *rootscript,int pos,int rid,int oid);
 	void (*run_main) (struct script_state *st);
-	int (*run_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*run_timer) (int tid, int64 tick, int id, intptr_t data);
 	int (*set_var) (struct map_session_data *sd, char *name, void *val);
 	void (*stop_instances) (struct script_code *code);
 	void (*free_code) (struct script_code* code);
diff --git a/src/map/skill.c b/src/map/skill.c
index 36a509876..b70e58c46 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -639,7 +639,7 @@ struct s_skill_unit_layout* skill_get_unit_layout (uint16 skill_id, uint16 skill
 /*==========================================
  *
  *------------------------------------------*/
-int skill_additional_effect(struct block_list* src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int attack_type, int dmg_lv, unsigned int tick) {
+int skill_additional_effect(struct block_list* src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int attack_type, int dmg_lv, int64 tick) {
 	struct map_session_data *sd, *dstsd;
 	struct mob_data *md, *dstmd;
 	struct status_data *sstatus, *tstatus;
@@ -1569,7 +1569,7 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
 	return 0;
 }
 
-int skill_onskillusage(struct map_session_data *sd, struct block_list *bl, uint16 skill_id, unsigned int tick) {
+int skill_onskillusage(struct map_session_data *sd, struct block_list *bl, uint16 skill_id, int64 tick) {
 	int temp, skill_lv, i, type, notok;
 	struct block_list *tbl;
 
@@ -1667,7 +1667,7 @@ int skill_onskillusage(struct map_session_data *sd, struct block_list *bl, uint1
  * type of skills, so not every instance of skill->additional_effect needs a call
  * to this one.
  */
-int skill_counter_additional_effect(struct block_list* src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int attack_type, unsigned int tick) {
+int skill_counter_additional_effect(struct block_list* src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int attack_type, int64 tick) {
 	int rate;
 	struct map_session_data *sd=NULL;
 	struct map_session_data *dstsd=NULL;
@@ -2109,7 +2109,7 @@ int skill_magic_reflect(struct block_list* src, struct block_list* bl, int type)
  * flag&0x2000 is used to signal that the skill_lv should be passed as -1 to the
  *      client (causes player characters to not scream skill name)
  *-------------------------------------------------------------------------*/
-int skill_attack (int attack_type, struct block_list* src, struct block_list *dsrc, struct block_list *bl, uint16 skill_id, uint16 skill_lv, unsigned int tick, int flag) {
+int skill_attack(int attack_type, struct block_list* src, struct block_list *dsrc, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int64 tick, int flag) {
 	struct Damage dmg;
 	struct status_data *sstatus, *tstatus;
 	struct status_change *sc;
@@ -2357,7 +2357,7 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
 				break;
 		}	//Switch End
 		if (flag) { //Possible to chain
-			if ( (flag = DIFF_TICK(sd->ud.canact_tick, tick)) < 50 ) flag = 50;/* less is a waste. */
+			if ( (flag = DIFF_TICK32(sd->ud.canact_tick, tick)) < 50 ) flag = 50;/* less is a waste. */
 			sc_start2(src,SC_COMBOATTACK,100,skill_id,bl->id,flag);
 			clif->combo_delay(src, flag);
 		}
@@ -2767,21 +2767,21 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
  * Checking bl battle flag and display dammage
  * then call func with source,target,skill_id,skill_lv,tick,flag
  *------------------------------------------*/
-int skill_area_sub (struct block_list *bl, va_list ap) {
+int skill_area_sub(struct block_list *bl, va_list ap) {
 	struct block_list *src;
 	uint16 skill_id,skill_lv;
 	int flag;
-	unsigned int tick;
+	int64 tick;
 	SkillFunc func;
 
 	nullpo_ret(bl);
 
-	src=va_arg(ap,struct block_list *);
-	skill_id=va_arg(ap,int);
-	skill_lv=va_arg(ap,int);
-	tick=va_arg(ap,unsigned int);
-	flag=va_arg(ap,int);
-	func=va_arg(ap,SkillFunc);
+	src = va_arg(ap,struct block_list *);
+	skill_id = va_arg(ap,int);
+	skill_lv = va_arg(ap,int);
+	tick = va_arg(ap,int64);
+	flag = va_arg(ap,int);
+	func = va_arg(ap,SkillFunc);
 
 	if(battle->check_target(src,bl,flag) > 0) {
 		// several splash skills need this initial dummy packet to display correctly
@@ -3036,14 +3036,14 @@ int skill_check_condition_mercenary(struct block_list *bl, int skill_id, int lv,
 /*==========================================
  * what the hell it doesn't need to receive this many params, it doesn't do anything ~_~
  *------------------------------------------*/
-int skill_area_sub_count (struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, unsigned int tick, int flag) {
+int skill_area_sub_count(struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int64 tick, int flag) {
 	return 1;
 }
 
 /*==========================================
  *
  *------------------------------------------*/
-int skill_timerskill(int tid, unsigned int tick, int id, intptr_t data) {
+int skill_timerskill(int tid, int64 tick, int id, intptr_t data) {
 	struct block_list *src = map->id2bl(id),*target;
 	struct unit_data *ud = unit->bl2ud(src);
 	struct skill_timerskill *skl;
@@ -3153,7 +3153,7 @@ int skill_timerskill(int tid, unsigned int tick, int id, intptr_t data) {
 				case WL_TETRAVORTEX_WIND:
 				case WL_TETRAVORTEX_GROUND:
 					clif->skill_nodamage(src, target, skl->skill_id, skl->skill_lv, 1);
-					skill_attack(BF_MAGIC, src, src, target, skl->skill_id, skl->skill_lv, tick, skl->flag); 
+					skill->attack(BF_MAGIC, src, src, target, skl->skill_id, skl->skill_lv, tick, skl->flag); 
 					skill->toggle_magicpower(src, skl->skill_id); // only the first hit will be amplify
 					if( skl->type == 4 ){ 
 						const enum sc_type scs[] = { SC_BURNING, SC_BLOODING, SC_FROSTMISTY, SC_STUN }; // status inflicts are depend on what summoned element is used.
@@ -3269,8 +3269,7 @@ int skill_timerskill(int tid, unsigned int tick, int id, intptr_t data) {
 /*==========================================
  *
  *------------------------------------------*/
-int skill_addtimerskill (struct block_list *src, unsigned int tick, int target, int x,int y, uint16 skill_id, uint16 skill_lv, int type, int flag)
-{
+int skill_addtimerskill(struct block_list *src, int64 tick, int target, int x,int y, uint16 skill_id, uint16 skill_lv, int type, int flag) {
 	int i;
 	struct unit_data *ud;
 	nullpo_retr(1, src);
@@ -3334,7 +3333,7 @@ int skill_activate_reverbetion( struct block_list *bl, va_list ap) {
 		return 0;
 	if( su->alive && (sg = su->group) && sg->skill_id == WM_REVERBERATION ) {
 		map->foreachinrange(skill->trap_splash, bl, skill->get_splash(sg->skill_id, sg->skill_lv), sg->bl_flag, bl, timer->gettick());
-		su->limit=DIFF_TICK(timer->gettick(),sg->tick);
+		su->limit=DIFF_TICK32(timer->gettick(),sg->tick);
 		sg->unit_id = UNT_USED_TRAPS;
 	}
 	return 0;
@@ -3355,7 +3354,7 @@ int skill_reveal_trap (struct block_list *bl, va_list ap) {
  *
  *
  *------------------------------------------*/
-int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, unsigned int tick, int flag) {
+int skill_castend_damage_id(struct block_list* src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int64 tick, int flag) {
 	struct map_session_data *sd = NULL;
 	struct status_data *tstatus;
 	struct status_change *sc;
@@ -4557,8 +4556,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
 /*==========================================
  *
  *------------------------------------------*/
-int skill_castend_id(int tid, unsigned int tick, int id, intptr_t data)
-{
+int skill_castend_id(int tid, int64 tick, int id, intptr_t data) {
 	struct block_list *target, *src;
 	struct map_session_data *sd;
 	struct mob_data *md;
@@ -4885,8 +4883,7 @@ int skill_castend_id(int tid, unsigned int tick, int id, intptr_t data)
 /*==========================================
  *
  *------------------------------------------*/
-int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, unsigned int tick, int flag)
-{
+int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int64 tick, int flag) {
 	struct map_session_data *sd, *dstsd;
 	struct mob_data *md, *dstmd;
 	struct homun_data *hd;
@@ -4965,11 +4962,11 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
 					clif->skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
 					return 0;
 				}
-				return skill->castend_damage_id (src, bl, skill_id, skill_lv, tick, flag);
+				return skill->castend_damage_id(src, bl, skill_id, skill_lv, tick, flag);
 			}
 			break;
 		case NPC_SMOKING: //Since it is a self skill, this one ends here rather than in damage_id. [Skotlex]
-			return skill->castend_damage_id (src, bl, skill_id, skill_lv, tick, flag);
+			return skill->castend_damage_id(src, bl, skill_id, skill_lv, tick, flag);
 		case MH_STEINWAND: {
 			struct block_list *s_src = battle->get_master(src);
 			short ret = 0;
@@ -7107,8 +7104,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
 						case UNT_TALKIEBOX:
 							su->group->unit_id = UNT_USED_TRAPS;
 							clif->changetraplook(bl, UNT_USED_TRAPS);
-							su->group->limit=DIFF_TICK(tick+1500,su->group->tick);
-							su->limit=DIFF_TICK(tick+1500,su->group->tick);
+							su->group->limit=DIFF_TICK32(tick+1500,su->group->tick);
+							su->limit=DIFF_TICK32(tick+1500,su->group->tick);
 					}
 				}
 			}
@@ -9119,7 +9116,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
 					md->special_state.ai = AI_ZANZOU;
 					if( md->deletetimer != INVALID_TIMER )
 						timer->delete(md->deletetimer, mob->timer_delete);
-					md->deletetimer = timer->add (timer->gettick() + skill->get_time(skill_id, skill_lv), mob->timer_delete, md->bl.id, 0);
+					md->deletetimer = timer->add(timer->gettick() + skill->get_time(skill_id, skill_lv), mob->timer_delete, md->bl.id, 0);
 					mob->spawn( md );
 					pc->setinvincibletimer(sd,500);// unlock target lock
 					clif->skill_nodamage(src,bl,skill_id,skill_lv,1);
@@ -9352,7 +9349,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
 /*==========================================
  *
  *------------------------------------------*/
-int skill_castend_pos(int tid, unsigned int tick, int id, intptr_t data) {
+int skill_castend_pos(int tid, int64 tick, int id, intptr_t data) {
 	struct block_list* src = map->id2bl(id);
 	int maxcount;
 	struct map_session_data *sd;
@@ -9652,8 +9649,7 @@ int skill_castend_map (struct map_session_data *sd, uint16 skill_id, const char
 /*==========================================
  *
  *------------------------------------------*/
-int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, uint16 skill_lv, unsigned int tick, int flag)
-{
+int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, uint16 skill_lv, int64 tick, int flag) {
 	struct map_session_data* sd;
 	struct status_change* sc;
 	struct status_change_entry *sce;
@@ -9968,7 +9964,7 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui
 					md->special_state.ai = (skill_id == AM_SPHEREMINE) ? AI_SPHERE : AI_FLORA;
 					if( md->deletetimer != INVALID_TIMER )
 						timer->delete(md->deletetimer, mob->timer_delete);
-					md->deletetimer = timer->add (timer->gettick() + skill->get_time(skill_id,skill_lv), mob->timer_delete, md->bl.id, 0);
+					md->deletetimer = timer->add(timer->gettick() + skill->get_time(skill_id,skill_lv), mob->timer_delete, md->bl.id, 0);
 					mob->spawn (md); //Now it is ready for spawning.
 				}
 			}
@@ -10066,7 +10062,7 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui
 					{
 						if( md->deletetimer != INVALID_TIMER )
 							timer->delete(md->deletetimer, mob->timer_delete);
-						md->deletetimer = timer->add (tick + i, mob->timer_delete, md->bl.id, 0);
+						md->deletetimer = timer->add(tick + i, mob->timer_delete, md->bl.id, 0);
 					}
 					mob->spawn (md);
 				}
@@ -10197,7 +10193,7 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui
 					md->special_state.ai = AI_FLORA;
 					if( md->deletetimer != INVALID_TIMER )
 						timer->delete(md->deletetimer, mob->timer_delete);
-					md->deletetimer = timer->add (timer->gettick() + skill->get_time(skill_id, skill_lv), mob->timer_delete, md->bl.id, 0);
+					md->deletetimer = timer->add(timer->gettick() + skill->get_time(skill_id, skill_lv), mob->timer_delete, md->bl.id, 0);
 					mob->spawn( md );
 				}
 			}
@@ -10605,7 +10601,7 @@ struct skill_unit_group* skill_unitsetting(struct block_list *src, uint16 skill_
 					old_sg->skill_id == SA_VIOLENTGALE
 				) && old_sg->limit > 0)
 				{	//Use the previous limit (minus the elapsed time) [Skotlex]
-					limit = old_sg->limit - DIFF_TICK(timer->gettick(), old_sg->tick);
+					limit = old_sg->limit - DIFF_TICK32(timer->gettick(), old_sg->tick);
 					if (limit < 0)	//This can happen...
 						limit = skill->get_time(skill_id,skill_lv);
 				}
@@ -10962,7 +10958,7 @@ struct skill_unit_group* skill_unitsetting(struct block_list *src, uint16 skill_
 /*==========================================
  *
  *------------------------------------------*/
-int skill_unit_onplace (struct skill_unit *src, struct block_list *bl, unsigned int tick) {
+int skill_unit_onplace(struct skill_unit *src, struct block_list *bl, int64 tick) {
 	struct skill_unit_group *sg;
 	struct block_list *ss;
 	struct status_change *sc;
@@ -11002,14 +10998,14 @@ int skill_unit_onplace (struct skill_unit *src, struct block_list *bl, unsigned
 				if( status->change_start(bl,type,10000,sg->skill_lv,1,sg->group_id,0,sec,8) ) {
 					const struct TimerData* td = sc->data[type]?timer->get(sc->data[type]->timer):NULL;
 					if( td )
-						sec = DIFF_TICK(td->tick, tick);
+						sec = DIFF_TICK32(td->tick, tick);
 					map->moveblock(bl, src->bl.x, src->bl.y, tick);
 					clif->fixpos(bl);
 					sg->val2 = bl->id;
 				}
 				else
 					sec = 3000; //Couldn't trap it?
-				sg->limit = DIFF_TICK(tick,sg->tick)+sec;
+				sg->limit = DIFF_TICK32(tick,sg->tick)+sec;
 			}
 			break;
 		case UNT_SAFETYWALL:
@@ -11135,7 +11131,7 @@ int skill_unit_onplace (struct skill_unit *src, struct block_list *bl, unsigned
 		//	case UNT_ICEWALL: //Destroy the cell. [Skotlex]
 		//		src->val1 = 0;
 		//		if(src->limit + sg->tick > tick + 700)
-		//			src->limit = DIFF_TICK(tick+700,sg->tick);
+		//			src->limit = DIFF_TICK32(tick+700,sg->tick);
 		//		break;
 
 		case UNT_MOONLIT:
@@ -11173,7 +11169,7 @@ int skill_unit_onplace (struct skill_unit *src, struct block_list *bl, unsigned
 /*==========================================
  *
  *------------------------------------------*/
-int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, unsigned int tick) {
+int skill_unit_onplace_timer(struct skill_unit *src, struct block_list *bl, int64 tick) {
 	struct skill_unit_group *sg;
 	struct block_list *ss;
 	TBL_PC* tsd;
@@ -11217,7 +11213,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
 
 	if ((ts = skill->unitgrouptickset_search(bl,sg,tick))) {
 		//Not all have it, eg: Traps don't have it even though they can be hit by Heaven's Drive [Skotlex]
-		diff = DIFF_TICK(tick,ts->tick);
+		diff = DIFF_TICK32(tick,ts->tick);
 		if (diff < 0)
 			return 0;
 		ts->tick = tick+sg->interval;
@@ -11317,7 +11313,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
 								status->charge(ss, 0, 8); //costs additional 8 SP if miss
 						} else { // mobs
 							//should end when out of sp.
-							sg->limit = DIFF_TICK(tick,sg->tick);
+							sg->limit = DIFF_TICK32(tick,sg->tick);
 							break;
 						}
 					} while( x == bl->x && y == bl->y
@@ -11360,7 +11356,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
 				skill->blown(&src->bl,bl,skill->get_blewcount(sg->skill_id,sg->skill_lv),unit->getdir(bl),0);
 				sg->unit_id = UNT_USED_TRAPS;
 				clif->changetraplook(&src->bl, UNT_USED_TRAPS);
-				sg->limit=DIFF_TICK(tick,sg->tick)+1500;
+				sg->limit=DIFF_TICK32(tick,sg->tick)+1500;
 			}
 			break;
 
@@ -11371,7 +11367,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
 				if( status->change_start(bl,type,10000,sg->skill_lv,sg->group_id,0,0,sec, 8) ) {
 					const struct TimerData* td = tsc->data[type]?timer->get(tsc->data[type]->timer):NULL;
 					if( td )
-						sec = DIFF_TICK(td->tick, tick);
+						sec = DIFF_TICK32(td->tick, tick);
 					if( sg->unit_id == UNT_MANHOLE || battle_config.skill_trap_type || !map_flag_gvg2(src->bl.m) ) {
 						unit->movepos(bl, src->bl.x, src->bl.y, 0, 0);
 						clif->fixpos(bl);
@@ -11388,7 +11384,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
 					 **/
 					clif->changetraplook(&src->bl, UNT_ANKLESNARE);
 				}
-				sg->limit = DIFF_TICK(tick,sg->tick)+sec;
+				sg->limit = DIFF_TICK32(tick,sg->tick)+sec;
 				sg->interval = -1;
 				src->range = 0;
 			}
@@ -11440,7 +11436,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
 				map->foreachinrange(skill->trap_splash,&src->bl, skill->get_splash(sg->skill_id, sg->skill_lv), sg->bl_flag, &src->bl,tick);
 			if (sg->unit_id != UNT_FIREPILLAR_ACTIVE)
 				clif->changetraplook(&src->bl, sg->unit_id==UNT_LANDMINE?UNT_FIREPILLAR_ACTIVE:UNT_USED_TRAPS);
-			sg->limit=DIFF_TICK(tick,sg->tick)+1500 +
+			sg->limit=DIFF_TICK32(tick,sg->tick)+1500 +
 				(sg->unit_id== UNT_CLUSTERBOMB || sg->unit_id== UNT_ICEBOUNDTRAP?1000:0);// Cluster Bomb/Icebound has 1s to disappear once activated.
 			sg->unit_id = UNT_USED_TRAPS; //Changed ID so it does not invoke a for each in area again.
 			break;
@@ -11452,7 +11448,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
 				clif->talkiebox(&src->bl, sg->valstr);
 				sg->unit_id = UNT_USED_TRAPS;
 				clif->changetraplook(&src->bl, UNT_USED_TRAPS);
-				sg->limit = DIFF_TICK(tick, sg->tick) + 5000;
+				sg->limit = DIFF_TICK32(tick, sg->tick) + 5000;
 				sg->val2 = -1;
 			}
 			break;
@@ -11629,7 +11625,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
 			                    &src->bl,tick);
 			sg->unit_id = UNT_USED_TRAPS;
 			//clif->changetraplook(&src->bl, UNT_FIREPILLAR_ACTIVE);
-			sg->limit=DIFF_TICK(tick,sg->tick)+1500;
+			sg->limit=DIFF_TICK32(tick,sg->tick)+1500;
 			break;
 		/**
 		 * 3rd stuff
@@ -11682,7 +11678,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
 		case UNT_REVERBERATION:
 			clif->changetraplook(&src->bl,UNT_USED_TRAPS);
 			map->foreachinrange(skill->trap_splash,&src->bl, skill->get_splash(sg->skill_id, sg->skill_lv), sg->bl_flag, &src->bl,tick);
-			sg->limit = DIFF_TICK(tick,sg->tick)+1000;
+			sg->limit = DIFF_TICK32(tick,sg->tick)+1000;
 			sg->unit_id = UNT_USED_TRAPS;
 			break;
 
@@ -11694,7 +11690,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
 			if( !(status_get_mode(bl)&MD_BOSS) && ss != bl && battle->check_target(&src->bl, bl, BCT_PARTY) > 0 ) {
 				if( !(tsc && tsc->data[type]) ){
 					sc_start(bl, type, 100, sg->skill_lv, skill->get_time2(sg->skill_id,sg->skill_lv));
-					sg->limit = DIFF_TICK(tick,sg->tick);
+					sg->limit = DIFF_TICK32(tick,sg->tick);
 					sg->unit_id = UNT_USED_TRAPS;
 				}
 			}
@@ -11706,13 +11702,13 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
 					if( sc_start(bl, type, 100, sg->skill_lv, sec) ) {
 						const struct TimerData* td = tsc->data[type]?timer->get(tsc->data[type]->timer):NULL;
 						if( td )
-							sec = DIFF_TICK(td->tick, tick);
+							sec = DIFF_TICK32(td->tick, tick);
 						///map->moveblock(bl, src->bl.x, src->bl.y, tick); // in official server it doesn't behave like this. [malufett]
 						clif->fixpos(bl);
 						sg->val2 = bl->id;
 					} else
 						sec = 3000;	// Couldn't trap it?
-					sg->limit = DIFF_TICK(tick, sg->tick) + sec;
+					sg->limit = DIFF_TICK32(tick, sg->tick) + sec;
 				} else if( tsc->data[SC_THORNS_TRAP] && bl->id == sg->val2 )
 					skill->attack(skill->get_type(GN_THORNS_TRAP), ss, ss, bl, sg->skill_id, sg->skill_lv, tick, SD_LEVEL|SD_ANIMATION);
 			}
@@ -11750,7 +11746,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
 			if( battle->check_target(&src->bl,bl,BCT_ENEMY) > 0 )
 				skill->attack(skill->get_type(GN_HELLS_PLANT_ATK), ss, &src->bl, bl, GN_HELLS_PLANT_ATK, sg->skill_lv, tick, 0);
 			if( ss != bl) //The caster is the only one who can step on the Plants, without destroying them
-				sg->limit = DIFF_TICK(tick, sg->tick) + 100;
+				sg->limit = DIFF_TICK32(tick, sg->tick) + 100;
 			break;
 
 		case UNT_CLOUD_KILL:
@@ -11800,7 +11796,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
 
 		case UNT_VACUUM_EXTREME:
 			{// TODO: official behavior in gvg area. [malufett]
-				int sec = sg->limit - DIFF_TICK(tick, sg->tick);
+				int sec = sg->limit - DIFF_TICK32(tick, sg->tick);
 				int range = skill->get_unit_range(sg->skill_id, sg->skill_lv);
 
 				if( tsc && !tsc->data[type] &&
@@ -11863,7 +11859,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
 		case UNT_LAVA_SLIDE:
 			skill->attack(BF_WEAPON, ss, &src->bl, bl, sg->skill_id, sg->skill_lv, tick, 0);
 			if(++sg->val1 > 4) //after 5 stop hit and destroy me
-				sg->limit = DIFF_TICK(tick, sg->tick);
+				sg->limit = DIFF_TICK32(tick, sg->tick);
 			break;
 
 		case UNT_POISON_MIST:
@@ -11880,7 +11876,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
 /*==========================================
  * Triggered when a char steps out of a skill cell
  *------------------------------------------*/
-int skill_unit_onout (struct skill_unit *src, struct block_list *bl, unsigned int tick) {
+int skill_unit_onout(struct skill_unit *src, struct block_list *bl, int64 tick) {
 	struct skill_unit_group *sg;
 	struct status_change *sc;
 	struct status_change_entry *sce;
@@ -11923,7 +11919,7 @@ int skill_unit_onout (struct skill_unit *src, struct block_list *bl, unsigned in
 			if (target && target==bl) {
 				if (sce && sce->val3 == sg->group_id)
 					status_change_end(bl, type, INVALID_TIMER);
-				sg->limit = DIFF_TICK(tick,sg->tick)+1000;
+				sg->limit = DIFF_TICK32(tick,sg->tick)+1000;
 			}
 		}
 			break;
@@ -11934,7 +11930,7 @@ int skill_unit_onout (struct skill_unit *src, struct block_list *bl, unsigned in
 /*==========================================
  * Triggered when a char steps out of a skill group (entirely) [Skotlex]
  *------------------------------------------*/
-int skill_unit_onleft (uint16 skill_id, struct block_list *bl, unsigned int tick) {
+int skill_unit_onleft(uint16 skill_id, struct block_list *bl, int64 tick) {
 	struct status_change *sc;
 	struct status_change_entry *sce;
 	enum sc_type type;
@@ -12040,10 +12036,10 @@ int skill_unit_onleft (uint16 skill_id, struct block_list *bl, unsigned int tick
  * flag&1: Invoke onplace function (otherwise invoke onout)
  * flag&4: Invoke a onleft call (the unit might be scheduled for deletion)
  *------------------------------------------*/
-int skill_unit_effect (struct block_list* bl, va_list ap) {
+int skill_unit_effect(struct block_list* bl, va_list ap) {
 	struct skill_unit* su = va_arg(ap,struct skill_unit*);
 	struct skill_unit_group* group = su->group;
-	unsigned int tick = va_arg(ap,unsigned int);
+	int64 tick = va_arg(ap,int64);
 	unsigned int flag = va_arg(ap,unsigned int);
 	uint16 skill_id;
 	bool dissonance;
@@ -12079,8 +12075,7 @@ int skill_unit_effect (struct block_list* bl, va_list ap) {
 /*==========================================
  *
  *------------------------------------------*/
-int skill_unit_ondamaged (struct skill_unit *src, struct block_list *bl, int64 damage, unsigned int tick)
-{
+int skill_unit_ondamaged(struct skill_unit *src, struct block_list *bl, int64 damage, int64 tick) {
 	struct skill_unit_group *sg;
 
 	nullpo_ret(src);
@@ -14187,8 +14182,7 @@ void skill_brandishspear_dir (struct square* tc, uint8 dir, int are) {
 	}
 }
 
-void skill_brandishspear(struct block_list* src, struct block_list* bl, uint16 skill_id, uint16 skill_lv, unsigned int tick, int flag)
-{
+void skill_brandishspear(struct block_list* src, struct block_list* bl, uint16 skill_id, uint16 skill_lv, int64 tick, int flag) {
 	int c,n=4;
 	uint8 dir = map->calc_dir(src,bl->x,bl->y);
 	struct square tc;
@@ -14525,10 +14519,10 @@ int skill_sit (struct map_session_data *sd, int type)
 /*==========================================
  *
  *------------------------------------------*/
-int skill_frostjoke_scream (struct block_list *bl, va_list ap) {
+int skill_frostjoke_scream(struct block_list *bl, va_list ap) {
 	struct block_list *src;
 	uint16 skill_id,skill_lv;
-	unsigned int tick;
+	int64 tick;
 
 	nullpo_ret(bl);
 	nullpo_ret(src=va_arg(ap,struct block_list*));
@@ -14536,7 +14530,7 @@ int skill_frostjoke_scream (struct block_list *bl, va_list ap) {
 	skill_id=va_arg(ap,int);
 	skill_lv=va_arg(ap,int);
 	if(!skill_lv) return 0;
-	tick=va_arg(ap,unsigned int);
+	tick=va_arg(ap,int64);
 
 	if (src == bl || status->isdead(bl))
 		return 0;
@@ -14569,22 +14563,22 @@ void skill_unitsetmapcell (struct skill_unit *src, uint16 skill_id, uint16 skill
 /*==========================================
  *
  *------------------------------------------*/
-int skill_attack_area (struct block_list *bl, va_list ap) {
+int skill_attack_area(struct block_list *bl, va_list ap) {
 	struct block_list *src,*dsrc;
 	int atk_type,skill_id,skill_lv,flag,type;
-	unsigned int tick;
+	int64 tick;
 
 	if(status->isdead(bl))
 		return 0;
 
 	atk_type = va_arg(ap,int);
-	src=va_arg(ap,struct block_list*);
-	dsrc=va_arg(ap,struct block_list*);
-	skill_id=va_arg(ap,int);
-	skill_lv=va_arg(ap,int);
-	tick=va_arg(ap,unsigned int);
-	flag=va_arg(ap,int);
-	type=va_arg(ap,int);
+	src = va_arg(ap,struct block_list*);
+	dsrc = va_arg(ap,struct block_list*);
+	skill_id = va_arg(ap,int);
+	skill_lv = va_arg(ap,int);
+	tick = va_arg(ap,int64);
+	flag = va_arg(ap,int);
+	type = va_arg(ap,int);
 
 
 	if (skill->area_temp[1] == bl->id) //This is the target of the skill, do a full attack and skip target checks.
@@ -14739,7 +14733,7 @@ int skill_detonator(struct block_list *bl, va_list ap) {
 					map->foreachinrange(skill->trap_splash,bl,skill->get_splash(su->group->skill_id,su->group->skill_lv),su->group->bl_flag,bl,su->group->tick);
 			}
 			clif->changetraplook(bl, UNT_USED_TRAPS);
-			su->group->limit = DIFF_TICK(timer->gettick(),su->group->tick) +
+			su->group->limit = DIFF_TICK32(timer->gettick(),su->group->tick) +
 				(unit_id == UNT_TALKIEBOX ? 5000 : (unit_id == UNT_CLUSTERBOMB || unit_id == UNT_ICEBOUNDTRAP? 2500 : (unit_id == UNT_FIRINGTRAP ? 0 : 1500)) );
 			su->group->unit_id = UNT_USED_TRAPS;
 			break;
@@ -14876,15 +14870,15 @@ int skill_chastle_mob_changetarget(struct block_list *bl,va_list ap)
 /*==========================================
  *
  *------------------------------------------*/
-int skill_trap_splash (struct block_list *bl, va_list ap) {
+int skill_trap_splash(struct block_list *bl, va_list ap) {
 	struct block_list *src;
-	int tick;
+	int64 tick;
 	struct skill_unit *su;
 	struct skill_unit_group *sg;
 	struct block_list *ss;
 	src = va_arg(ap,struct block_list *);
 	su = (struct skill_unit *)src;
-	tick = va_arg(ap,int);
+	tick = va_arg(ap,int64);
 
 	if( !su->alive || bl->prev == NULL )
 		return 0;
@@ -14962,7 +14956,7 @@ int skill_trap_splash (struct block_list *bl, va_list ap) {
 					case UNT_FIRINGTRAP:
 					case UNT_ICEBOUNDTRAP:
 						clif->changetraplook(bl, UNT_USED_TRAPS);
-						su->group->limit = DIFF_TICK(timer->gettick(),su->group->tick) + 1500;
+						su->group->limit = DIFF_TICK32(timer->gettick(),su->group->tick) + 1500;
 						su->group->unit_id = UNT_USED_TRAPS;
 				}
 				break;
@@ -15288,11 +15282,11 @@ struct skill_unit_group* skill_initunitgroup (struct block_list* src, int count,
 	if(i == MAX_SKILLUNITGROUP) {
 		// array is full, make room by discarding oldest group
 		int j=0;
-		unsigned maxdiff=0,x,tick=timer->gettick();
+		int64 maxdiff = 0, x, tick = timer->gettick();
 		for(i=0;i<MAX_SKILLUNITGROUP && ud->skillunit[i];i++)
-			if((x=DIFF_TICK(tick,ud->skillunit[i]->tick))>maxdiff){
-				maxdiff=x;
-				j=i;
+			if( (x=DIFF_TICK(tick,ud->skillunit[i]->tick)) > maxdiff ) {
+				maxdiff = x;
+				j = i;
 			}
 		skill->del_unitgroup(ud->skillunit[j],ALC_MARK);
 		//Since elements must have shifted, we use the last slot.
@@ -15479,7 +15473,7 @@ int skill_clear_unitgroup (struct block_list *src)
 /*==========================================
  *
  *------------------------------------------*/
-struct skill_unit_group_tickset *skill_unitgrouptickset_search (struct block_list *bl, struct skill_unit_group *group, int tick) {
+struct skill_unit_group_tickset *skill_unitgrouptickset_search(struct block_list *bl, struct skill_unit_group *group, int64 tick) {
 	int i,j=-1,k,s,id;
 	struct unit_data *ud;
 	struct skill_unit_group_tickset *set;
@@ -15519,10 +15513,10 @@ struct skill_unit_group_tickset *skill_unitgrouptickset_search (struct block_lis
 /*==========================================
  *
  *------------------------------------------*/
-int skill_unit_timer_sub_onplace (struct block_list* bl, va_list ap) {
+int skill_unit_timer_sub_onplace(struct block_list* bl, va_list ap) {
 	struct skill_unit* su = va_arg(ap,struct skill_unit *);
 	struct skill_unit_group* group = su->group;
-	unsigned int tick = va_arg(ap,unsigned int);
+	int64 tick = va_arg(ap,int64);
 
 	if( !su->alive || bl->prev == NULL )
 		return 0;
@@ -15546,7 +15540,7 @@ int skill_unit_timer_sub_onplace (struct block_list* bl, va_list ap) {
 int skill_unit_timer_sub(DBKey key, DBData *data, va_list ap) {
 	struct skill_unit* su = DB->data2ptr(data);
 	struct skill_unit_group* group = su->group;
-	unsigned int tick = va_arg(ap,unsigned int);
+	int64 tick = va_arg(ap,int64);
   	bool dissonance;
 	struct block_list* bl = &su->bl;
 
@@ -15570,8 +15564,8 @@ int skill_unit_timer_sub(DBKey key, DBData *data, va_list ap) {
 			case UNT_GROUNDDRIFT_FIRE:
 				group->unit_id = UNT_USED_TRAPS;
 				//clif->changetraplook(bl, UNT_FIREPILLAR_ACTIVE);
-				group->limit=DIFF_TICK(tick+1500,group->tick);
-				su->limit=DIFF_TICK(tick+1500,group->tick);
+				group->limit=DIFF_TICK32(tick+1500,group->tick);
+				su->limit=DIFF_TICK32(tick+1500,group->tick);
 			break;
 
 			case UNT_ANKLESNARE:
@@ -15650,8 +15644,8 @@ int skill_unit_timer_sub(DBKey key, DBData *data, va_list ap) {
 				}
 				clif->changetraplook(bl,UNT_USED_TRAPS);
 				map->foreachinrange(skill->trap_splash, bl, skill->get_splash(group->skill_id, group->skill_lv), group->bl_flag, bl, tick);
-				group->limit = DIFF_TICK(tick,group->tick)+1000;
-				su->limit = DIFF_TICK(tick,group->tick)+1000;
+				group->limit = DIFF_TICK32(tick,group->tick)+1000;
+				su->limit = DIFF_TICK32(tick,group->tick)+1000;
 				group->unit_id = UNT_USED_TRAPS;
 			break;
 
@@ -15672,8 +15666,8 @@ int skill_unit_timer_sub(DBKey key, DBData *data, va_list ap) {
 					break;
 				}
 				// This unit isn't removed while SC_BANDING is active.
-				group->limit = DIFF_TICK(tick+group->interval,group->tick);
-				su->limit = DIFF_TICK(tick+group->interval,group->tick);
+				group->limit = DIFF_TICK32(tick+group->interval,group->tick);
+				su->limit = DIFF_TICK32(tick+group->interval,group->tick);
 			}
 			break;
 
@@ -15686,7 +15680,7 @@ int skill_unit_timer_sub(DBKey key, DBData *data, va_list ap) {
 				// icewall loses 50 hp every second
 				su->val1 -= SKILLUNITTIMER_INTERVAL/20; // trap's hp
 				if( su->val1 <= 0 && su->limit + group->tick > tick + 700 )
-					su->limit = DIFF_TICK(tick+700,group->tick);
+					su->limit = DIFF_TICK32(tick+700,group->tick);
 				break;
 			case UNT_BLASTMINE:
 			case UNT_SKIDTRAP:
@@ -15703,7 +15697,7 @@ int skill_unit_timer_sub(DBKey key, DBData *data, va_list ap) {
 						skill->delunit(su);
 					else {
 						clif->changetraplook(bl, group->unit_id==UNT_LANDMINE?UNT_FIREPILLAR_ACTIVE:UNT_USED_TRAPS);
-						group->limit = DIFF_TICK(tick, group->tick) + 1500;
+						group->limit = DIFF_TICK32(tick, group->tick) + 1500;
 						group->unit_id = UNT_USED_TRAPS;
 					}
 				}
@@ -15712,15 +15706,15 @@ int skill_unit_timer_sub(DBKey key, DBData *data, va_list ap) {
 				if( su->val1 <= 0 ) {
 					clif->changetraplook(bl,UNT_USED_TRAPS);
 					map->foreachinrange(skill->trap_splash, bl, skill->get_splash(group->skill_id, group->skill_lv), group->bl_flag, bl, tick);
-					group->limit = DIFF_TICK(tick,group->tick)+1000;
-					su->limit = DIFF_TICK(tick,group->tick)+1000;
+					group->limit = DIFF_TICK32(tick,group->tick)+1000;
+					su->limit = DIFF_TICK32(tick,group->tick)+1000;
 					group->unit_id = UNT_USED_TRAPS;
 				}
 				break;
 			case UNT_WALLOFTHORN:
 				if( su->val1 <= 0 ) {
 					group->unit_id = UNT_USED_TRAPS;
-					group->limit = DIFF_TICK(tick, group->tick) + 1500;
+					group->limit = DIFF_TICK32(tick, group->tick) + 1500;
 				}
 				break;
 		}
@@ -15757,7 +15751,7 @@ int skill_unit_timer_sub(DBKey key, DBData *data, va_list ap) {
 /*==========================================
  * Executes on all skill units every SKILLUNITTIMER_INTERVAL miliseconds.
  *------------------------------------------*/
-int skill_unit_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int skill_unit_timer(int tid, int64 tick, int id, intptr_t data) {
 	map->freeblock_lock();
 
 	skill->unit_db->foreach(skill->unit_db, skill->unit_timer_sub, tick);
@@ -15770,12 +15764,12 @@ int skill_unit_timer(int tid, unsigned int tick, int id, intptr_t data) {
 /*==========================================
  *
  *------------------------------------------*/
-int skill_unit_move_sub (struct block_list* bl, va_list ap) {
+int skill_unit_move_sub(struct block_list* bl, va_list ap) {
 	struct skill_unit* su = (struct skill_unit *)bl;
 	struct skill_unit_group* group = su->group;
 
 	struct block_list* target = va_arg(ap,struct block_list*);
-	unsigned int tick = va_arg(ap,unsigned int);
+	int64 tick = va_arg(ap,int64);
 	int flag = va_arg(ap,int);
 
 	bool dissonance;
@@ -15867,7 +15861,7 @@ int skill_unit_move_sub (struct block_list* bl, va_list ap) {
  * units to figure out when they have left a group.
  * flag&4: Force a onleft event (triggered when the bl is killed, for example)
  *------------------------------------------*/
-int skill_unit_move (struct block_list *bl, unsigned int tick, int flag) {
+int skill_unit_move(struct block_list *bl, int64 tick, int flag) {
 	nullpo_ret(bl);
 
 	if( bl->prev == NULL )
@@ -15892,10 +15886,9 @@ int skill_unit_move (struct block_list *bl, unsigned int tick, int flag) {
 /*==========================================
  *
  *------------------------------------------*/
-int skill_unit_move_unit_group (struct skill_unit_group *group, int16 m, int16 dx, int16 dy)
-{
+int skill_unit_move_unit_group(struct skill_unit_group *group, int16 m, int16 dx, int16 dy) {
 	int i,j;
-	unsigned int tick = timer->gettick();
+	int64 tick = timer->gettick();
 	int *m_flag;
 	struct skill_unit *su1;
 	struct skill_unit *su2;
@@ -16749,7 +16742,7 @@ int skill_magicdecoy(struct map_session_data *sd, int nameid) {
 		md->special_state.ai = AI_FLORA;
 		if( md->deletetimer != INVALID_TIMER )
 			timer->delete(md->deletetimer, mob->timer_delete);
-		md->deletetimer = timer->add (timer->gettick() + skill->get_time(NC_MAGICDECOY,skill_id), mob->timer_delete, md->bl.id, 0);
+		md->deletetimer = timer->add(timer->gettick() + skill->get_time(NC_MAGICDECOY,skill_id), mob->timer_delete, md->bl.id, 0);
 		mob->spawn(md);
 		md->status.matk_min = md->status.matk_max = 250 + (50 * skill_id);
 	}
@@ -16947,13 +16940,13 @@ int skill_changematerial(struct map_session_data *sd, int n, unsigned short *ite
 /**
  * for Royal Guard's LG_TRAMPLE
  **/
-int skill_destroy_trap( struct block_list *bl, va_list ap ) {
+int skill_destroy_trap(struct block_list *bl, va_list ap) {
 	struct skill_unit *su = (struct skill_unit *)bl;
 	struct skill_unit_group *sg;
-	unsigned int tick;
+	int64 tick;
 
 	nullpo_ret(su);
-	tick = va_arg(ap, unsigned int);
+	tick = va_arg(ap, int64);
 
 	if (su->alive && (sg = su->group) && skill->get_inf2(sg->skill_id)&INF2_TRAP) {
 		switch( sg->unit_id ) {
@@ -16980,7 +16973,7 @@ int skill_destroy_trap( struct block_list *bl, va_list ap ) {
 /*==========================================
  *
  *------------------------------------------*/
-int skill_blockpc_end(int tid, unsigned int tick, int id, intptr_t data) {
+int skill_blockpc_end(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data *sd = map->id2sd(id);
 	struct skill_cd * cd = NULL;
 
@@ -17035,7 +17028,7 @@ int skill_blockpc_end(int tid, unsigned int tick, int id, intptr_t data) {
 int skill_blockpc_start_(struct map_session_data *sd, uint16 skill_id, int tick) {
 	struct skill_cd* cd = NULL;
 	uint16 idx = skill->get_index(skill_id);
-	unsigned int now = timer->gettick();
+	int64 now = timer->gettick();
 
 	nullpo_retr (-1, sd);
 
@@ -17099,7 +17092,7 @@ int skill_blockpc_start_(struct map_session_data *sd, uint16 skill_id, int tick)
 	return 0;
 }
 
-int skill_blockhomun_end(int tid, unsigned int tick, int id, intptr_t data) { //[orn]
+int skill_blockhomun_end(int tid, int64 tick, int id, intptr_t data) { //[orn]
 	struct homun_data *hd = (TBL_HOM*)map->id2bl(id);
 	if (data <= 0 || data >= MAX_SKILL)
 		return 0;
@@ -17124,7 +17117,7 @@ int skill_blockhomun_start(struct homun_data *hd, uint16 skill_id, int tick) { /
 	return timer->add(timer->gettick() + tick, skill->blockhomun_end, hd->bl.id, idx);
 }
 
-int skill_blockmerc_end(int tid, unsigned int tick, int id, intptr_t data) {//[orn]
+int skill_blockmerc_end(int tid, int64 tick, int id, intptr_t data) {//[orn]
 	struct mercenary_data *md = (TBL_MER*)map->id2bl(id);
 	if( data <= 0 || data >= MAX_SKILL )
 		return 0;
@@ -17592,7 +17585,7 @@ int skill_get_elemental_type( uint16 skill_id , uint16 skill_lv ) {
 void skill_cooldown_save(struct map_session_data * sd) {
 	int i;
 	struct skill_cd* cd = NULL;
-	unsigned int now = 0;
+	int64 now = 0;
 	
 	// always check to make sure the session properly exists
 	nullpo_retv(sd);
@@ -17605,7 +17598,7 @@ void skill_cooldown_save(struct map_session_data * sd) {
 		
 	// process each individual cooldown associated with the character
 	for( i = 0; i < cd->cursor; i++ ) {
-		cd->entry[i]->duration = DIFF_TICK(cd->entry[i]->started+cd->entry[i]->duration,now);
+		cd->entry[i]->duration = DIFF_TICK32(cd->entry[i]->started+cd->entry[i]->duration,now);
 		if( cd->entry[i]->timer != INVALID_TIMER ) {
 			timer->delete(cd->entry[i]->timer,skill->blockpc_end);
 			cd->entry[i]->timer = INVALID_TIMER;
@@ -17620,7 +17613,7 @@ void skill_cooldown_save(struct map_session_data * sd) {
 void skill_cooldown_load(struct map_session_data * sd) {
 	int i;
 	struct skill_cd* cd = NULL;
-	unsigned int now = 0;
+	int64 now = 0;
 
 	// always check to make sure the session properly exists
 	nullpo_retv(sd);
diff --git a/src/map/skill.h b/src/map/skill.h
index c968eebde..fca4952ef 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -1686,7 +1686,7 @@ struct skill_unit_group {
 	int map;
 	int target_flag; //Holds BCT_* flag for battle_check_target
 	int bl_flag;	//Holds BL_* flag for map_foreachin* functions
-	unsigned int tick;
+	int64 tick;
 	int limit,interval;
 	
 	uint16 skill_id,skill_lv;
@@ -1715,7 +1715,7 @@ struct skill_unit {
 };
 
 struct skill_unit_group_tickset {
-	unsigned int tick;
+	int64 tick;
 	int id;
 };
 
@@ -1750,7 +1750,7 @@ struct skill_cd_entry {
 	int total;/* used for display on newer clients */
 #endif
 	short skidx;//the skill index entries belong to
-	unsigned int started;/* gettick() of when it started, used vs duration to measure how much left upon logout */
+	int64 started;/* gettick() of when it started, used vs duration to measure how much left upon logout */
 	int timer;/* timer id */
 	uint16 skill_id;//skill id
 };
@@ -1791,7 +1791,7 @@ struct s_skill_spellbook_db {
 	int point;
 };
 
-typedef int (*SkillFunc)(struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, unsigned int tick, int flag);
+typedef int (*SkillFunc)(struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int64 tick, int flag);
 
 /**
  * Skill.c Interface
@@ -1883,13 +1883,13 @@ struct skill_interface {
 	int (*get_casttype2) (uint16 index);
 	int (*name2id) (const char* name);
 	int (*isammotype) (struct map_session_data *sd, int skill);
-	int (*castend_id) (int tid, unsigned int tick, int id, intptr_t data);
-	int (*castend_pos) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*castend_id) (int tid, int64 tick, int id, intptr_t data);
+	int (*castend_pos) (int tid, int64 tick, int id, intptr_t data);
 	int (*castend_map) ( struct map_session_data *sd,uint16 skill_id, const char *mapname);
 	int (*cleartimerskill) (struct block_list *src);
-	int (*addtimerskill) (struct block_list *src,unsigned int tick,int target,int x,int y,uint16 skill_id,uint16 skill_lv,int type,int flag);
-	int (*additional_effect) ( struct block_list* src, struct block_list *bl,uint16 skill_id,uint16 skill_lv,int attack_type,int dmg_lv,unsigned int tick);
-	int (*counter_additional_effect) ( struct block_list* src, struct block_list *bl,uint16 skill_id,uint16 skill_lv,int attack_type,unsigned int tick);
+	int (*addtimerskill) (struct block_list *src, int64 tick, int target, int x, int y, uint16 skill_id, uint16 skill_lv, int type, int flag);
+	int (*additional_effect) (struct block_list* src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int attack_type, int dmg_lv, int64 tick);
+	int (*counter_additional_effect) (struct block_list* src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int attack_type, int64 tick);
 	int (*blown) (struct block_list* src, struct block_list* target, int count, int8 dir, int flag);
 	int (*break_equip) (struct block_list *bl, unsigned short where, int rate, int flag);
 	int (*strip_equip) (struct block_list *bl, unsigned short where, int rate, int lv, int time);
@@ -1901,8 +1901,8 @@ struct skill_interface {
 	int (*del_unitgroup) (struct skill_unit_group *group, const char* file, int line, const char* func);
 	int (*clear_unitgroup) (struct block_list *src);
 	int (*clear_group) (struct block_list *bl, int flag);
-	int (*unit_onplace) (struct skill_unit *src, struct block_list *bl, unsigned int tick);
-	int (*unit_ondamaged) (struct skill_unit *src,struct block_list *bl,int64 damage,unsigned int tick);
+	int (*unit_onplace) (struct skill_unit *src, struct block_list *bl, int64 tick);
+	int (*unit_ondamaged) (struct skill_unit *src, struct block_list *bl, int64 damage, int64 tick);
 	int (*cast_fix) ( struct block_list *bl, uint16 skill_id, uint16 skill_lv);
 	int (*cast_fix_sc) ( struct block_list *bl, int time);
 	int (*vf_cast_fix) ( struct block_list *bl, double time, uint16 skill_id, uint16 skill_lv);
@@ -1912,12 +1912,12 @@ struct skill_interface {
 	int (*consume_requirement) (struct map_session_data *sd, uint16 skill_id, uint16 skill_lv, short type);
 	struct skill_condition (*get_requirement) (struct map_session_data *sd, uint16 skill_id, uint16 skill_lv);
 	int (*check_pc_partner) (struct map_session_data *sd, uint16 skill_id, uint16* skill_lv, int range, int cast_flag);
-	int (*unit_move) (struct block_list *bl,unsigned int tick,int flag);
-	int (*unit_onleft) (uint16 skill_id, struct block_list *bl,unsigned int tick);
-	int (*unit_onout) (struct skill_unit *src, struct block_list *bl, unsigned int tick);
+	int (*unit_move) (struct block_list *bl, int64 tick, int flag);
+	int (*unit_onleft) (uint16 skill_id, struct block_list *bl, int64 tick);
+	int (*unit_onout) (struct skill_unit *src, struct block_list *bl, int64 tick);
 	int (*unit_move_unit_group) ( struct skill_unit_group *group, int16 m,int16 dx,int16 dy);
 	int (*sit) (struct map_session_data *sd, int type);
-	void (*brandishspear) (struct block_list* src, struct block_list* bl, uint16 skill_id, uint16 skill_lv, unsigned int tick, int flag);
+	void (*brandishspear) (struct block_list* src, struct block_list* bl, uint16 skill_id, uint16 skill_lv, int64 tick, int flag);
 	void (*repairweapon) (struct map_session_data *sd, int idx);
 	void (*identify) (struct map_session_data *sd,int idx);
 	void (*weaponrefine) (struct map_session_data *sd,int idx);
@@ -1932,25 +1932,25 @@ struct skill_interface {
 	int (*can_produce_mix) ( struct map_session_data *sd, int nameid, int trigger, int qty);
 	int (*produce_mix) ( struct map_session_data *sd, uint16 skill_id, int nameid, int slot1, int slot2, int slot3, int qty );
 	int (*arrow_create) ( struct map_session_data *sd,int nameid);
-	int (*castend_nodamage_id) ( struct block_list *src, struct block_list *bl,uint16 skill_id,uint16 skill_lv,unsigned int tick,int flag );
-	int (*castend_damage_id) ( struct block_list* src, struct block_list *bl,uint16 skill_id,uint16 skill_lv,unsigned int tick,int flag );
-	int (*castend_pos2) ( struct block_list *src, int x,int y,uint16 skill_id,uint16 skill_lv,unsigned int tick,int flag);
+	int (*castend_nodamage_id) (struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int64 tick, int flag);
+	int (*castend_damage_id) (struct block_list* src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int64 tick,int flag);
+	int (*castend_pos2) (struct block_list *src, int x, int y, uint16 skill_id, uint16 skill_lv, int64 tick, int flag);
 	int (*blockpc_start) (struct map_session_data *sd, uint16 skill_id, int tick);
 	int (*blockhomun_start) (struct homun_data *hd, uint16 skill_id, int tick);
 	int (*blockmerc_start) (struct mercenary_data *md, uint16 skill_id, int tick);
-	int (*attack) ( int attack_type, struct block_list* src, struct block_list *dsrc,struct block_list *bl,uint16 skill_id,uint16 skill_lv,unsigned int tick,int flag );
+	int (*attack) (int attack_type, struct block_list* src, struct block_list *dsrc, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int64 tick, int flag);
 	int (*attack_area) (struct block_list *bl,va_list ap);
 	int (*area_sub) (struct block_list *bl, va_list ap);
-	int (*area_sub_count) (struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, unsigned int tick, int flag);
+	int (*area_sub_count) (struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int64 tick, int flag);
 	int (*check_unit_range) (struct block_list *bl, int x, int y, uint16 skill_id, uint16 skill_lv);
 	int (*check_unit_range_sub) (struct block_list *bl, va_list ap);
 	int (*check_unit_range2) (struct block_list *bl, int x, int y, uint16 skill_id, uint16 skill_lv);
 	int (*check_unit_range2_sub) (struct block_list *bl, va_list ap);
 	void (*toggle_magicpower) (struct block_list *bl, uint16 skill_id);
 	int (*magic_reflect) (struct block_list* src, struct block_list* bl, int type);
-	int (*onskillusage) (struct map_session_data *sd, struct block_list *bl, uint16 skill_id, unsigned int tick);
+	int (*onskillusage) (struct map_session_data *sd, struct block_list *bl, uint16 skill_id, int64 tick);
 	int (*cell_overlap) (struct block_list *bl, va_list ap);
-	int (*timerskill) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*timerskill) (int tid, int64 tick, int id, intptr_t data);
 	int (*trap_splash) (struct block_list *bl, va_list ap);
 	int (*check_condition_mercenary) (struct block_list *bl, int skill_id, int lv, int type);
 	struct skill_unit_group *(*locate_element_field) (struct block_list *bl);
@@ -1963,26 +1963,26 @@ struct skill_interface {
 	int (*greed) (struct block_list *bl, va_list ap);
 	int (*destroy_trap) ( struct block_list *bl, va_list ap );
 	int (*icewall_block) (struct block_list *bl,va_list ap);
-	struct skill_unit_group_tickset *(*unitgrouptickset_search) (struct block_list *bl, struct skill_unit_group *group, int tick);
+	struct skill_unit_group_tickset *(*unitgrouptickset_search) (struct block_list *bl, struct skill_unit_group *group, int64 tick);
 	bool (*dance_switch) (struct skill_unit* su, int flag);
 	int (*check_condition_char_sub) (struct block_list *bl, va_list ap);
 	int (*check_condition_mob_master_sub) (struct block_list *bl, va_list ap);
 	void (*brandishspear_first) (struct square *tc, uint8 dir, int16 x, int16 y);
 	void (*brandishspear_dir) (struct square* tc, uint8 dir, int are);
-	int	(*get_fixed_cast) ( uint16 skill_id ,uint16 skill_lv );
+	int (*get_fixed_cast) ( uint16 skill_id ,uint16 skill_lv );
 	int (*sit_count) (struct block_list *bl, va_list ap);
 	int (*sit_in) (struct block_list *bl, va_list ap);
 	int (*sit_out) (struct block_list *bl, va_list ap);
 	void (*unitsetmapcell) (struct skill_unit *src, uint16 skill_id, uint16 skill_lv, cell_t cell, bool flag);
-	int (*unit_onplace_timer) (struct skill_unit *src, struct block_list *bl, unsigned int tick);
+	int (*unit_onplace_timer) (struct skill_unit *src, struct block_list *bl, int64 tick);
 	int (*unit_effect) (struct block_list* bl, va_list ap);
 	int (*unit_timer_sub_onplace) (struct block_list* bl, va_list ap);
 	int (*unit_move_sub) (struct block_list* bl, va_list ap);
-	int (*blockpc_end) (int tid, unsigned int tick, int id, intptr_t data);
-	int (*blockhomun_end) (int tid, unsigned int tick, int id, intptr_t data);
-	int (*blockmerc_end) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*blockpc_end) (int tid, int64 tick, int id, intptr_t data);
+	int (*blockhomun_end) (int tid, int64 tick, int id, intptr_t data);
+	int (*blockmerc_end) (int tid, int64 tick, int id, intptr_t data);
 	int (*split_atoi) (char *str, int *val);
-	int (*unit_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*unit_timer) (int tid, int64 tick, int id, intptr_t data);
 	int (*unit_timer_sub) (DBKey key, DBData *data, va_list ap);
 	void (*init_unit_layout) (void);
 	bool (*parse_row_skilldb) (char* split[], int columns, int current);
diff --git a/src/map/status.c b/src/map/status.c
index 5f6444971..fc032686e 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -7806,7 +7806,13 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
 				val2 = 11-val1; //Chance to consume: 11-skill_lv%
 				break;
 			case SC_RUN:
-				val4 = timer->gettick(); //Store time at which you started running.
+			{
+				//Store time at which you started running.
+				int64 currenttick = timer->gettick();
+				// Note: this int64 value is stored in two separate int32 variables (FIXME)
+				val3 = (int)(currenttick&0x00000000ffffffff);
+				val4 = (int)((currenttick&0xffffffff00000000)>>32);
+			}
 				tick = -1;
 				break;
 			case SC_KAAHI:
@@ -8189,7 +8195,13 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
 				tick_time = 1000; // [GodLesZ] tick time
 				break;
 			case SC_WUGDASH:
-				val4 = timer->gettick(); //Store time at which you started running.
+			{
+				//Store time at which you started running.
+				int64 currenttick = timer->gettick();
+				// Note: this int64 value is stored in two separate int32 variables (FIXME)
+				val3 = (int)(currenttick&0x00000000ffffffff);
+				val4 = (int)((currenttick&0xffffffff00000000)>>32);
+			}
 				tick = -1;
 				break;
 			case SC__SHADOWFORM: {
@@ -9315,6 +9327,10 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const
 		{
 			struct unit_data *ud = unit->bl2ud(bl);
 			bool begin_spurt = true;
+			// Note: this int64 value is stored in two separate int32 variables (FIXME)
+			int64 starttick  = (int64)sce->val3&0x00000000ffffffff;
+			      starttick |= ((int64)sce->val4<<32)&0xffffffff00000000;
+
 			if (ud) {
 				if(!ud->state.running)
 					begin_spurt = false;
@@ -9323,7 +9339,7 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const
 					unit->stop_walking(bl,1);
 			}
 			if (begin_spurt && sce->val1 >= 7
-			 && DIFF_TICK(timer->gettick(), sce->val4) <= 1000
+			 && DIFF_TICK(timer->gettick(), starttick) <= 1000
 			 && (!sd || (sd->weapontype1 == 0 && sd->weapontype2 == 0))
 			)
 				sc_start(bl,SC_STRUP,100,sce->val1,skill->get_time2(status->sc2skill(type), sce->val1));
@@ -9932,7 +9948,7 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const
 	return 1;
 }
 
-int kaahi_heal_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int kaahi_heal_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct block_list *bl;
 	struct status_change *sc;
 	struct status_change_entry *sce;
@@ -9970,7 +9986,7 @@ int kaahi_heal_timer(int tid, unsigned int tick, int id, intptr_t data) {
 * For recusive status, like for each 5s we drop sp etc.
 * Reseting the end timer.
 *------------------------------------------*/
-int status_change_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int status_change_timer(int tid, int64 tick, int id, intptr_t data) {
 	enum sc_type type = (sc_type)data;
 	struct block_list *bl;
 	struct map_session_data *sd;
@@ -10786,7 +10802,7 @@ int status_change_timer_sub(struct block_list* bl, va_list ap) {
 	struct block_list* src = va_arg(ap,struct block_list*);
 	struct status_change_entry* sce = va_arg(ap,struct status_change_entry*);
 	enum sc_type type = (sc_type)va_arg(ap,int); //gcc: enum args get promoted to int
-	unsigned int tick = va_arg(ap,unsigned int);
+	int64 tick = va_arg(ap, int64);
 
 	if (status->isdead(bl))
 		return 0;
@@ -11040,7 +11056,7 @@ int status_change_clear_buffs (struct block_list* bl, int type) {
 int status_change_spread( struct block_list *src, struct block_list *bl ) {
 	int i, flag = 0;
 	struct status_change *sc = status->get_sc(src);
-	unsigned int tick;
+	int64 tick;
 	struct status_change_data data;
 
 	if( !sc || !sc->count )
@@ -11082,7 +11098,7 @@ int status_change_spread( struct block_list *src, struct block_list *bl ) {
 				const struct TimerData *td = timer->get(sc->data[i]->timer);
 				if (td == NULL || td->func != status->change_timer || DIFF_TICK(td->tick,tick) < 0)
 					continue;
-				data.tick = DIFF_TICK(td->tick,tick);
+				data.tick = DIFF_TICK32(td->tick,tick);
 			} else
 				data.tick = INVALID_TIMER;
 			break;
@@ -11310,8 +11326,9 @@ int status_natural_heal(struct block_list* bl, va_list args) {
 }
 
 //Natural heal main timer.
-int status_natural_heal_timer(int tid, unsigned int tick, int id, intptr_t data) {
-	status->natural_heal_diff_tick = DIFF_TICK(tick,status->natural_heal_prev_tick);
+int status_natural_heal_timer(int tid, int64 tick, int id, intptr_t data) {
+	// This difference is always positive and lower than UINT_MAX (~24 days)
+	status->natural_heal_diff_tick = (unsigned int)cap_value(DIFF_TICK(tick,status->natural_heal_prev_tick), 0, UINT_MAX);
 	map->foreachregen(status->natural_heal);
 	status->natural_heal_prev_tick = tick;
 	return 0;
diff --git a/src/map/status.h b/src/map/status.h
index 9b1721d1a..9edf29d2c 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -1858,7 +1858,8 @@ struct status_interface {
 	sc_conf_type sc_conf[SC_MAX];
 	struct eri *data_ers; //For sc_data entries
 	struct status_data dummy;
-	unsigned int natural_heal_prev_tick,natural_heal_diff_tick;
+	int64 natural_heal_prev_tick;
+	unsigned int natural_heal_diff_tick;
 	/* */
 	int (*init) (void);
 	void (*final) (void);
@@ -1902,8 +1903,8 @@ struct status_interface {
 	int (*get_sc_def) (struct block_list *bl, enum sc_type type, int rate, int tick, int flag);
 	int (*change_start) (struct block_list* bl,enum sc_type type,int rate,int val1,int val2,int val3,int val4,int tick,int flag);
 	int (*change_end_) (struct block_list* bl, enum sc_type type, int tid, const char* file, int line);
-	int (*kaahi_heal_timer) (int tid, unsigned int tick, int id, intptr_t data);
-	int (*change_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*kaahi_heal_timer) (int tid, int64 tick, int id, intptr_t data);
+	int (*change_timer) (int tid, int64 tick, int id, intptr_t data);
 	int (*change_timer_sub) (struct block_list* bl, va_list ap);
 	int (*change_clear) (struct block_list* bl, int type);
 	int (*change_clear_buffs) (struct block_list* bl, int type);
@@ -1967,7 +1968,7 @@ struct status_interface {
 	void (*display_add) (struct map_session_data *sd, enum sc_type type, int dval1, int dval2, int dval3);
 	void (*display_remove) (struct map_session_data *sd, enum sc_type type);
 	int (*natural_heal) (struct block_list *bl, va_list args);
-	int (*natural_heal_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*natural_heal_timer) (int tid, int64 tick, int id, intptr_t data);
 	bool (*readdb_job1) (char *fields[], int columns, int current);
 	bool (*readdb_job2) (char *fields[], int columns, int current);
 	bool (*readdb_sizefix) (char *fields[], int columns, int current);
diff --git a/src/map/unit.c b/src/map/unit.c
index a9cbd605e..7b4ac2c50 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -82,9 +82,6 @@ struct unit_data* unit_bl2ud2(struct block_list *bl) {
 	return unit->bl2ud(bl);
 }
 
-int unit_attack_timer(int tid, unsigned int tick, int id, intptr_t data);
-int unit_walktoxy_timer(int tid, unsigned int tick, int id, intptr_t data);
-
 int unit_walktoxy_sub(struct block_list *bl)
 {
 	int i;
@@ -137,7 +134,7 @@ int unit_walktoxy_sub(struct block_list *bl)
 	return 1;
 }
 
-int unit_walktoxy_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int unit_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) {
 	int i;
 	int x,y,dx,dy;
 	uint8 dir;
@@ -322,7 +319,7 @@ int unit_walktoxy_timer(int tid, unsigned int tick, int id, intptr_t data) {
 	return 0;
 }
 
-int unit_delay_walktoxy_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int unit_delay_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct block_list *bl = map->id2bl(id);
 
 	if (!bl || bl->prev == NULL)
@@ -402,7 +399,7 @@ static inline void set_mobstate(struct block_list* bl, int flag)
 		md->state.skillstate = md->state.aggressive ? MSS_FOLLOW : MSS_RUSH;
 }
 
-int unit_walktobl_sub(int tid, unsigned int tick, int id, intptr_t data) {
+int unit_walktobl_sub(int tid, int64 tick, int id, intptr_t data) {
 	struct block_list *bl = map->id2bl(id);
 	struct unit_data *ud = bl?unit->bl2ud(bl):NULL;
 
@@ -854,7 +851,7 @@ int unit_stop_walking(struct block_list *bl,int type)
 {
 	struct unit_data *ud;
 	const struct TimerData* td;
-	unsigned int tick;
+	int64 tick;
 	nullpo_ret(bl);
 
 	ud = unit->bl2ud(bl);
@@ -1001,7 +998,7 @@ int unit_can_move(struct block_list *bl) {
  * Resume running after a walk delay
  *------------------------------------------*/
 
-int unit_resume_running(int tid, unsigned int tick, int id, intptr_t data) {
+int unit_resume_running(int tid, int64 tick, int id, intptr_t data) {
 
 	struct unit_data *ud = (struct unit_data *)data;
 	TBL_PC * sd = map->id2sd(id);
@@ -1025,8 +1022,7 @@ int unit_resume_running(int tid, unsigned int tick, int id, intptr_t data) {
  * if type is 0, this is a damage induced delay: if previous delay is active, do not change it.
  * if type is 1, this is a skill induced delay: walk-delay may only be increased, not decreased.
  *------------------------------------------*/
-int unit_set_walkdelay(struct block_list *bl, unsigned int tick, int delay, int type)
-{
+int unit_set_walkdelay(struct block_list *bl, int64 tick, int delay, int type) {
 	struct unit_data *ud = unit->bl2ud(bl);
 	if (delay <= 0 || !ud) return 0;
 
@@ -1073,7 +1069,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill_id, ui
 	struct status_change *sc;
 	struct map_session_data *sd = NULL;
 	struct block_list * target = NULL;
-	unsigned int tick = timer->gettick();
+	int64 tick = timer->gettick();
 	int temp = 0, range;
 
 	nullpo_ret(src);
@@ -1437,7 +1433,7 @@ int unit_skilluse_pos2( struct block_list *src, short skill_x, short skill_y, ui
 	struct unit_data        *ud = NULL;
 	struct status_change *sc;
 	struct block_list    bl;
-	unsigned int tick = timer->gettick();
+	int64 tick = timer->gettick();
 	int range;
 
 	nullpo_ret(src);
@@ -1795,8 +1791,7 @@ int	unit_calc_pos(struct block_list *bl, int tx, int ty, uint8 dir)
 /*==========================================
  * Continuous Attack (function timer)
  *------------------------------------------*/
-int unit_attack_timer_sub(struct block_list* src, int tid, unsigned int tick)
-{
+int unit_attack_timer_sub(struct block_list* src, int tid, int64 tick) {
 	struct block_list *target;
 	struct unit_data *ud;
 	struct status_data *sstatus;
@@ -1923,7 +1918,7 @@ int unit_attack_timer_sub(struct block_list* src, int tid, unsigned int tick)
 	return 1;
 }
 
-int unit_attack_timer(int tid, unsigned int tick, int id, intptr_t data) {
+int unit_attack_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct block_list *bl;
 	bl = map->id2bl(id);
 	if(bl && unit->attack_timer_sub(bl, tid, tick) == 0)
@@ -1940,7 +1935,7 @@ int unit_skillcastcancel(struct block_list *bl,int type)
 {
 	struct map_session_data *sd = NULL;
 	struct unit_data *ud = unit->bl2ud( bl);
-	unsigned int tick=timer->gettick();
+	int64 tick = timer->gettick();
 	int ret=0, skill_id;
 
 	nullpo_ret(bl);
@@ -2021,8 +2016,7 @@ int unit_counttargeted(struct block_list* bl)
 /*==========================================
  *
  *------------------------------------------*/
-int unit_fixdamage(struct block_list *src,struct block_list *target,unsigned int tick,int sdelay,int ddelay,int64 damage,int div,int type,int64 damage2)
-{
+int unit_fixdamage(struct block_list *src, struct block_list *target, int64 tick, int sdelay, int ddelay, int64 damage, int div, int type, int64 damage2) {
 	nullpo_ret(target);
 
 	if(damage+damage2 <= 0)
diff --git a/src/map/unit.h b/src/map/unit.h
index be7b789d9..0567688a1 100644
--- a/src/map/unit.h
+++ b/src/map/unit.h
@@ -30,10 +30,10 @@ struct unit_data {
 	int   target_to;
 	int   attacktimer;
 	int   walktimer;
-	int	chaserange;
-	unsigned int attackabletime;
-	unsigned int canact_tick;
-	unsigned int canmove_tick;
+	int   chaserange;
+	int64 attackabletime;
+	int64 canact_tick;
+	int64 canmove_tick;
 	uint8 dir;
 	unsigned char walk_count;
 	unsigned char target_count;
@@ -77,12 +77,12 @@ struct unit_interface {
 	/* */
 	struct unit_data* (*bl2ud) (struct block_list *bl);
 	struct unit_data* (*bl2ud2) (struct block_list *bl);
-	int (*attack_timer) (int tid, unsigned int tick, int id, intptr_t data);
-	int (*walktoxy_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*attack_timer) (int tid, int64 tick, int id, intptr_t data);
+	int (*walktoxy_timer) (int tid, int64 tick, int id, intptr_t data);
 	int (*walktoxy_sub) (struct block_list *bl);
-	int (*delay_walktoxy_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*delay_walktoxy_timer) (int tid, int64 tick, int id, intptr_t data);
 	int (*walktoxy) (struct block_list *bl, short x, short y, int flag);
-	int (*walktobl_sub) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*walktobl_sub) (int tid, int64 tick, int id, intptr_t data);
 	int (*walktobl) (struct block_list *bl, struct block_list *tbl, int range, int flag);
 	int (*run) (struct block_list *bl);
 	int (*wugdash) (struct block_list *bl, struct map_session_data *sd);
@@ -96,8 +96,8 @@ struct unit_interface {
 	int (*skilluse_id) (struct block_list *src, int target_id, uint16 skill_id, uint16 skill_lv);
 	int (*is_walking) (struct block_list *bl);
 	int (*can_move) (struct block_list *bl);
-	int (*resume_running) (int tid, unsigned int tick, int id, intptr_t data);
-	int (*set_walkdelay) (struct block_list *bl, unsigned int tick, int delay, int type);
+	int (*resume_running) (int tid, int64 tick, int id, intptr_t data);
+	int (*set_walkdelay) (struct block_list *bl, int64 tick, int delay, int type);
 	int (*skilluse_id2) (struct block_list *src, int target_id, uint16 skill_id, uint16 skill_lv, int casttime, int castcancel);
 	int (*skilluse_pos) (struct block_list *src, short skill_x, short skill_y, uint16 skill_id, uint16 skill_lv);
 	int (*skilluse_pos2) (struct block_list *src, short skill_x, short skill_y, uint16 skill_id, uint16 skill_lv, int casttime, int castcancel);
@@ -109,11 +109,11 @@ struct unit_interface {
 	bool (*can_reach_pos) (struct block_list *bl, int x, int y, int easy);
 	bool (*can_reach_bl) (struct block_list *bl, struct block_list *tbl, int range, int easy, short *x, short *y);
 	int (*calc_pos) (struct block_list *bl, int tx, int ty, uint8 dir);
-	int (*attack_timer_sub) (struct block_list *src, int tid, unsigned int tick);
+	int (*attack_timer_sub) (struct block_list *src, int tid, int64 tick);
 	int (*skillcastcancel) (struct block_list *bl, int type);
 	void (*dataset) (struct block_list *bl);
 	int (*counttargeted) (struct block_list *bl);
-	int (*fixdamage) (struct block_list *src, struct block_list *target, unsigned int tick, int sdelay, int ddelay, int64 damage, int div, int type, int64 damage2);
+	int (*fixdamage) (struct block_list *src, struct block_list *target, int64 tick, int sdelay, int ddelay, int64 damage, int div, int type, int64 damage2);
 	int (*changeviewsize) (struct block_list *bl, short size);
 	int (*remove_map) (struct block_list *bl, clr_type clrtype, const char *file, int line, const char *func);
 	void (*remove_map_pc) (struct map_session_data *sd, clr_type clrtype);
-- 
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/socket.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 14f84fc044754d22740905b7fa90022b4a04b0d8 Mon Sep 17 00:00:00 2001
From: shennetsind <ind@henn.et>
Date: Sat, 18 Jan 2014 19:30:11 -0200
Subject: Socket interfaced

We designed this one with having as little changes required elsewhere in mind, thus the way most socket-related things are called has not changed.
Plugins may now take a greater advantage of the socket features.

Signed-off-by: shennetsind <ind@henn.et>
---
 src/char/char.c     |  24 ++++-----
 src/common/HPM.c    |   6 +--
 src/common/core.c   |   9 ++--
 src/common/socket.c | 135 +++++++++++++++++++++++++++++++++----------------
 src/common/socket.h | 142 ++++++++++++++++++++++++++++++----------------------
 src/common/strlib.h |   1 +
 src/common/timer.c  |   2 +-
 src/common/timer.h  |   2 +-
 src/map/atcommand.c |   2 +-
 src/map/chrif.c     |  10 ++--
 src/map/chrif.h     |   2 +-
 src/map/clif.c      |  32 ++++++------
 src/map/map.c       |  10 ++--
 src/map/mob.c       |   2 +-
 src/map/pc.c        |   2 +-
 src/map/pc.h        |   2 +-
 src/map/script.c    |   2 +-
 src/map/unit.c      |   2 +-
 18 files changed, 227 insertions(+), 160 deletions(-)

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

diff --git a/src/char/char.c b/src/char/char.c
index a6588dc09..efe02031f 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -2109,8 +2109,8 @@ void disconnect_player(int account_id)
 	struct char_session_data* sd;
 
 	// disconnect player if online on char-server
-	ARR_FIND( 0, fd_max, i, session[i] && (sd = (struct char_session_data*)session[i]->session_data) && sd->account_id == account_id );
-	if( i < fd_max )
+	ARR_FIND( 0, sockt->fd_max, i, session[i] && (sd = (struct char_session_data*)session[i]->session_data) && sd->account_id == account_id );
+	if( i < sockt->fd_max )
 		set_eof(i);
 }
 
@@ -2228,7 +2228,7 @@ int parse_fromlogin(int fd) {
 		loginif_on_disconnect();
 		return 0;
 	} else if ( session[fd]->flag.ping ) {/* we've reached stall time */
-		if( DIFF_TICK(last_tick, session[fd]->rdata_tick) > (stall_time * 2) ) {/* we can't wait any longer */
+		if( DIFF_TICK(sockt->last_tick, session[fd]->rdata_tick) > (sockt->stall_time * 2) ) {/* we can't wait any longer */
 			set_eof(fd);
 			return 0;
 		} else if( session[fd]->flag.ping != 2 ) { /* we haven't sent ping out yet */
@@ -2334,8 +2334,8 @@ int parse_fromlogin(int fd) {
 					return 0;
 
 				// find the authenticated session with this account id
-				ARR_FIND( 0, fd_max, i, session[i] && (sd = (struct char_session_data*)session[i]->session_data) && sd->auth && sd->account_id == RFIFOL(fd,2) );
-				if( i < fd_max ) {
+				ARR_FIND( 0, sockt->fd_max, i, session[i] && (sd = (struct char_session_data*)session[i]->session_data) && sd->auth && sd->account_id == RFIFOL(fd,2) );
+				if( i < sockt->fd_max ) {
 					memcpy(sd->email, RFIFOP(fd,6), 40);
 					sd->expiration_time = (time_t)RFIFOL(fd,46);
 					sd->group_id = RFIFOB(fd,50);
@@ -2512,8 +2512,8 @@ int parse_fromlogin(int fd) {
 					{// Manual kick from char server.
 						struct char_session_data *tsd;
 						int i;
-						ARR_FIND( 0, fd_max, i, session[i] && (tsd = (struct char_session_data*)session[i]->session_data) && tsd->account_id == aid );
-						if( i < fd_max )
+						ARR_FIND( 0, sockt->fd_max, i, session[i] && (tsd = (struct char_session_data*)session[i]->session_data) && tsd->account_id == aid );
+						if( i < sockt->fd_max )
 						{
 							WFIFOHEAD(i,3);
 							WFIFOW(i,0) = 0x81;
@@ -2885,7 +2885,7 @@ int parse_frommap(int fd)
 			case 0x2b0a:
 				if( RFIFOREST(fd) < RFIFOW(fd, 2) )
 					return 0;
-				socket_datasync(fd, false);
+				sockt->datasync(fd, false);
 				RFIFOSKIP(fd,RFIFOW(fd,2));
 				break;
 
@@ -4609,7 +4609,7 @@ int parse_char(int fd)
 					realloc_fifo(fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
 					char_mapif_init(fd);
 				}
-				socket_datasync(fd, true);
+				sockt->datasync(fd, true);
 
 				RFIFOSKIP(fd,60);
 			}
@@ -5304,11 +5304,11 @@ int do_init(int argc, char **argv) {
 	mmo_char_sql_init();
 	char_read_fame_list(); //Read fame lists.
 
-	if ((naddr_ != 0) && (!login_ip || !char_ip)) {
+	if ((sockt->naddr_ != 0) && (!login_ip || !char_ip)) {
 		char ip_str[16];
-		ip2str(addr_[0], ip_str);
+		ip2str(sockt->addr_[0], ip_str);
 
-		if (naddr_ > 1)
+		if (sockt->naddr_ > 1)
 			ShowStatus("Multiple interfaces detected..  using %s as our IP address\n", ip_str);
 		else
 			ShowStatus("Defaulting to %s as our IP address\n", ip_str);
diff --git a/src/common/HPM.c b/src/common/HPM.c
index e31437b72..cb70ddcd7 100644
--- a/src/common/HPM.c
+++ b/src/common/HPM.c
@@ -675,11 +675,7 @@ void hplugins_share_defaults(void) {
 	HPM->share(DB, "DB");
 	HPM->share(HPMiMalloc, "iMalloc");
 	/* socket */
-	HPM->share(RFIFOSKIP,"RFIFOSKIP");
-	HPM->share(WFIFOSET,"WFIFOSET");
-	HPM->share(do_close,"do_close");
-	HPM->share(make_connection,"make_connection");
-	//session,fd_max and addr_ are shared from within socket.c
+	HPM->share(sockt,"sockt");
 	/* strlib */
 	HPM->share(strlib,"strlib");
 	HPM->share(sv,"sv");
diff --git a/src/common/core.c b/src/common/core.c
index 5c1e58801..86634ec4b 100644
--- a/src/common/core.c
+++ b/src/common/core.c
@@ -287,6 +287,7 @@ void core_defaults(void) {
 	sql_defaults();
 	timer_defaults();
 	db_defaults();
+	socket_defaults();
 #endif
 }
 /*======================================
@@ -350,14 +351,14 @@ int main (int argc, char **argv) {
 	HPM->init();
 #endif
 		
-	socket_init();
+	sockt->init();
 
 	do_init(argc,argv);
 	{// Main runtime cycle
 		int next;
 		while (runflag != CORE_ST_STOP) {
-			next = timer->do_timer(timer->gettick_nocache());
-			do_sockets(next);
+			next = timer->perform(timer->gettick_nocache());
+			sockt->perform(next);
 		}
 	}
 
@@ -368,7 +369,7 @@ int main (int argc, char **argv) {
 	HPM->final();
 #endif
 	timer->final();
-	socket_final();
+	sockt->final();
 	DB->final();
 	rathread_final();
 #endif
diff --git a/src/common/socket.c b/src/common/socket.c
index 95333cdce..9a61b0827 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -10,6 +10,9 @@
 #include "../common/strlib.h"
 #include "../config/core.h"
 #include "../common/HPM.h"
+
+#define _H_SOCKET_C_
+
 #include "socket.h"
 
 #include <stdio.h>
@@ -43,6 +46,19 @@
 	#endif
 #endif
 
+/**
+ * Socket Interface Source
+ **/
+struct socket_interface sockt_s;
+
+#ifdef SEND_SHORTLIST
+	// Add a fd to the shortlist so that it'll be recognized as a fd that needs
+	// sending done on it.
+	void send_shortlist_add_fd(int fd);
+	// Do pending network sends (and eof handling) from the shortlist.
+	void send_shortlist_do_sends();
+#endif
+
 /////////////////////////////////////////////////////////////////////
 #if defined(WIN32)
 /////////////////////////////////////////////////////////////////////
@@ -212,12 +228,6 @@ char* sErr(int code)
 #endif
 
 fd_set readfds;
-int fd_max;
-time_t last_tick;
-time_t stall_time = 60;
-
-uint32 addr_[16];   // ip addresses of local host (host byte order)
-int naddr_ = 0;   // # of ip addresses
 
 // Maximum packet size in bytes, which the client is able to handle.
 // Larger packets cause a buffer overflow and stack corruption.
@@ -328,7 +338,7 @@ void setsocketopts(int fd, struct hSockOpt *opt) {
  *--------------------------------------*/
 void set_eof(int fd)
 {
-	if( session_isActive(fd) )
+	if( sockt->session_isActive(fd) )
 	{
 #ifdef SEND_SHORTLIST
 		// Add this socket to the shortlist for eof handling.
@@ -342,7 +352,7 @@ int recv_to_fifo(int fd)
 {
 	ssize_t len;
 
-	if( !session_isActive(fd) )
+	if( !sockt->session_isActive(fd) )
 		return -1;
 
 	len = sRecv(fd, (char *) session[fd]->rdata + session[fd]->rdata_size, (int)RFIFOSPACE(fd), 0);
@@ -363,7 +373,7 @@ int recv_to_fifo(int fd)
 	}
 
 	session[fd]->rdata_size += len;
-	session[fd]->rdata_tick = last_tick;
+	session[fd]->rdata_tick = sockt->last_tick;
 #ifdef SHOW_SERVER_STATS
 	socket_data_i += len;
 	socket_data_qi += len;
@@ -379,7 +389,7 @@ int send_from_fifo(int fd)
 {
 	ssize_t len;
 
-	if( !session_isValid(fd) )
+	if( !sockt->session_isValid(fd) )
 		return -1;
 
 	if( session[fd]->wdata_size == 0 )
@@ -431,8 +441,8 @@ void flush_fifo(int fd)
 void flush_fifos(void)
 {
 	int i;
-	for(i = 1; i < fd_max; i++)
-		flush_fifo(i);
+	for(i = 1; i < sockt->fd_max; i++)
+		sockt->flush_fifo(i);
 }
 
 /*======================================
@@ -466,12 +476,12 @@ int connect_client(int listen_fd) {
 
 #ifndef MINICORE
 	if( ip_rules && !connect_check(ntohl(client_address.sin_addr.s_addr)) ) {
-		do_close(fd);
+		sockt->close(fd);
 		return -1;
 	}
 #endif
 
-	if( fd_max <= fd ) fd_max = fd + 1;
+	if( sockt->fd_max <= fd ) sockt->fd_max = fd + 1;
 	sFD_SET(fd,&readfds);
 
 	create_session(fd, recv_to_fifo, send_from_fifo, default_func_parse);
@@ -521,7 +531,7 @@ int make_listen_bind(uint32 ip, uint16 port)
 		exit(EXIT_FAILURE);
 	}
 
-	if(fd_max <= fd) fd_max = fd + 1;
+	if(sockt->fd_max <= fd) sockt->fd_max = fd + 1;
 	sFD_SET(fd, &readfds);
 
 	create_session(fd, connect_client, null_send, null_parse);
@@ -566,13 +576,13 @@ int make_connection(uint32 ip, uint16 port, struct hSockOpt *opt) {
 	if( result == SOCKET_ERROR ) {
 		if( !( opt && opt->silent ) )
 			ShowError("make_connection: connect failed (socket #%d, %s)!\n", fd, error_msg());
-		do_close(fd);
+		sockt->close(fd);
 		return -1;
 	}
 	//Now the socket can be made non-blocking. [Skotlex]
 	set_nonblocking(fd, 1);
 
-	if (fd_max <= fd) fd_max = fd + 1;
+	if (sockt->fd_max <= fd) sockt->fd_max = fd + 1;
 	sFD_SET(fd,&readfds);
 
 	create_session(fd, recv_to_fifo, send_from_fifo, default_func_parse);
@@ -591,7 +601,7 @@ static int create_session(int fd, RecvFunc func_recv, SendFunc func_send, ParseF
 	session[fd]->func_recv  = func_recv;
 	session[fd]->func_send  = func_send;
 	session[fd]->func_parse = func_parse;
-	session[fd]->rdata_tick = last_tick;
+	session[fd]->rdata_tick = sockt->last_tick;
 	session[fd]->session_data = NULL;
 	session[fd]->hdata = NULL;
 	session[fd]->hdatac = 0;
@@ -600,7 +610,7 @@ static int create_session(int fd, RecvFunc func_recv, SendFunc func_send, ParseF
 
 static void delete_session(int fd)
 {
-	if( session_isValid(fd) ) {
+	if( sockt->session_isValid(fd) ) {
 		unsigned int i;
 #ifdef SHOW_SERVER_STATS
 		socket_data_qi -= session[fd]->rdata_size - session[fd]->rdata_pos;
@@ -625,7 +635,7 @@ static void delete_session(int fd)
 
 int realloc_fifo(int fd, unsigned int rfifo_size, unsigned int wfifo_size)
 {
-	if( !session_isValid(fd) )
+	if( !sockt->session_isValid(fd) )
 		return 0;
 
 	if( session[fd]->max_rdata != rfifo_size && session[fd]->rdata_size < rfifo_size) {
@@ -644,7 +654,7 @@ int realloc_writefifo(int fd, size_t addition)
 {
 	size_t newsize;
 
-	if( !session_isValid(fd) ) // might not happen
+	if( !sockt->session_isValid(fd) ) // might not happen
 		return 0;
 
 	if( session[fd]->wdata_size + addition  > session[fd]->max_wdata )
@@ -672,7 +682,7 @@ int RFIFOSKIP(int fd, size_t len)
 {
     struct socket_data *s;
 
-	if ( !session_isActive(fd) )
+	if ( !sockt->session_isActive(fd) )
 		return 0;
 
 	s = session[fd];
@@ -695,7 +705,7 @@ int WFIFOSET(int fd, size_t len)
 	size_t newreserve;
 	struct socket_data* s = session[fd];
 
-	if( !session_isValid(fd) || s->wdata == NULL )
+	if( !sockt->session_isValid(fd) || s->wdata == NULL )
 		return 0;
 
 	// we have written len bytes to the buffer already before calling WFIFOSET
@@ -771,7 +781,7 @@ int do_sockets(int next)
 #ifdef SEND_SHORTLIST
 	send_shortlist_do_sends();
 #else
-	for (i = 1; i < fd_max; i++)
+	for (i = 1; i < sockt->fd_max; i++)
 	{
 		if(!session[i])
 			continue;
@@ -786,7 +796,7 @@ int do_sockets(int next)
 	timeout.tv_usec = next%1000*1000;
 
 	memcpy(&rfd, &readfds, sizeof(rfd));
-	ret = sSelect(fd_max, &rfd, NULL, NULL, &timeout);
+	ret = sSelect(sockt->fd_max, &rfd, NULL, NULL, &timeout);
 
 	if( ret == SOCKET_ERROR )
 	{
@@ -798,7 +808,7 @@ int do_sockets(int next)
 		return 0; // interrupted by a signal, just loop and try again
 	}
 
-	last_tick = time(NULL);
+	sockt->last_tick = time(NULL);
 
 #if defined(WIN32)
 	// on windows, enumerating all members of the fd_set is way faster if we access the internals
@@ -810,7 +820,7 @@ int do_sockets(int next)
 	}
 #else
 	// otherwise assume that the fd_set is a bit-array and enumerate it in a standard way
-	for( i = 1; ret && i < fd_max; ++i )
+	for( i = 1; ret && i < sockt->fd_max; ++i )
 	{
 		if(sFD_ISSET(i,&rfd) && session[i])
 		{
@@ -824,7 +834,7 @@ int do_sockets(int next)
 #ifdef SEND_SHORTLIST
 	send_shortlist_do_sends();
 #else
-	for (i = 1; i < fd_max; i++)
+	for (i = 1; i < sockt->fd_max; i++)
 	{
 		if(!session[i])
 			continue;
@@ -840,12 +850,12 @@ int do_sockets(int next)
 #endif
 
 	// parse input data on each socket
-	for(i = 1; i < fd_max; i++)
+	for(i = 1; i < sockt->fd_max; i++)
 	{
 		if(!session[i])
 			continue;
 
-		if (session[i]->rdata_tick && DIFF_TICK(last_tick, session[i]->rdata_tick) > stall_time) {
+		if (session[i]->rdata_tick && DIFF_TICK(sockt->last_tick, session[i]->rdata_tick) > sockt->stall_time) {
 			if( session[i]->flag.server ) {/* server is special */
 				if( session[i]->flag.ping != 2 )/* only update if necessary otherwise it'd resend the ping unnecessarily */
 					session[i]->flag.ping = 1;
@@ -873,7 +883,7 @@ int do_sockets(int next)
 	}
 
 #ifdef SHOW_SERVER_STATS
-	if (last_tick != socket_data_last_tick)
+	if (sockt->last_tick != socket_data_last_tick)
 	{
 		char buf[1024];
 		
@@ -883,7 +893,7 @@ int do_sockets(int next)
 #else
 		ShowMessage("\033[s\033[1;1H\033[2K%s\033[u", buf);
 #endif
-		socket_data_last_tick = last_tick;
+		socket_data_last_tick = sockt->last_tick;
 		socket_data_i = socket_data_ci = 0;
 		socket_data_o = socket_data_co = 0;
 	}
@@ -1148,9 +1158,9 @@ int socket_config_read(const char* cfgName)
 			continue;
 
 		if (!strcmpi(w1, "stall_time")) {
-			stall_time = atoi(w2);
-			if( stall_time < 3 )
-				stall_time = 3;/* a minimum is required to refrain it from killing itself */
+			sockt->stall_time = atoi(w2);
+			if( sockt->stall_time < 3 )
+				sockt->stall_time = 3;/* a minimum is required to refrain it from killing itself */
 		}
 #ifndef MINICORE
 		else if (!strcmpi(w1, "enable_ip_rules")) {
@@ -1218,9 +1228,9 @@ void socket_final(void)
 		aFree(access_deny);
 #endif
 
-	for( i = 1; i < fd_max; i++ )
+	for( i = 1; i < sockt->fd_max; i++ )
 		if(session[i])
-			do_close(i);
+			sockt->close(i);
 
 	// session[0] ‚̃_ƒ~�[ƒf�[ƒ^‚ð�í�œ
 	aFree(session[0]->rdata);
@@ -1382,7 +1392,7 @@ void socket_init(void)
 #endif
 
 	// Get initial local ips
-	naddr_ = socket_getips(addr_,16);
+	sockt->naddr_ = socket_getips(sockt->addr_,16);
 
 	sFD_ZERO(&readfds);
 #if defined(SEND_SHORTLIST)
@@ -1394,7 +1404,7 @@ void socket_init(void)
 	socket_config_read(SOCKET_CONF_FILENAME);
 
 	// initialise last send-receive tick
-	last_tick = time(NULL);
+	sockt->last_tick = time(NULL);
 
 	// session[0] is now currently used for disconnected sessions of the map server, and as such,
 	// should hold enough buffer (it is a vacuum so to speak) as it is never flushed. [Skotlex]
@@ -1411,8 +1421,6 @@ void socket_init(void)
 	
 	/* Hercules Plugin Manager */
 	HPM->share(session,"session");
-	HPM->share(&fd_max,"fd_max");
-	HPM->share(addr_,"addr");
 }
 
 bool session_isValid(int fd)
@@ -1422,7 +1430,7 @@ bool session_isValid(int fd)
 
 bool session_isActive(int fd)
 {
-	return ( session_isValid(fd) && !session[fd]->flag.eof );
+	return ( sockt->session_isValid(fd) && !session[fd]->flag.eof );
 }
 
 // Resolves hostname into a numeric ip.
@@ -1526,7 +1534,7 @@ void send_shortlist_add_fd(int fd)
 	int i;
 	int bit;
 
-	if( !session_isValid(fd) )
+	if( !sockt->session_isValid(fd) )
 		return;// out of range
 
 	i = fd/32;
@@ -1595,3 +1603,44 @@ void send_shortlist_do_sends()
 	}
 }
 #endif
+
+void socket_defaults(void) {
+	sockt = &sockt_s;
+	
+	sockt->fd_max = 0;
+	/* */
+	sockt->stall_time = 60;
+	sockt->last_tick = 0;
+	/* */
+	memset(&sockt->addr_, 0, sizeof(sockt->addr_));
+	sockt->naddr_ = 0;
+	/* */
+	sockt->init = socket_init;
+	sockt->final = socket_final;
+	/* */
+	sockt->perform = do_sockets;
+	/* */
+	sockt->datasync = socket_datasync;
+	/* */
+	sockt->make_listen_bind = make_listen_bind;
+	sockt->make_connection = make_connection;
+	sockt->realloc_fifo = realloc_fifo;
+	sockt->realloc_writefifo = realloc_writefifo;
+	sockt->WFIFOSET = WFIFOSET;
+	sockt->RFIFOSKIP = RFIFOSKIP;
+	sockt->close = do_close;
+	/* */
+	sockt->session_isValid = session_isValid;
+	sockt->session_isActive = session_isActive;
+	/* */
+	sockt->flush_fifo = flush_fifo;
+	sockt->flush_fifos = flush_fifos;
+	sockt->set_nonblocking = set_nonblocking;
+	sockt->set_defaultparse = set_defaultparse;
+	sockt->host2ip = host2ip;
+	sockt->ip2str = ip2str;
+	sockt->str2ip = str2ip;
+	sockt->ntows = ntows;
+	sockt->getips = socket_getips;
+	sockt->set_eof = set_eof;
+}
diff --git a/src/common/socket.h b/src/common/socket.h
index 02817f653..6879d2e90 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -107,73 +107,93 @@ struct hSockOpt {
 	unsigned int setTimeo : 1;
 };
 
-// Data prototype declaration
-
-struct socket_data **session;
-
-extern int fd_max;
-
-extern time_t last_tick;
-extern time_t stall_time;
-
-//////////////////////////////////
-// some checking on sockets
-extern bool session_isValid(int fd);
-extern bool session_isActive(int fd);
-//////////////////////////////////
-
-// Function prototype declaration
-
-int make_listen_bind(uint32 ip, uint16 port);
-int make_connection(uint32 ip, uint16 port, struct hSockOpt *opt);
-int realloc_fifo(int fd, unsigned int rfifo_size, unsigned int wfifo_size);
-int realloc_writefifo(int fd, size_t addition);
-int WFIFOSET(int fd, size_t len);
-int RFIFOSKIP(int fd, size_t len);
-
-int do_sockets(int next);
-void do_close(int fd);
-void socket_init(void);
-void socket_final(void);
-
-extern void flush_fifo(int fd);
-extern void flush_fifos(void);
-extern void set_nonblocking(int fd, unsigned long yes);
-
-void set_defaultparse(ParseFunc defaultparse);
+/// Use a shortlist of sockets instead of iterating all sessions for sockets
+/// that have data to send or need eof handling.
+/// Adapted to use a static array instead of a linked list.
+///
+/// @author Buuyo-tama
+#define SEND_SHORTLIST
 
-// hostname/ip conversion functions
-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 ) ))
-uint16 ntows(uint16 netshort);
-
-int socket_getips(uint32* ips, int max);
-
-extern uint32 addr_[16];   // ip addresses of local host (host byte order)
-extern int naddr_;   // # of ip addresses
 
-void set_eof(int fd);
-
-/* [Ind/Hercules] - socket_datasync */
-void socket_datasync(int fd, bool send);
+/**
+ * This stays out of the interface.
+ **/
+struct socket_data **session;
 
-/// Use a shortlist of sockets instead of iterating all sessions for sockets 
-/// that have data to send or need eof handling.
-/// Adapted to use a static array instead of a linked list.
-///
-/// @author Buuyo-tama
-#define SEND_SHORTLIST
+/**
+ * Socket.c interface, mostly for reading however.
+ **/
+struct socket_interface {
+	int fd_max;
+	/* */
+	time_t stall_time;
+	time_t last_tick;
+	/* */
+	uint32 addr_[16];   // ip addresses of local host (host byte order)
+	int naddr_;   // # of ip addresses
+	/* */
+	void (*init) (void);
+	void (*final) (void);
+	/* */
+	int (*perform) (int next);
+	/* [Ind/Hercules] - socket_datasync */
+	void (*datasync) (int fd, bool send);
+	/* */
+	int (*make_listen_bind) (uint32 ip, uint16 port);
+	int (*make_connection) (uint32 ip, uint16 port, struct hSockOpt *opt);
+	int (*realloc_fifo) (int fd, unsigned int rfifo_size, unsigned int wfifo_size);
+	int (*realloc_writefifo) (int fd, size_t addition);
+	int (*WFIFOSET) (int fd, size_t len);
+	int (*RFIFOSKIP) (int fd, size_t len);
+	void (*close) (int fd);
+	/* */
+	bool (*session_isValid) (int fd);
+	bool (*session_isActive) (int fd);
+	/* */
+	void (*flush_fifo) (int fd);
+	void (*flush_fifos) (void);
+	void (*set_nonblocking) (int fd, unsigned long yes);
+	void (*set_defaultparse) (ParseFunc defaultparse);
+	/* hostname/ip conversion functions */
+	uint32 (*host2ip) (const char* hostname);
+	const char * (*ip2str) (uint32 ip, char ip_str[16]);
+	uint32 (*str2ip) (const char* ip_str);
+	/* */
+	uint16 (*ntows) (uint16 netshort);
+	/* */
+	int (*getips) (uint32* ips, int max);
+	/* */
+	void (*set_eof) (int fd);
+};
 
-#ifdef SEND_SHORTLIST
-// Add a fd to the shortlist so that it'll be recognized as a fd that needs
-// sending done on it.
-void send_shortlist_add_fd(int fd);
-// Do pending network sends (and eof handling) from the shortlist.
-void send_shortlist_do_sends();
-#endif
+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_
+	#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) )
+	#define realloc_writefifo(fd, addition) ( sockt->realloc_writefifo(fd, addition) )
+	#define WFIFOSET(fd, len) ( sockt->WFIFOSET(fd, len) )
+	#define RFIFOSKIP(fd, len) ( sockt->RFIFOSKIP(fd, len) )
+	#define do_close(fd) ( sockt->close(fd) )
+	#define session_isValid(fd) ( sockt->session_isValid(fd) )
+	#define session_isActive(fd) ( sockt->session_isActive(fd) )
+	#define flush_fifo(fd) ( sockt->flush_fifo(fd) )
+	#define flush_fifos() ( sockt->flush_fifos() )
+	#define set_nonblocking(fd, yes) ( sockt->set_nonblocking(fd, yes) )
+	#define set_defaultparse(defaultparse) ( sockt->set_defaultparse(defaultparse) )
+	#define host2ip(hostname) ( sockt->host2ip(hostname) )
+	#define ip2str(ip, ip_str) ( sockt->ip2str(ip, ip_str) )
+	#define str2ip(ip_str) ( sockt->str2ip(ip_str) )
+	#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 /* _SOCKET_H_ */
diff --git a/src/common/strlib.h b/src/common/strlib.h
index d1aea8cac..5336260f6 100644
--- a/src/common/strlib.h
+++ b/src/common/strlib.h
@@ -190,4 +190,5 @@ void strlib_defaults(void);
 	#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.c b/src/common/timer.c
index 7f9e20dad..526854582 100644
--- a/src/common/timer.c
+++ b/src/common/timer.c
@@ -468,7 +468,7 @@ void timer_defaults(void) {
 	timer->addtick = timer_addtick;
 	timer->settick = timer_settick;
 	timer->get_uptime = timer_get_uptime;
-	timer->do_timer = do_timer;
+	timer->perform = do_timer;
 	timer->init = timer_init;
 	timer->final = timer_final;
 }
diff --git a/src/common/timer.h b/src/common/timer.h
index 9aa29861e..af1a2b036 100644
--- a/src/common/timer.h
+++ b/src/common/timer.h
@@ -56,7 +56,7 @@ struct timer_interface {
 
 	unsigned long (*get_uptime) (void);
 
-	int (*do_timer) (int64 tick);
+	int (*perform) (int64 tick);
 	void (*init) (void);
 	void (*final) (void);
 };
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 3cdfb0e29..0cb552bd0 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -9847,7 +9847,7 @@ bool is_atcommand(const int fd, struct map_session_data* sd, const char* message
 	}
 
 	if( battle_config.idletime_criteria & BCIDLE_ATCOMMAND )
-		sd->idletime = last_tick;
+		sd->idletime = sockt->last_tick;
 	
 	//Clearing these to be used once more.
 	memset(command, '\0', sizeof(command));
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 0a3fb0ad2..3dc35fc68 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -426,7 +426,7 @@ void chrif_connectack(int fd) {
 		guild->castle_map_init();
 	}
 	
-	socket_datasync(fd, true);
+	sockt->datasync(fd, true);
 	chrif->skillid2idx(fd);
 }
 
@@ -1251,7 +1251,7 @@ bool chrif_char_offline_nsd(int account_id, int char_id) {
 /*=========================================
  * Tell char-server to reset all chars offline [Wizputer]
  *-----------------------------------------*/
-bool chrif_flush_fifo(void) {
+bool chrif_flush(void) {
 	chrif_check(false);
 
 	set_nonblocking(chrif->fd, 0);
@@ -1372,7 +1372,7 @@ int chrif_parse(int fd) {
 		chrif->on_disconnect();
 		return 0;
 	} else if ( session[fd]->flag.ping ) {/* we've reached stall time */
-		if( DIFF_TICK(last_tick, session[fd]->rdata_tick) > (stall_time * 2) ) {/* we can't wait any longer */
+		if( DIFF_TICK(sockt->last_tick, session[fd]->rdata_tick) > (sockt->stall_time * 2) ) {/* we can't wait any longer */
 			set_eof(fd);
 			return 0;
 		} else if( session[fd]->flag.ping != 2 ) { /* we haven't sent ping out yet */
@@ -1423,7 +1423,7 @@ int chrif_parse(int fd) {
 			case 0x2b04: chrif->recvmap(fd); break;
 			case 0x2b06: chrif->changemapserverack(RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10), RFIFOL(fd,14), RFIFOW(fd,18), RFIFOW(fd,20), RFIFOW(fd,22), RFIFOL(fd,24), RFIFOW(fd,28)); break;
 			case 0x2b09: map->addnickdb(RFIFOL(fd,2), (char*)RFIFOP(fd,6)); break;
-			case 0x2b0a: socket_datasync(fd, false); break;
+			case 0x2b0a: sockt->datasync(fd, false); break;
 			case 0x2b0d: chrif->changedsex(fd); break;
 			case 0x2b0f: chrif->char_ask_name_answer(RFIFOL(fd,2), (char*)RFIFOP(fd,6), RFIFOW(fd,30), RFIFOW(fd,32)); break;
 			case 0x2b12: chrif->divorceack(RFIFOL(fd,2), RFIFOL(fd,6)); break;
@@ -1692,7 +1692,7 @@ void chrif_defaults(void) {
 	chrif->removefriend = chrif_removefriend;
 	chrif->send_report = chrif_send_report;
 		
-	chrif->flush_fifo = chrif_flush_fifo;
+	chrif->flush = chrif_flush;
 	chrif->skillid2idx = chrif_skillid2idx;
 	
 	chrif->sd_to_auth = chrif_sd_to_auth;
diff --git a/src/map/chrif.h b/src/map/chrif.h
index 7e7aa43cd..163fdf670 100644
--- a/src/map/chrif.h
+++ b/src/map/chrif.h
@@ -104,7 +104,7 @@ struct chrif_interface {
 	bool (*removefriend) (int char_id, int friend_id);
 	void (*send_report) (char* buf, int len);
 			
-	bool (*flush_fifo) (void);
+	bool (*flush) (void);
 	void (*skillid2idx) (int fd);
 	
 	bool (*sd_to_auth) (TBL_PC* sd, enum sd_state state);
diff --git a/src/map/clif.c b/src/map/clif.c
index af328e7a7..975a5aa01 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9708,7 +9708,7 @@ void clif_parse_WalkToXY(int fd, struct map_session_data *sd)
 
 	//Set last idle time... [Skotlex]
 	if( battle_config.idletime_criteria & BCIDLE_WALK )
-		sd->idletime = last_tick;
+		sd->idletime = sockt->last_tick;
 
 	unit->walktoxy(&sd->bl, x, y, 4);
 }
@@ -9859,7 +9859,7 @@ void clif_parse_GlobalMessage(int fd, struct map_session_data* sd)
 	}
 	
 	if( battle_config.idletime_criteria & BCIDLE_CHAT )
-		sd->idletime = last_tick;
+		sd->idletime = sockt->last_tick;
 	
 	if( sd->gcbind ) {
 		clif->chsys_send(sd->gcbind,sd,message);
@@ -10024,7 +10024,7 @@ void clif_parse_Emotion(int fd, struct map_session_data *sd)
 		sd->emotionlasttime = time(NULL);
 		
 		if( battle_config.idletime_criteria & BCIDLE_EMOTION )
-			sd->idletime = last_tick;
+			sd->idletime = sockt->last_tick;
 
 		if(battle_config.client_reshuffle_dice && emoticon>=E_DICE1 && emoticon<=E_DICE6) {// re-roll dice
 			emoticon = rnd()%6+E_DICE1;
@@ -10099,7 +10099,7 @@ void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type,
 
 			pc->delinvincibletimer(sd);
 			if( battle_config.idletime_criteria & BCIDLE_ATTACK )
-				sd->idletime = last_tick;
+				sd->idletime = sockt->last_tick;
 			unit->attack(&sd->bl, target_id, action_type != 0);
 		break;
 		case 0x02: // sitdown
@@ -10124,7 +10124,7 @@ void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type,
 				break;
 
 			if( battle_config.idletime_criteria & BCIDLE_SIT )
-				sd->idletime = last_tick;
+				sd->idletime = sockt->last_tick;
 			
 			pc_setsit(sd);
 			skill->sit(sd,1);
@@ -10138,7 +10138,7 @@ void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type,
 			}
 			
 			if( battle_config.idletime_criteria & BCIDLE_SIT )
-				sd->idletime = last_tick;
+				sd->idletime = sockt->last_tick;
 			
 			pc->setstand(sd);
 			skill->sit(sd,0);
@@ -10332,7 +10332,7 @@ void clif_parse_WisMessage(int fd, struct map_session_data* sd)
 	}
 
 	if( battle_config.idletime_criteria & BCIDLE_CHAT )
-		sd->idletime = last_tick;
+		sd->idletime = sockt->last_tick;
 	
 	// Chat logging type 'W' / Whisper
 	logs->chat(LOG_CHAT_WHISPER, 0, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, target, message);
@@ -10552,7 +10552,7 @@ void clif_parse_DropItem(int fd, struct map_session_data *sd)
 			break;
 
 		if( battle_config.idletime_criteria & BCIDLE_DROPITEM )
-			sd->idletime = last_tick;
+			sd->idletime = sockt->last_tick;
 		
 		return;
 	}
@@ -10580,7 +10580,7 @@ void clif_parse_UseItem(int fd, struct map_session_data *sd)
 
 	//Whether the item is used or not is irrelevant, the char ain't idle. [Skotlex]
 	if( battle_config.idletime_criteria & BCIDLE_USEITEM )
-		sd->idletime = last_tick;
+		sd->idletime = sockt->last_tick;
 	n = RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0])-2;
 
 	if(n <0 || n >= MAX_INVENTORY)
@@ -10627,7 +10627,7 @@ void clif_parse_EquipItem(int fd,struct map_session_data *sd) {
 	}
 
 	if( battle_config.idletime_criteria & BCIDLE_USEITEM )
-		sd->idletime = last_tick;
+		sd->idletime = sockt->last_tick;
 	
 	//Client doesn't send the position for ammo.
 	if(sd->inventory_data[p->index]->type == IT_AMMO)
@@ -10747,7 +10747,7 @@ void clif_parse_UnequipItem(int fd,struct map_session_data *sd)
 	index = RFIFOW(fd,2)-2;
 
 	if( battle_config.idletime_criteria & BCIDLE_USEITEM )
-		sd->idletime = last_tick;
+		sd->idletime = sockt->last_tick;
 	
 	pc->unequipitem(sd,index,1);
 }
@@ -11297,7 +11297,7 @@ void clif_parse_UseSkillToId(int fd, struct map_session_data *sd)
 
 	// Whether skill fails or not is irrelevant, the char ain't idle. [Skotlex]
 	if( battle_config.idletime_criteria & BCIDLE_USESKILLTOID )
-		sd->idletime = last_tick;
+		sd->idletime = sockt->last_tick;
 
 	if( sd->npc_id || sd->state.workinprogress&1 ){
 #ifdef RENEWAL
@@ -11398,7 +11398,7 @@ void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, uint16 ski
 
 	//Whether skill fails or not is irrelevant, the char ain't idle. [Skotlex]
 	if( battle_config.idletime_criteria & BCIDLE_USESKILLTOPOS )
-		sd->idletime = last_tick;
+		sd->idletime = sockt->last_tick;
 
 	if( skill->not_ok(skill_id, sd) )
 		return;
@@ -12154,7 +12154,7 @@ void clif_parse_PartyMessage(int fd, struct map_session_data* sd)
 	}
 
 	if( battle_config.idletime_criteria & BCIDLE_CHAT )
-		sd->idletime = last_tick;
+		sd->idletime = sockt->last_tick;
 	
 	party->send_message(sd, text, textlen);
 }
@@ -13214,7 +13214,7 @@ void clif_parse_GuildMessage(int fd, struct map_session_data* sd)
 	}
 
 	if( battle_config.idletime_criteria & BCIDLE_CHAT )
-		sd->idletime = last_tick;
+		sd->idletime = sockt->last_tick;
 	
 	if( sd->bg_id )
 		bg->send_message(sd, text, textlen);
@@ -16203,7 +16203,7 @@ void clif_parse_BattleChat(int fd, struct map_session_data* sd)
 	}
 
 	if( battle_config.idletime_criteria & BCIDLE_CHAT )
-		sd->idletime = last_tick;
+		sd->idletime = sockt->last_tick;
 	
 	bg->send_message(sd, text, textlen);
 }
diff --git a/src/map/map.c b/src/map/map.c
index 052d589b4..8301caa5b 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -5113,7 +5113,7 @@ void do_final(void)
 
 	map->id_db->foreach(map->id_db,map->cleanup_db_sub);
 	chrif->char_reset_offline();
-	chrif->flush_fifo();
+	chrif->flush();
 
 	atcommand->final();
 	battle->final();
@@ -5200,7 +5200,7 @@ void do_abort(void)
 	}
 	ShowError("Server received crash signal! Attempting to save all online characters!\n");
 	map->foreachpc(map->abort_sub);
-	chrif->flush_fifo();
+	chrif->flush();
 }
 
 /*======================================================
@@ -5524,13 +5524,13 @@ int do_init(int argc, char *argv[])
 
 		if (!map->ip_set || !map->char_ip_set) {
 			char ip_str[16];
-			ip2str(addr_[0], ip_str);
+			ip2str(sockt->addr_[0], ip_str);
 
 			ShowWarning("Not all IP addresses in /conf/map-server.conf configured, autodetecting...\n");
 
-			if (naddr_ == 0)
+			if (sockt->naddr_ == 0)
 				ShowError("Unable to determine your IP address...\n");
-			else if (naddr_ > 1)
+			else if (sockt->naddr_ > 1)
 				ShowNotice("Multiple interfaces detected...\n");
 
 			ShowInfo("Defaulting to %s as our IP address\n", ip_str);
diff --git a/src/map/mob.c b/src/map/mob.c
index 6a8aa5f03..dab7b99ac 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -1825,7 +1825,7 @@ void mob_item_drop(struct mob_data *md, struct item_drop_list *dlist, struct ite
 
 	if( sd
 		&& (drop_rate <= sd->state.autoloot || pc->isautolooting(sd, ditem->item_data.nameid))
-		&& (battle_config.idle_no_autoloot == 0 || DIFF_TICK(last_tick, sd->idletime) < battle_config.idle_no_autoloot)
+		&& (battle_config.idle_no_autoloot == 0 || DIFF_TICK(sockt->last_tick, sd->idletime) < battle_config.idle_no_autoloot)
 		&& (battle_config.homunculus_autoloot?1:!flag)
 #ifdef AUTOLOOT_DISTANCE
 		&& sd->bl.m == md->bl.m
diff --git a/src/map/pc.c b/src/map/pc.c
index f96b70cdb..b6c354189 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -1035,7 +1035,7 @@ bool pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_tim
 	sd->cansendmail_tick = tick;
 	sd->hchsysch_tick = tick;
 
-	sd->idletime = last_tick;
+	sd->idletime = sockt->last_tick;
 	
 	for(i = 0; i < MAX_SPIRITBALL; i++)
 		sd->spirit_timer[i] = INVALID_TIMER;
diff --git a/src/map/pc.h b/src/map/pc.h
index f64b20945..487266646 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -585,7 +585,7 @@ enum equip_pos {
 #define pc_setsit(sd)         ( (sd)->state.dead_sit = (sd)->vd.dead_sit = 2 )
 #define pc_isdead(sd)         ( (sd)->state.dead_sit == 1 )
 #define pc_issit(sd)          ( (sd)->vd.dead_sit == 2 )
-#define pc_isidle(sd)         ( (sd)->chatID || (sd)->state.vending || (sd)->state.buyingstore || DIFF_TICK(last_tick, (sd)->idletime) >= battle_config.idle_no_share )
+#define pc_isidle(sd)         ( (sd)->chatID || (sd)->state.vending || (sd)->state.buyingstore || DIFF_TICK(sockt->last_tick, (sd)->idletime) >= battle_config.idle_no_share )
 #define pc_istrading(sd)      ( (sd)->npc_id || (sd)->state.vending || (sd)->state.buyingstore || (sd)->state.trading )
 #define pc_cant_act(sd)       ( (sd)->npc_id || (sd)->state.vending || (sd)->state.buyingstore || (sd)->chatID || ((sd)->sc.opt1 && (sd)->sc.opt1 != OPT1_BURNING) || (sd)->state.trading || (sd)->state.storage_flag || (sd)->state.prevend )
 
diff --git a/src/map/script.c b/src/map/script.c
index 75469a345..8e8f89727 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -15044,7 +15044,7 @@ BUILDIN(checkidle) {
 		sd = script->rid2sd(st);
 
 	if (sd)
-		script_pushint(st, DIFF_TICK32(last_tick, sd->idletime)); // TODO: change this to int64 when we'll support 64 bit script values
+		script_pushint(st, DIFF_TICK32(sockt->last_tick, sd->idletime)); // TODO: change this to int64 when we'll support 64 bit script values
 	else
 		script_pushint(st, 0);
 
diff --git a/src/map/unit.c b/src/map/unit.c
index d801a72f0..af52e6dfb 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -1918,7 +1918,7 @@ int unit_attack_timer_sub(struct block_list* src, int tid, int64 tick) {
 
 	if(ud->state.attack_continue) {
 		if( src->type == BL_PC && battle_config.idletime_criteria & BCIDLE_ATTACK )
-			((TBL_PC*)src)->idletime = last_tick;
+			((TBL_PC*)src)->idletime = sockt->last_tick;
 		ud->attacktimer = timer->add(ud->attackabletime,unit->attack_timer,src->id,0);
 	}
 
-- 
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/socket.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 9822be06be8e50418a62939e17b823009a00f2ee Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Sat, 22 Mar 2014 08:42:17 +0100
Subject: Whitespace cleanup

Replaced some tabs in the middle of the line with spaces.
Thanks to KeiKun for pointing out #ifdef<tab>_COMMON_SYSINFO_H_ and
making me realize how many of them were there.

Signed-off-by: Haru <haru@dotalux.com>
---
 src/common/HPM.h     |   2 +-
 src/common/HPMi.h    |  16 +++----
 src/common/console.h |   4 +-
 src/common/core.h    |  12 +++---
 src/common/des.h     |   5 ++-
 src/common/grfio.h   |   4 +-
 src/common/mmo.h     | 116 +++++++++++++++++++++++++--------------------------
 src/common/socket.h  |   2 +-
 src/common/timer.h   |   4 +-
 src/map/trade.h      |   4 +-
 src/map/vending.h    |   4 +-
 11 files changed, 87 insertions(+), 86 deletions(-)

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

diff --git a/src/common/HPM.h b/src/common/HPM.h
index b466cb4f3..0f0df4cda 100644
--- a/src/common/HPM.h
+++ b/src/common/HPM.h
@@ -1,7 +1,7 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 
-#ifndef	_COMMON_HPM_H_
+#ifndef _COMMON_HPM_H_
 #define _COMMON_HPM_H_
 
 #include "../common/cbasetypes.h"
diff --git a/src/common/HPMi.h b/src/common/HPMi.h
index 95037fd14..19206aeca 100644
--- a/src/common/HPMi.h
+++ b/src/common/HPMi.h
@@ -1,7 +1,7 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 
-#ifndef	_COMMON_HPMI_H_
+#ifndef _COMMON_HPMI_H_
 #define _COMMON_HPMI_H_
 
 #include "../common/cbasetypes.h"
@@ -67,13 +67,13 @@ enum hp_event_types {
 };
 
 enum HPluginPacketHookingPoints {
-	hpClif_Parse,		/* map-server (client-map) */
-	hpChrif_Parse,		/* map-server (char-map) */
-	hpParse_FromMap,	/* char-server (map-char) */
-	hpParse_FromLogin,	/* char-server (login-char) */
-	hpParse_Char,		/* char-server (client-char) */
-	hpParse_FromChar,	/* login-server (char-login) */
-	hpParse_Login,		/* login-server (client-login) */
+	hpClif_Parse,      ///< map-server (client-map)
+	hpChrif_Parse,     ///< map-server (char-map)
+	hpParse_FromMap,   ///< char-server (map-char)
+	hpParse_FromLogin, ///< char-server (login-char)
+	hpParse_Char,      ///< char-server (client-char)
+	hpParse_FromChar,  ///< login-server (char-login)
+	hpParse_Login,     ///< login-server (client-login)
 	/* */
 	hpPHP_MAX,
 };
diff --git a/src/common/console.h b/src/common/console.h
index bd1de4cbf..3d19ddc9d 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 "../common/thread.h"
 #include "../common/mutex.h"
diff --git a/src/common/core.h b/src/common/core.h
index 2cb623bc2..5c2f2c9a5 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"
@@ -24,10 +24,10 @@ extern int runflag;
 extern char *SERVER_NAME;
 
 enum server_types {
-	SERVER_TYPE_UNKNOWN	= 0x0,
-	SERVER_TYPE_LOGIN	= 0x1,
-	SERVER_TYPE_CHAR	= 0x2,
-	SERVER_TYPE_MAP		= 0x4,
+	SERVER_TYPE_UNKNOWN = 0x0,
+	SERVER_TYPE_LOGIN   = 0x1,
+	SERVER_TYPE_CHAR    = 0x2,
+	SERVER_TYPE_MAP     = 0x4,
 };
 
 enum server_types SERVER_TYPE;
diff --git a/src/common/des.h b/src/common/des.h
index 3f55448ba..0f908a15b 100644
--- a/src/common/des.h
+++ b/src/common/des.h
@@ -1,8 +1,9 @@
 // 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"
 
 /// One 64-bit block.
 typedef struct BIT64 { uint8_t b[8]; } BIT64;
diff --git a/src/common/grfio.h b/src/common/grfio.h
index 4f5d0d6bc..930ed7e36 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);
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 476d12d3f..04f3210ca 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 "cbasetypes.h"
 #include "../common/db.h"
@@ -60,7 +60,7 @@
 
 // Client support for experimental RagexeRE UI present in 2012-04-10 and 2012-04-18
 #if defined(PACKETVER_RE) && ( PACKETVER == 20120410 || PACKETVER == 20120418 )
-#define	PARTY_RECRUIT
+#define PARTY_RECRUIT
 #endif // PACKETVER_RE && (PACKETVER == 20120410 || PACKETVER == 10120418)
 
 // Comment the following line to disable sc_data saving. [Skotlex]
@@ -113,11 +113,11 @@
 #define MAX_GUILDPOSITION 20    // Increased max guild positions to accomodate for all members [Valaris] (removed) [PoW]
 #define MAX_GUILDEXPULSION 32
 #define MAX_GUILDALLIANCE 16
-#define MAX_GUILDSKILL	15      // Increased max guild skills because of new skills [Sara-chan]
+#define MAX_GUILDSKILL 15       // Increased max guild skills because of new skills [Sara-chan]
 #define MAX_GUILDLEVEL 50
 #define MAX_GUARDIANS 8         // Local max per castle. [Skotlex]
 #define MAX_QUEST_OBJECTIVES 3  // Max quest objectives for a quest
-#define MAX_START_ITEMS 32	    // Max number of items allowed to be given to a char whenever it's created. [mkbu95]
+#define MAX_START_ITEMS 32      // Max number of items allowed to be given to a char whenever it's created. [mkbu95]
 
 // for produce
 #define MIN_ATTRIBUTE 0
@@ -158,7 +158,7 @@
 // Base Homun skill.
 #define HM_SKILLBASE 8001
 #define MAX_HOMUNSKILL 43
-#define MAX_HOMUNCULUS_CLASS	52	// [orn] Increased to 60 from 16 to allow new Homun-S.
+#define MAX_HOMUNCULUS_CLASS 52 // [orn] Increased to 60 from 16 to allow new Homun-S.
 #define HM_CLASS_BASE 6001
 #define HM_CLASS_MAX (HM_CLASS_BASE+MAX_HOMUNCULUS_CLASS-1)
 
@@ -266,17 +266,17 @@ enum e_skill_flag
 	SKILL_FLAG_PERMANENT,
 	SKILL_FLAG_TEMPORARY,
 	SKILL_FLAG_PLAGIARIZED,
-	SKILL_FLAG_UNUSED,			/* needed to maintain the order since the values are saved, can be renamed and used if a new flag is necessary */
-	SKILL_FLAG_PERM_GRANTED,    // Permanent, granted through someway (e.g. script).
+	SKILL_FLAG_UNUSED,       ///< needed to maintain the order since the values are saved, can be renamed and used if a new flag is necessary
+	SKILL_FLAG_PERM_GRANTED, ///< Permanent, granted through someway (e.g. script).
 	/* */
 	/* MUST be the last, because with it the flag value stores a dynamic value (flag+lv) */
 	SKILL_FLAG_REPLACED_LV_0,   // Temporary skill overshadowing permanent skill of level 'N - SKILL_FLAG_REPLACED_LV_0',
 };
 
 enum e_mmo_charstatus_opt {
-	OPT_NONE		= 0x0,
-	OPT_SHOW_EQUIP	= 0x1,
-	OPT_ALLOW_PARTY	= 0x2,
+	OPT_NONE        = 0x0,
+	OPT_SHOW_EQUIP  = 0x1,
+	OPT_ALLOW_PARTY = 0x2,
 };
 
 enum e_item_bound_type {
@@ -345,14 +345,14 @@ struct s_pet {
 	char incuvate;
 };
 
-struct s_homunculus {	//[orn]
+struct s_homunculus { //[orn]
 	char name[NAME_LENGTH];
 	int hom_id;
 	int char_id;
 	short class_;
 	short prev_class;
 	int hp,max_hp,sp,max_sp;
-	unsigned int intimacy;	//[orn]
+	unsigned int intimacy;
 	short hunger;
 	struct s_skill hskill[MAX_HOMUNSKILL]; //albator
 	short skillpts;
@@ -527,7 +527,7 @@ struct party {
 	unsigned char count; //Count of online characters.
 	unsigned exp : 1,
 				item : 2; //&1: Party-Share (round-robin), &2: pickup style: shared.
-	struct party_member member[MAX_PARTY];	
+	struct party_member member[MAX_PARTY];
 };
 
 struct map_session_data;
@@ -631,14 +631,14 @@ enum fame_list_type {
 };
 
 enum { //Change Guild Infos
-	GBI_EXP	=1,		// Guild Experience (EXP)
-	GBI_GUILDLV,		// Guild level
-	GBI_SKILLPOINT,		// Guild skillpoints
-	GBI_SKILLLV,		// Guild skill_lv ?? seem unused
+	GBI_EXP = 1,    ///< Guild Experience (EXP)
+	GBI_GUILDLV,    ///< Guild level
+	GBI_SKILLPOINT, ///< Guild skillpoints
+	GBI_SKILLLV,    ///< Guild skill_lv ?? seem unused
 };
 
 enum { //Change Member Infos
-	GMI_POSITION	=0,
+	GMI_POSITION = 0,
 	GMI_EXP,
 	GMI_HAIR,
 	GMI_HAIR_COLOR,
@@ -835,50 +835,50 @@ enum {
 };
 
 enum weapon_type {
-	W_FIST,	//Bare hands
-	W_DAGGER,	//1
-	W_1HSWORD,	//2
-	W_2HSWORD,	//3
-	W_1HSPEAR,	//4
-	W_2HSPEAR,	//5
-	W_1HAXE,	//6
-	W_2HAXE,	//7
-	W_MACE,	//8
-	W_2HMACE,	//9 (unused)
-	W_STAFF,	//10
-	W_BOW,	//11
-	W_KNUCKLE,	//12
-	W_MUSICAL,	//13
-	W_WHIP,	//14
-	W_BOOK,	//15
-	W_KATAR,	//16
-	W_REVOLVER,	//17
-	W_RIFLE,	//18
-	W_GATLING,	//19
-	W_SHOTGUN,	//20
-	W_GRENADE,	//21
-	W_HUUMA,	//22
-	W_2HSTAFF,	//23
+	W_FIST,      ///< Bare hands
+	W_DAGGER,    //1
+	W_1HSWORD,   //2
+	W_2HSWORD,   //3
+	W_1HSPEAR,   //4
+	W_2HSPEAR,   //5
+	W_1HAXE,     //6
+	W_2HAXE,     //7
+	W_MACE,      //8
+	W_2HMACE,    //9 (unused)
+	W_STAFF,     //10
+	W_BOW,       //11
+	W_KNUCKLE,   //12
+	W_MUSICAL,   //13
+	W_WHIP,      //14
+	W_BOOK,      //15
+	W_KATAR,     //16
+	W_REVOLVER,  //17
+	W_RIFLE,     //18
+	W_GATLING,   //19
+	W_SHOTGUN,   //20
+	W_GRENADE,   //21
+	W_HUUMA,     //22
+	W_2HSTAFF,   //23
 	MAX_WEAPON_TYPE,
 	// dual-wield constants
-	W_DOUBLE_DD, // 2 daggers
-	W_DOUBLE_SS, // 2 swords
-	W_DOUBLE_AA, // 2 axes
-	W_DOUBLE_DS, // dagger + sword
-	W_DOUBLE_DA, // dagger + axe
-	W_DOUBLE_SA, // sword + axe
+	W_DOUBLE_DD, ///< 2 daggers
+	W_DOUBLE_SS, ///< 2 swords
+	W_DOUBLE_AA, ///< 2 axes
+	W_DOUBLE_DS, ///< dagger + sword
+	W_DOUBLE_DA, ///< dagger + axe
+	W_DOUBLE_SA, ///< sword + axe
 };
 
 enum ammo_type {
-	A_ARROW = 1,
-	A_DAGGER,   //2
-	A_BULLET,   //3
-	A_SHELL,    //4
-	A_GRENADE,  //5
-	A_SHURIKEN, //6
-	A_KUNAI,     //7
-	A_CANNONBALL,	//8
-	A_THROWWEAPON	//9
+	A_ARROW        = 1,
+	A_DAGGER,      //2
+	A_BULLET,      //3
+	A_SHELL,       //4
+	A_GRENADE,     //5
+	A_SHURIKEN,    //6
+	A_KUNAI,       //7
+	A_CANNONBALL,  //8
+	A_THROWWEAPON, //9
 };
 
 enum e_char_server_type {
diff --git a/src/common/socket.h b/src/common/socket.h
index ca9141716..75adde4cf 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -2,7 +2,7 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef	_COMMON_SOCKET_H_
+#ifndef _COMMON_SOCKET_H_
 #define _COMMON_SOCKET_H_
 
 #include "../common/cbasetypes.h"
diff --git a/src/common/timer.h b/src/common/timer.h
index ab3ffc21f..1ce8cf203 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"
 
diff --git a/src/map/trade.h b/src/map/trade.h
index f2c0d4622..143f26d74 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?
diff --git a/src/map/vending.h b/src/map/vending.h
index b2ba22955..a212f8385 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"
-- 
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/socket.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/socket.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/socket.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/socket.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