diff --git a/src/common/mmo.hpp b/src/common/mmo.hpp
index 176fef5585..3b77fc9260 100644
--- a/src/common/mmo.hpp
+++ b/src/common/mmo.hpp
@@ -693,14 +693,14 @@ struct party {
 	struct party_member member[MAX_PARTY];
 };
 
-struct map_session_data;
+class map_session_data;
 struct guild_member {
 	uint32 account_id, char_id;
 	short hair,hair_color,gender,class_,lv;
 	t_exp exp;
 	short online,position;
 	char name[NAME_LENGTH];
-	struct map_session_data *sd;
+	map_session_data *sd;
 	unsigned char modified;
 	uint32 last_login;
 };
@@ -1121,7 +1121,7 @@ struct clan{
 	char master[NAME_LENGTH];
 	char map[MAP_NAME_LENGTH_EXT];
 	short max_member, connect_member;
-	struct map_session_data *members[MAX_CLAN];
+	map_session_data *members[MAX_CLAN];
 	struct clan_alliance alliance[MAX_CLANALLIANCE];
 	unsigned short instance_id;
 };
diff --git a/src/map/achievement.cpp b/src/map/achievement.cpp
index 40b584bfb1..67a0d89330 100644
--- a/src/map/achievement.cpp
+++ b/src/map/achievement.cpp
@@ -439,7 +439,7 @@ AchievementLevelDatabase achievement_level_db;
  * @param achievement_id: Achievement to add
  * @return NULL on failure, achievement data on success
  */
-struct achievement *achievement_add(struct map_session_data *sd, int achievement_id)
+struct achievement *achievement_add(map_session_data *sd, int achievement_id)
 {
 	int i, index;
 
@@ -485,7 +485,7 @@ struct achievement *achievement_add(struct map_session_data *sd, int achievement
  * @param achievement_id: Achievement to remove
  * @return True on success, false on failure
  */
-bool achievement_remove(struct map_session_data *sd, int achievement_id)
+bool achievement_remove(map_session_data *sd, int achievement_id)
 {
 	struct achievement dummy;
 	int i;
@@ -532,7 +532,7 @@ bool achievement_remove(struct map_session_data *sd, int achievement_id)
  * @param achievement_id: Achievement to check if it's complete
  * @return True on completed, false if not
  */
-static bool achievement_done(struct map_session_data *sd, int achievement_id) {
+static bool achievement_done(map_session_data *sd, int achievement_id) {
 	for (int i = 0; i < sd->achievement_data.count; i++) {
 		if (sd->achievement_data.achievements[i].achievement_id == achievement_id && sd->achievement_data.achievements[i].completed > 0)
 			return true;
@@ -547,7 +547,7 @@ static bool achievement_done(struct map_session_data *sd, int achievement_id) {
  * @param achievement_id: Achievement to check if it has a dependent
  * @return False on failure or not complete, true on complete or no dependents
  */
-bool achievement_check_dependent(struct map_session_data *sd, int achievement_id)
+bool achievement_check_dependent(map_session_data *sd, int achievement_id)
 {
 	nullpo_retr(false, sd);
 
@@ -573,7 +573,7 @@ bool achievement_check_dependent(struct map_session_data *sd, int achievement_id
  * @param sd: Achievement to compare for completed dependents
  * @return True if successful, false if not
  */
-static int achievement_check_groups(struct map_session_data *sd, struct s_achievement_db *ad)
+static int achievement_check_groups(map_session_data *sd, struct s_achievement_db *ad)
 {
 	int i;
 
@@ -604,7 +604,7 @@ static int achievement_check_groups(struct map_session_data *sd, struct s_achiev
  * @param complete: Complete state of an achievement
  * @return True if successful, false if not
  */
-bool achievement_update_achievement(struct map_session_data *sd, int achievement_id, bool complete)
+bool achievement_update_achievement(map_session_data *sd, int achievement_id, bool complete)
 {
 	int i;
 
@@ -658,7 +658,7 @@ bool achievement_update_achievement(struct map_session_data *sd, int achievement
  * @param sd: Player getting the reward
  * @param achievement_id: Achievement to get reward data
  */
-void achievement_get_reward(struct map_session_data *sd, int achievement_id, time_t rewarded)
+void achievement_get_reward(map_session_data *sd, int achievement_id, time_t rewarded)
 {
 	int i;
 
@@ -699,7 +699,7 @@ void achievement_get_reward(struct map_session_data *sd, int achievement_id, tim
  * @param sd: Player to get reward
  * @param achievement_id: Achievement to get reward data
  */
-void achievement_check_reward(struct map_session_data *sd, int achievement_id)
+void achievement_check_reward(map_session_data *sd, int achievement_id)
 {
 	int i;
 
@@ -735,7 +735,7 @@ void achievement_check_reward(struct map_session_data *sd, int achievement_id)
  */
 void achievement_get_titles(uint32 char_id)
 {
-	struct map_session_data *sd = map_charid2sd(char_id);
+	map_session_data *sd = map_charid2sd(char_id);
 
 	if (sd) {
 		sd->titles.clear();
@@ -757,7 +757,7 @@ void achievement_get_titles(uint32 char_id)
  * Frees the player's data for achievements
  * @param sd: Player's session
  */
-void achievement_free(struct map_session_data *sd)
+void achievement_free(map_session_data *sd)
 {
 	nullpo_retv(sd);
 
@@ -775,7 +775,7 @@ void achievement_free(struct map_session_data *sd)
  * @param type: Type to return
  * @return The type's data, -1 if player doesn't have achievement, -2 on failure/incorrect type
  */
-int achievement_check_progress(struct map_session_data *sd, int achievement_id, int type)
+int achievement_check_progress(map_session_data *sd, int achievement_id, int type)
 {
 	int i;
 
@@ -808,7 +808,7 @@ int achievement_check_progress(struct map_session_data *sd, int achievement_id,
  * @param flag: If the call should attempt to give the AG_GOAL_ACHIEVE achievement
  * @return Rollover and TNL EXP or 0 on failure
  */
-int *achievement_level(struct map_session_data *sd, bool flag)
+int *achievement_level(map_session_data *sd, bool flag)
 {
 	nullpo_retr(nullptr, sd);
 
@@ -872,7 +872,7 @@ int *achievement_level(struct map_session_data *sd, bool flag)
 	return info;
 }
 
-bool achievement_check_condition( struct script_code* condition, struct map_session_data* sd ){
+bool achievement_check_condition( struct script_code* condition, map_session_data* sd ){
 	// Save the old script the player was attached to
 	struct script_state* previous_st = sd->st;
 
@@ -927,7 +927,7 @@ static bool achievement_target_complete(std::shared_ptr<s_achievement_db> ad, st
  * @param update_count: Objective values from event
  * @return 1 on success and false on failure
  */
-static bool achievement_update_objectives(struct map_session_data *sd, std::shared_ptr<struct s_achievement_db> ad, enum e_achievement_group group, const std::array<int, MAX_ACHIEVEMENT_OBJECTIVES> &update_count)
+static bool achievement_update_objectives(map_session_data *sd, std::shared_ptr<struct s_achievement_db> ad, enum e_achievement_group group, const std::array<int, MAX_ACHIEVEMENT_OBJECTIVES> &update_count)
 {
 	if (!ad || !sd)
 		return false;
@@ -1087,7 +1087,7 @@ static bool achievement_update_objectives(struct map_session_data *sd, std::shar
  * @param sp_value: SP parameter value
  * @param arg_count: va_arg count
  */
-void achievement_update_objective(struct map_session_data *sd, enum e_achievement_group group, uint8 arg_count, ...)
+void achievement_update_objective(map_session_data *sd, enum e_achievement_group group, uint8 arg_count, ...)
 {
 	if (!battle_config.feature_achievement)
 		return;
diff --git a/src/map/achievement.hpp b/src/map/achievement.hpp
index 12beb21ec1..ed138fec30 100644
--- a/src/map/achievement.hpp
+++ b/src/map/achievement.hpp
@@ -15,7 +15,7 @@
 #include "../common/database.hpp"
 #include "../common/db.hpp"
 
-struct map_session_data;
+class map_session_data;
 struct block_list;
 
 enum e_achievement_group {
@@ -134,17 +134,17 @@ public:
 
 extern AchievementLevelDatabase achievement_level_db;
 
-void achievement_get_reward(struct map_session_data *sd, int achievement_id, time_t rewarded);
-struct achievement *achievement_add(struct map_session_data *sd, int achievement_id);
-bool achievement_remove(struct map_session_data *sd, int achievement_id);
-bool achievement_update_achievement(struct map_session_data *sd, int achievement_id, bool complete);
-void achievement_check_reward(struct map_session_data *sd, int achievement_id);
-void achievement_free(struct map_session_data *sd);
-int achievement_check_progress(struct map_session_data *sd, int achievement_id, int type);
-int *achievement_level(struct map_session_data *sd, bool flag);
-bool achievement_check_condition(struct script_code* condition, struct map_session_data* sd);
+void achievement_get_reward(map_session_data *sd, int achievement_id, time_t rewarded);
+struct achievement *achievement_add(map_session_data *sd, int achievement_id);
+bool achievement_remove(map_session_data *sd, int achievement_id);
+bool achievement_update_achievement(map_session_data *sd, int achievement_id, bool complete);
+void achievement_check_reward(map_session_data *sd, int achievement_id);
+void achievement_free(map_session_data *sd);
+int achievement_check_progress(map_session_data *sd, int achievement_id, int type);
+int *achievement_level(map_session_data *sd, bool flag);
+bool achievement_check_condition(struct script_code* condition, map_session_data* sd);
 void achievement_get_titles(uint32 char_id);
-void achievement_update_objective(struct map_session_data *sd, enum e_achievement_group group, uint8 arg_count, ...);
+void achievement_update_objective(map_session_data *sd, enum e_achievement_group group, uint8 arg_count, ...);
 int achievement_update_objective_sub(block_list *bl, va_list ap);
 void achievement_read_db(void);
 void achievement_db_reload(void);
diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp
index ba4244ec7d..defcef28d5 100644
--- a/src/map/atcommand.cpp
+++ b/src/map/atcommand.cpp
@@ -58,7 +58,7 @@
 using namespace rathena;
 
 #define ATCOMMAND_LENGTH 50
-#define ACMD_FUNC(x) static int atcommand_ ## x (const int fd, struct map_session_data* sd, const char* command, const char* message)
+#define ACMD_FUNC(x) static int atcommand_ ## x (const int fd, map_session_data* sd, const char* command, const char* message)
 
 typedef struct AtCommandInfo AtCommandInfo;
 
@@ -195,8 +195,8 @@ const char *parent_cmd;
 struct atcmd_binding_data** atcmd_binding;
 
 static AtCommandInfo* get_atcommandinfo_byname(const char *name); // @help
-static void atcommand_get_suggestions(struct map_session_data* sd, const char *name, bool atcommand); // @help
-static void warp_get_suggestions(struct map_session_data* sd, const char *name); // @rura, @warp, @mapmove
+static void atcommand_get_suggestions(map_session_data* sd, const char *name, bool atcommand); // @help
+static void warp_get_suggestions(map_session_data* sd, const char *name); // @rura, @warp, @mapmove
 
 // @commands (script-based)
 struct atcmd_binding_data* get_atcommandbind_byname(const char* name) {
@@ -478,7 +478,7 @@ ACMD_FUNC(send)
  *
  * @author Euphy
  */
-static void warp_get_suggestions(struct map_session_data* sd, const char *name) {
+static void warp_get_suggestions(map_session_data* sd, const char *name) {
 	// Minimum length for suggestions is 2 characters
 	if( strlen( name ) < 2 ){
 		return;
@@ -637,7 +637,7 @@ ACMD_FUNC(mapmove)
  *------------------------------------------*/
 ACMD_FUNC(where)
 {
-	struct map_session_data* pl_sd;
+	map_session_data* pl_sd;
 
 	nullpo_retr(-1, sd);
 	memset(atcmd_player_name, '\0', sizeof atcmd_player_name);
@@ -667,7 +667,7 @@ ACMD_FUNC(where)
  *------------------------------------------*/
 ACMD_FUNC(jumpto)
 {
-	struct map_session_data *pl_sd = NULL;
+	map_session_data* pl_sd = nullptr;;
 
 	nullpo_retr(-1, sd);
 
@@ -751,7 +751,7 @@ ACMD_FUNC(jump)
  * various info.
  *------------------------------------------*/
 ACMD_FUNC(who) {
-	struct map_session_data *pl_sd = NULL;
+	map_session_data* pl_sd = nullptr;;
 	struct s_mapiterator *iter = NULL;	
 	char player_name[NAME_LENGTH] = "";
 	int count = 0;
@@ -855,7 +855,7 @@ ACMD_FUNC(who) {
  *------------------------------------------*/
 ACMD_FUNC(whogm)
 {
-	struct map_session_data* pl_sd;
+	map_session_data* pl_sd;
 	struct s_mapiterator* iter;
 	int j, count;
 	int level;
@@ -3249,7 +3249,7 @@ ACMD_FUNC(petrename)
  *
  *------------------------------------------*/
 ACMD_FUNC(recall) {
-	struct map_session_data *pl_sd = NULL;
+	map_session_data* pl_sd = nullptr;;
 
 	nullpo_retr(-1, sd);
 
@@ -3479,7 +3479,7 @@ ACMD_FUNC(day)
  *------------------------------------------*/
 ACMD_FUNC(doom)
 {
-	struct map_session_data* pl_sd;
+	map_session_data* pl_sd;
 	struct s_mapiterator* iter;
 
 	nullpo_retr(-1, sd);
@@ -3506,7 +3506,7 @@ ACMD_FUNC(doom)
  *------------------------------------------*/
 ACMD_FUNC(doommap)
 {
-	struct map_session_data* pl_sd;
+	map_session_data* pl_sd;
 	struct s_mapiterator* iter;
 
 	nullpo_retr(-1, sd);
@@ -3531,7 +3531,7 @@ ACMD_FUNC(doommap)
 /*==========================================
  *
  *------------------------------------------*/
-static void atcommand_raise_sub(struct map_session_data* sd) {
+static void atcommand_raise_sub(map_session_data* sd) {
 
 	status_revive(&sd->bl, 100, 100);
 
@@ -3544,7 +3544,7 @@ static void atcommand_raise_sub(struct map_session_data* sd) {
  *------------------------------------------*/
 ACMD_FUNC(raise)
 {
-	struct map_session_data* pl_sd;
+	map_session_data* pl_sd;
 	struct s_mapiterator* iter;
 
 	nullpo_retr(-1, sd);
@@ -3565,7 +3565,7 @@ ACMD_FUNC(raise)
  *------------------------------------------*/
 ACMD_FUNC(raisemap)
 {
-	struct map_session_data* pl_sd;
+	map_session_data* pl_sd;
 	struct s_mapiterator* iter;
 
 	nullpo_retr(-1, sd);
@@ -3586,7 +3586,7 @@ ACMD_FUNC(raisemap)
  *------------------------------------------*/
 ACMD_FUNC(kick)
 {
-	struct map_session_data *pl_sd;
+	map_session_data *pl_sd;
 	nullpo_retr(-1, sd);
 
 	memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
@@ -3618,7 +3618,7 @@ ACMD_FUNC(kick)
  *------------------------------------------*/
 ACMD_FUNC(kickall)
 {
-	struct map_session_data* pl_sd;
+	map_session_data* pl_sd;
 	struct s_mapiterator* iter;
 	nullpo_retr(-1, sd);
 
@@ -4021,7 +4021,7 @@ ACMD_FUNC(idsearch)
  *------------------------------------------*/
 ACMD_FUNC(recallall)
 {
-	struct map_session_data* pl_sd;
+	map_session_data* pl_sd;
 	struct s_mapiterator* iter;
 	int count;
 	nullpo_retr(-1, sd);
@@ -4066,7 +4066,7 @@ ACMD_FUNC(recallall)
  *------------------------------------------*/
 ACMD_FUNC(guildrecall)
 {
-	struct map_session_data* pl_sd;
+	map_session_data* pl_sd;
 	struct s_mapiterator* iter;
 	int count;
 	char guild_name[NAME_LENGTH];
@@ -4128,7 +4128,7 @@ ACMD_FUNC(guildrecall)
  *------------------------------------------*/
 ACMD_FUNC(partyrecall)
 {
-	struct map_session_data* pl_sd;
+	map_session_data* pl_sd;
 	struct s_mapiterator* iter;
 	char party_name[NAME_LENGTH];
 	struct party_data *p;
@@ -4276,7 +4276,7 @@ ACMD_FUNC(reload) {
 		clif_displaymessage(fd, msg_txt(sd,268)); // Reloaded the Message of the Day.
 	} else if (strstr(command, "script") || strncmp(message, "script", 3) == 0) {
 		struct s_mapiterator* iter;
-		struct map_session_data* pl_sd;
+		map_session_data* pl_sd;
 		//atcommand_broadcast( fd, sd, "@broadcast", "Server is reloading scripts..." );
 		//atcommand_broadcast( fd, sd, "@broadcast", "You will feel a bit of lag at this point !" );
 
@@ -4356,7 +4356,7 @@ ACMD_FUNC(partysharelvl) {
  * 3 = Shows the chats in that map
  *------------------------------------------*/
 ACMD_FUNC(mapinfo) {
-	struct map_session_data* pl_sd;
+	map_session_data* pl_sd;
 	struct s_mapiterator* iter;
 	struct chat_data *cd = NULL;
 	char direction[12];
@@ -4910,7 +4910,7 @@ ACMD_FUNC(repairall)
  *------------------------------------------*/
 ACMD_FUNC(nuke)
 {
-	struct map_session_data *pl_sd;
+	map_session_data *pl_sd;
 	nullpo_retr(-1, sd);
 
 	memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
@@ -5217,7 +5217,7 @@ ACMD_FUNC(servertime)
  *------------------------------------------*/
 ACMD_FUNC(jail)
 {
-	struct map_session_data *pl_sd;
+	map_session_data *pl_sd;
 
 	nullpo_retr(-1, sd);
 
@@ -5255,7 +5255,7 @@ ACMD_FUNC(jail)
  *------------------------------------------*/
 ACMD_FUNC(unjail)
 {
-	struct map_session_data *pl_sd;
+	map_session_data *pl_sd;
 
 	memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
 
@@ -5288,7 +5288,7 @@ ACMD_FUNC(unjail)
 }
 
 ACMD_FUNC(jailfor) {
-	struct map_session_data *pl_sd = NULL;
+	map_session_data* pl_sd = nullptr;;
 	char * modif_p;
 	int jailtime = 0;
 
@@ -5442,7 +5442,7 @@ ACMD_FUNC(disguise)
 ACMD_FUNC(disguiseall)
 {
 	int mob_id=0;
-	struct map_session_data *pl_sd;
+	map_session_data *pl_sd;
 	struct s_mapiterator* iter;
 	nullpo_retr(-1, sd);
 
@@ -5508,7 +5508,7 @@ ACMD_FUNC(disguiseguild)
 	}
 
 	for( i = 0; i < g->max_member; i++ ){
-		struct map_session_data *pl_sd;
+		map_session_data *pl_sd;
 		if( (pl_sd = g->member[i].sd) && !pc_isriding(pl_sd) )
 			pc_disguise(pl_sd, id);
 	}
@@ -5540,7 +5540,7 @@ ACMD_FUNC(undisguise)
  *------------------------------------------*/
 ACMD_FUNC(undisguiseall)
 {
-	struct map_session_data *pl_sd;
+	map_session_data *pl_sd;
 	struct s_mapiterator* iter;
 	nullpo_retr(-1, sd);
 
@@ -5578,7 +5578,7 @@ ACMD_FUNC(undisguiseguild)
 	}
 
 	for(i = 0; i < g->max_member; i++){
-		struct map_session_data *pl_sd;
+		map_session_data *pl_sd;
 		if( (pl_sd = g->member[i].sd) && pl_sd->disguise )
 			pc_disguise(pl_sd, 0);
 	}
@@ -5849,7 +5849,7 @@ ACMD_FUNC(addwarp)
  *------------------------------------------*/
 ACMD_FUNC(follow)
 {
-	struct map_session_data *pl_sd = NULL;
+	map_session_data* pl_sd = nullptr;;
 	nullpo_retr(-1, sd);
 
 	memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
@@ -6117,7 +6117,7 @@ ACMD_FUNC(skillid) {
  *------------------------------------------*/
 ACMD_FUNC(useskill)
 {
-	struct map_session_data *pl_sd = NULL;
+	map_session_data* pl_sd = nullptr;;
 	struct block_list *bl;
 	uint16 skill_id;
 	uint16 skill_lv;
@@ -6254,7 +6254,7 @@ ACMD_FUNC(displayskillunit)
  *------------------------------------------*/
 ACMD_FUNC(skilltree)
 {
-	struct map_session_data *pl_sd = NULL;
+	map_session_data* pl_sd = nullptr;;
 	uint16 skill_id;
 	nullpo_retr(-1, sd);
 
@@ -6301,7 +6301,7 @@ ACMD_FUNC(skilltree)
 }
 
 // Hand a ring with partners name on it to this char
-void getring (struct map_session_data* sd)
+void getring (map_session_data* sd)
 {
 	char flag = 0;
 	t_itemid item_id;
@@ -6327,7 +6327,7 @@ void getring (struct map_session_data* sd)
  *------------------------------------------*/
 ACMD_FUNC(marry)
 {
-	struct map_session_data *pl_sd = NULL;
+	map_session_data* pl_sd = nullptr;;
 
 	nullpo_retr(-1, sd);
 
@@ -6457,7 +6457,7 @@ ACMD_FUNC(autotrade) {
 ACMD_FUNC(changegm)
 {
 	struct guild *g;
-	struct map_session_data *pl_sd;
+	map_session_data *pl_sd;
 	nullpo_retr(-1, sd);
 
 	memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
@@ -7219,7 +7219,7 @@ ACMD_FUNC(users)
 	iter = mapit_getallusers();
 	for(;;)
 	{
-		struct map_session_data* sd2 = (struct map_session_data*)mapit_next(iter);
+		map_session_data* sd2 = (map_session_data*)mapit_next(iter);
 		if( sd2 == NULL )
 			break;// no more users
 
@@ -7342,7 +7342,7 @@ ACMD_FUNC(adjgroup)
  *------------------------------------------*/
 ACMD_FUNC(trade)
 {
-    struct map_session_data *pl_sd = NULL;
+    map_session_data* pl_sd = nullptr;;
 	nullpo_retr(-1, sd);
 
 	memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
@@ -7396,7 +7396,7 @@ ACMD_FUNC(setbattleflag)
  *------------------------------------------*/
 ACMD_FUNC(unmute)
 {
-	struct map_session_data *pl_sd = NULL;
+	map_session_data* pl_sd = nullptr;;
 	nullpo_retr(-1, sd);
 
 	memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
@@ -7494,7 +7494,7 @@ ACMD_FUNC(changecharsex)
  *------------------------------------------------*/
 ACMD_FUNC(mute)
 {
-	struct map_session_data *pl_sd = NULL;
+	map_session_data* pl_sd = nullptr;;
 	int manner;
 	nullpo_retr(-1, sd);
 
@@ -7545,7 +7545,7 @@ ACMD_FUNC(refresh)
 
 ACMD_FUNC(refreshall)
 {
-	struct map_session_data* iter_sd;
+	map_session_data* iter_sd;
 	struct s_mapiterator* iter;
 	nullpo_retr(-1, sd);
 
@@ -8400,7 +8400,7 @@ static int atcommand_mutearea_sub(struct block_list *bl,va_list ap)
 {
 
 	int time, id;
-	struct map_session_data *pl_sd = (struct map_session_data *)bl;
+	map_session_data *pl_sd = (map_session_data *)bl;
 	if (pl_sd == NULL)
 		return 0;
 
@@ -8534,7 +8534,7 @@ ACMD_FUNC(size)
 ACMD_FUNC(sizeall)
 {
 	int size;
-	struct map_session_data *pl_sd;
+	map_session_data *pl_sd;
 	struct s_mapiterator* iter;
 
 	size = atoi(message);
@@ -8565,7 +8565,7 @@ ACMD_FUNC(sizeguild)
 {
 	int size = SZ_SMALL, i;
 	char guild[NAME_LENGTH];
-	struct map_session_data *pl_sd;
+	map_session_data *pl_sd;
 	struct guild *g;
 	nullpo_retr(-1, sd);
 
@@ -8798,7 +8798,7 @@ ACMD_FUNC(showdelay)
 ACMD_FUNC(invite)
 {
 	unsigned int did = sd->duel_group;
-	struct map_session_data *target_sd = NULL;
+	map_session_data *target_sd = NULL;
 
 	memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
 	memset(atcmd_output, '\0', sizeof(atcmd_output));
@@ -8870,7 +8870,7 @@ ACMD_FUNC(duel)
 			}
 			duel_create(sd, maxpl);
 		} else {
-			struct map_session_data *target_sd = NULL;
+			map_session_data *target_sd = NULL;
 
 			memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
 			memset(atcmd_output, '\0', sizeof(atcmd_output));
@@ -9027,7 +9027,7 @@ ACMD_FUNC(cash)
 ACMD_FUNC(clone)
 {
 	int x=0,y=0,flag=0,master=0,i=0;
-	struct map_session_data *pl_sd=NULL;
+	map_session_data *pl_sd=NULL;
 
 	memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
 
@@ -9605,7 +9605,7 @@ ACMD_FUNC(font)
 /*==========================================
  * type: 1 = commands (@), 2 = charcommands (#)
  *------------------------------------------*/
-static void atcommand_commands_sub(struct map_session_data* sd, const int fd, AtCommandType type)
+static void atcommand_commands_sub(map_session_data* sd, const int fd, AtCommandType type)
 {
 	char line_buff[CHATBOX_SIZE];
 	char* cur = line_buff;
@@ -9992,7 +9992,7 @@ ACMD_FUNC(join){
  * Display available option for @channel command
  * @command : the name of used command (for alias case)
  */
-static inline void atcmd_channel_help(struct map_session_data *sd, const char *command)
+static inline void atcmd_channel_help(map_session_data *sd, const char *command)
 {
 	int fd = sd->fd;
 	bool can_delete = pc_has_permission(sd, PC_PERM_CHANNEL_ADMIN);
@@ -10194,7 +10194,7 @@ ACMD_FUNC(langtype)
 
 #ifdef VIP_ENABLE
 ACMD_FUNC(vip) {
-	struct map_session_data *pl_sd = NULL;
+	map_session_data* pl_sd = nullptr;;
 	char * modif_p;
 	int32 vipdifftime = 0;
 	time_t now=time(NULL);
@@ -10383,7 +10383,7 @@ ACMD_FUNC(costume) {
 * @author [Cydh], [Antares]
 */
 ACMD_FUNC(cloneequip) {
-	struct map_session_data *pl_sd;
+	map_session_data *pl_sd;
 
 	nullpo_retr(-1, sd);
 
@@ -10456,7 +10456,7 @@ ACMD_FUNC(cloneequip) {
 * @author [Cydh], [Antares]
 */
 ACMD_FUNC(clonestat) {
-	struct map_session_data *pl_sd;
+	map_session_data *pl_sd;
 
 	nullpo_retr(-1, sd);
 
@@ -11172,7 +11172,7 @@ static AtCommandInfo* get_atcommandinfo_byname(const char *name)
 }
 
 /// AtCommand suggestion
-static void atcommand_get_suggestions(struct map_session_data* sd, const char *name, bool atcommand) {
+static void atcommand_get_suggestions(map_session_data* sd, const char *name, bool atcommand) {
 	DBIterator* atcommand_iter;
 	AtCommandInfo* command_info = NULL;
 	AtCommandType type = atcommand ? COMMAND_ATCOMMAND : COMMAND_CHARCOMMAND;
@@ -11259,7 +11259,7 @@ static void atcommand_get_suggestions(struct map_session_data* sd, const char *n
  *  2 : console (admin:@atcommand)
  *  3 : script call (useatcmd)
  */
-bool is_atcommand(const int fd, struct map_session_data* sd, const char* message, int type)
+bool is_atcommand(const int fd, map_session_data* sd, const char* message, int type)
 {
 	char command[CHAT_SIZE_MAX], params[CHAT_SIZE_MAX];
 	char output[CHAT_SIZE_MAX];
diff --git a/src/map/atcommand.hpp b/src/map/atcommand.hpp
index 8266f4a78f..1879997c4d 100644
--- a/src/map/atcommand.hpp
+++ b/src/map/atcommand.hpp
@@ -7,7 +7,7 @@
 #include "../common/cbasetypes.hpp"
 #include "../common/mmo.hpp"
 
-struct map_session_data;
+class map_session_data;
 
 //global var
 extern char atcommand_symbol;
@@ -19,9 +19,9 @@ enum AtCommandType : uint8 {
 	COMMAND_CHARCOMMAND = 2,
 } ;
 
-typedef int (*AtCommandFunc)(const int fd, struct map_session_data* sd, const char* command, const char* message);
+typedef int (*AtCommandFunc)(const int fd, map_session_data* sd, const char* command, const char* message);
 
-bool is_atcommand(const int fd, struct map_session_data* sd, const char* message, int type);
+bool is_atcommand(const int fd, map_session_data* sd, const char* message, int type);
 
 void do_init_atcommand(void);
 void do_final_atcommand(void);
diff --git a/src/map/battle.cpp b/src/map/battle.cpp
index facd7754f0..55ea9f9ac2 100644
--- a/src/map/battle.cpp
+++ b/src/map/battle.cpp
@@ -123,7 +123,7 @@ int battle_gettarget(struct block_list* bl)
 {
 
 	switch (bl->type) {
-		case BL_PC:  return ((struct map_session_data*)bl)->ud.target;
+		case BL_PC:  return ((map_session_data*)bl)->ud.target;
 		case BL_MOB: return ((struct mob_data*)bl)->target_id;
 		case BL_PET: return ((struct pet_data*)bl)->target_id;
 		case BL_HOM: return ((struct homun_data*)bl)->ud.target;
@@ -334,7 +334,7 @@ TIMER_FUNC(battle_delay_damage_sub){
 			}
 		}
 
-		struct map_session_data *sd = BL_CAST(BL_PC, src);
+		map_session_data *sd = BL_CAST(BL_PC, src);
 
 		if (sd && --sd->delayed_damage == 0 && sd->state.hold_recalc) {
 			sd->state.hold_recalc = false;
@@ -348,7 +348,7 @@ TIMER_FUNC(battle_delay_damage_sub){
 int battle_delay_damage(t_tick 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, t_tick ddelay, bool additional_effects, bool isspdamage)
 {
 	struct delay_damage *dat;
-	struct status_change *sc;
+	status_change *sc;
 	struct block_list *d_tbl = NULL;
 	struct block_list *e_tbl = NULL;
 
@@ -370,7 +370,7 @@ int battle_delay_damage(t_tick tick, int amotion, struct block_list *src, struct
 		&& skill_id != PA_PRESSURE
 #endif
 		) {
-		struct map_session_data* tsd = BL_CAST( BL_PC, target );
+		map_session_data* tsd = BL_CAST( BL_PC, target );
 
 		if( tsd && pc_issit( tsd ) && battle_config.devotion_standup_fix ){
 			pc_setstand( tsd, true );
@@ -424,7 +424,7 @@ int battle_delay_damage(t_tick tick, int amotion, struct block_list *src, struct
  */
 int64 battle_attr_fix(struct block_list *src, struct block_list *target, int64 damage,int atk_elem,int def_type, int def_lv)
 {
-	struct status_change *sc = NULL, *tsc = NULL;
+	status_change *sc = NULL, *tsc = NULL;
 	int ratio;
 
 	if (src) sc = status_get_sc(src);
@@ -654,7 +654,7 @@ int64 battle_attr_fix(struct block_list *src, struct block_list *target, int64 d
  * @return damage Damage diff between original damage and after calculation
  */
 int battle_calc_cardfix(int attack_type, struct block_list *src, struct block_list *target, std::bitset<NK_MAX> nk, int rh_ele, int lh_ele, int64 damage, int left, int flag){
-	struct map_session_data *sd, ///< Attacker session data if BL_PC
+	map_session_data *sd, ///< Attacker session data if BL_PC
 		*tsd; ///< Target session data if BL_PC
 	int cardfix = 1000;
 	int s_class, ///< Attacker class
@@ -1060,7 +1060,7 @@ static void battle_absorb_damage(struct block_list *bl, struct Damage *d) {
 	switch (bl->type) {
 		case BL_PC:
 			{
-				struct map_session_data *sd = BL_CAST(BL_PC, bl);
+				map_session_data *sd = BL_CAST(BL_PC, bl);
 				if (!sd)
 					return;
 				dmg_ori = dmg_new = d->damage + d->damage2;
@@ -1106,7 +1106,7 @@ static void battle_absorb_damage(struct block_list *bl, struct Damage *d) {
  * @param skill_lv: Skill level
  * @return True: Damage inflicted, False: Missed
  **/
-bool battle_status_block_damage(struct block_list *src, struct block_list *target, struct status_change *sc, struct Damage *d, int64 &damage, uint16 skill_id, uint16 skill_lv) {
+bool battle_status_block_damage(struct block_list *src, struct block_list *target, status_change *sc, struct Damage *d, int64 &damage, uint16 skill_id, uint16 skill_lv) {
 	if (!src || !target || !sc || !d)
 		return true;
 
@@ -1413,8 +1413,8 @@ bool battle_status_block_damage(struct block_list *src, struct block_list *targe
  */
 int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Damage *d,int64 damage,uint16 skill_id,uint16 skill_lv)
 {
-	struct map_session_data *sd = NULL, *tsd = BL_CAST(BL_PC, src);
-	struct status_change *sc;
+	map_session_data *sd = NULL, *tsd = BL_CAST(BL_PC, src);
+	status_change *sc;
 	struct status_change_entry *sce;
 	int div_ = d->div_, flag = d->flag;
 
@@ -1430,7 +1430,7 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
 		return 0;
 
 	if (bl->type == BL_PC) {
-		sd=(struct map_session_data *)bl;
+		sd=(map_session_data *)bl;
 		//Special no damage states
 		if(flag&BF_WEAPON && sd->special_state.no_weapon_damage)
 			damage -= damage * sd->special_state.no_weapon_damage / 100;
@@ -1868,7 +1868,7 @@ bool battle_can_hit_bg_target(struct block_list *src, struct block_list *bl, uin
 		if (status_bl_has_mode(bl, MD_SKILLIMMUNE) && flag&BF_SKILL) //Skill immunity.
 			return false;
 		if (src->type == BL_PC) {
-			struct map_session_data *sd = map_id2sd(src->id);
+			map_session_data *sd = map_id2sd(src->id);
 
 			if (sd && sd->bg_id == md->bg_id)
 				return false;
@@ -2059,7 +2059,7 @@ static int battle_calc_drain(int64 damage, int rate, int per)
  * @param type
  * @return damage
  */
-int64 battle_addmastery(struct map_session_data *sd,struct block_list *target,int64 dmg,int type)
+int64 battle_addmastery(map_session_data *sd,struct block_list *target,int64 dmg,int type)
 {
 	int64 damage;
 	struct status_data *status = status_get_status_data(target);
@@ -2189,7 +2189,7 @@ int64 battle_addmastery(struct map_session_data *sd,struct block_list *target,in
 * @param damage Current damage
 * @param lr_type EQI_HAND_L:left-hand weapon, EQI_HAND_R:right-hand weapon
 */
-static void battle_add_weapon_damage(struct map_session_data *sd, int64 *damage, int lr_type) {
+static void battle_add_weapon_damage(map_session_data *sd, int64 *damage, int lr_type) {
 	if (!sd)
 		return;
 	//rodatazone says that Overrefine bonuses are part of baseatk
@@ -2209,7 +2209,7 @@ static void battle_add_weapon_damage(struct map_session_data *sd, int64 *damage,
 }
 
 #ifdef RENEWAL
-static int battle_calc_sizefix(int64 damage, struct map_session_data *sd, unsigned char t_size, unsigned char weapon_type, short flag)
+static int battle_calc_sizefix(int64 damage, map_session_data *sd, unsigned char t_size, unsigned char weapon_type, short flag)
 {
 	if (sd && !sd->special_state.no_sizefix && !flag) // Size fix only for players
 		damage = damage * (weapon_type == EQI_HAND_L ? sd->left_weapon.atkmods[t_size] : sd->right_weapon.atkmods[t_size]) / 100;
@@ -2234,7 +2234,7 @@ static int battle_calc_status_attack(struct status_data *status, short hand)
  * @param sd Player
  * @return Base weapon damage
  */
-static int battle_calc_base_weapon_attack(struct block_list *src, struct status_data *tstatus, struct weapon_atk *wa, struct map_session_data *sd, bool critical)
+static int battle_calc_base_weapon_attack(struct block_list *src, struct status_data *tstatus, struct weapon_atk *wa, map_session_data *sd, bool critical)
 {
 	struct status_data *status = status_get_status_data(src);
 	uint8 type = (wa == &status->lhw)?EQI_HAND_L:EQI_HAND_R;
@@ -2242,7 +2242,7 @@ static int battle_calc_base_weapon_attack(struct block_list *src, struct status_
 	uint16 atkmax = atkmin;
 	int64 damage = atkmin;
 	bool weapon_perfection = false;
-	struct status_change *sc = status_get_sc(src);
+	status_change *sc = status_get_sc(src);
 
 	if (sd && sd->equip_index[type] >= 0 && sd->inventory_data[sd->equip_index[type]]) {
 		short base_stat;
@@ -2307,12 +2307,12 @@ static int battle_calc_base_weapon_attack(struct block_list *src, struct status_
  *	Initial refactoring by Baalberith
  *	Refined and optimized by helvetica
  */
-static int64 battle_calc_base_damage(struct block_list *src, struct status_data *status, struct weapon_atk *wa, struct status_change *sc, unsigned short t_size, int flag)
+static int64 battle_calc_base_damage(struct block_list *src, struct status_data *status, struct weapon_atk *wa, status_change *sc, unsigned short t_size, int flag)
 {
 	unsigned int atkmin = 0, atkmax = 0;
 	short type = 0;
 	int64 damage = 0;
-	struct map_session_data *sd = NULL;
+	map_session_data *sd = NULL;
 
 	nullpo_retr(damage, src);
 
@@ -2371,7 +2371,7 @@ static int64 battle_calc_base_damage(struct block_list *src, struct status_data
 		if (!(sd->special_state.no_sizefix || (flag&8)))
 			damage = damage * (type == EQI_HAND_L ? sd->left_weapon.atkmods[t_size] : sd->right_weapon.atkmods[t_size]) / 100;
 	} else if (src->type == BL_ELEM) {
-		struct status_change *ele_sc = status_get_sc(src);
+		status_change *ele_sc = status_get_sc(src);
 		int ele_class = status_get_class(src);
 
 		if (ele_sc) {
@@ -2434,7 +2434,7 @@ static int64 battle_calc_base_damage(struct block_list *src, struct status_data
  *	Initial refactoring by Baalberith
  *	Refined and optimized by helvetica
  */
-void battle_consume_ammo(struct map_session_data*sd, int skill, int lv)
+void battle_consume_ammo(map_session_data*sd, int skill, int lv)
 {
 	int qty = 1;
 
@@ -2505,7 +2505,7 @@ static int battle_range_type(struct block_list *src, struct block_list *target,
 	return BF_LONG;
 }
 
-static int battle_blewcount_bonus(struct map_session_data *sd, uint16 skill_id)
+static int battle_blewcount_bonus(map_session_data *sd, uint16 skill_id)
 {
 	if (sd->skillblown.empty())
 		return 0;
@@ -2615,7 +2615,7 @@ static int battle_skill_damage(struct block_list *src, struct block_list *target
  * @param sd: Player who has Chorus skill active
  * @return Bonus value based on party count
  */
-int battle_calc_chorusbonus(struct map_session_data *sd) {
+int battle_calc_chorusbonus(map_session_data *sd) {
 #ifdef RENEWAL // No bonus in renewal
 	return 0;
 #endif
@@ -2681,7 +2681,7 @@ static bool is_skill_using_arrow(struct block_list *src, int skill_id)
 {
 	if(src != NULL) {
 		struct status_data *sstatus = status_get_status_data(src);
-		struct map_session_data *sd = BL_CAST(BL_PC, src);
+		map_session_data *sd = BL_CAST(BL_PC, src);
 
 		return ((sd && sd->state.arrow_atk) || (!sd && ((skill_id && skill_get_ammotype(skill_id)) || sstatus->rhw.range>3)) || (skill_id == HT_PHANTASMIC) || (skill_id == GS_GROUNDDRIFT));
 	} else
@@ -2699,7 +2699,7 @@ static bool is_skill_using_arrow(struct block_list *src, int skill_id)
 static bool is_attack_right_handed(struct block_list *src, int skill_id)
 {
 	if(src != NULL) {
-		struct map_session_data *sd = BL_CAST(BL_PC, src);
+		map_session_data *sd = BL_CAST(BL_PC, src);
 
 		//Skills ALWAYS use ONLY your right-hand weapon (tested on Aegis 10.2)
 		if(!skill_id && sd && sd->weapontype1 == W_FIST && sd->weapontype2 != W_FIST)
@@ -2721,7 +2721,7 @@ static bool is_attack_left_handed(struct block_list *src, int skill_id)
 	if(src != NULL) {
 		//Skills ALWAYS use ONLY your right-hand weapon (tested on Aegis 10.2)
 		if(!skill_id) {
-			struct map_session_data *sd = BL_CAST(BL_PC, src);
+			map_session_data *sd = BL_CAST(BL_PC, src);
 
 			if (sd) {
 				if (sd->weapontype1 == W_FIST && sd->weapontype2 != W_FIST)
@@ -2763,7 +2763,7 @@ static bool is_attack_critical(struct Damage* wd, struct block_list *src, struct
 
 	if( sstatus->cri )
 	{
-		struct map_session_data *sd = BL_CAST(BL_PC, src);
+		map_session_data *sd = BL_CAST(BL_PC, src);
 
 		if(wd->type == DMG_MULTI_HIT){	//Multiple Hit Attack Skills.
 			if(pc_checkskill(sd,GS_CHAINACTION) && !skill_get_nk(GS_CHAINACTION,NK_CRITICAL)) //Chain Action
@@ -2774,9 +2774,9 @@ static bool is_attack_critical(struct Damage* wd, struct block_list *src, struct
 		}
 
 		struct status_data *tstatus = status_get_status_data(target);
-		struct status_change *sc = status_get_sc(src);
-		struct status_change *tsc = status_get_sc(target);
-		struct map_session_data *tsd = BL_CAST(BL_PC, target);
+		status_change *sc = status_get_sc(src);
+		status_change *tsc = status_get_sc(target);
+		map_session_data *tsd = BL_CAST(BL_PC, target);
 		short cri = sstatus->cri;
 
 		if (sd) {
@@ -2856,7 +2856,7 @@ static int is_attack_piercing(struct Damage* wd, struct block_list *src, struct
 		return 2;
 
 	if(src != NULL) {
-		struct map_session_data *sd = BL_CAST(BL_PC, src);
+		map_session_data *sd = BL_CAST(BL_PC, src);
 		struct status_data *tstatus = status_get_status_data(target);
 
 		if( skill_id != PA_SACRIFICE && skill_id != CR_GRANDCROSS && skill_id != NPC_GRANDDARKNESS && skill_id != PA_SHIELDCHAIN && skill_id != KO_HAPPOKUNAI
@@ -2917,9 +2917,9 @@ static bool is_attack_hitting(struct Damage* wd, struct block_list *src, struct
 {
 	struct status_data *sstatus = status_get_status_data(src);
 	struct status_data *tstatus = status_get_status_data(target);
-	struct status_change *sc = status_get_sc(src);
-	struct status_change *tsc = status_get_sc(target);
-	struct map_session_data *sd = BL_CAST(BL_PC, src);
+	status_change *sc = status_get_sc(src);
+	status_change *tsc = status_get_sc(target);
+	map_session_data *sd = BL_CAST(BL_PC, src);
 	std::bitset<NK_MAX> nk = battle_skill_get_damage_properties(skill_id, wd->miscflag);
 	short flee, hitrate;
 
@@ -3105,8 +3105,8 @@ static bool is_attack_hitting(struct Damage* wd, struct block_list *src, struct
 static bool attack_ignores_def(struct Damage* wd, struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, short weapon_position)
 {
 	struct status_data *tstatus = status_get_status_data(target);
-	struct status_change *sc = status_get_sc(src);
-	struct map_session_data *sd = BL_CAST(BL_PC, src);
+	status_change *sc = status_get_sc(src);
+	map_session_data *sd = BL_CAST(BL_PC, src);
 	std::bitset<NK_MAX> nk = battle_skill_get_damage_properties(skill_id, wd->miscflag);
 
 #ifndef RENEWAL
@@ -3175,7 +3175,7 @@ static int battle_calc_equip_attack(struct block_list *src, int skill_id)
 	if(src != NULL) {
 		int eatk = 0;
 		struct status_data *status = status_get_status_data(src);
-		struct map_session_data *sd = BL_CAST(BL_PC, src);
+		map_session_data *sd = BL_CAST(BL_PC, src);
 
 		if (sd) // add arrow atk if using an applicable skill
 			eatk += (is_skill_using_arrow(src, skill_id) ? sd->bonus.arrow_atk : 0);
@@ -3196,8 +3196,8 @@ static int battle_calc_equip_attack(struct block_list *src, int skill_id)
  */
 int battle_get_weapon_element(struct Damage* wd, struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, short weapon_position, bool calc_for_damage_only)
 {
-	struct map_session_data *sd = BL_CAST(BL_PC, src);
-	struct status_change *sc = status_get_sc(src);
+	map_session_data *sd = BL_CAST(BL_PC, src);
+	status_change *sc = status_get_sc(src);
 	struct status_data *sstatus = status_get_status_data(src);
 	int element = skill_get_ele(skill_id, skill_lv);
 
@@ -3290,8 +3290,8 @@ static void battle_calc_element_damage(struct Damage* wd, struct block_list *src
 
 	// Elemental attribute fix
 	if(!nk[NK_IGNOREELEMENT] && (wd->damage > 0 || wd->damage2 > 0)) {
-		struct map_session_data *sd = BL_CAST(BL_PC, src);
-		struct status_change *sc = status_get_sc(src);
+		map_session_data *sd = BL_CAST(BL_PC, src);
+		status_change *sc = status_get_sc(src);
 		struct status_data *sstatus = status_get_status_data(src);
 		struct status_data *tstatus = status_get_status_data(target);
 		int left_element = battle_get_weapon_element(wd, src, target, skill_id, skill_lv, EQI_HAND_L, true);
@@ -3391,8 +3391,8 @@ static void battle_calc_element_damage(struct Damage* wd, struct block_list *src
  */
 static void battle_calc_attack_masteries(struct Damage* wd, struct block_list *src,struct block_list *target,uint16 skill_id,uint16 skill_lv)
 {
-	struct map_session_data *sd = BL_CAST(BL_PC, src);
-	struct status_change *sc = status_get_sc(src);
+	map_session_data *sd = BL_CAST(BL_PC, src);
+	status_change *sc = status_get_sc(src);
 	struct status_data *sstatus = status_get_status_data(src);
 	int t_class = status_get_class(target);
 
@@ -3488,7 +3488,7 @@ static void battle_calc_damage_parts(struct Damage* wd, struct block_list *src,s
 {
 	struct status_data *sstatus = status_get_status_data(src);
 	struct status_data *tstatus = status_get_status_data(target);
-	struct map_session_data *sd = BL_CAST(BL_PC, src);
+	map_session_data *sd = BL_CAST(BL_PC, src);
 	bool critical = false;
 
 	int right_element = battle_get_weapon_element(wd, src, target, skill_id, skill_lv, EQI_HAND_R, false);
@@ -3557,11 +3557,11 @@ static void battle_calc_damage_parts(struct Damage* wd, struct block_list *src,s
  */
 static void battle_calc_skill_base_damage(struct Damage* wd, struct block_list *src,struct block_list *target,uint16 skill_id,uint16 skill_lv)
 {
-	struct status_change *sc = status_get_sc(src);
+	status_change *sc = status_get_sc(src);
 	struct status_data *sstatus = status_get_status_data(src);
 	struct status_data *tstatus = status_get_status_data(target);
-	struct map_session_data *sd = BL_CAST(BL_PC, src);
-	struct map_session_data *tsd = BL_CAST(BL_PC, target);
+	map_session_data *sd = BL_CAST(BL_PC, src);
+	map_session_data *tsd = BL_CAST(BL_PC, target);
 
 	uint16 i;
 	std::bitset<NK_MAX> nk = battle_skill_get_damage_properties(skill_id, wd->miscflag);
@@ -3818,9 +3818,9 @@ static void battle_apply_div_fix(struct Damage* d, uint16 skill_id)
  */
 static void battle_calc_multi_attack(struct Damage* wd, struct block_list *src,struct block_list *target, uint16 skill_id, uint16 skill_lv)
 {
-	struct map_session_data *sd = BL_CAST(BL_PC, src);
-	struct status_change *sc = status_get_sc(src);
-	struct status_change *tsc = status_get_sc(target);
+	map_session_data *sd = BL_CAST(BL_PC, src);
+	status_change *sc = status_get_sc(src);
+	status_change *tsc = status_get_sc(target);
 	struct status_data *tstatus = status_get_status_data(target);
 
 	if( sd && !skill_id ) {	// if no skill_id passed, check for double attack [helvetica]
@@ -3915,10 +3915,10 @@ static void battle_calc_multi_attack(struct Damage* wd, struct block_list *src,s
  */
 static int battle_calc_attack_skill_ratio(struct Damage* wd, struct block_list *src,struct block_list *target,uint16 skill_id,uint16 skill_lv)
 {
-	struct map_session_data *sd = BL_CAST(BL_PC, src);
-	struct map_session_data *tsd = BL_CAST(BL_PC, target);
-	struct status_change *sc = status_get_sc(src);
-	struct status_change *tsc = status_get_sc(target);
+	map_session_data *sd = BL_CAST(BL_PC, src);
+	map_session_data *tsd = BL_CAST(BL_PC, target);
+	status_change *sc = status_get_sc(src);
+	status_change *tsc = status_get_sc(target);
 	struct status_data *sstatus = status_get_status_data(src);
 	struct status_data *tstatus = status_get_status_data(target);
 	int skillratio = 100;
@@ -5386,8 +5386,8 @@ static int battle_calc_attack_skill_ratio(struct Damage* wd, struct block_list *
  */
 static int64 battle_calc_skill_constant_addition(struct Damage* wd, struct block_list *src,struct block_list *target,uint16 skill_id,uint16 skill_lv)
 {
-	struct map_session_data *sd = BL_CAST(BL_PC, src);
-	struct map_session_data *tsd = BL_CAST(BL_PC, target);
+	map_session_data *sd = BL_CAST(BL_PC, src);
+	map_session_data *tsd = BL_CAST(BL_PC, target);
 	struct status_data *sstatus = status_get_status_data(src);
 	struct status_data *tstatus = status_get_status_data(target);
 	int64 atk = 0;
@@ -5441,8 +5441,8 @@ static int64 battle_calc_skill_constant_addition(struct Damage* wd, struct block
  */
 static void battle_attack_sc_bonus(struct Damage* wd, struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv)
 {
-	struct map_session_data *sd = BL_CAST(BL_PC, src);
-	struct status_change *sc = status_get_sc(src);
+	map_session_data *sd = BL_CAST(BL_PC, src);
+	status_change *sc = status_get_sc(src);
 	struct status_data *sstatus = status_get_status_data(src);
 	struct status_data *tstatus = status_get_status_data(target);
 	uint8 anger_id = 0; // SLS Anger
@@ -5634,10 +5634,10 @@ static void battle_attack_sc_bonus(struct Damage* wd, struct block_list *src, st
  */
 static void battle_calc_defense_reduction(struct Damage* wd, struct block_list *src,struct block_list *target, uint16 skill_id, uint16 skill_lv)
 {
-	struct map_session_data *sd = BL_CAST(BL_PC, src);
-	struct map_session_data *tsd = BL_CAST(BL_PC, target);
-	struct status_change *sc = status_get_sc(src);
-	struct status_change *tsc = status_get_sc(target);
+	map_session_data *sd = BL_CAST(BL_PC, src);
+	map_session_data *tsd = BL_CAST(BL_PC, target);
+	status_change *sc = status_get_sc(src);
+	status_change *tsc = status_get_sc(target);
 	struct status_data *sstatus = status_get_status_data(src);
 	struct status_data *tstatus = status_get_status_data(target);
 
@@ -5814,8 +5814,8 @@ static void battle_calc_defense_reduction(struct Damage* wd, struct block_list *
  */
 static void battle_calc_attack_post_defense(struct Damage* wd, struct block_list *src,struct block_list *target,uint16 skill_id,uint16 skill_lv)
 {
-	struct map_session_data *sd = BL_CAST(BL_PC, src);
-	struct status_change *sc = status_get_sc(src);
+	map_session_data *sd = BL_CAST(BL_PC, src);
+	status_change *sc = status_get_sc(src);
 	struct status_data *sstatus = status_get_status_data(src);
 
 	// Post skill/vit reduction damage increases
@@ -5881,7 +5881,7 @@ static void battle_calc_attack_plant(struct Damage* wd, struct block_list *src,s
 	if( attack_hits || wd->damage > 0 )
 		wd->damage = 1; //In some cases, right hand no need to have a weapon to deal a damage
 	if( is_attack_left_handed(src, skill_id) && (attack_hits || wd->damage2 > 0) ) {
-		struct map_session_data *sd = BL_CAST(BL_PC, src);
+		map_session_data *sd = BL_CAST(BL_PC, src);
 
 		if (sd && sd->status.weapon == W_KATAR)
 			wd->damage2 = 0; //No backhand damage against plants
@@ -5890,7 +5890,7 @@ static void battle_calc_attack_plant(struct Damage* wd, struct block_list *src,s
 	}
 
 	if (attack_hits && target->type == BL_MOB) {
-		struct status_change *sc = status_get_sc(target);
+		status_change *sc = status_get_sc(target);
 		int64 damage_dummy = 1;
 
 		if (sc && !battle_status_block_damage(src, target, sc, wd, damage_dummy, skill_id, skill_lv)) { // Statuses that reduce damage to 0.
@@ -5938,7 +5938,7 @@ static void battle_calc_attack_plant(struct Damage* wd, struct block_list *src,s
  */
 static void battle_calc_attack_left_right_hands(struct Damage* wd, struct block_list *src,struct block_list *target,uint16 skill_id,uint16 skill_lv)
 {
-	struct map_session_data *sd = BL_CAST(BL_PC, src);
+	map_session_data *sd = BL_CAST(BL_PC, src);
 
 	if (sd) {
 		int skill;
@@ -5997,7 +5997,7 @@ struct block_list *battle_check_devotion(struct block_list *bl) {
 	struct block_list *d_bl = NULL;
 
 	if (battle_config.devotion_rdamage && battle_config.devotion_rdamage > rnd() % 100) {
-		struct status_change *sc = status_get_sc(bl);
+		status_change *sc = status_get_sc(bl);
 		if (sc && sc->getSCE(SC_DEVOTION))
 			d_bl = map_id2bl(sc->getSCE(SC_DEVOTION)->val1);
 	}
@@ -6019,7 +6019,7 @@ static void battle_calc_attack_gvg_bg(struct Damage* wd, struct block_list *src,
 			(!skill_id || skill_id ||
 			(src->type == BL_SKILL && (skill_id == SG_SUN_WARM || skill_id == SG_MOON_WARM || skill_id == SG_STAR_WARM))) ) {
 				int64 damage = wd->damage + wd->damage2, rdamage = 0;
-				struct map_session_data *tsd = BL_CAST(BL_PC, target);
+				map_session_data *tsd = BL_CAST(BL_PC, target);
 				struct status_data *sstatus = status_get_status_data(src);
 				t_tick tick = gettick(), rdelay = 0;
 
@@ -6078,10 +6078,10 @@ static void battle_calc_attack_gvg_bg(struct Damage* wd, struct block_list *src,
  */
 static void battle_calc_weapon_final_atk_modifiers(struct Damage* wd, struct block_list *src,struct block_list *target,uint16 skill_id,uint16 skill_lv)
 {
-	struct map_session_data *sd = BL_CAST(BL_PC, src);
-	struct map_session_data *tsd = BL_CAST(BL_PC, target);
-	struct status_change *sc = status_get_sc(src);
-	struct status_change *tsc = status_get_sc(target);
+	map_session_data *sd = BL_CAST(BL_PC, src);
+	map_session_data *tsd = BL_CAST(BL_PC, target);
+	status_change *sc = status_get_sc(src);
+	status_change *tsc = status_get_sc(target);
 	struct status_data *sstatus = status_get_status_data(src);
 	struct status_data *tstatus = status_get_status_data(target);
 	int skill_damage = 0;
@@ -6179,8 +6179,8 @@ static struct Damage initialize_weapon_data(struct block_list *src, struct block
 {
 	struct status_data *sstatus = status_get_status_data(src);
 	struct status_data *tstatus = status_get_status_data(target);
-	struct status_change *sc = status_get_sc(src);
-	struct map_session_data *sd = BL_CAST(BL_PC, src);
+	status_change *sc = status_get_sc(src);
+	map_session_data *sd = BL_CAST(BL_PC, src);
 	struct Damage wd;
 
 	wd.type = DMG_NORMAL; //Normal attack
@@ -6348,8 +6348,8 @@ void battle_do_reflect(int attack_type, struct Damage *wd, struct block_list* sr
 		(src->type == BL_SKILL && (skill_id == SG_SUN_WARM || skill_id == SG_MOON_WARM || skill_id == SG_STAR_WARM ))))
 	{
 		int64 damage = wd->damage + wd->damage2, rdamage = 0;
-		struct map_session_data *tsd = BL_CAST(BL_PC, target);
-		struct status_change *tsc = status_get_sc(target);
+		map_session_data *tsd = BL_CAST(BL_PC, target);
+		status_change *tsc = status_get_sc(target);
 		struct status_data *sstatus = status_get_status_data(src);
 		struct unit_data *ud = unit_bl2ud(target);
 		t_tick tick = gettick(), rdelay = 0;
@@ -6397,10 +6397,10 @@ void battle_do_reflect(int attack_type, struct Damage *wd, struct block_list* sr
  */
 static struct Damage battle_calc_weapon_attack(struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int wflag)
 {
-	struct map_session_data *sd, *tsd;
+	map_session_data *sd, *tsd;
 	struct Damage wd;
-	struct status_change *sc = status_get_sc(src);
-	struct status_change *tsc = status_get_sc(target);
+	status_change *sc = status_get_sc(src);
+	status_change *tsc = status_get_sc(target);
 	struct status_data *sstatus = status_get_status_data(src);
 	struct status_data *tstatus = status_get_status_data(target);
 	int right_element, left_element;
@@ -6794,7 +6794,7 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
 
 	TBL_PC *sd;
 	TBL_PC *tsd;
-	struct status_change *sc, *tsc;
+	status_change *sc, *tsc;
 	struct Damage ad;
 	struct status_data *sstatus = status_get_status_data(src);
 	struct status_data *tstatus = status_get_status_data(target);
@@ -7924,11 +7924,11 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
 	int skill_damage = 0;
 	short i, s_ele;
 
-	struct map_session_data *sd, *tsd;
+	map_session_data *sd, *tsd;
 	struct Damage md; //DO NOT CONFUSE with md of mob_data!
 	struct status_data *sstatus = status_get_status_data(src);
 	struct status_data *tstatus = status_get_status_data(target);
-	struct status_change *ssc = status_get_sc(src);
+	status_change *ssc = status_get_sc(src);
 
 	memset(&md,0,sizeof(md));
 
@@ -8109,7 +8109,7 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
 			{
 				short totaldef;
 				struct Damage atk = battle_calc_weapon_attack(src, target, skill_id, skill_lv, 0);
-				struct status_change *sc = status_get_sc(src);
+				status_change *sc = status_get_sc(src);
 
 				md.damage = (int64)sstatus->hp + (atk.damage * (int64)sstatus->hp * skill_lv) / (int64)sstatus->max_hp;
 
@@ -8188,7 +8188,7 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
 	}
 
 	if (!nk[NK_IGNOREFLEE]) {
-		struct status_change *sc = status_get_sc(target);
+		status_change *sc = status_get_sc(target);
 
 		i = 0; //Temp for "hit or no hit"
 		if(sc && sc->opt1 && sc->opt1 != OPT1_STONEWAIT && sc->opt1 != OPT1_BURNING)
@@ -8298,7 +8298,7 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
  * @param target: Target to vanish HP/SP
  * @param flag: Damage struct battle flag
  */
-void battle_vanish_damage(struct map_session_data *sd, struct block_list *target, int flag)
+void battle_vanish_damage(map_session_data *sd, struct block_list *target, int flag)
 {
 	nullpo_retv(sd);
 	nullpo_retv(target);
@@ -8378,7 +8378,7 @@ struct Damage battle_calc_attack(int attack_type,struct block_list *bl,struct bl
 	else // Some skills like Weaponry Research will cause damage even if attack is dodged
 		d.dmg_lv = ATK_DEF;
 
-	struct map_session_data *sd = BL_CAST(BL_PC, bl);
+	map_session_data *sd = BL_CAST(BL_PC, bl);
 
 	if (sd && d.damage + d.damage2 > 1)
 		battle_vanish_damage(sd, target, d.flag);
@@ -8511,7 +8511,7 @@ int64 battle_calc_return_damage(struct block_list* tbl, struct block_list *src,
  * @param wd: Damage struct reference
  * @return True on damage done or false if not
  */
-bool battle_vellum_damage(struct map_session_data *sd, struct block_list *target, struct Damage *wd)
+bool battle_vellum_damage(map_session_data *sd, struct block_list *target, struct Damage *wd)
 {
 	nullpo_retr(false, sd);
 	nullpo_retr(false, target);
@@ -8543,7 +8543,7 @@ bool battle_vellum_damage(struct map_session_data *sd, struct block_list *target
 /*===========================================
  * Perform battle drain effects (HP/SP loss)
  *-------------------------------------------*/
-void battle_drain(struct map_session_data *sd, struct block_list *tbl, int64 rdamage, int64 ldamage, int race, int class_)
+void battle_drain(map_session_data *sd, struct block_list *tbl, int64 rdamage, int64 ldamage, int race, int class_)
 {
 	struct weapon_data *wd;
 	int64 *damage;
@@ -8677,7 +8677,7 @@ void battle_autocast_aftercast(struct block_list* src, uint16 skill_id, uint16 s
  * @param tick: Server tick
  * @param flag: Special skill flags
  */
-void battle_autocast_elembuff_skill(struct map_session_data* sd, struct block_list* target, uint16 skill_id, t_tick tick, int flag)
+void battle_autocast_elembuff_skill(map_session_data* sd, struct block_list* target, uint16 skill_id, t_tick tick, int flag)
 {
 	uint16 skill_lv = pc_checkskill(sd, skill_id);
 
@@ -8695,9 +8695,9 @@ void battle_autocast_elembuff_skill(struct map_session_data* sd, struct block_li
  * Do a basic physical attack (call through unit_attack_timer)
  *------------------------------------------*/
 enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* target, t_tick tick, int flag) {
-	struct map_session_data *sd = NULL, *tsd = NULL;
+	map_session_data *sd = NULL, *tsd = NULL;
 	struct status_data *sstatus, *tstatus;
-	struct status_change *sc, *tsc;
+	status_change *sc, *tsc;
 	int64 damage;
 	int skillv;
 	struct Damage wd;
@@ -8981,10 +8981,10 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t
 				// Only trigger if the devoted player was hit
 				if( damage > 0 ){
 					int64 devotion_damage = damage;
-					struct map_session_data* dsd = BL_CAST( BL_PC, d_bl );
+					map_session_data* dsd = BL_CAST( BL_PC, d_bl );
 
 					// Needed to check the devotion master for Rebound Shield status.
-					struct status_change *d_sc = status_get_sc(d_bl);
+					status_change *d_sc = status_get_sc(d_bl);
 
 					// The devoting player needs to stand up
 					if( dsd && pc_issit( dsd ) ){
@@ -9339,7 +9339,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
 
 	switch( target->type ) { // Checks on actual target
 		case BL_PC: {
-				struct status_change* sc = status_get_sc(src);
+				status_change* sc = status_get_sc(src);
 
 				if (((TBL_PC*)target)->invincible_timer != INVALID_TIMER || pc_isinvisible((TBL_PC*)target))
 					return -1; //Cannot be targeted yet.
@@ -9430,8 +9430,8 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
 
 	switch( t_bl->type ) { //Checks on target master
 		case BL_PC: {
-			struct map_session_data *sd;
-			struct status_change *sc = NULL;
+			map_session_data *sd;
+			status_change *sc = NULL;
 
 			if( t_bl == s_bl )
 				break;
@@ -9473,7 +9473,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
 			break;
 		case BL_SKILL: {
 				struct skill_unit *su = (struct skill_unit *)src;
-				struct status_change* sc = status_get_sc(target);
+				status_change* sc = status_get_sc(target);
 				if (!su || !su->group)
 					return 0;
 
@@ -9502,7 +9502,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
 	{	//Checks on source master
 		case BL_PC:
 		{
-			struct map_session_data *sd = BL_CAST(BL_PC, s_bl);
+			map_session_data *sd = BL_CAST(BL_PC, s_bl);
 			if( s_bl != t_bl )
 			{
 				if( sd->state.killer )
diff --git a/src/map/battle.hpp b/src/map/battle.hpp
index 98ffd16bbc..4fa61318a7 100644
--- a/src/map/battle.hpp
+++ b/src/map/battle.hpp
@@ -14,7 +14,7 @@
 #include "skill.hpp"
 
 //fwd declaration
-struct map_session_data;
+class map_session_data;
 struct mob_data;
 struct block_list;
 enum e_damage_type : uint8;
@@ -93,7 +93,7 @@ struct Damage battle_calc_attack(int attack_type,struct block_list *bl,struct bl
 
 int64 battle_calc_return_damage(struct block_list *bl, struct block_list *src, int64 *, int flag, uint16 skill_id, bool status_reflect);
 
-void battle_drain(struct map_session_data *sd, struct block_list *tbl, int64 rdamage, int64 ldamage, int race, int class_);
+void battle_drain(map_session_data *sd, struct block_list *tbl, int64 rdamage, int64 ldamage, int race, int class_);
 
 int64 battle_attr_fix(struct block_list *src, struct block_list *target, int64 damage,int atk_elem,int def_type, int def_lv);
 int battle_calc_cardfix(int attack_type, struct block_list *src, struct block_list *target, std::bitset<NK_MAX> nk, int s_ele, int s_ele_, int64 damage, int left, int flag);
@@ -107,7 +107,7 @@ int64 battle_calc_pk_damage(block_list &src, block_list &bl, int64 damage, uint1
 void battle_damage(struct block_list *src, struct block_list *target, int64 damage, t_tick delay, uint16 skill_lv, uint16 skill_id, enum damage_lv dmg_lv, unsigned short attack_type, bool additional_effects, t_tick tick, bool spdamage);
 int battle_delay_damage (t_tick 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, t_tick ddelay, bool additional_effects, bool spdamage);
 
-int battle_calc_chorusbonus(struct map_session_data *sd);
+int battle_calc_chorusbonus(map_session_data *sd);
 
 // Summary normal attack treatment (basic attack)
 enum damage_lv battle_weapon_attack( struct block_list *bl,struct block_list *target,t_tick tick,int flag);
@@ -123,7 +123,7 @@ int battle_check_undead(int race,int element);
 int battle_check_target(struct block_list *src, struct block_list *target,int flag);
 bool battle_check_range(struct block_list *src,struct block_list *bl,int range);
 
-void battle_consume_ammo(struct map_session_data* sd, int skill, int lv);
+void battle_consume_ammo(map_session_data* sd, int skill, int lv);
 
 bool is_infinite_defense(struct block_list *target, int flag);
 
diff --git a/src/map/battleground.cpp b/src/map/battleground.cpp
index 42e8c51e86..603989383e 100644
--- a/src/map/battleground.cpp
+++ b/src/map/battleground.cpp
@@ -402,7 +402,7 @@ std::shared_ptr<s_battleground_queue> bg_search_queue(int queue_id)
  * @param bg: Battleground data
  * @return map_session_data
  */
-struct map_session_data* bg_getavailablesd(s_battleground_data *bg)
+map_session_data* bg_getavailablesd(s_battleground_data *bg)
 {
 	nullpo_retr(nullptr, bg);
 
@@ -463,7 +463,7 @@ bool bg_team_warp(int bg_id, unsigned short mapindex, short x, short y)
  * Remove a player's Battleground map marker
  * @param sd: Player data
  */
-void bg_send_dot_remove(struct map_session_data *sd)
+void bg_send_dot_remove(map_session_data *sd)
 {
 	nullpo_retv(sd);
 
@@ -479,7 +479,7 @@ void bg_send_dot_remove(struct map_session_data *sd)
  * @param is_queue: Joined from queue
  * @return True on success or false otherwise
  */
-bool bg_team_join(int bg_id, struct map_session_data *sd, bool is_queue)
+bool bg_team_join(int bg_id, map_session_data *sd, bool is_queue)
 {
 	if (!sd || sd->bg_id)
 		return false;
@@ -525,7 +525,7 @@ bool bg_team_join(int bg_id, struct map_session_data *sd, bool is_queue)
  * @param deserter: Whether to apply the deserter status or not
  * @return Remaining count in Battleground team or -1 on failure
  */
-int bg_team_leave(struct map_session_data *sd, bool quit, bool deserter)
+int bg_team_leave(map_session_data *sd, bool quit, bool deserter)
 {
 	if (!sd || !sd->bg_id)
 		return -1;
@@ -586,7 +586,7 @@ int bg_team_leave(struct map_session_data *sd, bool quit, bool deserter)
  * @param sd: Player data
  * @return True on success or false otherwise
  */
-bool bg_member_respawn(struct map_session_data *sd)
+bool bg_member_respawn(map_session_data *sd)
 {
 	if (!sd || !sd->bg_id || !pc_isdead(sd))
 		return false;
@@ -654,7 +654,7 @@ int bg_team_get_id(struct block_list *bl)
 				return ((TBL_PET*)bl)->master->bg_id;
 			break;
 		case BL_MOB: {
-			struct map_session_data *msd;
+			map_session_data *msd;
 			struct mob_data *md = (TBL_MOB*)bl;
 
 			if( md->special_state.ai && (msd = map_id2sd(md->master_id)) != nullptr )
@@ -683,7 +683,7 @@ int bg_team_get_id(struct block_list *bl)
  * @param mes: Message
  * @param len: Message length
  */
-void bg_send_message(struct map_session_data *sd, const char *mes, int len)
+void bg_send_message(map_session_data *sd, const char *mes, int len)
 {
 	nullpo_retv(sd);
 
@@ -704,7 +704,7 @@ void bg_send_message(struct map_session_data *sd, const char *mes, int len)
  */
 int bg_send_xy_timer_sub(std::shared_ptr<s_battleground_data> bg)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	for (auto &pl_sd : bg->members) {
 		sd = pl_sd.sd;
@@ -823,7 +823,7 @@ static TIMER_FUNC(bg_on_ready_start)
  * @param sd: Player data
  * @return True if in a battleground or false otherwise
  */
-bool bg_player_is_in_bg_map(struct map_session_data *sd)
+bool bg_player_is_in_bg_map(map_session_data *sd)
 {
 	nullpo_retr(false, sd);
 
@@ -843,7 +843,7 @@ bool bg_player_is_in_bg_map(struct map_session_data *sd)
  * @param name: Battleground name
  * @return True if the player is good to join a queue or false otherwise
  */
-static bool bg_queue_check_status(struct map_session_data* sd, const char *name)
+static bool bg_queue_check_status(map_session_data* sd, const char *name)
 {
 	nullpo_retr(false, sd);
 
@@ -878,7 +878,7 @@ static bool bg_queue_check_status(struct map_session_data* sd, const char *name)
  * @param name: Battleground name
  * @return True on success or false otherwise
  */
-bool bg_queue_check_joinable(std::shared_ptr<s_battleground_type> bg, struct map_session_data *sd, const char *name)
+bool bg_queue_check_joinable(std::shared_ptr<s_battleground_type> bg, map_session_data *sd, const char *name)
 {
 	nullpo_retr(false, sd);
 
@@ -953,7 +953,7 @@ bool bg_queue_reservation(const char *name, bool state, bool ended)
  * @param name: Battleground name
  * @param sd: Player who requested to join the battlegrounds
  */
-void bg_queue_join_solo(const char *name, struct map_session_data *sd)
+void bg_queue_join_solo(const char *name, map_session_data *sd)
 {
 	if (!sd) {
 		ShowError("bg_queue_join_solo: Tried to join non-existent player\n.");
@@ -980,7 +980,7 @@ void bg_queue_join_solo(const char *name, struct map_session_data *sd)
  * @param name: Battleground name
  * @param sd: Player who requested to join the battlegrounds
  */
-void bg_queue_join_party(const char *name, struct map_session_data *sd)
+void bg_queue_join_party(const char *name, map_session_data *sd)
 {
 	if (!sd) {
 		ShowError("bg_queue_join_party: Tried to join non-existent player\n.");
@@ -1021,14 +1021,14 @@ void bg_queue_join_party(const char *name, struct map_session_data *sd)
 			return; // Too many party members online
 		}
 
-		std::vector<struct map_session_data *> list;
+		std::vector<map_session_data *> list;
 
 		for (const auto &it : p->party.member) {
 			if (list.size() == bg->max_players)
 				break;
 
 			if (it.online) {
-				struct map_session_data *pl_sd = map_charid2sd(it.char_id);
+				map_session_data *pl_sd = map_charid2sd(it.char_id);
 
 				if (pl_sd)
 					list.push_back(pl_sd);
@@ -1048,7 +1048,7 @@ void bg_queue_join_party(const char *name, struct map_session_data *sd)
  * @param name: Battleground name
  * @param sd: Player who requested to join the battlegrounds
  */
-void bg_queue_join_guild(const char *name, struct map_session_data *sd)
+void bg_queue_join_guild(const char *name, map_session_data *sd)
 {
 	if (!sd) {
 		ShowError("bg_queue_join_guild: Tried to join non-existent player\n.");
@@ -1080,14 +1080,14 @@ void bg_queue_join_guild(const char *name, struct map_session_data *sd)
 			return; // Too many guild members online
 		}
 
-		std::vector<struct map_session_data *> list;
+		std::vector<map_session_data *> list;
 
 		for (const auto &it : g->member) {
 			if (list.size() == bg->max_players)
 				break;
 
 			if (it.online) {
-				struct map_session_data *pl_sd = map_charid2sd(it.char_id);
+				map_session_data *pl_sd = map_charid2sd(it.char_id);
 
 				if (pl_sd)
 					list.push_back(pl_sd);
@@ -1108,7 +1108,7 @@ void bg_queue_join_guild(const char *name, struct map_session_data *sd)
  * @param sd: Player who requested to join the battlegrounds
  * @param list: Contains all players including the player who requested to join
  */
-void bg_queue_join_multi(const char *name, struct map_session_data *sd, std::vector <map_session_data *> list)
+void bg_queue_join_multi(const char *name, map_session_data *sd, std::vector <map_session_data *> list)
 {
 	if (!sd) {
 		ShowError("bg_queue_join_multi: Tried to join non-existent player\n.");
@@ -1151,7 +1151,7 @@ void bg_queue_join_multi(const char *name, struct map_session_data *sd, std::vec
 		}
 
 		while (!list.empty() && team->size() < bg->max_players) {
-			struct map_session_data *sd2 = list.back();
+			map_session_data *sd2 = list.back();
 
 			list.pop_back();
 
@@ -1238,7 +1238,7 @@ void bg_queue_clear(std::shared_ptr<s_battleground_queue> queue, bool ended)
  * @param apply_sc: Apply the SC_ENTRY_QUEUE_APPLY_DELAY status on queue leave (default: true)
  * @return True on success or false otherwise
  */
-static bool bg_queue_leave_sub(struct map_session_data *sd, std::vector<map_session_data *> &members, bool apply_sc)
+static bool bg_queue_leave_sub(map_session_data *sd, std::vector<map_session_data *> &members, bool apply_sc)
 {
 	if (!sd)
 		return false;
@@ -1268,7 +1268,7 @@ static bool bg_queue_leave_sub(struct map_session_data *sd, std::vector<map_sess
  * @param apply_sc: Apply the SC_ENTRY_QUEUE_APPLY_DELAY status on queue leave (default: true)
  * @return True on success or false otherwise
  */
-bool bg_queue_leave(struct map_session_data *sd, bool apply_sc)
+bool bg_queue_leave(map_session_data *sd, bool apply_sc)
 {
 	if (!sd || sd->bg_queue_id == 0)
 		return false;
@@ -1456,7 +1456,7 @@ bool bg_mapflag_check(std::shared_ptr<s_battleground_queue> queue) {
  * @param queue: Battleground queue
  * @param sd: Player data
  */
-void bg_queue_on_accept_invite(struct map_session_data *sd)
+void bg_queue_on_accept_invite(map_session_data *sd)
 {
 	nullpo_retv(sd);
 
diff --git a/src/map/battleground.hpp b/src/map/battleground.hpp
index a2df3e6f56..d143be34a2 100644
--- a/src/map/battleground.hpp
+++ b/src/map/battleground.hpp
@@ -16,7 +16,7 @@
 
 struct s_battleground_member_data {
 	unsigned short x, y;
-	struct map_session_data *sd;
+	map_session_data *sd;
 	unsigned afk : 1;
 	struct point entry_point; ///< Battleground queue entry point
 };
@@ -128,32 +128,32 @@ extern std::vector<std::shared_ptr<s_battleground_queue>> bg_queues;
 
 std::shared_ptr<s_battleground_type> bg_search_name(const char *name);
 std::shared_ptr<s_battleground_queue> bg_search_queue(int queue_id);
-void bg_send_dot_remove(struct map_session_data *sd);
+void bg_send_dot_remove(map_session_data *sd);
 int bg_team_get_id(struct block_list *bl);
-struct map_session_data *bg_getavailablesd(s_battleground_data *bg);
+map_session_data *bg_getavailablesd(s_battleground_data *bg);
 
 bool bg_queue_reservation(const char *name, bool state, bool ended);
 #define bg_queue_reserve(name, end) (bg_queue_reservation(name, true, end))
 #define bg_queue_unbook(name) (bg_queue_reservation(name, false, false))
 
 int bg_create(uint16 mapindex, s_battleground_team* team);
-bool bg_team_join(int bg_id, struct map_session_data *sd, bool is_queue);
+bool bg_team_join(int bg_id, map_session_data *sd, bool is_queue);
 bool bg_team_delete(int bg_id);
-int bg_team_leave(struct map_session_data *sd, bool quit, bool deserter);
+int bg_team_leave(map_session_data *sd, bool quit, bool deserter);
 bool bg_team_warp(int bg_id, unsigned short mapindex, short x, short y);
-bool bg_player_is_in_bg_map(struct map_session_data *sd);
-bool bg_queue_check_joinable(std::shared_ptr<s_battleground_type> bg, struct map_session_data *sd, const char *name);
-void bg_queue_join_solo(const char *name, struct map_session_data *sd);
-void bg_queue_join_party(const char *name, struct map_session_data *sd);
-void bg_queue_join_guild(const char *name, struct map_session_data *sd);
-void bg_queue_join_multi(const char *name, struct map_session_data *sd, std::vector<map_session_data *> list);
+bool bg_player_is_in_bg_map(map_session_data *sd);
+bool bg_queue_check_joinable(std::shared_ptr<s_battleground_type> bg, map_session_data *sd, const char *name);
+void bg_queue_join_solo(const char *name, map_session_data *sd);
+void bg_queue_join_party(const char *name, map_session_data *sd);
+void bg_queue_join_guild(const char *name, map_session_data *sd);
+void bg_queue_join_multi(const char *name, map_session_data *sd, std::vector<map_session_data *> list);
 void bg_queue_clear(std::shared_ptr<s_battleground_queue> queue, bool ended);
-bool bg_queue_leave(struct map_session_data *sd, bool apply_sc = true);
+bool bg_queue_leave(map_session_data *sd, bool apply_sc = true);
 bool bg_queue_on_ready(const char *name, std::shared_ptr<s_battleground_queue> queue);
-void bg_queue_on_accept_invite(struct map_session_data *sd);
+void bg_queue_on_accept_invite(map_session_data *sd);
 void bg_queue_start_battleground(std::shared_ptr<s_battleground_queue> queue);
-bool bg_member_respawn(struct map_session_data *sd);
-void bg_send_message(struct map_session_data *sd, const char *mes, int len);
+bool bg_member_respawn(map_session_data *sd);
+void bg_send_message(map_session_data *sd, const char *mes, int len);
 
 void do_init_battleground(void);
 void do_final_battleground(void);
diff --git a/src/map/buyingstore.cpp b/src/map/buyingstore.cpp
index 7bb99575b7..54c31c0950 100644
--- a/src/map/buyingstore.cpp
+++ b/src/map/buyingstore.cpp
@@ -19,7 +19,7 @@
 #include "clif.hpp"  // clif_buyingstore_*
 #include "log.hpp"  // log_pick_pc, log_zeny
 #include "npc.hpp"
-#include "pc.hpp"  // struct map_session_data
+#include "pc.hpp"  // map_session_data
 
 //Autotrader
 static DBMap *buyingstore_autotrader_db; /// Holds autotrader info: char_id -> struct s_autotrader
@@ -66,7 +66,7 @@ static unsigned int buyingstore_getuid(void)
 * @param slots Number of item on the list
 * @return 0 If success, 1 - Cannot open, 2 - Manner penalty, 3 - Mapflag restiction, 4 - Cell restriction
 */
-int8 buyingstore_setup(struct map_session_data* sd, unsigned char slots){
+int8 buyingstore_setup(map_session_data* sd, unsigned char slots){
 	nullpo_retr(1, sd);
 
 	if (!battle_config.feature_buying_store || sd->state.vending || sd->state.buyingstore || sd->state.trading || slots == 0) {
@@ -113,7 +113,7 @@ int8 buyingstore_setup(struct map_session_data* sd, unsigned char slots){
 * @param at Autotrader info, or NULL if requetsed not from autotrade persistance
 * @return 0 If success, 1 - Cannot open, 2 - Manner penalty, 3 - Mapflag restiction, 4 - Cell restriction, 5 - Invalid count/result, 6 - Cannot give item, 7 - Will be overweight
 */
-int8 buyingstore_create( struct map_session_data* sd, int zenylimit, unsigned char result, const char* storename, const struct PACKET_CZ_REQ_OPEN_BUYING_STORE_sub* itemlist, unsigned int count, struct s_autotrader *at ){
+int8 buyingstore_create( map_session_data* sd, int zenylimit, unsigned char result, const char* storename, const struct PACKET_CZ_REQ_OPEN_BUYING_STORE_sub* itemlist, unsigned int count, struct s_autotrader *at ){
 	unsigned int i, weight, listidx;
 	char message_sql[MESSAGE_SIZE*2];
 	StringBuf buf;
@@ -259,7 +259,7 @@ int8 buyingstore_create( struct map_session_data* sd, int zenylimit, unsigned ch
 * Close buying store and clear buying store data from tables
 * @param sd
 */
-void buyingstore_close(struct map_session_data* sd) {
+void buyingstore_close(map_session_data* sd) {
 	nullpo_retv(sd);
 
 	if( sd->state.buyingstore ) {
@@ -285,9 +285,9 @@ void buyingstore_close(struct map_session_data* sd) {
 * @param sd Player
 * @param account_id Buyer account ID
 */
-void buyingstore_open(struct map_session_data* sd, uint32 account_id)
+void buyingstore_open(map_session_data* sd, uint32 account_id)
 {
-	struct map_session_data* pl_sd;
+	map_session_data* pl_sd;
 
 	nullpo_retv(sd);
 
@@ -323,10 +323,10 @@ void buyingstore_open(struct map_session_data* sd, uint32 account_id)
 * @param *itemlist List of sold items { <index>.W, <nameid>.W, <amount>.W }*
 * @param count Number of item on the itemlist
 */
-void buyingstore_trade( struct map_session_data* sd, uint32 account_id, unsigned int buyer_id, const struct PACKET_CZ_REQ_TRADE_BUYING_STORE_sub* itemlist, unsigned int count ){
+void buyingstore_trade( map_session_data* sd, uint32 account_id, unsigned int buyer_id, const struct PACKET_CZ_REQ_TRADE_BUYING_STORE_sub* itemlist, unsigned int count ){
 	int zeny = 0;
 	unsigned int weight;
-	struct map_session_data* pl_sd;
+	map_session_data* pl_sd;
 
 	nullpo_retv(sd);
 
@@ -508,7 +508,7 @@ void buyingstore_trade( struct map_session_data* sd, uint32 account_id, unsigned
 
 
 /// Checks if an item is being bought in given player's buying store.
-bool buyingstore_search(struct map_session_data* sd, t_itemid nameid)
+bool buyingstore_search(map_session_data* sd, t_itemid nameid)
 {
 	unsigned int i;
 
@@ -531,7 +531,7 @@ bool buyingstore_search(struct map_session_data* sd, t_itemid nameid)
 
 /// Searches for all items in a buyingstore, that match given ids, price and possible cards.
 /// @return Whether or not the search should be continued.
-bool buyingstore_searchall(struct map_session_data* sd, const struct s_search_store_search* s)
+bool buyingstore_searchall(map_session_data* sd, const struct s_search_store_search* s)
 {
 	unsigned int i, idx;
 	struct s_buyingstore_item* it;
@@ -596,7 +596,7 @@ bool buyingstore_searchall(struct map_session_data* sd, const struct s_search_st
 * Open buyingstore for Autotrader
 * @param sd Player as autotrader
 */
-void buyingstore_reopen( struct map_session_data* sd ){
+void buyingstore_reopen( map_session_data* sd ){
 	struct s_autotrader *at = NULL;
 	int8 fail = -1;
 
@@ -702,7 +702,7 @@ void do_init_buyingstore_autotrade( void ) {
 					at->sit = battle_config.feature_autotrade_sit;
 
 				// initialize player
-				CREATE(at->sd, struct map_session_data, 1);
+				CREATE(at->sd, map_session_data, 1); // TODO: Dont use Memory Manager allocation anymore and rely on the C++ container
 				pc_setnewpc(at->sd, at->account_id, at->char_id, 0, gettick(), at->sex, 0);
 				at->sd->state.autotrade = 1|4;
 				if (battle_config.autotrade_monsterignore)
diff --git a/src/map/buyingstore.hpp b/src/map/buyingstore.hpp
index d4c594f30d..2bb5b28360 100644
--- a/src/map/buyingstore.hpp
+++ b/src/map/buyingstore.hpp
@@ -9,7 +9,7 @@
 #include "map.hpp" //MESSAGE_SIZE
 
 struct s_search_store_search;
-struct map_session_data;
+class map_session_data;
 
 #define MAX_BUYINGSTORE_SLOTS 5
 
@@ -52,22 +52,22 @@ struct s_autotrader {
 	uint32 limit; ///< Maximum zeny to be spent (for buyingstore)
 	uint16 count; ///< Number of item in store
 	struct s_autotrade_entry **entries; ///< Store details
-	struct map_session_data *sd;
+	map_session_data *sd;
 };
 
-int8 buyingstore_setup(struct map_session_data* sd, unsigned char slots);
-int8 buyingstore_create(struct map_session_data* sd, int zenylimit, unsigned char result, const char* storename, const struct PACKET_CZ_REQ_OPEN_BUYING_STORE_sub* itemlist, unsigned int count, struct s_autotrader *at);
-void buyingstore_close(struct map_session_data* sd);
-void buyingstore_open(struct map_session_data* sd, uint32 account_id);
-void buyingstore_trade(struct map_session_data* sd, uint32 account_id, unsigned int buyer_id, const struct PACKET_CZ_REQ_TRADE_BUYING_STORE_sub* itemlist, unsigned int count);
-bool buyingstore_search(struct map_session_data* sd, t_itemid nameid);
-bool buyingstore_searchall(struct map_session_data* sd, const struct s_search_store_search* s);
+int8 buyingstore_setup(map_session_data* sd, unsigned char slots);
+int8 buyingstore_create(map_session_data* sd, int zenylimit, unsigned char result, const char* storename, const struct PACKET_CZ_REQ_OPEN_BUYING_STORE_sub* itemlist, unsigned int count, struct s_autotrader *at);
+void buyingstore_close(map_session_data* sd);
+void buyingstore_open(map_session_data* sd, uint32 account_id);
+void buyingstore_trade(map_session_data* sd, uint32 account_id, unsigned int buyer_id, const struct PACKET_CZ_REQ_TRADE_BUYING_STORE_sub* itemlist, unsigned int count);
+bool buyingstore_search(map_session_data* sd, t_itemid nameid);
+bool buyingstore_searchall(map_session_data* sd, const struct s_search_store_search* s);
 DBMap *buyingstore_getdb(void);
 void do_final_buyingstore(void);
 void do_init_buyingstore(void);
 
 void do_init_buyingstore_autotrade( void );
-void buyingstore_reopen( struct map_session_data* sd );
+void buyingstore_reopen( map_session_data* sd );
 void buyingstore_update(map_session_data &sd);
 
 #endif /* BUYINGSTORE_HPP */
diff --git a/src/map/cashshop.cpp b/src/map/cashshop.cpp
index ef36903984..e6366fa321 100644
--- a/src/map/cashshop.cpp
+++ b/src/map/cashshop.cpp
@@ -409,7 +409,7 @@ struct sale_item_data* sale_find_item( t_itemid nameid, bool onsale ){
 	return sale_items.item[i];
 }
 
-void sale_notify_login( struct map_session_data* sd ){
+void sale_notify_login( map_session_data* sd ){
 	int i;
 
 	for( i = 0; i < sale_items.count; i++ ){
@@ -467,7 +467,7 @@ static void cashshop_read_db( void ){
  * @param item_list Array of item ID
  * @return true: success, false: fail
  */
-bool cashshop_buylist( struct map_session_data* sd, uint32 kafrapoints, int n, struct PACKET_CZ_SE_PC_BUY_CASHITEM_LIST_sub* item_list ){
+bool cashshop_buylist( map_session_data* sd, uint32 kafrapoints, int n, struct PACKET_CZ_SE_PC_BUY_CASHITEM_LIST_sub* item_list ){
 	uint32 totalcash = 0;
 	uint32 totalweight = 0;
 	int i,new_;
diff --git a/src/map/cashshop.hpp b/src/map/cashshop.hpp
index 7566507d83..b9a37aa945 100644
--- a/src/map/cashshop.hpp
+++ b/src/map/cashshop.hpp
@@ -10,12 +10,12 @@
 #include "../common/mmo.hpp" // t_itemid
 #include "../common/timer.hpp" // ShowWarning, ShowStatus
 
-struct map_session_data;
+class map_session_data;
 
 void do_init_cashshop( void );
 void do_final_cashshop( void );
 void cashshop_reloaddb( void );
-bool cashshop_buylist( struct map_session_data* sd, uint32 kafrapoints, int n, struct PACKET_CZ_SE_PC_BUY_CASHITEM_LIST_sub* item_list );
+bool cashshop_buylist( map_session_data* sd, uint32 kafrapoints, int n, struct PACKET_CZ_SE_PC_BUY_CASHITEM_LIST_sub* item_list );
 
 // Taken from AEGIS
 enum CASH_SHOP_TAB_CODE
@@ -94,7 +94,7 @@ extern struct sale_item_db sale_items;
 struct sale_item_data* sale_find_item(t_itemid nameid, bool onsale);
 enum e_sale_add_result sale_add_item(t_itemid nameid, int32 count, time_t from, time_t to);
 bool sale_remove_item(t_itemid nameid);
-void sale_notify_login( struct map_session_data* sd );
+void sale_notify_login( map_session_data* sd );
 #endif
 
 #endif /* CASHSHOP_HPP */
diff --git a/src/map/channel.cpp b/src/map/channel.cpp
index f1cd241019..1a705f4aee 100644
--- a/src/map/channel.cpp
+++ b/src/map/channel.cpp
@@ -146,9 +146,9 @@ int channel_delete(struct Channel *channel, bool force) {
 	if(!force && channel->type == CHAN_TYPE_PUBLIC && runflag == MAPSERVER_ST_RUNNING) //only delete those serv stop
 		return -2;
 	if( db_size(channel->users)) {
-		struct map_session_data *sd;
+		map_session_data *sd;
 		DBIterator *iter = db_iterator(channel->users);
-		for( sd = (struct map_session_data *)dbi_first(iter); dbi_exists(iter); sd = (struct map_session_data *)dbi_next(iter) ) { //for all users
+		for( sd = (map_session_data *)dbi_first(iter); dbi_exists(iter); sd = (map_session_data *)dbi_next(iter) ) { //for all users
 			channel_clean(channel,sd,1); //make all quit
 		}
 		dbi_destroy(iter);
@@ -192,7 +192,7 @@ int channel_delete(struct Channel *channel, bool force) {
  *  -3: Player banned
  *  -4: Reached max limit
  */
-int channel_join(struct Channel *channel, struct map_session_data *sd) {
+int channel_join(struct Channel *channel, map_session_data *sd) {
 	if(!channel || !sd)
 		return -1;
 	if(sd->state.autotrade)
@@ -247,7 +247,7 @@ int channel_join(struct Channel *channel, struct map_session_data *sd) {
  *  -2: Player already in channel (channel_join)
  *  -3: Player banned (channel_join)
  */
-int channel_mjoin(struct map_session_data *sd) {
+int channel_mjoin(map_session_data *sd) {
 	char mout[60];
 	if(!sd) return -1;
 
@@ -275,7 +275,7 @@ int channel_mjoin(struct map_session_data *sd) {
  */
 int channel_ajoin(struct guild *g){
 	int i, j;
-	struct map_session_data *pl_sd;
+	map_session_data *pl_sd;
 
 	if(!g || !g->channel) return -1;
 	for (i = 0; i < MAX_GUILDALLIANCE; i++){
@@ -302,7 +302,7 @@ int channel_ajoin(struct guild *g){
  *  -1: Invalid player
  *  -2: Player has no guild attached
  */
-int channel_gjoin(struct map_session_data *sd, int flag){
+int channel_gjoin(map_session_data *sd, int flag){
 	struct Channel *channel;
 	struct guild *g;
 
@@ -341,7 +341,7 @@ int channel_gjoin(struct map_session_data *sd, int flag){
  *  0: Success
  * -1: Invalid player or channel
  */
-int channel_clean(struct Channel *channel, struct map_session_data *sd, int flag) {
+int channel_clean(struct Channel *channel, map_session_data *sd, int flag) {
 	unsigned char i;
 
 	if(!channel || !sd)
@@ -388,7 +388,7 @@ int channel_clean(struct Channel *channel, struct map_session_data *sd, int flag
  *  0: Success
  * -1: Invalid player
  */
-int channel_pcquit(struct map_session_data *sd, int type){
+int channel_pcquit(map_session_data *sd, int type){
 	int i;
 
 	//On closing state we could have clean all chan by sd but pcquit is more used to free unit when
@@ -438,7 +438,7 @@ int channel_pcquit(struct map_session_data *sd, int type){
  * -1: Invalid player, channel, or message
  * -2: Delay message from last message
  */
-int channel_send(struct Channel *channel, struct map_session_data *sd, const char *msg) {
+int channel_send(struct Channel *channel, map_session_data *sd, const char *msg) {
 	int idx = 0;
 
 	if(!channel || !sd || !msg || (idx = channel_pc_haschan(sd, channel)) < 0)
@@ -500,7 +500,7 @@ int channel_chk(char *chname, char *chpass, int type){
  * @param flag: Lookup types (1 - Create channel if it does not exist (map or ally only), 2 - Join the channel if not joined yet (map or ally only))
  * @return NULL on channel not found or channel data on success
  */
-struct Channel* channel_name2channel(char *chname, struct map_session_data *sd, int flag){
+struct Channel* channel_name2channel(char *chname, map_session_data *sd, int flag){
 	if(channel_chk(chname, NULL, 1))
 		return NULL;
 
@@ -533,7 +533,7 @@ struct Channel* channel_name2channel(char *chname, struct map_session_data *sd,
  *  0: Player not found or not banned
  *  1: Player is in channel
  */
-int channel_haspc(struct Channel *channel,struct map_session_data *sd){
+int channel_haspc(struct Channel *channel,map_session_data *sd){
 	if(!channel || !sd) return -1;
 	return (idb_exists(channel->users, sd->status.char_id))?1:0;
 }
@@ -545,7 +545,7 @@ int channel_haspc(struct Channel *channel,struct map_session_data *sd){
  *  0: Player not found or not banned
  *  1: Player is banned
  */
-int channel_haspcbanned(struct Channel *channel,struct map_session_data *sd){
+int channel_haspcbanned(struct Channel *channel,map_session_data *sd){
 	if(!channel || !sd) return -1;
 	return (idb_exists(channel->banned, sd->status.char_id))?1:0;
 }
@@ -560,7 +560,7 @@ int channel_haspcbanned(struct Channel *channel,struct map_session_data *sd){
  * -2: Player not found or not in channel
  * x > 0: has_channel at index x
  */
-int channel_pc_haschan(struct map_session_data *sd, struct Channel *channel){
+int channel_pc_haschan(map_session_data *sd, struct Channel *channel){
 	int k;
 	if(!channel || !sd) return -1; //channel or player doesn't exist
 	ARR_FIND(0, sd->channel_count, k, strcmpi(channel->name,sd->channels[k]->name) == 0);
@@ -577,7 +577,7 @@ int channel_pc_haschan(struct map_session_data *sd, struct Channel *channel){
  *   void: List of public channel and map and guild and number of users
  * @return 0 on success or -1 on failure
  */
-int channel_display_list(struct map_session_data *sd, const char *options){
+int channel_display_list(map_session_data *sd, const char *options){
 
 	if(!sd || !options)
 		return -1;
@@ -654,7 +654,7 @@ int channel_display_list(struct map_session_data *sd, const char *options){
  * @param chpass: Channel password
  * @return 0 on success or -1 on failure
  */
-int channel_pccreate(struct map_session_data *sd, char *chname, char *chpass){
+int channel_pccreate(map_session_data *sd, char *chname, char *chpass){
 	char output[CHAT_SIZE_MAX];
 	int8 res;
 
@@ -688,7 +688,7 @@ int channel_pccreate(struct map_session_data *sd, char *chname, char *chpass){
  * @param chname: Channel name
  * @return 0 on success or -1 on failure
  */
-int channel_pcdelete(struct map_session_data *sd, char *chname){
+int channel_pcdelete(map_session_data *sd, char *chname){
 	struct Channel *channel;
 	char output[CHAT_SIZE_MAX];
 
@@ -719,7 +719,7 @@ int channel_pcdelete(struct map_session_data *sd, char *chname){
  * @param chname: Channel name
  * @return 0 on success or -1 on failure
  */
-int channel_pcleave(struct map_session_data *sd, char *chname){
+int channel_pcleave(map_session_data *sd, char *chname){
 	struct Channel *channel;
 	char output[CHAT_SIZE_MAX];
 
@@ -767,7 +767,7 @@ int channel_pcleave(struct map_session_data *sd, char *chname){
  * @param pass: Channel password
  * @return 0 on success or -1 on failure
  */
-int channel_pcjoin(struct map_session_data *sd, char *chname, char *pass){
+int channel_pcjoin(map_session_data *sd, char *chname, char *pass){
 	struct Channel *channel;
 	char output[CHAT_SIZE_MAX];
 
@@ -832,7 +832,7 @@ int channel_pcjoin(struct map_session_data *sd, char *chname, char *pass){
  * @param color: New color
  * @return 0 on success or -1 on failure
  */
-int channel_pccolor(struct map_session_data *sd, char *chname, char *color){
+int channel_pccolor(map_session_data *sd, char *chname, char *color){
 	struct Channel *channel;
 	char output[CHAT_SIZE_MAX];
 	int k;
@@ -885,7 +885,7 @@ int channel_pccolor(struct map_session_data *sd, char *chname, char *color){
  * @param chname: Channel name
  * @return 0 on success, -1 on incorrect channel name, or -2 channel doesn't exist or player didn't join
  */
-int channel_pcbind(struct map_session_data *sd, char *chname){
+int channel_pcbind(map_session_data *sd, char *chname){
 	struct Channel *channel;
 	char output[CHAT_SIZE_MAX];
 
@@ -914,7 +914,7 @@ int channel_pcbind(struct map_session_data *sd, char *chname){
  * @param sd: Player data
  * @return 0 on success or -1 on failure
  */
-int channel_pcunbind(struct map_session_data *sd){
+int channel_pcunbind(map_session_data *sd){
 	char output[CHAT_SIZE_MAX];
 
 	if(!sd)
@@ -938,10 +938,10 @@ int channel_pcunbind(struct map_session_data *sd){
  * @param flag: Ban options (0 - Ban, 1 - Unban, 2 - Unban all, 3 - Ban list)
  * @return 0 on success or -1 on failure
  */
-int channel_pcban(struct map_session_data *sd, char *chname, char *pname, int flag){
+int channel_pcban(map_session_data *sd, char *chname, char *pname, int flag){
 	struct Channel *channel;
 	char output[CHAT_SIZE_MAX];
-	struct map_session_data *tsd = map_nick2sd(pname,false);
+	map_session_data *tsd = map_nick2sd(pname,false);
 
 	if( channel_chk(chname,NULL,1) ) {
 		clif_displaymessage(sd->fd, msg_txt(sd,1405));// Channel name must start with '#'.
@@ -1047,10 +1047,10 @@ int channel_pcban(struct map_session_data *sd, char *chname, char *pname, int fl
  * @param pname: Player name to kick
  * @return 0 on success or -1 on failure
  */
-int channel_pckick(struct map_session_data *sd, char *chname, char *pname) {
+int channel_pckick(map_session_data *sd, char *chname, char *pname) {
 	struct Channel *channel;
 	char output[CHAT_SIZE_MAX];
-	struct map_session_data *tsd = map_nick2sd(pname,false);
+	map_session_data *tsd = map_nick2sd(pname,false);
 
 	if( channel_chk(chname,NULL,1) ) {
 		clif_displaymessage(sd->fd, msg_txt(sd,1405));// Channel name must start with '#'.
@@ -1114,7 +1114,7 @@ int channel_pckick(struct map_session_data *sd, char *chname, char *pname) {
  * @param val: Option value
  * @return 0 on success or -1 on failure
  */
-int channel_pcsetopt(struct map_session_data *sd, char *chname, const char *option, const char *val){
+int channel_pcsetopt(map_session_data *sd, char *chname, const char *option, const char *val){
 	struct Channel *channel;
 	char output[CHAT_SIZE_MAX];
 	int k, s = 0, opt;
@@ -1266,11 +1266,11 @@ bool channel_pccheckgroup(struct Channel *channel, int group_id) {
  */
 int channel_pcautojoin_sub(DBKey key, DBData *data, va_list ap) {
 	struct Channel *channel = (struct Channel *)db_data2ptr(data);
-	struct map_session_data *sd = NULL;
+	map_session_data *sd = NULL;
 	char channame[CHAN_NAME_LENGTH+1];
 
 	nullpo_ret(channel);
-	nullpo_ret((sd = va_arg(ap, struct map_session_data *)));
+	nullpo_ret((sd = va_arg(ap, map_session_data *)));
 
 	if (channel->pass[0])
 		return 0;
@@ -1288,7 +1288,7 @@ int channel_pcautojoin_sub(DBKey key, DBData *data, va_list ap) {
  * Attempt to autojoin a player to a channel
  * @param sd: Player data
  */
-void channel_autojoin(struct map_session_data *sd) {
+void channel_autojoin(map_session_data *sd) {
 	nullpo_retv(sd);
 	if (sd->state.autotrade || !sd->fd)
 		return;
diff --git a/src/map/channel.hpp b/src/map/channel.hpp
index 19b8605f2c..20d80d65b3 100644
--- a/src/map/channel.hpp
+++ b/src/map/channel.hpp
@@ -9,7 +9,7 @@
 
 //namespace rA {
 
-struct map_session_data;
+class map_session_data;
 struct guild;
 struct DBMap;
 
@@ -92,38 +92,38 @@ struct Channel* channel_create(struct Channel *tmp_chan);
 struct Channel* channel_create_simple(char *name, char *pass, enum Channel_Type chantype, unsigned int owner);
 int channel_delete(struct Channel *channel, bool force);
 
-int channel_join(struct Channel *channel, struct map_session_data *sd);
-int channel_mjoin(struct map_session_data *sd);
-int channel_gjoin(struct map_session_data *sd, int flag);
+int channel_join(struct Channel *channel, map_session_data *sd);
+int channel_mjoin(map_session_data *sd);
+int channel_gjoin(map_session_data *sd, int flag);
 int channel_ajoin(struct guild *g);
-int channel_clean(struct Channel *channel, struct map_session_data *sd, int flag);
-int channel_pcquit(struct map_session_data *sd, int type);
+int channel_clean(struct Channel *channel, map_session_data *sd, int flag);
+int channel_pcquit(map_session_data *sd, int type);
 
 unsigned long channel_getColor(const char *color_str);
 
-int channel_send(struct Channel *channel, struct map_session_data *sd, const char *msg);
+int channel_send(struct Channel *channel, map_session_data *sd, const char *msg);
 void channel_read_config(void);
 
 int channel_chk(char *name, char *pass, int type);
-struct Channel* channel_name2channel(char *chname, struct map_session_data *sd, int flag);
-int channel_haspc(struct Channel *channel,struct map_session_data *sd);
-int channel_haspcbanned(struct Channel *channel,struct map_session_data *sd);
-int channel_pc_haschan(struct map_session_data *sd, struct Channel *channel);
-int channel_display_list(struct map_session_data *sd, const char *option);
+struct Channel* channel_name2channel(char *chname, map_session_data *sd, int flag);
+int channel_haspc(struct Channel *channel,map_session_data *sd);
+int channel_haspcbanned(struct Channel *channel,map_session_data *sd);
+int channel_pc_haschan(map_session_data *sd, struct Channel *channel);
+int channel_display_list(map_session_data *sd, const char *option);
 
-void channel_autojoin(struct map_session_data *sd);
+void channel_autojoin(map_session_data *sd);
 bool channel_pccheckgroup(struct Channel *channel, int group_id);
 
-int channel_pccreate(struct map_session_data *sd, char *chname, char *pass);
-int channel_pcdelete(struct map_session_data *sd, char *chname);
-int channel_pcjoin(struct map_session_data *sd, char *chname, char *pass);
-int channel_pcleave(struct map_session_data *sd, char *chname);
-int channel_pccolor(struct map_session_data *sd, char *chname, char *color);
-int channel_pcbind(struct map_session_data *sd, char *chname);
-int channel_pcunbind(struct map_session_data *sd);
-int channel_pcban(struct map_session_data *sd, char *chname, char *pname, int flag);
-int channel_pckick(struct map_session_data *sd, char *chname, char *pname);
-int channel_pcsetopt(struct map_session_data *sd, char *chname, const char *option, const char *val);
+int channel_pccreate(map_session_data *sd, char *chname, char *pass);
+int channel_pcdelete(map_session_data *sd, char *chname);
+int channel_pcjoin(map_session_data *sd, char *chname, char *pass);
+int channel_pcleave(map_session_data *sd, char *chname);
+int channel_pccolor(map_session_data *sd, char *chname, char *color);
+int channel_pcbind(map_session_data *sd, char *chname);
+int channel_pcunbind(map_session_data *sd);
+int channel_pcban(map_session_data *sd, char *chname, char *pname, int flag);
+int channel_pckick(map_session_data *sd, char *chname, char *pname);
+int channel_pcsetopt(map_session_data *sd, char *chname, const char *option, const char *val);
 
 void do_init_channel(void);
 void do_final_channel(void);
diff --git a/src/map/chat.cpp b/src/map/chat.cpp
index c350d40de3..c429cb34d3 100644
--- a/src/map/chat.cpp
+++ b/src/map/chat.cpp
@@ -74,7 +74,7 @@ static struct chat_data* chat_createchat(struct block_list* bl, const char* titl
  * @param pub : public or private
  * @return 0
  */
-int chat_createpcchat(struct map_session_data* sd, const char* title, const char* pass, int limit, bool pub)
+int chat_createpcchat(map_session_data* sd, const char* title, const char* pass, int limit, bool pub)
 {
 	struct chat_data* cd;
 
@@ -125,7 +125,7 @@ int chat_createpcchat(struct map_session_data* sd, const char* title, const char
  * @param pass : password of chat room
  * @return 0
  */
-int chat_joinchat(struct map_session_data* sd, int chatid, const char* pass)
+int chat_joinchat(map_session_data* sd, int chatid, const char* pass)
 {
 	struct chat_data* cd;
 
@@ -186,7 +186,7 @@ int chat_joinchat(struct map_session_data* sd, int chatid, const char* pass)
  * @param kicked : for clif notification, kicked=1 or regular leave
  * @return 0:success, 1:failed
  */
-int chat_leavechat(struct map_session_data* sd, bool kicked)
+int chat_leavechat(map_session_data* sd, bool kicked)
 {
 	struct chat_data* cd;
 	int i;
@@ -257,10 +257,10 @@ int chat_leavechat(struct map_session_data* sd, bool kicked)
  * @param nextownername : string of new owner (name should be in chatroom)
  * @return 0:success, 1:failure
  */
-int chat_changechatowner(struct map_session_data* sd, const char* nextownername)
+int chat_changechatowner(map_session_data* sd, const char* nextownername)
 {
 	struct chat_data* cd;
-	struct map_session_data* tmpsd;
+	map_session_data* tmpsd;
 	int i;
 
 	nullpo_retr(1, sd);
@@ -309,7 +309,7 @@ int chat_changechatowner(struct map_session_data* sd, const char* nextownername)
  * @param pub : public or private
  * @return 1:success, 0:failure
  */
-int chat_changechatstatus(struct map_session_data* sd, const char* title, const char* pass, int limit, bool pub)
+int chat_changechatstatus(map_session_data* sd, const char* title, const char* pass, int limit, bool pub)
 {
 	struct chat_data* cd;
 
@@ -355,7 +355,7 @@ int chat_npckickchat(struct chat_data* cd, const char* kickusername)
  * @param kickusername : player name to be kicked
  * @retur 1:success, 0:failure
  */
-int chat_kickchat(struct map_session_data* sd, const char* kickusername)
+int chat_kickchat(map_session_data* sd, const char* kickusername)
 {
 	struct chat_data* cd;
 	int i;
diff --git a/src/map/chat.hpp b/src/map/chat.hpp
index 28787f3596..dae50f23c1 100644
--- a/src/map/chat.hpp
+++ b/src/map/chat.hpp
@@ -6,7 +6,7 @@
 
 #include "map.hpp" // struct block_list, CHATROOM_TITLE_SIZE
 
-struct map_session_data;
+class map_session_data;
 struct chat_data;
 
 #define MAX_CHAT_USERS 20
@@ -22,18 +22,18 @@ struct chat_data {
 	uint32 zeny;						 // required zeny to join
 	uint32 minLvl;					 // minimum base level to join
 	uint32 maxLvl;					 // maximum base level allowed to join
-	struct map_session_data* usersd[MAX_CHAT_USERS];
+	map_session_data* usersd[MAX_CHAT_USERS];
 	struct block_list* owner;
 	char npc_event[EVENT_NAME_LENGTH];
 	DBMap* kick_list;				//DBMap of users who were kicked from this chat
 };
 
-int chat_createpcchat(struct map_session_data* sd, const char* title, const char* pass, int limit, bool pub);
-int chat_joinchat(struct map_session_data* sd, int chatid, const char* pass);
-int chat_leavechat(struct map_session_data* sd, bool kicked);
-int chat_changechatowner(struct map_session_data* sd, const char* nextownername);
-int chat_changechatstatus(struct map_session_data* sd, const char* title, const char* pass, int limit, bool pub);
-int chat_kickchat(struct map_session_data* sd, const char* kickusername);
+int chat_createpcchat(map_session_data* sd, const char* title, const char* pass, int limit, bool pub);
+int chat_joinchat(map_session_data* sd, int chatid, const char* pass);
+int chat_leavechat(map_session_data* sd, bool kicked);
+int chat_changechatowner(map_session_data* sd, const char* nextownername);
+int chat_changechatstatus(map_session_data* sd, const char* title, const char* pass, int limit, bool pub);
+int chat_kickchat(map_session_data* sd, const char* kickusername);
 
 int chat_createnpcchat(struct npc_data* nd, const char* title, int limit, bool pub, int trigger, const char* ev, int zeny, int minLvl, int maxLvl);
 int chat_deletenpcchat(struct npc_data* nd);
diff --git a/src/map/chrif.cpp b/src/map/chrif.cpp
index d9398d1d14..9a17bf5800 100644
--- a/src/map/chrif.cpp
+++ b/src/map/chrif.cpp
@@ -223,7 +223,7 @@ static bool chrif_auth_logout(TBL_PC* sd, enum sd_state state) {
 	return chrif_sd_to_auth(sd, state);
 }
 
-bool chrif_auth_finished(struct map_session_data* sd) {
+bool chrif_auth_finished(map_session_data* sd) {
 	struct auth_node *node= chrif_search(sd->status.account_id);
 
 	if ( node && node->sd == sd && node->state == ST_LOGIN ) {
@@ -292,7 +292,7 @@ int chrif_isconnected(void) {
  *  CSAVE_INVENTORY: Character changed inventory data
  *  CSAVE_CART: Character changed cart data
  */
-int chrif_save(struct map_session_data *sd, int flag) {
+int chrif_save(map_session_data *sd, int flag) {
 	uint16 mmo_charstatus_len = 0;
 
 	nullpo_retr(-1, sd);
@@ -450,7 +450,7 @@ static void chrif_save_ack(int fd) {
 }
 
 // request to move a character between mapservers
-int chrif_changemapserver(struct map_session_data* sd, uint32 ip, uint16 port) {
+int chrif_changemapserver(map_session_data* sd, uint32 ip, uint16 port) {
 	nullpo_retr(-1, sd);
 
 	if (other_mapserver_count < 1) {//No other map servers are online!
@@ -549,7 +549,7 @@ static int chrif_reconnect(DBKey key, DBData *data, va_list ap) {
 			chrif_save(node->sd, CSAVE_QUIT|CSAVE_INVENTORY|CSAVE_CART);
 			break;
 		case ST_MAPCHANGE: { //Re-send map-change request.
-			struct map_session_data *sd = node->sd;
+			map_session_data *sd = node->sd;
 			uint32 ip;
 			uint16 port;
 
@@ -664,7 +664,7 @@ int chrif_skillcooldown_request(uint32 account_id, uint32 char_id) {
 /*==========================================
  * Request auth confirmation
  *------------------------------------------*/
-void chrif_authreq(struct map_session_data *sd, bool autotrade) {
+void chrif_authreq(map_session_data *sd, bool autotrade) {
 	struct auth_node *node= chrif_search(sd->bl.id);
 
 	if( node != NULL || !chrif_isconnected() ) {
@@ -812,7 +812,7 @@ TIMER_FUNC(auth_db_cleanup){
 /*==========================================
  *
  *------------------------------------------*/
-int chrif_charselectreq(struct map_session_data* sd, uint32 s_ip) {
+int chrif_charselectreq(map_session_data* sd, uint32 s_ip) {
 	nullpo_retr(-1, sd);
 
 	if( !sd || !sd->bl.id || !sd->login_id1 )
@@ -905,7 +905,7 @@ int chrif_req_login_operation(int aid, const char* character_name, enum chrif_re
  * Send a sex change (for account or character) request to the login server (via char server).
  * @sd : Player requesting operation
  */
-int chrif_changesex(struct map_session_data *sd, bool change_account) {
+int chrif_changesex(map_session_data *sd, bool change_account) {
 	chrif_check(-1);
 
 	WFIFOHEAD(char_fd,44);
@@ -940,7 +940,7 @@ int chrif_changesex(struct map_session_data *sd, bool change_account) {
  *   3: login-server offline
  */
 static void chrif_ack_login_req(int aid, const char* player_name, uint16 type, uint16 answer) {
-	struct map_session_data* sd;
+	map_session_data* sd;
 	char action[25];
 	char output[256];
 
@@ -987,7 +987,7 @@ static void chrif_ack_login_req(int aid, const char* player_name, uint16 type, u
  *------------------------------------------*/
 int chrif_changedsex(int fd) {
 	int acc, sex;
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	acc = RFIFOL(fd,2);
 	sex = RFIFOL(fd,6);
@@ -1070,7 +1070,7 @@ int chrif_divorce(int partner_id1, int partner_id2) {
  * only used if 'partner_id' is offline
  *------------------------------------------*/
 int chrif_divorceack(uint32 char_id, int partner_id) {
-	struct map_session_data* sd;
+	map_session_data* sd;
 	int i;
 
 	if( !char_id || !partner_id )
@@ -1096,7 +1096,7 @@ int chrif_divorceack(uint32 char_id, int partner_id) {
  * Removes Baby from parents
  *------------------------------------------*/
 int chrif_deadopt(uint32 father_id, uint32 mother_id, uint32 child_id) {
-	struct map_session_data* sd;
+	map_session_data* sd;
 	uint16 idx = skill_get_index(WE_CALLBABY);
 
 	if( father_id && ( sd = map_charid2sd(father_id) ) != NULL && sd->status.child == child_id ) {
@@ -1123,7 +1123,7 @@ int chrif_deadopt(uint32 father_id, uint32 mother_id, uint32 child_id) {
  *------------------------------------------*/
 int chrif_ban(int fd) {
 	int id, res=0;
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	id = RFIFOL(fd,2);
 	res = RFIFOB(fd,6); // 0: change of statut, 1: ban, 2 charban
@@ -1189,7 +1189,7 @@ int chrif_req_charunban(int aid, const char* character_name){
 //Disconnect the player out of the game, simple packet
 //packet.w AID.L WHY.B 2+4+1 = 7byte
 int chrif_disconnectplayer(int fd) {
-	struct map_session_data* sd;
+	map_session_data* sd;
 	uint32 account_id = RFIFOL(fd, 2);
 
 	sd = map_id2sd(account_id);
@@ -1309,12 +1309,12 @@ int chrif_updatefamelist_ack(int fd) {
 	return 1;
 }
 
-int chrif_save_scdata(struct map_session_data *sd) { //parses the sc_data of the player and sends it to the char-server for saving. [Skotlex]
+int chrif_save_scdata(map_session_data *sd) { //parses the sc_data of the player and sends it to the char-server for saving. [Skotlex]
 #ifdef ENABLE_SC_SAVING
 	int i, count=0;
 	t_tick tick;
 	struct status_change_data data;
-	struct status_change *sc = &sd->sc;
+	status_change *sc = &sd->sc;
 	const struct TimerData *timer;
 
 	chrif_check(-1);
@@ -1356,7 +1356,7 @@ int chrif_save_scdata(struct map_session_data *sd) { //parses the sc_data of the
 	return 0;
 }
 
-int chrif_skillcooldown_save(struct map_session_data *sd) {
+int chrif_skillcooldown_save(map_session_data *sd) {
 	int i, count = 0;
 	struct skill_cooldown_data data;
 	t_tick tick;
@@ -1399,7 +1399,7 @@ int chrif_skillcooldown_save(struct map_session_data *sd) {
 int chrif_load_scdata(int fd) {
 
 #ifdef ENABLE_SC_SAVING
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int aid, cid, i, count;
 
 	aid = RFIFOL(fd,4); //Player Account ID
@@ -1433,7 +1433,7 @@ int chrif_load_scdata(int fd) {
 //Retrieve and load skillcooldown for a player
 
 int chrif_skillcooldown_load(int fd) {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int aid, cid, i, count;
 
 	aid = RFIFOL(fd, 4);
@@ -1459,7 +1459,7 @@ int chrif_skillcooldown_load(int fd) {
 /*=========================================
  * Tell char-server charcter disconnected [Wizputer]
  *-----------------------------------------*/
-int chrif_char_offline(struct map_session_data *sd) {
+int chrif_char_offline(map_session_data *sd) {
 	chrif_check(-1);
 
 	WFIFOHEAD(char_fd,10);
@@ -1512,7 +1512,7 @@ int chrif_char_reset_offline(void) {
  * Tell char-server charcter is online [Wizputer]
  *-----------------------------------------*/
 
-int chrif_char_online(struct map_session_data *sd) {
+int chrif_char_online(map_session_data *sd) {
 	chrif_check(-1);
 
 	WFIFOHEAD(char_fd,10);
@@ -1645,7 +1645,7 @@ int chrif_bsdata_request(uint32 char_id) {
  * @param sd
  * @author [Cydh]
  **/
-int chrif_bsdata_save(struct map_session_data *sd, bool quit) {
+int chrif_bsdata_save(map_session_data *sd, bool quit) {
 	uint8 i = 0;
 
 	chrif_check(-1);
@@ -1711,7 +1711,7 @@ int chrif_bsdata_save(struct map_session_data *sd, bool quit) {
  * @author [Cydh]
  **/
 int chrif_bsdata_received(int fd) {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	uint32 cid = RFIFOL(fd,4);
 	uint8 count = 0;
 
@@ -1853,7 +1853,7 @@ TIMER_FUNC(send_usercount_tochar){
  *------------------------------------------*/
 int send_users_tochar(void) {
 	int users = 0, i = 0;
-	struct map_session_data* sd;
+	map_session_data* sd;
 	struct s_mapiterator* iter;
 
 	chrif_check(-1);
diff --git a/src/map/chrif.hpp b/src/map/chrif.hpp
index 5a26413c38..7bd5a143c7 100644
--- a/src/map/chrif.hpp
+++ b/src/map/chrif.hpp
@@ -12,7 +12,7 @@
 #include "../common/socket.hpp" // enum chrif_req_op
 
 //fwd declaration
-struct map_session_data;
+class map_session_data;
 
 enum sd_state { ST_LOGIN, ST_LOGOUT, ST_MAPCHANGE };
 
@@ -30,7 +30,7 @@ struct auth_node {
 	uint32 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.
+	map_session_data *sd;	//Data from logged on char.
 	struct mmo_charstatus *char_dat;	//Data from char server.
 	t_tick node_created; //timestamp for node timeouts
 	enum sd_state state; //To track whether player was login in/out or changing maps.
@@ -52,31 +52,31 @@ extern char charserver_name[NAME_LENGTH];
 struct auth_node* chrif_search(uint32 account_id);
 struct auth_node* chrif_auth_check(uint32 account_id, uint32 char_id, enum sd_state state);
 bool chrif_auth_delete(uint32 account_id, uint32 char_id, enum sd_state state);
-bool chrif_auth_finished(struct map_session_data* sd);
+bool chrif_auth_finished(map_session_data* sd);
 
-void chrif_authreq(struct map_session_data* sd, bool autotrade);
+void chrif_authreq(map_session_data* sd, bool autotrade);
 void chrif_authok(int fd);
 int chrif_scdata_request(uint32 account_id, uint32 char_id);
 int chrif_skillcooldown_request(uint32 account_id, uint32 char_id);
-int chrif_skillcooldown_save(struct map_session_data *sd);
+int chrif_skillcooldown_save(map_session_data *sd);
 int chrif_skillcooldown_load(int fd);
 
-int chrif_save(struct map_session_data* sd, int flag);
-int chrif_charselectreq(struct map_session_data* sd, uint32 s_ip);
-int chrif_changemapserver(struct map_session_data* sd, uint32 ip, uint16 port);
+int chrif_save(map_session_data* sd, int flag);
+int chrif_charselectreq(map_session_data* sd, uint32 s_ip);
+int chrif_changemapserver(map_session_data* sd, uint32 ip, uint16 port);
 
 int chrif_searchcharid(uint32 char_id);
 int chrif_changeemail(int id, const char *actual_email, const char *new_email);
 int chrif_req_login_operation(int aid, const char* character_name, enum chrif_req_op operation_type, int32 timediff, int val1, int val2);
 int chrif_updatefamelist(map_session_data &sd, e_rank ranktype);
 int chrif_buildfamelist(void);
-int chrif_save_scdata(struct map_session_data *sd);
-int chrif_char_offline(struct map_session_data *sd);
+int chrif_save_scdata(map_session_data *sd);
+int chrif_char_offline(map_session_data *sd);
 int chrif_char_offline_nsd(uint32 account_id, uint32 char_id);
 int chrif_char_reset_offline(void);
 int send_users_tochar(void);
-int chrif_char_online(struct map_session_data *sd);
-int chrif_changesex(struct map_session_data *sd, bool change_account);
+int chrif_char_online(map_session_data *sd);
+int chrif_changesex(map_session_data *sd, bool change_account);
 int chrif_divorce(int partner_id1, int partner_id2);
 
 int chrif_removefriend(uint32 char_id, int friend_id);
@@ -87,7 +87,7 @@ int chrif_req_charban(int aid, const char* character_name, int32 timediff);
 int chrif_req_charunban(int aid, const char* character_name);
 
 int chrif_bsdata_request(uint32 char_id);
-int chrif_bsdata_save(struct map_session_data *sd, bool quit);
+int chrif_bsdata_save(map_session_data *sd, bool quit);
 
 void do_final_chrif(void);
 void do_init_chrif(void);
diff --git a/src/map/clan.cpp b/src/map/clan.cpp
index ef01d5fd08..5b26034028 100644
--- a/src/map/clan.cpp
+++ b/src/map/clan.cpp
@@ -73,7 +73,7 @@ struct clan* clan_searchname( const char* name ){
 	return c;
 }
 
-struct map_session_data* clan_getavailablesd( struct clan* clan ){
+map_session_data* clan_getavailablesd( struct clan* clan ){
 	int i;
 
 	nullpo_retr(NULL, clan);
@@ -110,7 +110,7 @@ int clan_getNextFreeMemberIndex( struct clan* clan ){
 	}
 }
 
-void clan_member_joined( struct map_session_data* sd ){
+void clan_member_joined( map_session_data* sd ){
 	nullpo_retv(sd);
 
 	if( sd->clan != nullptr ){
@@ -136,7 +136,7 @@ void clan_member_joined( struct map_session_data* sd ){
 	}
 }
 
-void clan_member_left( struct map_session_data* sd ){
+void clan_member_left( map_session_data* sd ){
 	int index;
 	struct clan* clan;
 
@@ -152,7 +152,7 @@ void clan_member_left( struct map_session_data* sd ){
 	}
 }
 
-bool clan_member_join( struct map_session_data *sd, int clan_id, uint32 account_id, uint32 char_id ){
+bool clan_member_join( map_session_data *sd, int clan_id, uint32 account_id, uint32 char_id ){
 	struct clan *clan;
 
 	nullpo_ret(sd);
@@ -172,7 +172,7 @@ bool clan_member_join( struct map_session_data *sd, int clan_id, uint32 account_
 	return true;
 }
 
-bool clan_member_leave( struct map_session_data* sd, int clan_id, uint32 account_id, uint32 char_id ){
+bool clan_member_leave( map_session_data* sd, int clan_id, uint32 account_id, uint32 char_id ){
 	struct clan *clan;
 
 	nullpo_ret(sd);
@@ -199,7 +199,7 @@ void clan_recv_message(int clan_id,uint32 account_id,const char *mes,int len) {
 	clif_clan_message(clan,mes,len);
 }
 
-void clan_send_message( struct map_session_data *sd, const char *mes, int len ){
+void clan_send_message( map_session_data *sd, const char *mes, int len ){
 	nullpo_retv(sd);
 	nullpo_retv(sd->clan);
 
diff --git a/src/map/clan.hpp b/src/map/clan.hpp
index 7066ba6ba3..9ba03f8027 100644
--- a/src/map/clan.hpp
+++ b/src/map/clan.hpp
@@ -7,20 +7,20 @@
 #include "../common/mmo.hpp"
 
 struct clan;
-struct map_session_data;
+class map_session_data;
 
 void do_init_clan();
 void do_final_clan();
 struct clan* clan_search( int id );
 struct clan* clan_searchname( const char* name );
 void clan_load_clandata( int count, struct clan* clans );
-void clan_member_joined( struct map_session_data* sd );
-void clan_member_left( struct map_session_data* sd );
-bool clan_member_join( struct map_session_data *sd, int clan_id, uint32 account_id, uint32 char_id );
-bool clan_member_leave( struct map_session_data* sd, int clan_id, uint32 account_id, uint32 char_id );
-void clan_send_message( struct map_session_data *sd, const char *mes, int len );
+void clan_member_joined( map_session_data* sd );
+void clan_member_left( map_session_data* sd );
+bool clan_member_join( map_session_data *sd, int clan_id, uint32 account_id, uint32 char_id );
+bool clan_member_leave( map_session_data* sd, int clan_id, uint32 account_id, uint32 char_id );
+void clan_send_message( map_session_data *sd, const char *mes, int len );
 void clan_recv_message(int clan_id,uint32 account_id,const char *mes,int len);
-struct map_session_data* clan_getavailablesd( struct clan* clan );
+map_session_data* clan_getavailablesd( struct clan* clan );
 int clan_get_alliance_count( struct clan *clan, int flag );
 
 #endif /* CLAN_HPP */
diff --git a/src/map/clif.cpp b/src/map/clif.cpp
index 6e74a5829e..e683a14ef0 100644
--- a/src/map/clif.cpp
+++ b/src/map/clif.cpp
@@ -85,8 +85,8 @@ static int8 packet_buffer[UINT16_MAX];
 unsigned long color_table[COLOR_MAX];
 
 #include "clif_obfuscation.hpp"
-static bool clif_session_isValid(struct map_session_data *sd);
-static void clif_loadConfirm( struct map_session_data *sd );
+static bool clif_session_isValid(map_session_data *sd);
+static void clif_loadConfirm( map_session_data *sd );
 
 #if PACKETVER >= 20150513
 enum mail_type {
@@ -388,7 +388,7 @@ static inline unsigned char clif_bl_type(struct block_list *bl, bool walking) {
 }
 #endif
 
-static bool clif_session_isValid(struct map_session_data *sd) {
+static bool clif_session_isValid(map_session_data *sd) {
 	return ( sd != nullptr && session_isActive(sd->fd) );
 }
 
@@ -405,12 +405,12 @@ static bool clif_session_isValid(struct map_session_data *sd) {
 static int clif_send_sub(struct block_list *bl, va_list ap)
 {
 	struct block_list *src_bl;
-	struct map_session_data *sd;
+	map_session_data *sd;
 	unsigned char *buf;
 	int len, type, fd;
 
 	nullpo_ret(bl);
-	nullpo_ret(sd = (struct map_session_data *)bl);
+	nullpo_ret(sd = (map_session_data *)bl);
 
 	// Don't send to disconnected clients.
 	if( !session_isActive( fd = sd->fd ) ){
@@ -434,7 +434,7 @@ static int clif_send_sub(struct block_list *bl, va_list ap)
 	case AREA_WOSC:
 	{
 		if(src_bl->type == BL_PC) {
-			struct map_session_data *ssd = (struct map_session_data *)src_bl;
+			map_session_data *ssd = (map_session_data *)src_bl;
 			if (ssd && sd->chatID && (sd->chatID == ssd->chatID))
 			return 0;
 		}
@@ -481,7 +481,7 @@ static int clif_send_sub(struct block_list *bl, va_list ap)
 int clif_send(const void* buf, int len, struct block_list* bl, enum send_target type)
 {
 	int i;
-	struct map_session_data *sd, *tsd;
+	map_session_data *sd, *tsd;
 	struct party_data *p = NULL;
 	struct guild *g = NULL;
 	std::shared_ptr<s_battleground_data> bg;
@@ -753,7 +753,7 @@ int clif_send(const void* buf, int len, struct block_list* bl, enum send_target
 /// 0073 <start time>.L <position>.3B <x size>.B <y size>.B (ZC_ACCEPT_ENTER)
 /// 02eb <start time>.L <position>.3B <x size>.B <y size>.B <font>.W (ZC_ACCEPT_ENTER2)
 /// 0a18 <start time>.L <position>.3B <x size>.B <y size>.B <font>.W <sex>.B (ZC_ACCEPT_ENTER3)
-void clif_authok(struct map_session_data *sd)
+void clif_authok(map_session_data *sd)
 {
 #if PACKETVER < 20080102
 	const int cmd = 0x73;
@@ -849,7 +849,7 @@ void clif_authfail_fd(int fd, int type)
 ///     ? = nothing
 void clif_charselectok(int id, uint8 ok)
 {
-	struct map_session_data* sd;
+	map_session_data* sd;
 	int fd;
 
 	if ((sd = map_id2sd(id)) == NULL || !session_isValid(sd->fd))
@@ -1010,7 +1010,7 @@ void clif_clearunit_delayed(struct block_list* bl, clr_type type, t_tick tick)
 	add_timer(tick, clif_clearunit_delayed_sub, (int)type, (intptr_t)tbl);
 }
 
-void clif_get_weapon_view(struct map_session_data* sd, t_itemid *rhand, t_itemid *lhand)
+void clif_get_weapon_view(map_session_data* sd, t_itemid *rhand, t_itemid *lhand)
 {
 	if(sd->sc.option&OPTION_COSTUME)
 	{
@@ -1079,8 +1079,8 @@ static int clif_setlevel(struct block_list* bl) {
 static void clif_set_unit_idle( struct block_list* bl, bool walking, send_target target, struct block_list* tbl ){
 	nullpo_retv( bl );
 
-	struct map_session_data* sd = BL_CAST( BL_PC, bl );
-	struct status_change* sc = status_get_sc( bl );
+	map_session_data* sd = BL_CAST( BL_PC, bl );
+	status_change* sc = status_get_sc( bl );
 	struct view_data* vd = status_get_viewdata( bl );
 	int g_id = status_get_guild_id( bl );
 
@@ -1150,7 +1150,7 @@ static void clif_set_unit_idle( struct block_list* bl, bool walking, send_target
 
 	// npc option changed?
 	if( tbl && tbl->type == BL_PC && bl->type == BL_NPC ){
-		struct map_session_data* sd = (struct map_session_data*)tbl;
+		map_session_data* sd = (map_session_data*)tbl;
 		struct npc_data* nd = (struct npc_data*)bl;
 		int option = (sc) ? sc->option : 0;
 
@@ -1244,8 +1244,8 @@ static void clif_set_unit_idle( struct block_list* bl, bool walking, send_target
 static void clif_spawn_unit( struct block_list *bl, enum send_target target ){
 	nullpo_retv( bl );
 
-	struct map_session_data* sd = BL_CAST( BL_PC, bl );
-	struct status_change* sc = status_get_sc( bl );
+	map_session_data* sd = BL_CAST( BL_PC, bl );
+	status_change* sc = status_get_sc( bl );
 	struct view_data* vd = status_get_viewdata( bl );
 	int g_id = status_get_guild_id( bl );
 
@@ -1391,12 +1391,12 @@ static void clif_spawn_unit( struct block_list *bl, enum send_target target ){
 /*==========================================
  * Prepares 'unit walking' packet
  *------------------------------------------*/
-static void clif_set_unit_walking( struct block_list *bl, struct map_session_data *tsd, struct unit_data *ud, enum send_target target ){
+static void clif_set_unit_walking( struct block_list *bl, map_session_data *tsd, struct unit_data *ud, enum send_target target ){
 	nullpo_retv( bl );
 	nullpo_retv( ud );
 
-	struct map_session_data* sd;
-	struct status_change* sc = status_get_sc( bl );
+	map_session_data* sd;
+	status_change* sc = status_get_sc( bl );
 	struct view_data* vd = status_get_viewdata( bl );
 	struct packet_unit_walking p;
 	int g_id = status_get_guild_id(bl);
@@ -1512,7 +1512,7 @@ static void clif_setdisguise(struct block_list *bl, unsigned char *buf,int len)
 /// 01b0 <id>.L <type>.B <value>.L
 /// type:
 ///     unused
-void clif_class_change_target(struct block_list *bl,int class_,int type, enum send_target target, struct map_session_data *sd)
+void clif_class_change_target(struct block_list *bl,int class_,int type, enum send_target target, map_session_data *sd)
 {
 	nullpo_retv(bl);
 
@@ -1527,7 +1527,7 @@ void clif_class_change_target(struct block_list *bl,int class_,int type, enum se
 	}
 }
 
-void clif_servantball( struct map_session_data& sd, struct block_list* target, enum send_target send_target ){
+void clif_servantball( map_session_data& sd, struct block_list* target, enum send_target send_target ){
 	struct PACKET_ZC_SPIRITS p = {};
 
 	p.PacketType = HEADER_ZC_SPIRITS;
@@ -1541,7 +1541,7 @@ void clif_servantball( struct map_session_data& sd, struct block_list* target, e
 	clif_send( &p, sizeof( p ), target, send_target );
 }
 
-void clif_abyssball( struct map_session_data& sd, struct block_list* target, enum send_target send_target ){
+void clif_abyssball( map_session_data& sd, struct block_list* target, enum send_target send_target ){
 	struct PACKET_ZC_SPIRITS p = {};
 
 	p.PacketType = HEADER_ZC_SPIRITS;
@@ -1574,7 +1574,7 @@ static void clif_millenniumshield_single(int fd, map_session_data *sd)
 /*==========================================
  * Kagerou/Oboro amulet spirit
  *------------------------------------------*/
-static void clif_spiritcharm_single(int fd, struct map_session_data *sd)
+static void clif_spiritcharm_single(int fd, map_session_data *sd)
 {
 	WFIFOHEAD(fd, packet_len(0x08cf));
 	WFIFOW(fd,0)=0x08cf;
@@ -1604,7 +1604,7 @@ void clif_enchantingshadow_spirit(unit_data &ud) {
  * Run when player changes map / refreshes
  * Tells its client to display all weather settings being used by this map
  *------------------------------------------*/
-static void clif_weather_check(struct map_session_data *sd)
+static void clif_weather_check(map_session_data *sd)
 {
 	int16 m = sd->bl.m;
 	int fd = sd->fd;
@@ -1642,10 +1642,10 @@ static void clif_weather_check(struct map_session_data *sd)
 void clif_weather(int16 m)
 {
 	struct s_mapiterator* iter;
-	struct map_session_data *sd=NULL;
+	map_session_data *sd=NULL;
 
 	iter = mapit_getallusers();
-	for( sd = (struct map_session_data*)mapit_first(iter); mapit_exists(iter); sd = (struct map_session_data*)mapit_next(iter) )
+	for( sd = (map_session_data*)mapit_first(iter); mapit_exists(iter); sd = (map_session_data*)mapit_next(iter) )
 	{
 		if( sd->bl.m == m )
 			clif_weather_check(sd);
@@ -1760,7 +1760,7 @@ int clif_spawn( struct block_list *bl, bool walking ){
 /// Sends information about owned homunculus to the client . [orn]
 /// 022e <name>.24B <modified>.B <level>.W <hunger>.W <intimacy>.W <equip id>.W <atk>.W <matk>.W <hit>.W <crit>.W <def>.W <mdef>.W <flee>.W <aspd>.W <hp>.W <max hp>.W <sp>.W <max sp>.W <exp>.L <max exp>.L <skill points>.W <atk range>.W	(ZC_PROPERTY_HOMUN)
 /// 09f7 <name>.24B <modified>.B <level>.W <hunger>.W <intimacy>.W <equip id>.W <atk>.W <matk>.W <hit>.W <crit>.W <def>.W <mdef>.W <flee>.W <aspd>.W <hp>.L <max hp>.L <sp>.W <max sp>.W <exp>.L <max exp>.L <skill points>.W <atk range>.W (ZC_PROPERTY_HOMUN_2)
-void clif_hominfo( struct map_session_data *sd, struct homun_data *hd, int flag ){
+void clif_hominfo( map_session_data *sd, struct homun_data *hd, int flag ){
 #if PACKETVER_MAIN_NUM >= 20101005 || PACKETVER_RE_NUM >= 20080827 || defined(PACKETVER_ZERO)
 	nullpo_retv( sd );
 	nullpo_retv( hd );
@@ -1859,7 +1859,7 @@ void clif_hominfo( struct map_session_data *sd, struct homun_data *hd, int flag
 ///     2 = hunger
 ///     3 = accessory?
 ///     ? = ignored
-void clif_send_homdata(struct map_session_data *sd, int state, int param)
+void clif_send_homdata(map_session_data *sd, int state, int param)
 {	//[orn]
 	int fd = sd->fd;
 
@@ -1876,7 +1876,7 @@ void clif_send_homdata(struct map_session_data *sd, int state, int param)
 }
 
 
-int clif_homskillinfoblock(struct map_session_data *sd)
+int clif_homskillinfoblock(map_session_data *sd)
 {	//[orn]
 	struct homun_data *hd;
 	int fd = sd->fd;
@@ -1914,7 +1914,7 @@ int clif_homskillinfoblock(struct map_session_data *sd)
 	return 0;
 }
 
-void clif_homskillup(struct map_session_data *sd, uint16 skill_id)
+void clif_homskillup(map_session_data *sd, uint16 skill_id)
 {	//[orn]
 	struct homun_data *hd;
 	int fd;
@@ -1942,7 +1942,7 @@ void clif_homskillup(struct map_session_data *sd, uint16 skill_id)
 /// result:
 ///     0 = failure
 ///     1 = success
-void clif_hom_food( struct map_session_data *sd, int foodid, int fail ){
+void clif_hom_food( map_session_data *sd, int foodid, int fail ){
 	nullpo_retv( sd );
 
 	struct PACKET_ZC_FEED_MER p;
@@ -1957,7 +1957,7 @@ void clif_hom_food( struct map_session_data *sd, int foodid, int fail ){
 
 /// Notifies the client, that it is walking (ZC_NOTIFY_PLAYERMOVE).
 /// 0087 <walk start time>.L <walk data>.6B
-void clif_walkok(struct map_session_data *sd)
+void clif_walkok(map_session_data *sd)
 {
 	int fd=sd->fd;
 
@@ -1970,7 +1970,7 @@ void clif_walkok(struct map_session_data *sd)
 
 
 static void clif_move2( struct block_list *bl, struct view_data *vd, struct unit_data *ud ){
-	struct status_change *sc = NULL;
+	status_change *sc = NULL;
 
 	if ((sc = status_get_sc(bl)) && sc->option&(OPTION_HIDE|OPTION_CLOAK|OPTION_INVISIBLE|OPTION_CHASEWALK))
 		clif_ally_only = true;
@@ -2021,7 +2021,7 @@ void clif_move(struct unit_data *ud)
 	unsigned char buf[16];
 	struct view_data* vd;
 	struct block_list* bl = ud->bl;
-	struct status_change *sc = NULL;
+	status_change *sc = NULL;
 
 	vd = status_get_viewdata(bl);
 	if (!vd )
@@ -2071,7 +2071,7 @@ void clif_move(struct unit_data *ud)
  * Delays the map_quit of a player after they are disconnected. [Skotlex]
  *------------------------------------------*/
 static TIMER_FUNC(clif_delayquit){
-	struct map_session_data *sd = NULL;
+	map_session_data *sd = NULL;
 
 	//Remove player from map server
 	if ((sd = map_id2sd(id)) != NULL && sd->fd == 0) //Should be a disconnected player.
@@ -2082,7 +2082,7 @@ static TIMER_FUNC(clif_delayquit){
 /*==========================================
  *
  *------------------------------------------*/
-void clif_quitsave(int fd,struct map_session_data *sd) {
+void clif_quitsave(int fd,map_session_data *sd) {
 	if (!battle_config.prevent_logout ||
 		sd->canlog_tick == 0 ||
 		DIFF_TICK(gettick(), sd->canlog_tick) > battle_config.prevent_logout)
@@ -2098,7 +2098,7 @@ void clif_quitsave(int fd,struct map_session_data *sd) {
 
 /// Notifies the client of a position change to coordinates on given map (ZC_NPCACK_MAPMOVE).
 /// 0091 <map name>.16B <x>.W <y>.W
-void clif_changemap(struct map_session_data *sd, short m, int x, int y)
+void clif_changemap(map_session_data *sd, short m, int x, int y)
 {
 	nullpo_retv(sd);
 	int fd = sd->fd;
@@ -2115,7 +2115,7 @@ void clif_changemap(struct map_session_data *sd, short m, int x, int y)
 /// Notifies the client of a position change to coordinates on given map, which is on another map-server.
 /// 0092 <map name>.16B <x>.W <y>.W <ip>.L <port>.W (ZC_NPCACK_SERVERMOVE)
 /// 0ac7 <map name>.16B <x>.W <y>.W <ip>.L <port>.W <unknown>.128B (ZC_NPCACK_SERVERMOVE2)
-void clif_changemapserver(struct map_session_data* sd, unsigned short map_index, int x, int y, uint32 ip, uint16 port)
+void clif_changemapserver(map_session_data* sd, unsigned short map_index, int x, int y, uint32 ip, uint16 port)
 {
 	int fd;
 #if PACKETVER >= 20170315
@@ -2173,7 +2173,7 @@ void clif_fixpos(struct block_list *bl)
 
 /// Displays the buy/sell dialog of an NPC shop (ZC_SELECT_DEALTYPE).
 /// 00c4 <shop id>.L
-void clif_npcbuysell(struct map_session_data* sd, int id)
+void clif_npcbuysell(map_session_data* sd, int id)
 {
 	int fd;
 
@@ -2189,7 +2189,7 @@ void clif_npcbuysell(struct map_session_data* sd, int id)
 
 /// Presents list of items, that can be bought in an NPC shop.
 /// 00c6 <packet len>.W { <price>.L <discount price>.L <item type>.B <name id>.W }* (ZC_PC_PURCHASE_ITEMLIST)
-void clif_buylist( struct map_session_data *sd, struct npc_data *nd ){
+void clif_buylist( map_session_data *sd, struct npc_data *nd ){
 	nullpo_retv( sd );
 	nullpo_retv( nd );
 
@@ -2228,7 +2228,7 @@ void clif_buylist( struct map_session_data *sd, struct npc_data *nd ){
 
 /// Presents list of items, that can be sold to an NPC shop (ZC_PC_SELL_ITEMLIST).
 /// 00c7 <packet len>.W { <index>.W <price>.L <overcharge price>.L }*
-void clif_selllist(struct map_session_data *sd)
+void clif_selllist(map_session_data *sd)
 {
 	int fd,i,c=0,val;
 	struct npc_data *nd;
@@ -2266,7 +2266,7 @@ void clif_selllist(struct map_session_data *sd)
 
 /// Closes shop (CZ_NPC_TRADE_QUIT).
 /// 09d4
-void clif_parse_NPCShopClosed(int fd, struct map_session_data *sd) {
+void clif_parse_NPCShopClosed(int fd, map_session_data *sd) {
 	// TODO: State tracking?
 	sd->npc_shopid = 0;
 }
@@ -2276,7 +2276,7 @@ void clif_parse_NPCShopClosed(int fd, struct map_session_data *sd) {
  * @author: Ind and Yommy
  **/
 /// 0x9d5 <packet len>.W { <name id>.W <type>.B <price>.L <qty>.L <weight>.W }* (ZC_NPC_MARKET_OPEN)
-void clif_npc_market_open(struct map_session_data *sd, struct npc_data *nd) {
+void clif_npc_market_open(map_session_data *sd, struct npc_data *nd) {
 #if PACKETVER >= 20131223
 	nullpo_retv( sd );
 	nullpo_retv( nd );
@@ -2330,7 +2330,7 @@ void clif_npc_market_open(struct map_session_data *sd, struct npc_data *nd) {
 
 
 /// Closes the Market shop window.
-void clif_parse_NPCMarketClosed(int fd, struct map_session_data *sd) {
+void clif_parse_NPCMarketClosed(int fd, map_session_data *sd) {
 	nullpo_retv(sd);
 	sd->npc_shopid = 0;
 	sd->state.trading = 0;
@@ -2339,7 +2339,7 @@ void clif_parse_NPCMarketClosed(int fd, struct map_session_data *sd) {
 
 /// Purchase item from Market shop.
 /// 0x9d7 <packet len>.W <count>.B { <name id>.W <qty>.W <price>.L }* (ZC_NPC_MARKET_PURCHASE_RESULT)
-void clif_npc_market_purchase_ack( struct map_session_data *sd, e_purchase_result res, std::vector<s_npc_buy_list>& list ){
+void clif_npc_market_purchase_ack( map_session_data *sd, e_purchase_result res, std::vector<s_npc_buy_list>& list ){
 #if PACKETVER >= 20131223
 	nullpo_retv( sd );
 
@@ -2382,7 +2382,7 @@ void clif_npc_market_purchase_ack( struct map_session_data *sd, e_purchase_resul
 
 /// Purchase item from Market shop.
 /// 0x9d6 <len>.W { <name id>.W <qty>.L } (CZ_NPC_MARKET_PURCHASE)
-void clif_parse_NPCMarketPurchase(int fd, struct map_session_data *sd) {
+void clif_parse_NPCMarketPurchase(int fd, map_session_data *sd) {
 #if PACKETVER >= 20131223
 	nullpo_retv( sd );
 
@@ -2421,7 +2421,7 @@ void clif_parse_NPCMarketPurchase(int fd, struct map_session_data *sd) {
 /// - set npcid of dialog window (0 by default)
 /// - if set to clear on next mes, clear contents
 /// - append this text
-void clif_scriptmes( struct map_session_data& sd, uint32 npcid, const char *mes ){
+void clif_scriptmes( map_session_data& sd, uint32 npcid, const char *mes ){
 	struct PACKET_ZC_SAY_DIALOG* p = (struct PACKET_ZC_SAY_DIALOG*)packet_buffer;
 
 	int16 length = (int16)( strlen( mes ) + 1 );
@@ -2445,7 +2445,7 @@ void clif_scriptmes( struct map_session_data& sd, uint32 npcid, const char *mes
 /// - 00B9 <npcid of dialog window>.L
 /// - set to clear on next mes
 /// - remove 'next' button
-void clif_scriptnext( struct map_session_data& sd, uint32 npcid ){
+void clif_scriptnext( map_session_data& sd, uint32 npcid ){
 	struct PACKET_ZC_WAIT_DIALOG p = {};
 
 	p.PacketType = HEADER_ZC_WAIT_DIALOG;
@@ -2470,7 +2470,7 @@ void clif_scriptnext( struct map_session_data& sd, uint32 npcid ){
 /// - close the dialog window
 /// - close the menu window
 /// - 0146 <npcid of dialog window>.L
-void clif_scriptclose(struct map_session_data *sd, int npcid)
+void clif_scriptclose(map_session_data *sd, int npcid)
 {
 	int fd;
 
@@ -2490,7 +2490,7 @@ void clif_scriptclose(struct map_session_data *sd, int npcid)
  * @param sd : player pointer
  * @param npcid : npc gid to close
  */
-void clif_scriptclear( struct map_session_data& sd, int npcid ){
+void clif_scriptclear( map_session_data& sd, int npcid ){
 	struct PACKET_ZC_CLEAR_DIALOG p = {};
 
 	p.packetType = HEADER_ZC_CLEAR_DIALOG;
@@ -2502,7 +2502,7 @@ void clif_scriptclear( struct map_session_data& sd, int npcid ){
 /*==========================================
  *
  *------------------------------------------*/
-void clif_sendfakenpc(struct map_session_data *sd, int npcid) {
+void clif_sendfakenpc(map_session_data *sd, int npcid) {
 	unsigned char *buf;
 	int fd = sd->fd;
 	sd->state.using_fake_npc = 1;
@@ -2544,7 +2544,7 @@ void clif_sendfakenpc(struct map_session_data *sd, int npcid) {
 /// WARNING: the 'cancel' button closes other windows besides the dialog window and the menu window.
 ///    Which suggests their have intertwined behavior. (probably the mouse targeting)
 /// TODO investigate behavior of other windows [FlavioJS]
-void clif_scriptmenu(struct map_session_data* sd, int npcid, const char* mes)
+void clif_scriptmenu(map_session_data* sd, int npcid, const char* mes)
 {
 	int fd = sd->fd;
 	int slen = strlen(mes) + 9;
@@ -2575,7 +2575,7 @@ void clif_scriptmenu(struct map_session_data* sd, int npcid, const char* mes)
 ///   - if npcid exists in the client:
 ///     - 0143 <npcid of inputnum window>.L <atoi(text)>.L
 ///   - close inputnum window
-void clif_scriptinput(struct map_session_data *sd, int npcid)
+void clif_scriptinput(map_session_data *sd, int npcid)
 {
 	int fd;
 	struct block_list *bl = NULL;
@@ -2606,7 +2606,7 @@ void clif_scriptinput(struct map_session_data *sd, int npcid)
 ///   - if npcid is 0 or npcid exists in the client:
 ///     - 01d5 <packetlen>.W <npcid of inputstr window>.L <text>.?B
 ///   - close inputstr window
-void clif_scriptinputstr(struct map_session_data *sd, int npcid)
+void clif_scriptinputstr(map_session_data *sd, int npcid)
 {
 	int fd;
 	struct block_list *bl = NULL;
@@ -2636,7 +2636,7 @@ void clif_scriptinputstr(struct map_session_data *sd, int npcid)
 ///     2 = remove mark
 /// color:
 ///     0x00RRGGBB
-void clif_viewpoint(struct map_session_data *sd, int npc_id, int type, int x, int y, int id, int color)
+void clif_viewpoint(map_session_data *sd, int npc_id, int type, int x, int y, int id, int color)
 {
 	int fd;
 
@@ -2664,7 +2664,7 @@ void clif_viewpoint(struct map_session_data *sd, int npc_id, int type, int x, in
 ///     3 = middle of screen, inside a movable window
 ///     4 = middle of screen, movable with a close button, chrome-less
 ///   255 = clear all displayed cutins
-void clif_cutin(struct map_session_data* sd, const char* image, int type)
+void clif_cutin(map_session_data* sd, const char* image, int type)
 {
 	int fd;
 
@@ -2770,7 +2770,7 @@ static uint8 clif_add_random_options( struct ItemOptions buf[MAX_ITEM_RDM_OPT],
 /// 0990 <index>.W <amount>.W <name id>.W <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W <equip location>.L <item type>.B <result>.B <expire time>.L <bindOnEquipType>.W (ZC_ITEM_PICKUP_ACK_V5)
 /// 0a0c <index>.W <amount>.W <name id>.W <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W <equip location>.L <item type>.B <result>.B <expire time>.L <bindOnEquipType>.W { <option id>.W <option value>.W <option param>.B }*5 (ZC_ITEM_PICKUP_ACK_V6)
 /// 0a37 <index>.W <amount>.W <name id>.W <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W <equip location>.L <item type>.B <result>.B <expire time>.L <bindOnEquipType>.W { <option id>.W <option value>.W <option param>.B }*5 <favorite>.B <view id>.W (ZC_ITEM_PICKUP_ACK_V7)
-void clif_additem( struct map_session_data *sd, int n, int amount, unsigned char fail ){
+void clif_additem( map_session_data *sd, int n, int amount, unsigned char fail ){
 	nullpo_retv( sd );
 
 	int fd = sd->fd;
@@ -2827,7 +2827,7 @@ void clif_additem( struct map_session_data *sd, int n, int amount, unsigned char
 
 /// Notifies the client, that an inventory item was deleted or dropped (ZC_ITEM_THROW_ACK).
 /// 00af <index>.W <amount>.W
-void clif_dropitem(struct map_session_data *sd,int n,int amount)
+void clif_dropitem(map_session_data *sd,int n,int amount)
 {
 	int fd;
 
@@ -2853,7 +2853,7 @@ void clif_dropitem(struct map_session_data *sd,int n,int amount)
 ///     5 = Moved to cart
 ///     6 = Item sold
 ///     7 = Consumed by Four Spirit Analysis (SO_EL_ANALYSIS) skill
-void clif_delitem(struct map_session_data *sd,int n,int amount, short reason)
+void clif_delitem(map_session_data *sd,int n,int amount, short reason)
 {
 #if PACKETVER < 20091117
 	clif_dropitem(sd,n,amount);
@@ -2959,7 +2959,7 @@ static void clif_item_normal( short idx, struct NORMALITEM_INFO *p, struct item
 #endif
 }
 
-static void clif_inventoryStart( struct map_session_data *sd, e_inventory_type type, const char *name ){
+static void clif_inventoryStart( map_session_data *sd, e_inventory_type type, const char *name ){
 #if PACKETVER_RE_NUM >= 20180829 || PACKETVER_ZERO_NUM >= 20180919 || PACKETVER_MAIN_NUM >= 20181002
 	nullpo_retv(sd);
 	nullpo_retv(name);
@@ -2986,7 +2986,7 @@ static void clif_inventoryStart( struct map_session_data *sd, e_inventory_type t
 #endif
 }
 
-static void clif_inventoryEnd( struct map_session_data *sd, e_inventory_type type ){
+static void clif_inventoryEnd( map_session_data *sd, e_inventory_type type ){
 #if PACKETVER_RE_NUM >= 20180829 || PACKETVER_ZERO_NUM >= 20180919 || PACKETVER_MAIN_NUM >= 20181002
 	nullpo_retv(sd);
 
@@ -3000,9 +3000,9 @@ static void clif_inventoryEnd( struct map_session_data *sd, e_inventory_type typ
 #endif
 }
 
-void clif_favorite_item(struct map_session_data* sd, unsigned short index);
+void clif_favorite_item(map_session_data* sd, unsigned short index);
 //Unified inventory function which sends all of the inventory (requires two packets, one for equipable items and one for stackable ones. [Skotlex]
-void clif_inventorylist( struct map_session_data *sd ){
+void clif_inventorylist( map_session_data *sd ){
 	nullpo_retv( sd );
 
 #if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919 || PACKETVER_MAIN_NUM >= 20181002
@@ -3092,12 +3092,12 @@ void clif_inventorylist( struct map_session_data *sd ){
 }
 
 //Required when items break/get-repaired. Only sends equippable item list.
-void clif_equiplist( struct map_session_data *sd ){
+void clif_equiplist( map_session_data *sd ){
 	// TODO: implement again => only send equip part
 	clif_inventorylist( sd );
 }
 
-void clif_storagelist(struct map_session_data* sd, struct item* items, int items_length, const char *storename){
+void clif_storagelist(map_session_data* sd, struct item* items, int items_length, const char *storename){
 #if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919 || PACKETVER_MAIN_NUM >= 20181002
 	e_inventory_type type = INVTYPE_STORAGE;
 
@@ -3181,7 +3181,7 @@ void clif_storagelist(struct map_session_data* sd, struct item* items, int items
 #endif
 }
 
-void clif_cartlist( struct map_session_data *sd ){
+void clif_cartlist( map_session_data *sd ){
 	nullpo_retv( sd );
 
 #if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919 || PACKETVER_MAIN_NUM >= 20181002
@@ -3252,7 +3252,7 @@ void clif_clearcart(int fd)
 
 /// Guild XY locators (ZC_NOTIFY_POSITION_TO_GUILDM) [Valaris]
 /// 01eb <account id>.L <x>.W <y>.W
-void clif_guild_xy(struct map_session_data *sd)
+void clif_guild_xy(map_session_data *sd)
 {
 	unsigned char buf[10];
 
@@ -3268,7 +3268,7 @@ void clif_guild_xy(struct map_session_data *sd)
 /*==========================================
  * Sends x/y dot to a single fd. [Skotlex]
  *------------------------------------------*/
-void clif_guild_xy_single(int fd, struct map_session_data *sd)
+void clif_guild_xy_single(int fd, map_session_data *sd)
 {
 	if( sd->bg_id )
 		return;
@@ -3282,7 +3282,7 @@ void clif_guild_xy_single(int fd, struct map_session_data *sd)
 }
 
 // Guild XY locators [Valaris]
-void clif_guild_xy_remove(struct map_session_data *sd)
+void clif_guild_xy_remove(map_session_data *sd)
 {
 	unsigned char buf[10];
 
@@ -3299,8 +3299,8 @@ void clif_guild_xy_remove(struct map_session_data *sd)
  *
  *------------------------------------------*/
 static int clif_hpmeter_sub( struct block_list *bl, va_list ap ){
-	struct map_session_data* sd = va_arg( ap, struct map_session_data* );
-	struct map_session_data* tsd = BL_CAST( BL_PC, bl );
+	map_session_data* sd = va_arg( ap, map_session_data* );
+	map_session_data* tsd = BL_CAST( BL_PC, bl );
 
 	nullpo_ret(sd);
 	nullpo_ret(tsd);
@@ -3315,7 +3315,7 @@ static int clif_hpmeter_sub( struct block_list *bl, va_list ap ){
  * Server tells all players that are allowed to view HP bars
  * and are nearby 'sd' that 'sd' hp bar was updated.
  *------------------------------------------*/
-static int clif_hpmeter(struct map_session_data *sd)
+static int clif_hpmeter(map_session_data *sd)
 {
 	nullpo_ret(sd);
 	map_foreachinallarea(clif_hpmeter_sub, sd->bl.m, sd->bl.x-AREA_SIZE, sd->bl.y-AREA_SIZE, sd->bl.x+AREA_SIZE, sd->bl.y+AREA_SIZE, BL_PC, sd);
@@ -3345,7 +3345,7 @@ void clif_update_hp(map_session_data &sd) {
 /// 0acb <var id>.W <value>.Q (ZC_LONGPAR_CHANGE2)
 /// TODO: Extract individual packets.
 /// FIXME: Packet lengths from packet_len(cmd)
-void clif_updatestatus(struct map_session_data *sd,int type)
+void clif_updatestatus(map_session_data *sd,int type)
 {
 	int fd,len=8;
 
@@ -3715,7 +3715,7 @@ void clif_updatestatus(struct map_session_data *sd,int type)
 
 /// Notifies client of a parameter change of an another player (ZC_PAR_CHANGE_USER).
 /// 01ab <account id>.L <var id>.W <value>.L
-void clif_changestatus(struct map_session_data* sd,int type,int val)
+void clif_changestatus(map_session_data* sd,int type,int val)
 {
 	unsigned char buf[12];
 
@@ -3758,8 +3758,8 @@ void clif_sprite_change( struct block_list *bl, int id, int type, int val, int v
 
 /// Updates sprite/style properties of an object.
 void clif_changelook(struct block_list *bl, int type, int val) {
-	struct map_session_data* sd;
-	struct status_change* sc;
+	map_session_data* sd;
+	status_change* sc;
 	struct view_data* vd;
 	enum send_target target = AREA;
 	int val2 = 0;
@@ -3921,7 +3921,7 @@ void clif_refreshlook(struct block_list *bl, int id, int type, int val, enum sen
 ///     <int>.B <need int>.B <dex>.B <need dex>.B <luk>.B <need luk>.B <atk>.W <atk2>.W
 ///     <matk min>.W <matk max>.W <def>.W <def2>.W <mdef>.W <mdef2>.W <hit>.W
 ///     <flee>.W <flee2>.W <crit>.W <aspd>.W <aspd2>.W
-void clif_initialstatus(struct map_session_data *sd) {
+void clif_initialstatus(map_session_data *sd) {
 	int fd, mdef2;
 	unsigned char *buf;
 
@@ -4006,7 +4006,7 @@ void clif_initialstatus(struct map_session_data *sd) {
 
 /// Marks an ammunition item in inventory as equipped (ZC_EQUIP_ARROW).
 /// 013c <index>.W
-void clif_arrowequip(struct map_session_data *sd,int val) {
+void clif_arrowequip(map_session_data *sd,int val) {
 	int fd;
 
 	nullpo_retv(sd);
@@ -4031,7 +4031,7 @@ void clif_arrowequip(struct map_session_data *sd,int val) {
 ///     3 = assassin, baby_assassin, assassin_cross => MsgStringTable[1040]="You have equipped throwing daggers."
 ///         gunslinger => MsgStringTable[1175]="Bullets have been equipped."
 ///         NOT ninja => MsgStringTable[245]="Ammunition has been equipped."
-void clif_arrow_fail(struct map_session_data *sd,int type) {
+void clif_arrow_fail(map_session_data *sd,int type) {
 	int fd;
 
 	nullpo_retv(sd);
@@ -4046,7 +4046,7 @@ void clif_arrow_fail(struct map_session_data *sd,int type) {
 
 /// Presents a list of items, that can be processed by Arrow Crafting (ZC_MAKINGARROW_LIST).
 /// 01ad <packet len>.W { <name id>.W }*
-void clif_arrow_create_list( struct map_session_data *sd ){
+void clif_arrow_create_list( map_session_data *sd ){
 	nullpo_retv( sd );
 
 	struct PACKET_ZC_MAKINGARROW_LIST *p = (struct PACKET_ZC_MAKINGARROW_LIST *)packet_buffer;
@@ -4097,7 +4097,7 @@ void clif_arrow_create_list( struct map_session_data *sd ){
 /// result:
 ///     0 = failure
 ///     1 = success
-void clif_statusupack(struct map_session_data *sd,int type,int ok,int val) {
+void clif_statusupack(map_session_data *sd,int type,int ok,int val) {
 	int fd;
 
 	nullpo_retv(sd);
@@ -4121,7 +4121,7 @@ void clif_statusupack(struct map_session_data *sd,int type,int ok,int val) {
 ///     0 = failure
 ///     1 = success
 ///     2 = failure due to low level
-void clif_equipitemack( struct map_session_data& sd, uint8 flag, int index, int pos ){
+void clif_equipitemack( map_session_data& sd, uint8 flag, int index, int pos ){
 	struct PACKET_ZC_REQ_WEAR_EQUIP_ACK p = {};
 
 	p.PacketType = HEADER_ZC_REQ_WEAR_EQUIP_ACK;
@@ -4147,7 +4147,7 @@ void clif_equipitemack( struct map_session_data& sd, uint8 flag, int index, int
 /// @ok : //inversed for v2 v5
 ///     0 = failure
 ///     1 = success
-void clif_unequipitemack(struct map_session_data *sd,int n,int pos,int ok)
+void clif_unequipitemack(map_session_data *sd,int n,int pos,int ok)
 {
 	int fd, header, offs = 0;
 #if PACKETVER >= 20130000
@@ -4209,14 +4209,14 @@ void clif_misceffect(struct block_list* bl,int type)
 void clif_changeoption_target( struct block_list* bl, struct block_list* target ){
 	nullpo_retv( bl );
 
-	struct status_change* sc = status_get_sc( bl );
+	status_change* sc = status_get_sc( bl );
 
 	//How can an option change if there's no sc?
 	if( sc == nullptr ){
 		return;
 	}
 
-	struct map_session_data* sd = BL_CAST( BL_PC, bl );
+	map_session_data* sd = BL_CAST( BL_PC, bl );
 
 	struct PACKET_ZC_STATE_CHANGE p;
 
@@ -4265,7 +4265,7 @@ void clif_changeoption_target( struct block_list* bl, struct block_list* target
 void clif_changeoption2(struct block_list* bl)
 {
 	unsigned char buf[20];
-	struct status_change *sc;
+	status_change *sc;
 
 	sc = status_get_sc(bl);
 	if (!sc) return; //How can an option change if there's no sc?
@@ -4290,7 +4290,7 @@ void clif_changeoption2(struct block_list* bl)
 /// Notifies the client about the result of an item use request.
 /// 00a8 <index>.W <amount>.W <result>.B (ZC_USE_ITEM_ACK)
 /// 01c8 <index>.W <name id>.W <id>.L <amount>.W <result>.B (ZC_USE_ITEM_ACK2)
-void clif_useitemack( struct map_session_data *sd, int index, int amount, bool ok ){
+void clif_useitemack( map_session_data *sd, int index, int amount, bool ok ){
 	nullpo_retv( sd );
 
 	int fd = sd->fd;
@@ -4328,7 +4328,7 @@ void clif_useitemack( struct map_session_data *sd, int index, int amount, bool o
 ///     0 = Room has been successfully created (opens chat room)
 ///     1 = Room limit exceeded
 ///     2 = Same room already exists
-void clif_createchat(struct map_session_data* sd, int flag)
+void clif_createchat(map_session_data* sd, int flag)
 {
 	int fd;
 
@@ -4443,7 +4443,7 @@ void clif_clearchat(struct chat_data *cd,int fd)
 ///     5 = too low level
 ///     6 = too high level
 ///     7 = unsuitable job class
-void clif_joinchatfail(struct map_session_data *sd,int flag)
+void clif_joinchatfail(map_session_data *sd,int flag)
 {
 	int fd;
 
@@ -4463,7 +4463,7 @@ void clif_joinchatfail(struct map_session_data *sd,int flag)
 /// role:
 ///     0 = owner (menu)
 ///     1 = normal
-void clif_joinchatok(struct map_session_data *sd,struct chat_data* cd)
+void clif_joinchatok(map_session_data *sd,struct chat_data* cd)
 {
 	int fd;
 	int i,t;
@@ -4500,7 +4500,7 @@ void clif_joinchatok(struct map_session_data *sd,struct chat_data* cd)
 
 /// Notifies clients in a chat about a new member (ZC_MEMBER_NEWENTRY).
 /// 00dc <users>.W <name>.24B
-void clif_addchat(struct chat_data* cd,struct map_session_data *sd)
+void clif_addchat(struct chat_data* cd,map_session_data *sd)
 {
 	unsigned char buf[29];
 
@@ -4519,7 +4519,7 @@ void clif_addchat(struct chat_data* cd,struct map_session_data *sd)
 /// role:
 ///     0 = owner (menu)
 ///     1 = normal
-void clif_changechatowner(struct chat_data* cd, struct map_session_data* sd)
+void clif_changechatowner(struct chat_data* cd, map_session_data* sd)
 {
 	unsigned char buf[64];
 
@@ -4543,7 +4543,7 @@ void clif_changechatowner(struct chat_data* cd, struct map_session_data* sd)
 /// flag:
 ///     0 = left
 ///     1 = kicked
-void clif_leavechat(struct chat_data* cd, struct map_session_data* sd, bool flag)
+void clif_leavechat(struct chat_data* cd, map_session_data* sd, bool flag)
 {
 	unsigned char buf[32];
 
@@ -4562,7 +4562,7 @@ void clif_leavechat(struct chat_data* cd, struct map_session_data* sd, bool flag
 /// Opens a trade request window from char 'name'.
 /// 00e5 <nick>.24B (ZC_REQ_EXCHANGE_ITEM)
 /// 01f4 <nick>.24B <charid>.L <baselvl>.W (ZC_REQ_EXCHANGE_ITEM2)
-void clif_traderequest(struct map_session_data* sd, const char* name)
+void clif_traderequest(map_session_data* sd, const char* name)
 {
 	int fd = sd->fd;
 
@@ -4572,7 +4572,7 @@ void clif_traderequest(struct map_session_data* sd, const char* name)
 	safestrncpy(WFIFOCP(fd,2), name, NAME_LENGTH);
 	WFIFOSET(fd,packet_len(0xe5));
 #else
-	struct map_session_data* tsd = map_id2sd(sd->trade_partner);
+	map_session_data* tsd = map_id2sd(sd->trade_partner);
 	if( !tsd ) return;
 
 	WFIFOHEAD(fd,packet_len(0x1f4));
@@ -4595,10 +4595,10 @@ void clif_traderequest(struct map_session_data* sd, const char* name)
 ///     3 = Accept
 ///     4 = Cancel
 ///     5 = Busy
-void clif_tradestart(struct map_session_data* sd, uint8 type)
+void clif_tradestart(map_session_data* sd, uint8 type)
 {
 	int fd = sd->fd;
-	struct map_session_data* tsd = map_id2sd(sd->trade_partner);
+	map_session_data* tsd = map_id2sd(sd->trade_partner);
 	if( PACKETVER < 6 || !tsd ) {
 		WFIFOHEAD(fd,packet_len(0xe7));
 		WFIFOW(fd,0) = 0xe7;
@@ -4619,7 +4619,7 @@ void clif_tradestart(struct map_session_data* sd, uint8 type)
 /// 00e9 <amount>.L <nameid>.W <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W (ZC_ADD_EXCHANGE_ITEM)
 /// 080f <nameid>.W <item type>.B <amount>.L <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W (ZC_ADD_EXCHANGE_ITEM2)
 /// 0a09 <nameid>.W <item type>.B <amount>.L <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W { <option id>.W <option value>.W <option param>.B }*5 (ZC_ADD_EXCHANGE_ITEM3)
-void clif_tradeadditem( struct map_session_data* sd, struct map_session_data* tsd, int index, int amount ){
+void clif_tradeadditem( map_session_data* sd, map_session_data* tsd, int index, int amount ){
 	nullpo_retv( sd );
 	nullpo_retv( tsd );
 
@@ -4671,7 +4671,7 @@ void clif_tradeadditem( struct map_session_data* sd, struct map_session_data* ts
 ///     0 = success
 ///     1 = overweight
 ///     2 = trade canceled
-void clif_tradeitemok(struct map_session_data& sd, int index, e_exitem_add_result result)
+void clif_tradeitemok(map_session_data& sd, int index, e_exitem_add_result result)
 {
 	PACKET_ZC_ACK_ADD_EXCHANGE_ITEM p = {};
 	p.packetType = HEADER_ZC_ACK_ADD_EXCHANGE_ITEM;
@@ -4687,7 +4687,7 @@ void clif_tradeitemok(struct map_session_data& sd, int index, e_exitem_add_resul
 /// who:
 ///     0 = self
 ///     1 = other player
-void clif_tradedeal_lock(struct map_session_data* sd, int fail)
+void clif_tradedeal_lock(map_session_data* sd, int fail)
 {
 	int fd;
 	nullpo_retv(sd);
@@ -4702,7 +4702,7 @@ void clif_tradedeal_lock(struct map_session_data* sd, int fail)
 
 /// Notifies the client about the trade being canceled (ZC_CANCEL_EXCHANGE_ITEM).
 /// 00ee
-void clif_tradecancelled(struct map_session_data* sd)
+void clif_tradecancelled(map_session_data* sd)
 {
 	int fd;
 	nullpo_retv(sd);
@@ -4719,7 +4719,7 @@ void clif_tradecancelled(struct map_session_data* sd)
 /// result:
 ///     0 = success
 ///     1 = failure
-void clif_tradecompleted(struct map_session_data* sd, int fail)
+void clif_tradecompleted(map_session_data* sd, int fail)
 {
 	int fd;
 	nullpo_retv(sd);
@@ -4736,7 +4736,7 @@ void clif_tradecompleted(struct map_session_data* sd, int fail)
 /// 00f1
 /// NOTE: Unknown purpose. Items are not removed until the window is
 ///       refreshed (ex. by putting another item in there).
-void clif_tradeundo(struct map_session_data* sd)
+void clif_tradeundo(map_session_data* sd)
 {
 	int fd = sd->fd;
 
@@ -4748,7 +4748,7 @@ void clif_tradeundo(struct map_session_data* sd)
 
 /// Updates storage total amount (ZC_NOTIFY_STOREITEM_COUNTINFO).
 /// 00f2 <current count>.W <max count>.W
-void clif_updatestorageamount(struct map_session_data* sd, int amount, int max_amount)
+void clif_updatestorageamount(map_session_data* sd, int amount, int max_amount)
 {
 	int fd;
 
@@ -4767,7 +4767,7 @@ void clif_updatestorageamount(struct map_session_data* sd, int amount, int max_a
 /// 00f4 <index>.W <amount>.L <nameid>.W <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W (ZC_ADD_ITEM_TO_STORE)
 /// 01c4 <index>.W <amount>.L <nameid>.W <type>.B <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W (ZC_ADD_ITEM_TO_STORE2)
 /// 0a0a <index>.W <amount>.L <nameid>.W <type>.B <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W { <option id>.W <option value>.W <option param>.B }*5 (ZC_ADD_ITEM_TO_STORE3)
-void clif_storageitemadded( struct map_session_data* sd, struct item* i, int index, int amount ){
+void clif_storageitemadded( map_session_data* sd, struct item* i, int index, int amount ){
 	nullpo_retv( sd );
 	nullpo_retv( i );
 
@@ -4803,7 +4803,7 @@ void clif_storageitemadded( struct map_session_data* sd, struct item* i, int ind
 
 /// Notifies the client of an item being deleted from the storage (ZC_DELETE_ITEM_FROM_STORE).
 /// 00f6 <index>.W <amount>.L
-void clif_storageitemremoved(struct map_session_data* sd, int index, int amount)
+void clif_storageitemremoved(map_session_data* sd, int index, int amount)
 {
 	int fd;
 
@@ -4820,7 +4820,7 @@ void clif_storageitemremoved(struct map_session_data* sd, int index, int amount)
 
 /// Closes storage (ZC_CLOSE_STORE).
 /// 00f8
-void clif_storageclose(struct map_session_data* sd)
+void clif_storageclose(map_session_data* sd)
 {
 	int fd;
 
@@ -4837,7 +4837,7 @@ void clif_storageclose(struct map_session_data* sd)
 /// 01d0 <id>.L <amount>.W (ZC_SPIRITS)
 /// 01e1 <id>.L <amount>.W (ZC_SPIRITS2)
 /// 0b73 <id>.L <amount>.W
-void clif_soulball( struct map_session_data *sd, struct block_list* target, enum send_target send_target ){
+void clif_soulball( map_session_data *sd, struct block_list* target, enum send_target send_target ){
 #if PACKETVER_MAIN_NUM >= 20200916 || PACKETVER_RE_NUM >= 20200724
 	struct PACKET_ZC_SOULENERGY p = {};
 
@@ -4858,7 +4858,7 @@ void clif_soulball( struct map_session_data *sd, struct block_list* target, enum
 /*==========================================
  * Server tells 'sd' player client the abouts of 'dstsd' player
  *------------------------------------------*/
-static void clif_getareachar_pc(struct map_session_data* sd,struct map_session_data* dstsd)
+static void clif_getareachar_pc(map_session_data* sd,map_session_data* dstsd)
 {
 	struct block_list *d_bl;
 	int i;
@@ -4903,7 +4903,7 @@ static void clif_getareachar_pc(struct map_session_data* sd,struct map_session_d
 		clif_devotion(d_bl, sd);
 }
 
-void clif_getareachar_unit( struct map_session_data* sd,struct block_list *bl ){
+void clif_getareachar_unit( map_session_data* sd,struct block_list *bl ){
 	struct unit_data *ud;
 	struct view_data *vd;
 	bool option = false;
@@ -5065,7 +5065,7 @@ static int clif_hallucination_damage()
 int clif_damage(struct block_list* src, struct block_list* dst, t_tick tick, int sdelay, int ddelay, int64 sdamage, int div, enum e_damage_type type, int64 sdamage2, bool spdamage)
 {
 	unsigned char buf[34];
-	struct status_change *sc;
+	status_change *sc;
 	int damage = (int)cap_value(sdamage,INT_MIN,INT_MAX);
 	int damage2 = (int)cap_value(sdamage2,INT_MIN,INT_MAX);
 #if PACKETVER < 20071113
@@ -5242,7 +5242,7 @@ void clif_changemapcell(int fd, int16 m, int x, int y, int type, enum send_targe
 
 /// Notifies the client about an item on floor (ZC_ITEM_ENTRY).
 /// 009d <id>.L <name id>.W <identified>.B <x>.W <y>.W <amount>.W <subX>.B <subY>.B
-void clif_getareachar_item( struct map_session_data* sd,struct flooritem_data* fitem ){
+void clif_getareachar_item( map_session_data* sd,struct flooritem_data* fitem ){
 	nullpo_retv( sd );
 	nullpo_retv( fitem );
 
@@ -5437,11 +5437,11 @@ void clif_skillunit_update(struct block_list* bl)
  *------------------------------------------*/
 static int clif_getareachar(struct block_list* bl,va_list ap)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	nullpo_ret(bl);
 
-	sd=va_arg(ap,struct map_session_data*);
+	sd=va_arg(ap,map_session_data*);
 
 	if (!clif_session_isValid(sd))
 		return 0;
@@ -5555,7 +5555,7 @@ int clif_insight(struct block_list *bl,va_list ap)
 
 /// Updates whole skill tree (ZC_SKILLINFO_LIST).
 /// 010f <packet len>.W { <skill id>.W <type>.L <level>.W <sp cost>.W <attack range>.W <skill name>.24B <upgradable>.B }*
-void clif_skillinfoblock(struct map_session_data *sd)
+void clif_skillinfoblock(map_session_data *sd)
 {
 	int fd;
 	int i,len,id;
@@ -5620,7 +5620,7 @@ void clif_skillinfoblock(struct map_session_data *sd)
 
 /// Adds new skill to the skill tree (ZC_ADD_SKILL).
 /// 0111 <skill id>.W <type>.L <level>.W <sp cost>.W <attack range>.W <skill name>.24B <upgradable>.B
-void clif_addskill(struct map_session_data *sd, int skill_id)
+void clif_addskill(map_session_data *sd, int skill_id)
 {
 	nullpo_retv(sd);
 
@@ -5651,7 +5651,7 @@ void clif_addskill(struct map_session_data *sd, int skill_id)
 
 /// Deletes a skill from the skill tree (ZC_SKILLINFO_DELETE).
 /// 0441 <skill id>.W
-void clif_deleteskill(struct map_session_data *sd, int skill_id)
+void clif_deleteskill(map_session_data *sd, int skill_id)
 {
 #if PACKETVER >= 20081217
 	nullpo_retv(sd);
@@ -5672,7 +5672,7 @@ void clif_deleteskill(struct map_session_data *sd, int skill_id)
 
 /// Updates a skill in the skill tree (ZC_SKILLINFO_UPDATE).
 /// 010e <skill id>.W <level>.W <sp cost>.W <attack range>.W <upgradable>.B
-void clif_skillup(struct map_session_data *sd, uint16 skill_id, int lv, int range, int upgradable) {
+void clif_skillup(map_session_data *sd, uint16 skill_id, int lv, int range, int upgradable) {
 	nullpo_retv(sd);
 
 	int fd = sd->fd;
@@ -5694,7 +5694,7 @@ void clif_skillup(struct map_session_data *sd, uint16 skill_id, int lv, int rang
 
 /// Updates a skill in the skill tree (ZC_SKILLINFO_UPDATE2).
 /// 07e1 <skill id>.W <type>.L <level>.W <sp cost>.W <attack range>.W <upgradable>.B
-void clif_skillinfo(struct map_session_data *sd,int skill_id, int inf)
+void clif_skillinfo(map_session_data *sd,int skill_id, int inf)
 {
 	nullpo_retv(sd);
 
@@ -5830,7 +5830,7 @@ void clif_skillcastcancel(struct block_list* bl)
 /// if(result!=0) doesn't display any of the previous messages
 /// Note: when this packet is received an unknown flag is always set to 0,
 /// suggesting this is an ACK packet for the UseSkill packets and should be sent on success too [FlavioJS]
-void clif_skill_fail( struct map_session_data *sd, uint16 skill_id, enum useskill_fail_cause cause, int btype, t_itemid itemId ){
+void clif_skill_fail( map_session_data *sd, uint16 skill_id, enum useskill_fail_cause cause, int btype, t_itemid itemId ){
 	nullpo_retv( sd );
 
 	int fd = sd->fd;
@@ -5866,7 +5866,7 @@ void clif_skill_fail( struct map_session_data *sd, uint16 skill_id, enum useskil
 
 /// 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, t_tick tick)
+void clif_skill_cooldown(map_session_data *sd, uint16 skill_id, t_tick tick)
 {
 #if PACKETVER>=20081112
 	int fd;
@@ -5888,7 +5888,7 @@ void clif_skill_cooldown(struct map_session_data *sd, uint16 skill_id, t_tick ti
 int clif_skill_damage(struct block_list *src,struct block_list *dst,t_tick tick,int sdelay,int ddelay,int64 sdamage,int div,uint16 skill_id,uint16 skill_lv,enum e_damage_type type)
 {
 	unsigned char buf[64];
-	struct status_change *sc;
+	status_change *sc;
 	int damage = (int)cap_value(sdamage,INT_MIN,INT_MAX);
 
 	nullpo_ret(src);
@@ -5984,7 +5984,7 @@ int clif_skill_damage(struct block_list *src,struct block_list *dst,t_tick tick,
 int clif_skill_damage2(struct block_list *src,struct block_list *dst,t_tick tick,int sdelay,int ddelay,int damage,int div,uint16 skill_id,uint16 skill_lv,enum e_damage_type type)
 {
 	unsigned char buf[64];
-	struct status_change *sc;
+	status_change *sc;
 
 	nullpo_ret(src);
 	nullpo_ret(dst);
@@ -6108,7 +6108,7 @@ void clif_skill_poseffect(struct block_list *src,uint16 skill_id,int val,int x,i
 
 /// Presents a list of available warp destinations (ZC_WARPLIST).
 /// 011c <skill id>.W { <map name>.16B }*4
-void clif_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 clif_skill_warppoint(map_session_data* sd, uint16 skill_id, uint16 skill_lv, unsigned short map1, unsigned short map2, unsigned short map3, unsigned short map4)
 {
 	int fd;
 	nullpo_retv(sd);
@@ -6144,7 +6144,7 @@ void clif_skill_warppoint(struct map_session_data* sd, uint16 skill_id, uint16 s
 ///
 /// @param sd Who receives the message
 /// @param type What message
-void clif_skill_memomessage(struct map_session_data* sd, int type)
+void clif_skill_memomessage(map_session_data* sd, int type)
 {
 	int fd;
 
@@ -6166,7 +6166,7 @@ void clif_skill_memomessage(struct map_session_data* sd, int type)
 ///
 /// @param sd Who receives the message
 /// @param type What message
-void clif_skill_teleportmessage(struct map_session_data *sd, int type)
+void clif_skill_teleportmessage(map_session_data *sd, int type)
 {
 	int fd;
 
@@ -6183,7 +6183,7 @@ void clif_skill_teleportmessage(struct map_session_data *sd, int type)
 /// Displays Sense (WZ_ESTIMATION) information window (ZC_MONSTER_INFO).
 /// 018c <class>.W <level>.W <size>.W <hp>.L <def>.W <race>.W <mdef>.W <element>.W
 ///     <water%>.B <earth%>.B <fire%>.B <wind%>.B <poison%>.B <holy%>.B <shadow%>.B <ghost%>.B <undead%>.B
-void clif_skill_estimation(struct map_session_data *sd,struct block_list *dst)
+void clif_skill_estimation(map_session_data *sd,struct block_list *dst)
 {
 	struct status_data *status;
 	unsigned char buf[64];
@@ -6220,7 +6220,7 @@ void clif_skill_estimation(struct map_session_data *sd,struct block_list *dst)
 /// 018d <packet len>.W { <name id>.W { <material id>.W }*3 }*
 /// material id:
 ///     unused by the client
-void clif_skill_produce_mix_list( struct map_session_data *sd, int skill_id, int trigger ){
+void clif_skill_produce_mix_list( map_session_data *sd, int skill_id, int trigger ){
 	nullpo_retv(sd);
 
 	int fd = sd->fd;
@@ -6274,7 +6274,7 @@ void clif_skill_produce_mix_list( struct map_session_data *sd, int skill_id, int
 ///     6 = GN_S_PHARMACY
 ///     7 = MT_M_MACHINE - Unconfirmed
 ///     8 = BO_BIONIC_PHARMACY - Unconfirmed
-void clif_cooking_list( struct map_session_data *sd, int trigger, uint16 skill_id, int qty, int list_type ){
+void clif_cooking_list( map_session_data *sd, int trigger, uint16 skill_id, int qty, int list_type ){
 	nullpo_retv( sd );
 
 	// Avoid resending the menu twice or more times...
@@ -6399,7 +6399,7 @@ void clif_status_change_sub(struct block_list *bl, int id, int type, int flag, t
  * @param val3
  */
 void clif_status_change(struct block_list *bl, int type, int flag, t_tick tick, int val1, int val2, int val3) {
-	struct map_session_data *sd = NULL;
+	map_session_data *sd = NULL;
 
 	if (type == EFST_BLANK)  //It shows nothing on the client...
 		return;
@@ -6442,7 +6442,7 @@ void clif_efst_status_change_sub(struct block_list *tbl, struct block_list *bl,
 
 	switch( bl->type ){
 		case BL_PC: {
-			struct map_session_data* sd = (struct map_session_data*)bl;
+			map_session_data* sd = (map_session_data*)bl;
 
 			sc_display = sd->sc_display;
 			sc_display_count = sd->sc_display_count;
@@ -6463,7 +6463,7 @@ void clif_efst_status_change_sub(struct block_list *tbl, struct block_list *bl,
 
 	for (i = 0; i < sc_display_count; i++) {
 		enum sc_type type = sc_display[i]->type;
-		struct status_change *sc = status_get_sc(bl);
+		status_change *sc = status_get_sc(bl);
 		const struct TimerData *td = (sc && sc->getSCE(type) ? get_timer(sc->getSCE(type)->timer) : NULL);
 		t_tick tick = 0;
 
@@ -6672,7 +6672,7 @@ void clif_broadcast2(struct block_list* bl, const char* mes, int len, unsigned l
  */
 void clif_channel_msg(struct Channel *channel, const char *msg, unsigned long color) {
 	DBIterator *iter;
-	struct map_session_data *user;
+	map_session_data *user;
 	unsigned short msg_len = 0, len = 0;
 	unsigned char buf[CHAT_SIZE_MAX];
 
@@ -6693,7 +6693,7 @@ void clif_channel_msg(struct Channel *channel, const char *msg, unsigned long co
 	safestrncpy(WBUFCP(buf,12), msg, msg_len);
 
 	iter = db_iterator(channel->users);
-	for( user = (struct map_session_data *)dbi_first(iter); dbi_exists(iter); user = (struct map_session_data *)dbi_next(iter) ) {
+	for( user = (map_session_data *)dbi_first(iter); dbi_exists(iter); user = (map_session_data *)dbi_next(iter) ) {
 		clif_send(buf, len, &user->bl, SELF);
 	}
 	dbi_destroy(iter);
@@ -6763,7 +6763,7 @@ void clif_map_property(struct block_list *bl, enum map_property property, enum s
 
 #if PACKETVER >= 20121010
 	struct map_data *mapdata = map_getmapdata(bl->m);
-	struct map_session_data *sd = BL_CAST(BL_PC, bl);
+	map_session_data *sd = BL_CAST(BL_PC, bl);
 
 	WBUFL(buf,4) = ((mapdata->flag[MF_PVP] || (sd && sd->duel_group > 0))<<0)| // PARTY - Show attack cursor on non-party members (PvP)
 		((mapdata->flag[MF_BATTLEGROUND] || mapdata_flag_gvg2(mapdata))<<1)|// GUILD - Show attack cursor on non-guild members (GvG)
@@ -6784,7 +6784,7 @@ void clif_map_property(struct block_list *bl, enum map_property property, enum s
 
 /// Set the map type (ZC_NOTIFY_MAPPROPERTY2).
 /// 01d6 <type>.W
-void clif_map_type(struct map_session_data* sd, enum map_type type)
+void clif_map_type(map_session_data* sd, enum map_type type)
 {
 	int fd;
 
@@ -6800,7 +6800,7 @@ void clif_map_type(struct map_session_data* sd, enum map_type type)
 
 /// Updates PvP ranking (ZC_NOTIFY_RANKING).
 /// 019a <id>.L <ranking>.L <total>.L
-void clif_pvpset(struct map_session_data *sd,int pvprank,int pvpnum,int type)
+void clif_pvpset(map_session_data *sd,int pvprank,int pvpnum,int type)
 {
 	if(type == 2) {
 		int fd = sd->fd;
@@ -6867,7 +6867,7 @@ void clif_refine(int fd, int fail, int index, int val)
 ///     1 = "weapon upgraded: %s" MsgStringTable[912] in rgb(0,205,205)
 ///     2 = "cannot upgrade %s until you level up the upgrade weapon skill" MsgStringTable[913] in rgb(255,200,200)
 ///     3 = "you lack the item %s to upgrade the weapon" MsgStringTable[914] in rgb(255,200,200)
-void clif_upgrademessage( struct map_session_data* sd, int result, t_itemid item_id ){
+void clif_upgrademessage( map_session_data* sd, int result, t_itemid item_id ){
 	struct PACKET_ZC_ACK_WEAPONREFINE p;
 
 	p.packetType = HEADER_ZC_ACK_WEAPONREFINE;
@@ -6881,7 +6881,7 @@ void clif_upgrademessage( struct map_session_data* sd, int result, t_itemid item
 /// Whisper is transmitted to the destination player (ZC_WHISPER).
 /// 0097 <packet len>.W <nick>.24B <message>.?B
 /// 0097 <packet len>.W <nick>.24B <isAdmin>.L <message>.?B (PACKETVER >= 20091104)
-void clif_wis_message(struct map_session_data* sd, const char* nick, const char* mes, int mes_len, int gmlvl){
+void clif_wis_message(map_session_data* sd, const char* nick, const char* mes, int mes_len, int gmlvl){
 	int fd;
 
 	nullpo_retv(sd);
@@ -6896,7 +6896,7 @@ void clif_wis_message(struct map_session_data* sd, const char* nick, const char*
 	safestrncpy(WFIFOCP(fd,28), mes, mes_len);
 	WFIFOSET(fd,WFIFOW(fd,2));
 #else
-	struct map_session_data *ssd = map_nick2sd(nick,false);
+	map_session_data *ssd = map_nick2sd(nick,false);
 
 	WFIFOHEAD(fd, mes_len + NAME_LENGTH + 8);
 	WFIFOW(fd,0) = 0x97;
@@ -6923,7 +6923,7 @@ void clif_wis_message(struct map_session_data* sd, const char* nick, const char*
 ///     3 = everyone ignored by target
 void clif_wis_end(int fd, int result)
 {
-	struct map_session_data *sd = (session_isActive(fd) ? (struct map_session_data *)session[fd]->session_data : NULL);
+	map_session_data *sd = (session_isActive(fd) ? (map_session_data *)session[fd]->session_data : NULL);
 #if PACKETVER < 20131223
 	const int cmd = 0x98;
 #else
@@ -6967,7 +6967,7 @@ void clif_solved_charname(int fd, int charid, const char* name)
 
 /// Presents a list of items that can be carded/composed (ZC_ITEMCOMPOSITION_LIST).
 /// 017b <packet len>.W { <name id>.W }*
-void clif_use_card(struct map_session_data *sd,int idx)
+void clif_use_card(map_session_data *sd,int idx)
 {
 	int i,c,ep;
 	int fd=sd->fd;
@@ -7028,7 +7028,7 @@ void clif_use_card(struct map_session_data *sd,int idx)
 /// result:
 ///     0 = success
 ///     1 = failure
-void clif_insert_card(struct map_session_data *sd,int idx_equip,int idx_card,int flag)
+void clif_insert_card(map_session_data *sd,int idx_equip,int idx_card,int flag)
 {
 	int fd;
 
@@ -7046,7 +7046,7 @@ void clif_insert_card(struct map_session_data *sd,int idx_equip,int idx_card,int
 
 /// Presents a list of items that can be identified (ZC_ITEMIDENTIFY_LIST).
 /// 0177 <packet len>.W { <index>.W }*
-void clif_item_identify_list(struct map_session_data *sd)
+void clif_item_identify_list(map_session_data *sd)
 {
 	int i,c;
 	int fd;
@@ -7075,7 +7075,7 @@ void clif_item_identify_list(struct map_session_data *sd)
 
 /// Notifies the client about the result of a item identify request (ZC_ACK_ITEMIDENTIFY).
 /// 0179 <index>.W <result>.B
-void clif_item_identified(struct map_session_data *sd,int idx,int flag)
+void clif_item_identified(map_session_data *sd,int idx,int flag)
 {
 	int fd;
 
@@ -7092,7 +7092,7 @@ void clif_item_identified(struct map_session_data *sd,int idx,int flag)
 
 /// Presents a list of items that can be repaired.
 /// 01fc <packet len>.W { <index>.W <name id>.W <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W }* (ZC_REPAIRITEMLIST)
-void clif_item_repair_list( struct map_session_data *sd,struct map_session_data *dstsd, int lv ){
+void clif_item_repair_list( map_session_data *sd,map_session_data *dstsd, int lv ){
 	nullpo_retv( sd );
 	nullpo_retv( dstsd );
 
@@ -7146,7 +7146,7 @@ void clif_item_repair_list( struct map_session_data *sd,struct map_session_data
 /// result:
 ///     0 = Item repair success.
 ///     1 = Item repair failure.
-void clif_item_repaireffect(struct map_session_data *sd,int idx,int flag)
+void clif_item_repaireffect(map_session_data *sd,int idx,int flag)
 {
 	int fd;
 
@@ -7165,7 +7165,7 @@ void clif_item_repaireffect(struct map_session_data *sd,int idx,int flag)
 
 /// Displays a message, that an equipment got damaged (ZC_EQUIPITEM_DAMAGED).
 /// 02bb <equip location>.W <account id>.L
-void clif_item_damaged(struct map_session_data* sd, unsigned short position)
+void clif_item_damaged(map_session_data* sd, unsigned short position)
 {
 	int fd = sd->fd;
 
@@ -7179,7 +7179,7 @@ void clif_item_damaged(struct map_session_data* sd, unsigned short position)
 
 /// Presents a list of weapon items that can be refined [Taken from jAthena] (ZC_NOTIFY_WEAPONITEMLIST).
 /// 0221 <packet len>.W { <index>.W <name id>.W <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W }*
-void clif_item_refine_list( struct map_session_data *sd ){
+void clif_item_refine_list( map_session_data *sd ){
 	nullpo_retv( sd );
 
 	struct PACKET_ZC_NOTIFY_WEAPONITEMLIST *p = (struct PACKET_ZC_NOTIFY_WEAPONITEMLIST *)packet_buffer;
@@ -7225,7 +7225,7 @@ void clif_item_refine_list( struct map_session_data *sd ){
 
 /// Notification of an auto-casted skill (ZC_AUTORUN_SKILL).
 /// 0147 <skill id>.W <type>.L <level>.W <sp cost>.W <atk range>.W <skill name>.24B <upgradable>.B
-void clif_item_skill( struct map_session_data *sd, uint16 skill_id, uint16 skill_lv ){
+void clif_item_skill( map_session_data *sd, uint16 skill_id, uint16 skill_lv ){
 	nullpo_retv( sd );
 
 	struct PACKET_ZC_AUTORUN_SKILL p;
@@ -7247,7 +7247,7 @@ void clif_item_skill( struct map_session_data *sd, uint16 skill_id, uint16 skill
 /// 0124 <index>.W <amount>.L <name id>.W <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W (ZC_ADD_ITEM_TO_CART)
 /// 01c5 <index>.W <amount>.L <name id>.W <type>.B <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W (ZC_ADD_ITEM_TO_CART2)
 /// 0a0b <index>.W <amount>.L <name id>.W <type>.B <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W { <option id>.W <option value>.W <option param>.B }*5 (ZC_ADD_ITEM_TO_CART3)
-void clif_cart_additem( struct map_session_data *sd, int n, int amount ){
+void clif_cart_additem( map_session_data *sd, int n, int amount ){
 	nullpo_retv( sd );
 
 	int fd = sd->fd;
@@ -7290,7 +7290,7 @@ void clif_cart_additem( struct map_session_data *sd, int n, int amount ){
  * 0 = ADDITEM_TO_CART_FAIL_WEIGHT
  * 1 = ADDITEM_TO_CART_FAIL_COUNT
  */
-void clif_cart_additem_ack(struct map_session_data *sd, uint8 flag)
+void clif_cart_additem_ack(map_session_data *sd, uint8 flag)
 {
 	int fd;
 	unsigned char *buf;
@@ -7304,7 +7304,7 @@ void clif_cart_additem_ack(struct map_session_data *sd, uint8 flag)
 }
 
 // 09B7 <unknow data> (ZC_ACK_OPEN_BANKING)
-void clif_bank_open( struct map_session_data& sd ){
+void clif_bank_open( map_session_data& sd ){
 #if PACKETVER >= 20130717
 	struct PACKET_ZC_ACK_OPEN_BANKING p = {};
 
@@ -7319,7 +7319,7 @@ void clif_bank_open( struct map_session_data& sd ){
  * Request to Open the banking system
  * 09B6 <aid>L ??? (dunno just wild guess checkme)
  */
-void clif_parse_BankOpen(int fd, struct map_session_data* sd) {
+void clif_parse_BankOpen(int fd, map_session_data* sd) {
 	//TODO check if preventing trade or stuff like that
 	//also mark something in case char ain't available for saving, should we check now ?
 	nullpo_retv(sd);
@@ -7341,7 +7341,7 @@ void clif_parse_BankOpen(int fd, struct map_session_data* sd) {
 }
 
 // 09B9 <unknow data> (ZC_ACK_CLOSE_BANKING)
-void clif_bank_close( struct map_session_data& sd ){
+void clif_bank_close( map_session_data& sd ){
 #if PACKETVER >= 20130717
 	struct PACKET_ZC_ACK_CLOSE_BANKING p = {};
 
@@ -7356,7 +7356,7 @@ void clif_bank_close( struct map_session_data& sd ){
  * Request to close the banking system
  * 09B8 <aid>L ??? (dunno just wild guess checkme)
  */
-void clif_parse_BankClose(int fd, struct map_session_data* sd) {
+void clif_parse_BankClose(int fd, map_session_data* sd) {
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	int aid = RFIFOL(fd,info->pos[0]); //unused should we check vs fd ?
 
@@ -7375,7 +7375,7 @@ void clif_parse_BankClose(int fd, struct map_session_data* sd) {
  * Display how much we got in bank (I suppose)
  * 09A6 <Bank_Vault>Q <Reason>W (ZC_BANKING_CHECK)
  */
-void clif_Bank_Check( struct map_session_data& sd ){
+void clif_Bank_Check( map_session_data& sd ){
 #if PACKETVER >= 20130717
 	struct PACKET_ZC_BANKING_CHECK p = {};
 
@@ -7391,7 +7391,7 @@ void clif_Bank_Check( struct map_session_data& sd ){
  * Requesting the data in bank
  * 09AB <aid>L (PACKET_CZ_REQ_BANKING_CHECK)
  */
-void clif_parse_BankCheck(int fd, struct map_session_data* sd) {
+void clif_parse_BankCheck(int fd, map_session_data* sd) {
 	nullpo_retv(sd);
 
 	if( !battle_config.feature_banking ) {
@@ -7410,7 +7410,7 @@ void clif_parse_BankCheck(int fd, struct map_session_data* sd) {
  * Acknowledge of deposit some money in bank
   09A8 <Reason>W <Money>Q <balance>L (PACKET_ZC_ACK_BANKING_DEPOSIT)
  */
-void clif_bank_deposit( struct map_session_data& sd, enum e_BANKING_DEPOSIT_ACK reason ){
+void clif_bank_deposit( map_session_data& sd, enum e_BANKING_DEPOSIT_ACK reason ){
 #if PACKETVER >= 20130717
 	struct PACKET_ZC_ACK_BANKING_DEPOSIT p = {};
 
@@ -7428,7 +7428,7 @@ void clif_bank_deposit( struct map_session_data& sd, enum e_BANKING_DEPOSIT_ACK
  * @author : original [Yommy/Hercules]
  * 09A7 <AID>L <Money>L (PACKET_CZ_REQ_BANKING_DEPOSIT)
  */
-void clif_parse_BankDeposit(int fd, struct map_session_data* sd) {
+void clif_parse_BankDeposit(int fd, map_session_data* sd) {
 	nullpo_retv(sd);
 	if( !battle_config.feature_banking ) {
 		clif_messagecolor(&sd->bl,color_table[COLOR_RED],msg_txt(sd,1496),false,SELF); //Banking is disabled
@@ -7450,7 +7450,7 @@ void clif_parse_BankDeposit(int fd, struct map_session_data* sd) {
  * Acknowledge of withdrawing some money from bank
   09AA <Reason>W <Money>Q <balance>L (PACKET_ZC_ACK_BANKING_WITHDRAW)
  */
-void clif_bank_withdraw( struct map_session_data& sd, enum e_BANKING_WITHDRAW_ACK reason ){
+void clif_bank_withdraw( map_session_data& sd, enum e_BANKING_WITHDRAW_ACK reason ){
 #if PACKETVER >= 20130717
 	struct PACKET_ZC_ACK_BANKING_WITHDRAW p = {};
 
@@ -7467,7 +7467,7 @@ void clif_bank_withdraw( struct map_session_data& sd, enum e_BANKING_WITHDRAW_AC
  * Request Withdrawing some money from bank
  * 09A9 <AID>L <Money>L (PACKET_CZ_REQ_BANKING_WITHDRAW)
  */
-void clif_parse_BankWithdraw(int fd, struct map_session_data* sd) {
+void clif_parse_BankWithdraw(int fd, map_session_data* sd) {
         nullpo_retv(sd);
 	if( !battle_config.feature_banking ) {
 		clif_messagecolor(&sd->bl,color_table[COLOR_RED],msg_txt(sd,1496),false,SELF); //Banking is disabled
@@ -7486,7 +7486,7 @@ void clif_parse_BankWithdraw(int fd, struct map_session_data* sd) {
 
 /// Deletes an item from character's cart (ZC_DELETE_ITEM_FROM_CART).
 /// 0125 <index>.W <amount>.L
-void clif_cart_delitem(struct map_session_data *sd,int n,int amount)
+void clif_cart_delitem(map_session_data *sd,int n,int amount)
 {
 	int fd;
 
@@ -7506,7 +7506,7 @@ void clif_cart_delitem(struct map_session_data *sd,int n,int amount)
 /// 012d <num>.W
 /// num:
 ///     number of allowed item slots
-void clif_openvendingreq(struct map_session_data* sd, int num)
+void clif_openvendingreq(map_session_data* sd, int num)
 {
 	int fd;
 
@@ -7522,7 +7522,7 @@ void clif_openvendingreq(struct map_session_data* sd, int num)
 
 /// Displays a vending board to target/area (ZC_STORE_ENTRY).
 /// 0131 <owner id>.L <message>.80B
-void clif_showvendingboard( struct map_session_data& sd, enum send_target target, struct block_list* tbl ){
+void clif_showvendingboard( map_session_data& sd, enum send_target target, struct block_list* tbl ){
 	if( tbl == nullptr ){
 		tbl = &sd.bl;
 		target = AREA_WOS;
@@ -7561,7 +7561,7 @@ void clif_closevendingboard(struct block_list* bl, int fd)
 /// Sends a list of items in a shop.
 /// R 0133 <packet len>.W <owner id>.L { <price>.L <amount>.W <index>.W <type>.B <name id>.W <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W }* (ZC_PC_PURCHASE_ITEMLIST_FROMMC)
 /// R 0800 <packet len>.W <owner id>.L <unique id>.L { <price>.L <amount>.W <index>.W <type>.B <name id>.W <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W }* (ZC_PC_PURCHASE_ITEMLIST_FROMMC2)
-void clif_vendinglist( struct map_session_data* sd, struct map_session_data* vsd ){
+void clif_vendinglist( map_session_data* sd, map_session_data* vsd ){
 	nullpo_retv( sd );
 	nullpo_retv( vsd );
 	nullpo_retv( vsd->vending );
@@ -7624,7 +7624,7 @@ void clif_vendinglist( struct map_session_data* sd, struct map_session_data* vsd
 ///     5 = "cannot use an npc shop while in a trade"
 ///     6 = Because the store information was incorrect the item was not purchased.
 ///     7 = No sales information.
-void clif_buyvending(struct map_session_data* sd, int index, int amount, int fail)
+void clif_buyvending(map_session_data* sd, int index, int amount, int fail)
 {
 	int fd;
 
@@ -7644,7 +7644,7 @@ void clif_buyvending(struct map_session_data* sd, int index, int amount, int fai
 /// result:
 ///     0 = Successed
 ///     1 = Failed
-void clif_openvending_ack(struct map_session_data* sd, int result)
+void clif_openvending_ack(map_session_data* sd, int result)
 {
 	int fd;
 
@@ -7659,7 +7659,7 @@ void clif_openvending_ack(struct map_session_data* sd, int result)
 
 /// Shop creation success.
 /// 0136 <packet len>.W <owner id>.L { <price>.L <index>.W <amount>.W <type>.B <name id>.W <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W }* (ZC_PC_PURCHASE_MYITEMLIST)
-void clif_openvending( struct map_session_data* sd, int id, struct s_vending* vending ){
+void clif_openvending( map_session_data* sd, int id, struct s_vending* vending ){
 	nullpo_retv( sd );
 	nullpo_retv( vending );
 
@@ -7712,7 +7712,7 @@ void clif_openvending( struct map_session_data* sd, int id, struct s_vending* ve
 /// Inform merchant that someone has bought an item.
 /// 0137 <index>.W <amount>.W (ZC_DELETEITEM_FROM_MCSTORE).
 /// 09e5 <index>.W <amount>.W <GID>.L <Date>.L <zeny>.L (ZC_DELETEITEM_FROM_MCSTORE2).
-void clif_vendingreport(struct map_session_data* sd, int index, int amount, uint32 char_id, int zeny) {
+void clif_vendingreport(map_session_data* sd, int index, int amount, uint32 char_id, int zeny) {
 #if PACKETVER < 20141016		// TODO : not sure for client date [Napster]
 	const int cmd = 0x137;
 #else
@@ -7743,7 +7743,7 @@ void clif_vendingreport(struct map_session_data* sd, int index, int amount, uint
 ///     2 = MsgStringTable[79]="already in a party"
 ///     3 = cannot organize parties on this map
 ///     ? = nothing
-void clif_party_created( struct map_session_data& sd, int result ){
+void clif_party_created( map_session_data& sd, int result ){
 	struct PACKET_ZC_ACK_MAKE_GROUP p = {};
 
 	p.PacketType = HEADER_ZC_ACK_MAKE_GROUP;
@@ -7763,7 +7763,7 @@ void clif_party_created( struct map_session_data& sd, int result ){
 /// state:
 ///     0 = connected
 ///     1 = disconnected
-void clif_party_member_info( struct party_data& party, struct map_session_data& sd ){
+void clif_party_member_info( struct party_data& party, map_session_data& sd ){
 	int id = party_getmemberid( &party, &sd );
 
 	if( id < 0 ){
@@ -7804,7 +7804,7 @@ void clif_party_member_info( struct party_data& party, struct map_session_data&
 ///     0 = connected
 ///     1 = disconnected
 /// 0a44 <packet len>.W <party name>.24B { <account id>.L <nick>.24B <map name>.16B <role>.B <state>.B <class>.W <base level>.W }* <item pickup rule>.B <item share rule>.B <unknown>.L
-void clif_party_info( struct party_data& party, struct map_session_data* sd ){
+void clif_party_info( struct party_data& party, map_session_data* sd ){
 	send_target target;
 
 	if( sd == nullptr ){
@@ -7863,7 +7863,7 @@ void clif_party_info( struct party_data& party, struct map_session_data* sd ){
 /// flag:
 ///     0 = allow party invites
 ///     1 = auto-deny party invites
-void clif_partyinvitationstate( struct map_session_data& sd ){
+void clif_partyinvitationstate( map_session_data& sd ){
 #if PACKETVER_MAIN_NUM >= 20070911 || defined(PACKETVER_RE) || PACKETVER_AD_NUM >= 20070911 || PACKETVER_SAK_NUM >= 20070904 || defined(PACKETVER_ZERO)
 	struct PACKET_ZC_PARTY_CONFIG p = {};
 
@@ -7878,7 +7878,7 @@ void clif_partyinvitationstate( struct map_session_data& sd ){
 /// Party invitation request.
 /// 00fe <party id>.L <party name>.24B (ZC_REQ_JOIN_GROUP)
 /// 02c6 <party id>.L <party name>.24B (ZC_PARTY_JOIN_REQ)
-void clif_party_invite( struct map_session_data& sd, struct map_session_data& tsd ){
+void clif_party_invite( map_session_data& sd, map_session_data& tsd ){
 	struct party_data* party = party_search( sd.status.party_id );
 
 	if( party == nullptr ){
@@ -7909,7 +7909,7 @@ void clif_party_invite( struct map_session_data& sd, struct map_session_data& ts
 /// result=9  : Cannot join a party in this map. -> MsgStringTable[1871] (since 20110215)
 /// result=10 : You cannot invite or withdraw while in memorial dungeon -> message: MSG_ID_BD3 (since 20161130)
 /// result=11 : The character is a level that can not join the party -> message: MSG_ID_C9A (since 20170412)
-void clif_party_invite_reply( struct map_session_data& sd, const char* nick, enum e_party_invite_reply reply ){
+void clif_party_invite_reply( map_session_data& sd, const char* nick, enum e_party_invite_reply reply ){
 #if PACKETVER < 20070904
 	if( reply == PARTY_REPLY_OFFLINE ){
 		clif_displaymessage( sd.fd, msg_txt( &sd, 3 ) ); // Character not found.
@@ -7938,7 +7938,7 @@ void clif_party_invite_reply( struct map_session_data& sd, const char* nick, enu
 /// flag:
 ///     0 = send to party
 ///     1 = send to sd
-void clif_party_option(struct party_data *p,struct map_session_data *sd,int flag)
+void clif_party_option(struct party_data *p,map_session_data *sd,int flag)
 {
 	unsigned char buf[16];
 #if PACKETVER < 20090603
@@ -7976,7 +7976,7 @@ void clif_party_option(struct party_data *p,struct map_session_data *sd,int flag
  * @param result Party leave result @see PARTY_MEMBER_WITHDRAW
  * @param target Send target
  **/
-void clif_party_withdraw( struct map_session_data& sd, uint32 account_id, const char* name, enum e_party_member_withdraw result, enum send_target target ){
+void clif_party_withdraw( map_session_data& sd, uint32 account_id, const char* name, enum e_party_member_withdraw result, enum send_target target ){
 	struct PACKET_ZC_DELETE_MEMBER_FROM_GROUP p = {};
 
 	p.PacketType = HEADER_ZC_DELETE_MEMBER_FROM_GROUP;
@@ -7991,7 +7991,7 @@ void clif_party_withdraw( struct map_session_data& sd, uint32 account_id, const
 /// Party chat message (ZC_NOTIFY_CHAT_PARTY).
 /// 0109 <packet len>.W <account id>.L <message>.?B
 void clif_party_message( struct party_data& party, uint32 account_id, const char* mes, int len ){
-	struct map_session_data* sd = party_getavailablesd( &party );
+	map_session_data* sd = party_getavailablesd( &party );
 
 	if( sd == nullptr ){
 		return;
@@ -8015,7 +8015,7 @@ void clif_party_message( struct party_data& party, uint32 account_id, const char
 
 /// Updates the position of a party member on the minimap (ZC_NOTIFY_POSITION_TO_GROUPM).
 /// 0107 <account id>.L <x>.W <y>.W
-void clif_party_xy( struct map_session_data& sd ){
+void clif_party_xy( map_session_data& sd ){
 	struct PACKET_ZC_NOTIFY_POSITION_TO_GROUPM p = {};
 
 	p.PacketType = HEADER_ZC_NOTIFY_POSITION_TO_GROUPM;
@@ -8029,7 +8029,7 @@ void clif_party_xy( struct map_session_data& sd ){
 /*==========================================
  * Sends x/y dot to a single fd. [Skotlex]
  *------------------------------------------*/
-void clif_party_xy_single( struct map_session_data& sd, struct map_session_data& tsd ){
+void clif_party_xy_single( map_session_data& sd, map_session_data& tsd ){
 	struct PACKET_ZC_NOTIFY_POSITION_TO_GROUPM p = {};
 
 	p.PacketType = HEADER_ZC_NOTIFY_POSITION_TO_GROUPM;
@@ -8043,7 +8043,7 @@ void clif_party_xy_single( struct map_session_data& sd, struct map_session_data&
 /// Updates HP bar of a party member.
 /// 0106 <account id>.L <hp>.W <max hp>.W (ZC_NOTIFY_HP_TO_GROUPM)
 /// 080e <account id>.L <hp>.L <max hp>.L (ZC_NOTIFY_HP_TO_GROUPM_R2)
-void clif_party_hp( struct map_session_data& sd ){
+void clif_party_hp( map_session_data& sd ){
 	struct PACKET_ZC_NOTIFY_HP_TO_GROUPM p = {};
 
 	p.PacketType = HEADER_ZC_NOTIFY_HP_TO_GROUPM;
@@ -8067,7 +8067,7 @@ void clif_party_hp( struct map_session_data& sd ){
 
 /// Notifies the party members of a character's death or revival.
 /// 0AB2 <GID>.L <dead>.B
-void clif_party_dead( struct map_session_data& sd ){
+void clif_party_dead( map_session_data& sd ){
 #if PACKETVER_MAIN_NUM >= 20170524 || PACKETVER_RE_NUM >= 20170502 || defined(PACKETVER_ZERO)
 	struct PACKET_ZC_GROUP_ISALIVE p = {};
 
@@ -8081,7 +8081,7 @@ void clif_party_dead( struct map_session_data& sd ){
 
 /// Updates the job and level of a party member
 /// 0abd <account id>.L <job>.W <level>.W
-void clif_party_job_and_level( struct map_session_data& sd ){
+void clif_party_job_and_level( map_session_data& sd ){
 #if PACKETVER_MAIN_NUM >= 20170502 || PACKETVER_RE_NUM >= 20170419 || defined(PACKETVER_ZERO)
 	struct PACKET_ZC_NOTIFY_MEMBERINFO_TO_GROUPM p = {};
 
@@ -8097,7 +8097,7 @@ void clif_party_job_and_level( struct map_session_data& sd ){
 /*==========================================
  * Sends HP bar to a single fd. [Skotlex]
  *------------------------------------------*/
-void clif_hpmeter_single( struct map_session_data& sd, uint32 id, uint32 hp, uint32 maxhp ){
+void clif_hpmeter_single( map_session_data& sd, uint32 id, uint32 hp, uint32 maxhp ){
 	struct PACKET_ZC_NOTIFY_HP_TO_GROUPM p = {};
 
 	p.PacketType = HEADER_ZC_NOTIFY_HP_TO_GROUPM;
@@ -8121,7 +8121,7 @@ void clif_hpmeter_single( struct map_session_data& sd, uint32 id, uint32 hp, uin
 
 /// Notifies the client, that it's attack target is too far (ZC_ATTACK_FAILURE_FOR_DISTANCE).
 /// 0139 <target id>.L <target x>.W <target y>.W <x>.W <y>.W <atk range>.W
-void clif_movetoattack(struct map_session_data *sd,struct block_list *bl)
+void clif_movetoattack(map_session_data *sd,struct block_list *bl)
 {
 	int fd;
 
@@ -8148,7 +8148,7 @@ void clif_movetoattack(struct map_session_data *sd,struct block_list *bl)
 ///     1 = failure
 ///     2 = success (alchemist)
 ///     3 = failure (alchemist)
-void clif_produceeffect(struct map_session_data* sd,int flag, t_itemid nameid){
+void clif_produceeffect(map_session_data* sd,int flag, t_itemid nameid){
 	nullpo_retv( sd );
 
 	clif_solved_charname( sd->fd, sd->status.char_id, sd->status.name );
@@ -8165,7 +8165,7 @@ void clif_produceeffect(struct map_session_data* sd,int flag, t_itemid nameid){
 
 /// Initiates the pet taming process (ZC_START_CAPTURE).
 /// 019e
-void clif_catch_process(struct map_session_data *sd)
+void clif_catch_process(map_session_data *sd)
 {
 	int fd;
 
@@ -8182,7 +8182,7 @@ void clif_catch_process(struct map_session_data *sd)
 /// 01a0 <result>.B
 ///     0 = failure
 ///     1 = success
-void clif_pet_roulette(struct map_session_data *sd,int data)
+void clif_pet_roulette(map_session_data *sd,int data)
 {
 	int fd;
 
@@ -8198,7 +8198,7 @@ void clif_pet_roulette(struct map_session_data *sd,int data)
 
 /// Presents a list of pet eggs that can be hatched (ZC_PETEGG_LIST).
 /// 01a6 <packet len>.W { <index>.W }*
-void clif_sendegg(struct map_session_data *sd)
+void clif_sendegg(map_session_data *sd)
 {
 	int i,n=0,fd;
 
@@ -8239,7 +8239,7 @@ void clif_sendegg(struct map_session_data *sd)
 ///     6 = close egg selection ui and update egg in inventory (PACKETVER >= 20180704)
 ///
 /// If sd is null, the update is sent to nearby objects, otherwise it is sent only to that player.
-void clif_send_petdata(struct map_session_data* sd, struct pet_data* pd, int type, int param)
+void clif_send_petdata(map_session_data* sd, struct pet_data* pd, int type, int param)
 {
 	uint8 buf[16];
 	nullpo_retv(pd);
@@ -8257,7 +8257,7 @@ void clif_send_petdata(struct map_session_data* sd, struct pet_data* pd, int typ
 
 /// Pet's base data (ZC_PROPERTY_PET).
 /// 01a2 <name>.24B <renamed>.B <level>.W <hunger>.W <intimacy>.W <accessory id>.W <class>.W
-void clif_send_petstatus(struct map_session_data *sd)
+void clif_send_petstatus(map_session_data *sd)
 {
 	int fd;
 	struct s_pet *pet;
@@ -8307,7 +8307,7 @@ void clif_pet_emotion(struct pet_data *pd,int param)
 /// result:
 ///     0 = failure
 ///     1 = success
-void clif_pet_food( struct map_session_data *sd, int foodid,int fail ){
+void clif_pet_food( map_session_data *sd, int foodid,int fail ){
 	nullpo_retv( sd );
 
 	struct PACKET_ZC_FEED_PET p;
@@ -8320,7 +8320,7 @@ void clif_pet_food( struct map_session_data *sd, int foodid,int fail ){
 }
 
 /// Send pet auto feed info.
-void clif_pet_autofeed_status(struct map_session_data* sd, bool force) {
+void clif_pet_autofeed_status(map_session_data* sd, bool force) {
 #if PACKETVER >= 20141008
 	nullpo_retv(sd);
 
@@ -8344,7 +8344,7 @@ void clif_pet_autofeed_status(struct map_session_data* sd, bool force) {
 
 /// Presents a list of skills that can be auto-spelled (ZC_AUTOSPELLLIST).
 /// 01cd { <skill id>.L }*7
-void clif_autospell(struct map_session_data *sd,uint16 skill_lv)
+void clif_autospell(map_session_data *sd,uint16 skill_lv)
 {
 	nullpo_retv(sd);
 
@@ -8416,7 +8416,7 @@ void clif_autospell(struct map_session_data *sd,uint16 skill_lv)
 
 /// Devotion's visual effect (ZC_DEVOTIONLIST).
 /// 01cf <devoter id>.L { <devotee id>.L }*5 <max distance>.W
-void clif_devotion(struct block_list *src, struct map_session_data *tsd)
+void clif_devotion(struct block_list *src, map_session_data *tsd)
 {
 	unsigned char buf[56];
 
@@ -8436,7 +8436,7 @@ void clif_devotion(struct block_list *src, struct map_session_data *tsd)
 	else
 	{
 		int i;
-		struct map_session_data *sd = BL_CAST(BL_PC,src);
+		map_session_data *sd = BL_CAST(BL_PC,src);
 		if( sd == NULL )
 			return;
 
@@ -8464,7 +8464,7 @@ void clif_spiritball( struct block_list *bl, struct block_list* target, enum sen
 
 	switch( bl->type ){
 		case BL_PC:
-			p.num = ( (struct map_session_data*)bl )->spiritball;
+			p.num = ( (map_session_data*)bl )->spiritball;
 			break;
 		case BL_HOM:
 			p.num = ( (struct homun_data*)bl )->homunculus.spiritball;
@@ -8511,7 +8511,7 @@ void clif_bladestop(struct block_list *src, int dst_id, int active)
 
 /// MVP effect (ZC_MVP).
 /// 010c <account id>.L
-void clif_mvp_effect(struct map_session_data *sd)
+void clif_mvp_effect(map_session_data *sd)
 {
 	unsigned char buf[16];
 
@@ -8525,7 +8525,7 @@ void clif_mvp_effect(struct map_session_data *sd)
 
 /// MVP item reward message (ZC_MVP_GETTING_ITEM).
 /// 010a <name id>.W
-void clif_mvp_item( struct map_session_data *sd, t_itemid nameid ){
+void clif_mvp_item( map_session_data *sd, t_itemid nameid ){
 	struct PACKET_ZC_MVP_GETTING_ITEM p;
 
 	p.packetType = HEADER_ZC_MVP_GETTING_ITEM;
@@ -8537,7 +8537,7 @@ void clif_mvp_item( struct map_session_data *sd, t_itemid nameid ){
 
 /// MVP EXP reward message (ZC_MVP_GETTING_SPECIAL_EXP).
 /// 010b <exp>.L
-void clif_mvp_exp(struct map_session_data *sd, t_exp exp) {
+void clif_mvp_exp(map_session_data *sd, t_exp exp) {
 #if PACKETVER >= 20131223		// Kro remove this packet [Napster]
 	if (battle_config.mvp_exp_reward_message) {
 		char e_msg[CHAT_SIZE_MAX];
@@ -8563,7 +8563,7 @@ void clif_mvp_exp(struct map_session_data *sd, t_exp exp) {
 ///
 /// "You are the MVP, but cannot obtain the reward because
 ///     you are overweight."
-void clif_mvp_noitem(struct map_session_data* sd)
+void clif_mvp_noitem(map_session_data* sd)
 {
 	int fd = sd->fd;
 
@@ -8580,7 +8580,7 @@ void clif_mvp_noitem(struct map_session_data* sd)
 ///     1 = "You are already in a Guild."
 ///     2 = "That Guild Name already exists."
 ///     3 = "You need the neccessary item to create a Guild."
-void clif_guild_created(struct map_session_data *sd,int flag)
+void clif_guild_created(map_session_data *sd,int flag)
 {
 	int fd;
 
@@ -8599,7 +8599,7 @@ void clif_guild_created(struct map_session_data *sd,int flag)
 /// mode:
 ///     &0x01 = allow invite
 ///     &0x10 = allow expel
-void clif_guild_belonginfo( struct map_session_data& sd ){
+void clif_guild_belonginfo( map_session_data& sd ){
 	if( sd.guild == nullptr ){
 		return;
 	}
@@ -8637,7 +8637,7 @@ void clif_guild_belonginfo( struct map_session_data& sd ){
 void clif_guild_memberlogin_notice(struct guild *g,int idx,int flag)
 {
 	unsigned char buf[64];
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	nullpo_retv(g);
 
@@ -8671,7 +8671,7 @@ void clif_guild_memberlogin_notice(struct guild *g,int idx,int flag)
 // At next time the client would always show the message.
 // The function sends all the statuses in the single packet
 // to economize traffic. [LuzZza]
-void clif_guild_send_onlineinfo(struct map_session_data *sd)
+void clif_guild_send_onlineinfo(map_session_data *sd)
 {
 	struct guild *g;
 	unsigned char buf[14*128];
@@ -8711,7 +8711,7 @@ void clif_guild_send_onlineinfo(struct map_session_data *sd)
 ///     &0x10 = Expulsion list
 ///     &0x40 = Unknown (GMENUFLAG_ALLGUILDLIST)
 ///     &0x80 = Notice
-void clif_guild_masterormember(struct map_session_data *sd)
+void clif_guild_masterormember(map_session_data *sd)
 {
 	int fd;
 
@@ -8729,7 +8729,7 @@ void clif_guild_masterormember(struct map_session_data *sd)
 /// 0150 <guild id>.L <level>.L <member num>.L <member max>.L <exp>.L <max exp>.L <points>.L <honor>.L <virtue>.L <emblem id>.L <name>.24B <master name>.24B <manage land>.16B (ZC_GUILD_INFO)
 /// 01b6 <guild id>.L <level>.L <member num>.L <member max>.L <exp>.L <max exp>.L <points>.L <honor>.L <virtue>.L <emblem id>.L <name>.24B <master name>.24B <manage land>.16B <zeny>.L (ZC_GUILD_INFO2)
 /// 0a84 <guild id>.L <level>.L <member num>.L <member max>.L <exp>.L <max exp>.L <points>.L <honor>.L <virtue>.L <emblem id>.L <name>.24B <manage land>.16B <zeny>.L <master char id>.L (ZC_GUILD_INFO3)
-void clif_guild_basicinfo( struct map_session_data& sd ){
+void clif_guild_basicinfo( map_session_data& sd ){
 	if( sd.guild == nullptr ){
 		return;
 	}
@@ -8767,7 +8767,7 @@ void clif_guild_basicinfo( struct map_session_data& sd ){
 
 /// Guild alliance and opposition list (ZC_MYGUILD_BASIC_INFO).
 /// 014c <packet len>.W { <relation>.L <guild id>.L <guild name>.24B }*
-void clif_guild_allianceinfo(struct map_session_data *sd)
+void clif_guild_allianceinfo(map_session_data *sd)
 {
 	int fd,i,c;
 	struct guild *g;
@@ -8801,7 +8801,7 @@ void clif_guild_allianceinfo(struct map_session_data *sd)
 /// memo:
 ///     probably member's self-introduction (unused, no client UI/packets for editing it)
 /// 0aa5 <packet len>.W { <account>.L <char id>.L <hair style>.W <hair color>.W <gender>.W <class>.W <level>.W <contrib exp>.L <state>.L <position>.L <lastlogin>.L }* (ZC_MEMBERMGR_INFO2)
-void clif_guild_memberlist( struct map_session_data& sd ){
+void clif_guild_memberlist( map_session_data& sd ){
 	if( sd.guild == nullptr ){
 		return;
 	}
@@ -8851,7 +8851,7 @@ void clif_guild_memberlist( struct map_session_data& sd ){
 
 /// Guild position name information (ZC_POSITION_ID_NAME_INFO).
 /// 0166 <packet len>.W { <position id>.L <position name>.24B }*
-void clif_guild_positionnamelist(struct map_session_data *sd)
+void clif_guild_positionnamelist(map_session_data *sd)
 {
 	int i,fd;
 	struct guild *g;
@@ -8879,7 +8879,7 @@ void clif_guild_positionnamelist(struct map_session_data *sd)
 ///     &0x10 = allow expel
 /// ranking:
 ///     TODO
-void clif_guild_positioninfolist(struct map_session_data *sd)
+void clif_guild_positioninfolist(map_session_data *sd)
 {
 	int i,fd;
 	struct guild *g;
@@ -8915,7 +8915,7 @@ void clif_guild_positionchanged(struct guild *g,int idx)
 	// FIXME: This packet is intended to update the clients after a
 	// commit of position info changes, not sending one packet per
 	// position.
-	struct map_session_data *sd;
+	map_session_data *sd;
 	unsigned char buf[128];
 
 	nullpo_retv(g);
@@ -8941,7 +8941,7 @@ void clif_guild_memberpositionchanged(struct guild *g,int idx)
 	// FIXME: This packet is intended to update the clients after a
 	// commit of member position assignment changes, not sending one
 	// packet per position.
-	struct map_session_data *sd;
+	map_session_data *sd;
 	unsigned char buf[64];
 
 	nullpo_retv(g);
@@ -8960,7 +8960,7 @@ void clif_guild_memberpositionchanged(struct guild *g,int idx)
 
 /// Sends emblems bitmap data to the client that requested it (ZC_GUILD_EMBLEM_IMG).
 /// 0152 <packet len>.W <guild id>.L <emblem id>.L <emblem data>.?B
-void clif_guild_emblem(struct map_session_data *sd,struct guild *g)
+void clif_guild_emblem(map_session_data *sd,struct guild *g)
 {
 	int fd;
 	nullpo_retv(sd);
@@ -9005,7 +9005,7 @@ void clif_guild_emblem_area(struct block_list* bl)
 
 /// Sends guild skills (ZC_GUILD_SKILLINFO).
 /// 0162 <packet len>.W <skill points>.W { <skill id>.W <type>.L <level>.W <sp cost>.W <atk range>.W <skill name>.24B <upgradable>.B }*
-void clif_guild_skillinfo(struct map_session_data* sd)
+void clif_guild_skillinfo(map_session_data* sd)
 {
 	int fd;
 	struct guild* g;
@@ -9042,7 +9042,7 @@ void clif_guild_skillinfo(struct map_session_data* sd)
 
 /// Sends guild notice to client (ZC_GUILD_NOTICE).
 /// 016f <subject>.60B <notice>.120B
-void clif_guild_notice(struct map_session_data* sd)
+void clif_guild_notice(map_session_data* sd)
 {
 	struct guild* g;
 
@@ -9067,7 +9067,7 @@ void clif_guild_notice(struct map_session_data* sd)
 
 /// Guild invite (ZC_REQ_JOIN_GUILD).
 /// 016a <guild id>.L <guild name>.24B
-void clif_guild_invite(struct map_session_data *sd,struct guild *g)
+void clif_guild_invite(map_session_data *sd,struct guild *g)
 {
 	int fd;
 
@@ -9090,7 +9090,7 @@ void clif_guild_invite(struct map_session_data *sd,struct guild *g)
 ///     1 = Offer rejected.
 ///     2 = Offer accepted.
 ///     3 = Guild full.
-void clif_guild_inviteack(struct map_session_data *sd,int flag)
+void clif_guild_inviteack(map_session_data *sd,int flag)
 {
 	int fd;
 
@@ -9106,7 +9106,7 @@ void clif_guild_inviteack(struct map_session_data *sd,int flag)
 
 /// Notifies clients of a guild of a leaving member (ZC_ACK_LEAVE_GUILD).
 /// 015a <char name>.24B <reason>.40B
-void clif_guild_leave(struct map_session_data *sd,const char *name,const char *mes)
+void clif_guild_leave(map_session_data *sd,const char *name,const char *mes)
 {
 	unsigned char buf[128];
 
@@ -9122,7 +9122,7 @@ void clif_guild_leave(struct map_session_data *sd,const char *name,const char *m
 /// Notifies clients of a guild of an expelled member.
 /// 015c <char name>.24B <reason>.40B <account name>.24B (ZC_ACK_BAN_GUILD)
 /// 0839 <char name>.24B <reason>.40B (ZC_ACK_BAN_GUILD_SSO)
-void clif_guild_expulsion(struct map_session_data* sd, const char* name, const char* mes, uint32 account_id)
+void clif_guild_expulsion(map_session_data* sd, const char* name, const char* mes, uint32 account_id)
 {
 	unsigned char buf[128];
 #if PACKETVER < 20100803
@@ -9146,7 +9146,7 @@ void clif_guild_expulsion(struct map_session_data* sd, const char* name, const c
 /// Guild expulsion list (ZC_BAN_LIST).
 /// 0163 <packet len>.W { <char name>.24B <account name>.24B <reason>.40B }*
 /// 0163 <packet len>.W { <char name>.24B <reason>.40B }* (PACKETVER >= 20100803)
-void clif_guild_expulsionlist(struct map_session_data* sd)
+void clif_guild_expulsionlist(map_session_data* sd)
 {
 #if PACKETVER < 20100803
 	const int offset = NAME_LENGTH*2+40;
@@ -9191,7 +9191,7 @@ void clif_guild_expulsionlist(struct map_session_data* sd)
 /// 017f <packet len>.W <message>.?B
 void clif_guild_message(struct guild *g,uint32 account_id,const char *mes,int len)
 {// TODO: account_id is not used, candidate for deletion? [Ai4rei]
-	struct map_session_data *sd;
+	map_session_data *sd;
 	uint8 buf[256];
 
 	if( len == 0 )
@@ -9214,7 +9214,7 @@ void clif_guild_message(struct guild *g,uint32 account_id,const char *mes,int le
 
 /// Request for guild alliance (ZC_REQ_ALLY_GUILD).
 /// 0171 <inviter account id>.L <guild name>.24B
-void clif_guild_reqalliance(struct map_session_data *sd,uint32 account_id,const char *name)
+void clif_guild_reqalliance(map_session_data *sd,uint32 account_id,const char *name)
 {
 	int fd;
 
@@ -9238,7 +9238,7 @@ void clif_guild_reqalliance(struct map_session_data *sd,uint32 account_id,const
 ///     3 = They have too any alliances.
 ///     4 = You have too many alliances.
 ///     5 = Alliances are disabled.
-void clif_guild_allianceack(struct map_session_data *sd,int flag)
+void clif_guild_allianceack(map_session_data *sd,int flag)
 {
 	int fd;
 
@@ -9257,7 +9257,7 @@ void clif_guild_allianceack(struct map_session_data *sd,int flag)
 /// relation:
 ///     0 = Ally
 ///     1 = Enemy
-void clif_guild_delalliance(struct map_session_data *sd,int guild_id,int flag)
+void clif_guild_delalliance(map_session_data *sd,int guild_id,int flag)
 {
 	nullpo_retv(sd);
 
@@ -9281,7 +9281,7 @@ void clif_guild_delalliance(struct map_session_data *sd,int guild_id,int flag)
 ///     1 = Guild has too many Antagonists.
 ///     2 = Already set as an Antagonist.
 ///     3 = Antagonists are disabled.
-void clif_guild_oppositionack(struct map_session_data *sd,int flag)
+void clif_guild_oppositionack(map_session_data *sd,int flag)
 {
 	int fd;
 
@@ -9315,7 +9315,7 @@ void clif_guild_allianceadded(struct guild *g,int idx)
 ///     0 = success
 ///     1 = invalid key (guild name, @see clif_parse_GuildBreak)
 ///     2 = there are still members in the guild
-void clif_guild_broken(struct map_session_data *sd,int flag)
+void clif_guild_broken(map_session_data *sd,int flag)
 {
 	int fd;
 
@@ -9378,14 +9378,14 @@ void clif_wedding_effect(struct block_list *bl)
 
 /// Notifies the client of the name of the partner character (ZC_COUPLENAME).
 /// 01e6 <partner name>.24B
-void clif_callpartner(struct map_session_data& sd)
+void clif_callpartner(map_session_data& sd)
 {
 	PACKET_ZC_COUPLENAME p = { 0 };
 
 	p.packetType = HEADER_ZC_COUPLENAME;
 
 	if( sd.status.partner_id ) {
-		struct map_session_data *p_sd = pc_get_partner(&sd);
+		map_session_data *p_sd = pc_get_partner(&sd);
 		if (p_sd != nullptr && !p_sd->state.autotrade)
 			safestrncpy(p.name, p_sd->status.name, NAME_LENGTH);
 		else
@@ -9402,7 +9402,7 @@ void clif_callpartner(struct map_session_data& sd)
 /// 01e4
 /// This packet while still implemented by the client is no longer being officially used.
 /*
-void clif_marriage_process(struct map_session_data *sd)
+void clif_marriage_process(map_session_data *sd)
 {
 	int fd;
 	nullpo_retv(sd);
@@ -9417,7 +9417,7 @@ void clif_marriage_process(struct map_session_data *sd)
 
 /// Notice of divorce (ZC_DIVORCE).
 /// 0205 <partner name>.24B
-void clif_divorced(struct map_session_data* sd, const char* name)
+void clif_divorced(map_session_data* sd, const char* name)
 {
 	int fd;
 	nullpo_retv(sd);
@@ -9434,7 +9434,7 @@ void clif_divorced(struct map_session_data* sd, const char* name)
 /// 01e2 <account id>.L <char id>.L <char name>.24B
 /// This packet while still implemented by the client is no longer being officially used.
 /*
-void clif_marriage_proposal(int fd, struct map_session_data *sd, struct map_session_data* ssd)
+void clif_marriage_proposal(int fd, map_session_data *sd, map_session_data* ssd)
 {
 	nullpo_retv(sd);
 
@@ -9475,7 +9475,7 @@ void clif_disp_message(struct block_list* src, const char* mes, int len, enum se
 /// result:
 ///     0 = failure
 ///     1 = success
-void clif_GM_kickack(struct map_session_data *sd, int id)
+void clif_GM_kickack(map_session_data *sd, int id)
 {
 	int fd;
 
@@ -9489,7 +9489,7 @@ void clif_GM_kickack(struct map_session_data *sd, int id)
 }
 
 
-void clif_GM_kick(struct map_session_data *sd, struct map_session_data *tsd)
+void clif_GM_kick(map_session_data *sd, map_session_data *tsd)
 {
 	nullpo_retv(tsd);
 
@@ -9515,7 +9515,7 @@ void clif_GM_kick(struct map_session_data *sd, struct map_session_data *tsd)
 ///     3 = "Chat Block has been applied by GM due to your ill-mannerous action."
 ///     4 = "Automated Chat Block has been applied due to Anti-Spam System."
 ///     5 = "You got a good point from %s."
-void clif_manner_message(struct map_session_data* sd, uint32 type)
+void clif_manner_message(map_session_data* sd, uint32 type)
 {
 	int fd;
 	nullpo_retv(sd);
@@ -9533,7 +9533,7 @@ void clif_manner_message(struct map_session_data* sd, uint32 type)
 /// type:
 ///     0 = positive (unmute)
 ///     1 = negative (mute)
-void clif_GM_silence(struct map_session_data* sd, struct map_session_data* tsd, uint8 type)
+void clif_GM_silence(map_session_data* sd, map_session_data* tsd, uint8 type)
 {
 	int fd;
 	nullpo_retv(sd);
@@ -9557,7 +9557,7 @@ void clif_GM_silence(struct map_session_data* sd, struct map_session_data* tsd,
 ///     0 = success
 ///     1 = failure
 ///     2 = too many blocks
-void clif_wisexin(struct map_session_data *sd,int type,int flag)
+void clif_wisexin(map_session_data *sd,int type,int flag)
 {
 	int fd;
 
@@ -9579,7 +9579,7 @@ void clif_wisexin(struct map_session_data *sd,int type,int flag)
 /// result:
 ///     0 = success
 ///     1 = failure
-void clif_wisall(struct map_session_data *sd,int type,int flag)
+void clif_wisall(map_session_data *sd,int type,int flag)
 {
 	int fd;
 
@@ -9595,7 +9595,7 @@ void clif_wisall(struct map_session_data *sd,int type,int flag)
 
 /// Play a BGM! [Rikter/Yommy] (ZC_PLAY_NPC_BGM).
 /// 07fe <bgm>.24B
-void clif_playBGM( struct map_session_data& sd, const char* name ){
+void clif_playBGM( map_session_data& sd, const char* name ){
 #if PACKETVER_MAIN_NUM >= 20220504
 	struct PACKET_ZC_PLAY_NPC_BGM* p = (struct PACKET_ZC_PLAY_NPC_BGM*)packet_buffer;
 	int16 length = (int16)( strlen( name ) + 1 );
@@ -9723,7 +9723,7 @@ void clif_specialeffect_remove(struct block_list* bl_src, int effect, enum send_
 
 /// Monster/NPC color chat [SnakeDrak] (ZC_NPC_CHAT).
 /// 02c1 <packet len>.W <id>.L <color>.L <message>.?B
-void clif_messagecolor_target(struct block_list *bl, unsigned long color, const char *msg, bool rgb2bgr, enum send_target type, struct map_session_data *sd) {
+void clif_messagecolor_target(struct block_list *bl, unsigned long color, const char *msg, bool rgb2bgr, enum send_target type, map_session_data *sd) {
 	unsigned short msg_len = (unsigned short)(strlen(msg) + 1);
 	uint8 buf[CHAT_SIZE_MAX];
 
@@ -9752,7 +9752,7 @@ void clif_messagecolor_target(struct block_list *bl, unsigned long color, const
  * Should only be used in cases where the client closed the 
  * storage window without server's consent
  */
-void clif_refresh_storagewindow(struct map_session_data *sd) {
+void clif_refresh_storagewindow(map_session_data *sd) {
 	// Notify the client that the storage is open
 	if( sd->state.storage_flag == 1 ) {
 		storage_sortitem(sd->storage.u.items_storage, ARRAYLENGTH(sd->storage.u.items_storage));
@@ -9781,7 +9781,7 @@ void clif_refresh_storagewindow(struct map_session_data *sd) {
 }
 
 // refresh the client's screen, getting rid of any effects
-void clif_refresh(struct map_session_data *sd)
+void clif_refresh(map_session_data *sd)
 {
 	nullpo_retv(sd);
 
@@ -10100,7 +10100,7 @@ void clif_disp_overhead_(struct block_list *bl, const char* mes, enum send_targe
  * Minimap fix [Kevin]
  * Remove dot from minimap
  *--------------------------*/
-void clif_party_xy_remove(struct map_session_data* sd)
+void clif_party_xy_remove(map_session_data* sd)
 {
 	nullpo_retv(sd);
 
@@ -10129,7 +10129,7 @@ void clif_party_xy_remove(struct map_session_data* sd)
 ///     0x20 = HIT/Flee +50 (PA_GOSPEL)
 ///     0x28 = Full strip failed because of coating (ST_FULLSTRIP)
 ///     ? = nothing
-void clif_gospel_info(struct map_session_data *sd, int type)
+void clif_gospel_info(map_session_data *sd, int type)
 {
 	int fd=sd->fd;
 	WFIFOHEAD(fd,packet_len(0x215));
@@ -10168,7 +10168,7 @@ void clif_gospel_info(struct map_session_data *sd, int type)
 ///      22 = [Collector Rank] Target Item : <monster_id used as item id>
 ///      30 = [Sun, Moon and Stars Angel] Designed places and monsters have been reset.
 ///      40 = Target HP : <monster_id used as HP>
-void clif_starskill(struct map_session_data* sd, const char* mapname, int monster_id, unsigned char star, unsigned char result)
+void clif_starskill(map_session_data* sd, const char* mapname, int monster_id, unsigned char star, unsigned char result)
 {
 	int fd = sd->fd;
 
@@ -10185,7 +10185,7 @@ void clif_starskill(struct map_session_data* sd, const char* mapname, int monste
  * Info about Star Glaldiator save map [Komurka]
  * type: 1: Information, 0: Map registered
  *------------------------------------------*/
-void clif_feel_info(struct map_session_data* sd, unsigned char feel_level, unsigned char type)
+void clif_feel_info(map_session_data* sd, unsigned char feel_level, unsigned char type)
 {
 	char mapname[MAP_NAME_LENGTH_EXT];
 
@@ -10197,7 +10197,7 @@ void clif_feel_info(struct map_session_data* sd, unsigned char feel_level, unsig
  * Info about Star Glaldiator hate mob [Komurka]
  * type: 1: Register mob, 0: Information.
  *------------------------------------------*/
-void clif_hate_info(struct map_session_data *sd, unsigned char hate_level,int class_, unsigned char type)
+void clif_hate_info(map_session_data *sd, unsigned char hate_level,int class_, unsigned char type)
 {
 	if( pcdb_checkid(class_) ) {
 		clif_starskill(sd, job_name(class_), class_, hate_level, type ? 10 : 11);
@@ -10211,7 +10211,7 @@ void clif_hate_info(struct map_session_data *sd, unsigned char hate_level,int cl
 /*==========================================
  * Info about TaeKwon Do TK_MISSION mob [Skotlex]
  *------------------------------------------*/
-void clif_mission_info(struct map_session_data *sd, int mob_id, unsigned char progress)
+void clif_mission_info(map_session_data *sd, int mob_id, unsigned char progress)
 {
 	clif_starskill(sd, mob_db.find(mob_id)->jname.c_str(), mob_id, progress, 20);
 }
@@ -10219,7 +10219,7 @@ void clif_mission_info(struct map_session_data *sd, int mob_id, unsigned char pr
 /*==========================================
  * Feel/Hate reset (thanks to Rayce) [Skotlex]
  *------------------------------------------*/
-void clif_feel_hate_reset(struct map_session_data *sd)
+void clif_feel_hate_reset(map_session_data *sd)
 {
 	clif_starskill(sd, "", 0, 0, 30);
 }
@@ -10231,7 +10231,7 @@ void clif_feel_hate_reset(struct map_session_data *sd)
 /// value:
 ///		false = disabled
 ///		true = enabled
-void clif_configuration( struct map_session_data* sd, enum e_config_type type, bool enabled ){
+void clif_configuration( map_session_data* sd, enum e_config_type type, bool enabled ){
 	int fd;
 	nullpo_retv(sd);
 	fd = sd->fd;
@@ -10249,7 +10249,7 @@ void clif_configuration( struct map_session_data* sd, enum e_config_type type, b
 /// open equip window:
 ///     0 = disabled
 ///     1 = enabled
-void clif_equipcheckbox(struct map_session_data* sd)
+void clif_equipcheckbox(map_session_data* sd)
 {
 	int fd;
 	nullpo_retv(sd);
@@ -10269,7 +10269,7 @@ void clif_equipcheckbox(struct map_session_data* sd)
 /// 0859 <packet len>.W <name>.24B <class>.W <hairstyle>.W <bottom-viewid>.W <mid-viewid>.W <up-viewid>.W <robe>.W <haircolor>.W <cloth-dye>.W <gender>.B {equip item}.28B* (ZC_EQUIPWIN_MICROSCOPE2, PACKETVER >= 20110111)
 /// 0997 <packet len>.W <name>.24B <class>.W <hairstyle>.W <bottom-viewid>.W <mid-viewid>.W <up-viewid>.W <robe>.W <haircolor>.W <cloth-dye>.W <gender>.B {equip item}.31B* (ZC_EQUIPWIN_MICROSCOPE_V5, PACKETVER >= 20120925)
 /// 0a2d <packet len>.W <name>.24B <class>.W <hairstyle>.W <bottom-viewid>.W <mid-viewid>.W <up-viewid>.W <robe>.W <haircolor>.W <cloth-dye>.W <gender>.B {equip item}.57B* (ZC_EQUIPWIN_MICROSCOPE_V6, PACKETVER >= 20150225)
-void clif_viewequip_ack( struct map_session_data* sd, struct map_session_data* tsd ){
+void clif_viewequip_ack( map_session_data* sd, map_session_data* tsd ){
 #if PACKETVER_AD_NUM >= 20071211 || PACKETVER_SAK_NUM >= 20071127 || PACKETVER_MAIN_NUM >= 20071211 || defined(PACKETVER_RE)
 	nullpo_retv( sd );
 	nullpo_retv( tsd );
@@ -10324,7 +10324,7 @@ void clif_viewequip_ack( struct map_session_data* sd, struct map_session_data* t
 
 /// Display msgstringtable.txt string (ZC_MSG).
 /// 0291 <message>.W
-void clif_msg(struct map_session_data* sd, unsigned short id)
+void clif_msg(map_session_data* sd, unsigned short id)
 {
 	int fd;
 	nullpo_retv(sd);
@@ -10339,7 +10339,7 @@ void clif_msg(struct map_session_data* sd, unsigned short id)
 
 /// Display msgstringtable.txt string and fill in a valid for %d format (ZC_MSG_VALUE).
 /// 0x7e2 <message>.W <value>.L
-void clif_msg_value(struct map_session_data* sd, unsigned short id, int value)
+void clif_msg_value(map_session_data* sd, unsigned short id, int value)
 {
 	int fd = sd->fd;
 
@@ -10356,7 +10356,7 @@ void clif_msg_value(struct map_session_data* sd, unsigned short id, int value)
 ///
 /// NOTE: Message has following format and is printed in color 0xCDCDFF (purple):
 ///       "[SkillName] Message"
-void clif_msg_skill(struct map_session_data* sd, uint16 skill_id, int msg_id)
+void clif_msg_skill(map_session_data* sd, uint16 skill_id, int msg_id)
 {
 	int fd = sd->fd;
 
@@ -10369,7 +10369,7 @@ void clif_msg_skill(struct map_session_data* sd, uint16 skill_id, int msg_id)
 
 /// Displays msgstringtable.txt string in a color. (ZC_MSG_COLOR).
 /// 09cd <msg id>.W <color>.L
-void clif_msg_color( struct map_session_data *sd, uint16 msg_id, uint32 color ){
+void clif_msg_color( map_session_data *sd, uint16 msg_id, uint32 color ){
 	nullpo_retv(sd);
 
 	int fd = sd->fd;
@@ -10386,7 +10386,7 @@ void clif_msg_color( struct map_session_data *sd, uint16 msg_id, uint32 color ){
 /// Returns true if the packet was parsed successfully.
 /// Formats: false - <packet id>.w <packet len>.w (<name> : <message>).?B 00
 ///          true - <packet id>.w <packet len>.w <name>.24B <message>.?B 00
-static bool clif_process_message(struct map_session_data* sd, bool whisperFormat, char* out_name, char* out_message, char* out_full_message ){
+static bool clif_process_message(map_session_data* sd, bool whisperFormat, char* out_name, char* out_message, char* out_full_message ){
 	const char* seperator = " : ";
 	int fd;
 	struct s_packet_db* info;
@@ -10528,7 +10528,7 @@ static bool clif_process_message(struct map_session_data* sd, bool whisperFormat
  * Displays a message if the player enters a PK Zone (during pk_mode)
  * @param sd: Player data
  */
-inline void clif_pk_mode_message(struct map_session_data * sd)
+inline void clif_pk_mode_message(map_session_data * sd)
 {
 	if (battle_config.pk_mode && battle_config.pk_mode_mes &&
 		sd && map_getmapflag(sd->bl.m, MF_PVP)) {
@@ -10590,7 +10590,7 @@ static int clif_parse_WantToConnection_sub(int fd)
 /// 0072 <account id>.L <char id>.L <auth code>.L <client time>.L <gender>.B (CZ_ENTER)
 /// 0436 <account id>.L <char id>.L <auth code>.L <client time>.L <gender>.B (CZ_ENTER2)
 /// There are various variants of this packet, some of them have padding between fields.
-void clif_parse_WantToConnection(int fd, struct map_session_data* sd)
+void clif_parse_WantToConnection(int fd, map_session_data* sd)
 {
 	struct block_list* bl;
 	struct auth_node* node;
@@ -10691,7 +10691,7 @@ void clif_parse_WantToConnection(int fd, struct map_session_data* sd)
 
 /// Notification from the client, that it has finished map loading and is about to display player's character (CZ_NOTIFY_ACTORINIT).
 /// 007d
-void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
+void clif_parse_LoadEndAck(int fd,map_session_data *sd)
 {
 	bool guild_notice = false;
 
@@ -11103,7 +11103,7 @@ 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, t_tick time)
+void clif_notify_time(map_session_data* sd, t_tick time)
 {
 	int fd = sd->fd;
 
@@ -11118,7 +11118,7 @@ void clif_notify_time(struct map_session_data* sd, t_tick time)
 /// 007e <client tick>.L (CZ_REQUEST_TIME)
 /// 0360 <client tick>.L (CZ_REQUEST_TIME2)
 /// There are various variants of this packet, some of them have padding between fields.
-void clif_parse_TickSend(int fd, struct map_session_data *sd)
+void clif_parse_TickSend(int fd, map_session_data *sd)
 {
 	sd->client_tick = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
 
@@ -11131,7 +11131,7 @@ void clif_parse_TickSend(int fd, struct map_session_data *sd)
 /// 07d9 { <is skill>.B <id>.L <count>.W }*36 (ZC_SHORTCUT_KEY_LIST_V2, PACKETVER >= 20090603)
 /// 07d9 { <is skill>.B <id>.L <count>.W }*38 (ZC_SHORTCUT_KEY_LIST_V2, PACKETVER >= 20090617)
 /// 0a00 <rotate>.B { <is skill>.B <id>.L <count>.W }*38 (ZC_SHORTCUT_KEY_LIST_V3, PACKETVER >= 20141022)
-void clif_hotkeys_send( struct map_session_data *sd, int tab ){
+void clif_hotkeys_send( map_session_data *sd, int tab ){
 #if defined(HOTKEY_SAVING) && ( PACKETVER_MAIN_NUM >= 20070711 || PACKETVER_RE_NUM >= 20080827 || PACKETVER_AD_NUM >= 20070711 || PACKETVER_SAK_NUM >= 20070628 )
 	nullpo_retv( sd );
 
@@ -11162,7 +11162,7 @@ void clif_hotkeys_send( struct map_session_data *sd, int tab ){
 }
 
 /// Request to update a position on the hotkey row bar
-void clif_parse_HotkeyRowShift( int fd, struct map_session_data *sd ){
+void clif_parse_HotkeyRowShift( int fd, map_session_data *sd ){
 #if PACKETVER_MAIN_NUM >= 20190522 || PACKETVER_RE_NUM >= 20190508 || PACKETVER_ZERO_NUM >= 20190605
 	const struct PACKET_CZ_SHORTCUTKEYBAR_ROTATE2 *p = (struct PACKET_CZ_SHORTCUTKEYBAR_ROTATE2 *)RFIFOP( fd, 0 );
 
@@ -11180,7 +11180,7 @@ void clif_parse_HotkeyRowShift( int fd, struct map_session_data *sd ){
 
 /// Request to update a position on the hotkey bar (CZ_SHORTCUT_KEY_CHANGE).
 /// 02ba <index>.W <is skill>.B <id>.L <count>.W
-void clif_parse_Hotkey(int fd, struct map_session_data *sd) {
+void clif_parse_Hotkey(int fd, map_session_data *sd) {
 #ifdef HOTKEY_SAVING
 #if PACKETVER_MAIN_NUM >= 20190522 || PACKETVER_RE_NUM >= 20190508 || PACKETVER_ZERO_NUM >= 20190605
 	const struct PACKET_CZ_SHORTCUT_KEY_CHANGE2* p = (struct PACKET_CZ_SHORTCUT_KEY_CHANGE2*)RFIFOP( fd, 0 );
@@ -11211,7 +11211,7 @@ void clif_parse_Hotkey(int fd, struct map_session_data *sd) {
 
 /// Displays cast-like progress bar (ZC_PROGRESS).
 /// 02f0 <color>.L <time>.L
-void clif_progressbar(struct map_session_data * sd, unsigned long color, unsigned int second)
+void clif_progressbar(map_session_data * sd, unsigned long color, unsigned int second)
 {
 	int fd = sd->fd;
 
@@ -11225,7 +11225,7 @@ void clif_progressbar(struct map_session_data * sd, unsigned long color, unsigne
 
 /// Removes an ongoing progress bar (ZC_PROGRESS_CANCEL).
 /// 02f2
-void clif_progressbar_abort(struct map_session_data * sd)
+void clif_progressbar_abort(map_session_data * sd)
 {
 	int fd = sd->fd;
 
@@ -11237,7 +11237,7 @@ void clif_progressbar_abort(struct map_session_data * sd)
 
 /// Notification from the client, that the progress bar has reached 100%.
 /// 02f1 (CZ_PROGRESS)
-void clif_parse_progressbar(int fd, struct map_session_data * sd){
+void clif_parse_progressbar(int fd, map_session_data * sd){
 	// No progressbar active, ignore it
 	if( !sd->progressbar.npc_id ){
 		return;
@@ -11270,7 +11270,7 @@ void clif_parse_progressbar(int fd, struct map_session_data * sd){
 
 /// Displays cast-like progress bar on a NPC
 /// 09d1 <id>.L <color>.L <time>.L (ZC_PROGRESS_ACTOR)
-void clif_progressbar_npc( struct npc_data *nd, struct map_session_data* sd ){
+void clif_progressbar_npc( struct npc_data *nd, map_session_data* sd ){
 #if PACKETVER >= 20130821
 	unsigned char buf[14];
 
@@ -11293,7 +11293,7 @@ void clif_progressbar_npc( struct npc_data *nd, struct map_session_data* sd ){
 /// 0085 <dest>.3B (CZ_REQUEST_MOVE)
 /// 035f <dest>.3B (CZ_REQUEST_MOVE2)
 /// There are various variants of this packet, some of them have padding between fields.
-void clif_parse_WalkToXY(int fd, struct map_session_data *sd)
+void clif_parse_WalkToXY(int fd, map_session_data *sd)
 {
 	short x, y;
 
@@ -11347,7 +11347,7 @@ void clif_parse_WalkToXY(int fd, struct map_session_data *sd)
 ///     0 = disconnect (quit)
 ///     1 = cannot disconnect (wait 10 seconds)
 ///     ? = ignored
-void clif_disconnect_ack(struct map_session_data* sd, short result)
+void clif_disconnect_ack(map_session_data* sd, short result)
 {
 	int fd = sd->fd;
 
@@ -11362,7 +11362,7 @@ void clif_disconnect_ack(struct map_session_data* sd, short result)
 /// 018a <type>.W
 /// type:
 ///     0 = quit
-void clif_parse_QuitGame(int fd, struct map_session_data *sd)
+void clif_parse_QuitGame(int fd, map_session_data *sd)
 {
 	/*	Rovert's prevent logout option fixed [Valaris]	*/
 	//int type = RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0]);
@@ -11385,11 +11385,11 @@ void clif_parse_QuitGame(int fd, struct map_session_data *sd)
 /// 0094 <id>.L (CZ_REQNAME)
 /// 0368 <id>.L (CZ_REQNAME2)
 /// There are various variants of this packet, some of them have padding between fields.
-void clif_parse_GetCharNameRequest(int fd, struct map_session_data *sd)
+void clif_parse_GetCharNameRequest(int fd, map_session_data *sd)
 {
 	int id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
 	struct block_list* bl;
-	//struct status_change *sc;
+	//status_change *sc;
 
 	if( id < 0 && -id == sd->bl.id ) // for disguises [Valaris]
 		id = sd->bl.id;
@@ -11424,7 +11424,7 @@ void clif_parse_GetCharNameRequest(int fd, struct map_session_data *sd)
 /// Validates and processes global messages
 /// 008c <packet len>.W <text>.?B (<name> : <message>) 00 (CZ_REQUEST_CHAT)
 /// There are various variants of this packet.
-void clif_parse_GlobalMessage(int fd, struct map_session_data* sd)
+void clif_parse_GlobalMessage(int fd, map_session_data* sd)
 {
 	char name[NAME_LENGTH], message[CHAT_SIZE_MAX], output[CHAT_SIZE_MAX+NAME_LENGTH*2];
 	size_t length;
@@ -11464,7 +11464,7 @@ void clif_parse_GlobalMessage(int fd, struct map_session_data* sd)
 /// /mm /mapmove (as @rura GM command) (CZ_MOVETO_MAP).
 /// Request to warp to a map on given coordinates.
 /// 0140 <map name>.16B <x>.W <y>.W
-void clif_parse_MapMove(int fd, struct map_session_data *sd)
+void clif_parse_MapMove(int fd, map_session_data *sd)
 {
 	char command[MAP_NAME_LENGTH_EXT+25];
 	char* map_name;
@@ -11517,7 +11517,7 @@ void clif_changed_dir(struct block_list *bl, enum send_target target)
 /// 009b <head dir>.W <dir>.B (CZ_CHANGE_DIRECTION)
 /// 0361 <head dir>.W <dir>.B (CZ_CHANGE_DIRECTION2)
 /// There are various variants of this packet, some of them have padding between fields.
-void clif_parse_ChangeDir(int fd, struct map_session_data *sd)
+void clif_parse_ChangeDir(int fd, map_session_data *sd)
 {
 	unsigned char headdir, dir;
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
@@ -11534,7 +11534,7 @@ void clif_parse_ChangeDir(int fd, struct map_session_data *sd)
 /// 00bf <type>.B
 /// type:
 ///     @see enum emotion_type
-void clif_parse_Emotion(int fd, struct map_session_data *sd)
+void clif_parse_Emotion(int fd, map_session_data *sd)
 {
 	int emoticon = RFIFOB(fd,packet_db[RFIFOW(fd,0)].pos[0]);
 
@@ -11575,7 +11575,7 @@ void clif_parse_Emotion(int fd, struct map_session_data *sd)
 
 /// Amount of currently online players, reply to /w /who (ZC_USER_COUNT).
 /// 00c2 <count>.L
-void clif_user_count(struct map_session_data* sd, int count)
+void clif_user_count(map_session_data* sd, int count)
 {
 	int fd = sd->fd;
 
@@ -11589,13 +11589,13 @@ void clif_user_count(struct map_session_data* sd, int count)
 /// /w /who (CZ_REQ_USER_COUNT).
 /// Request to display amount of currently connected players.
 /// 00c1
-void clif_parse_HowManyConnections(int fd, struct map_session_data *sd)
+void clif_parse_HowManyConnections(int fd, map_session_data *sd)
 {
 	clif_user_count(sd, map_getusers());
 }
 
 
-void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type, int target_id, t_tick tick)
+void clif_parse_ActionRequest_sub(map_session_data *sd, int action_type, int target_id, t_tick tick)
 {
 	if (pc_isdead(sd)) {
 		clif_clearunit_area(&sd->bl, CLR_DEAD);
@@ -11715,7 +11715,7 @@ void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type,
 ///     7 = continous attack
 ///     12 = (touch skill?)
 /// There are various variants of this packet, some of them have padding between fields.
-void clif_parse_ActionRequest(int fd, struct map_session_data *sd)
+void clif_parse_ActionRequest(int fd, map_session_data *sd)
 {
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	clif_parse_ActionRequest_sub(sd,
@@ -11731,7 +11731,7 @@ void clif_parse_ActionRequest(int fd, struct map_session_data *sd)
 /// type:
 ///     0 = restart (respawn)
 ///     1 = char-select (disconnect)
-void clif_parse_Restart(int fd, struct map_session_data *sd)
+void clif_parse_Restart(int fd, map_session_data *sd)
 {
 	switch(RFIFOB(fd,packet_db[RFIFOW(fd,0)].pos[0])) {
 	case 0x00:
@@ -11754,9 +11754,9 @@ void clif_parse_Restart(int fd, struct map_session_data *sd)
 
 /// Validates and processes whispered messages (CZ_WHISPER).
 /// 0096 <packet len>.W <nick>.24B <message>.?B
-void clif_parse_WisMessage(int fd, struct map_session_data* sd)
+void clif_parse_WisMessage(int fd, map_session_data* sd)
 {
-	struct map_session_data* dstsd;
+	map_session_data* dstsd;
 	int i;
 	char target[NAME_LENGTH], message[CHAT_SIZE_MAX], output[CHAT_SIZE_MAX+NAME_LENGTH*2];
 
@@ -11876,7 +11876,7 @@ void clif_parse_WisMessage(int fd, struct map_session_data* sd)
 /// /b /nb (CZ_BROADCAST).
 /// Request to broadcast a message on whole server.
 /// 0099 <packet len>.W <text>.?B 00
-void clif_parse_Broadcast(int fd, struct map_session_data* sd) {
+void clif_parse_Broadcast(int fd, map_session_data* sd) {
 	char command[CHAT_SIZE_MAX+11];
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	unsigned int len = RFIFOW(fd,info->pos[0])-4;
@@ -11894,7 +11894,7 @@ void clif_parse_Broadcast(int fd, struct map_session_data* sd) {
 /// 009f <id>.L (CZ_ITEM_PICKUP)
 /// 0362 <id>.L (CZ_ITEM_PICKUP2)
 /// There are various variants of this packet, some of them have padding between fields.
-void clif_parse_TakeItem(int fd, struct map_session_data *sd)
+void clif_parse_TakeItem(int fd, map_session_data *sd)
 {
 	struct flooritem_data *fitem;
 	int map_object_id;
@@ -11929,7 +11929,7 @@ void clif_parse_TakeItem(int fd, struct map_session_data *sd)
 /// 00a2 <index>.W <amount>.W (CZ_ITEM_THROW)
 /// 0363 <index>.W <amount>.W (CZ_ITEM_THROW2)
 /// There are various variants of this packet, some of them have padding between fields.
-void clif_parse_DropItem(int fd, struct map_session_data *sd){
+void clif_parse_DropItem(int fd, map_session_data *sd){
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	int item_index  = RFIFOW(fd,info->pos[0]) -2;
 	int item_amount = RFIFOW(fd,info->pos[1]) ;
@@ -11966,7 +11966,7 @@ void clif_parse_DropItem(int fd, struct map_session_data *sd){
 /// 00a7 <index>.W <account id>.L (CZ_USE_ITEM)
 /// 0439 <index>.W <account id>.L (CZ_USE_ITEM2)
 /// There are various variants of this packet, some of them have padding between fields.
-void clif_parse_UseItem(int fd, struct map_session_data *sd)
+void clif_parse_UseItem(int fd, map_session_data *sd)
 {
 	int n;
 
@@ -11999,7 +11999,7 @@ void clif_parse_UseItem(int fd, struct map_session_data *sd)
 /// Request to equip an item
 /// 00a9 <index>.W <position>.W (CZ_REQ_WEAR_EQUIP).
 /// 0998 <index>.W <position>.L (CZ_REQ_WEAR_EQUIP_V5)
-void clif_parse_EquipItem(int fd,struct map_session_data *sd)
+void clif_parse_EquipItem(int fd,map_session_data *sd)
 {
 	int index;
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
@@ -12058,7 +12058,7 @@ void clif_parse_EquipItem(int fd,struct map_session_data *sd)
 
 /// Request to take off an equip (CZ_REQ_TAKEOFF_EQUIP).
 /// 00ab <index>.W
-void clif_parse_UnequipItem(int fd,struct map_session_data *sd)
+void clif_parse_UnequipItem(int fd,map_session_data *sd)
 {
 	int index;
 
@@ -12092,7 +12092,7 @@ void clif_parse_UnequipItem(int fd,struct map_session_data *sd)
 /// 0090 <id>.L <type>.B
 /// type:
 ///     1 = click
-void clif_parse_NpcClicked(int fd,struct map_session_data *sd)
+void clif_parse_NpcClicked(int fd,map_session_data *sd)
 {
 	struct block_list *bl;
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
@@ -12147,7 +12147,7 @@ void clif_parse_NpcClicked(int fd,struct map_session_data *sd)
 /// type:
 ///     0 = buy
 ///     1 = sell
-void clif_parse_NpcBuySellSelected(int fd,struct map_session_data *sd)
+void clif_parse_NpcBuySellSelected(int fd,map_session_data *sd)
 {
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	if (sd->state.trading)
@@ -12169,7 +12169,7 @@ void clif_parse_NpcBuySellSelected(int fd,struct map_session_data *sd)
 ///    12 = "The exchange was well done."
 ///    13 = "The item is already sold and out of stock."
 ///    14 = "There is not enough goods to exchange."
-void clif_npc_buy_result( struct map_session_data* sd, e_purchase_result result ){
+void clif_npc_buy_result( map_session_data* sd, e_purchase_result result ){
 	struct PACKET_ZC_PC_PURCHASE_RESULT p = {};
 
 	p.packetType = HEADER_ZC_PC_PURCHASE_RESULT;
@@ -12181,7 +12181,7 @@ void clif_npc_buy_result( struct map_session_data* sd, e_purchase_result result
 
 /// Request to buy chosen items from npc shop (CZ_PC_PURCHASE_ITEMLIST).
 /// 00c8 <packet len>.W { <amount>.W <name id>.W }*
-void clif_parse_NpcBuyListSend( int fd, struct map_session_data* sd ){
+void clif_parse_NpcBuyListSend( int fd, map_session_data* sd ){
 	const struct PACKET_CZ_PC_PURCHASE_ITEMLIST *p = (struct PACKET_CZ_PC_PURCHASE_ITEMLIST *)RFIFOP( fd, 0 );
 
 	uint16 n = ( p->packetLength - sizeof(struct PACKET_CZ_PC_PURCHASE_ITEMLIST) ) / sizeof( struct PACKET_CZ_PC_PURCHASE_ITEMLIST_sub );
@@ -12216,7 +12216,7 @@ void clif_parse_NpcBuyListSend( int fd, struct map_session_data* sd ){
 /// result:
 ///     0 = "The deal has successfully completed."
 ///     1 = "The deal has failed."
-void clif_npc_sell_result(struct map_session_data* sd, unsigned char result)
+void clif_npc_sell_result(map_session_data* sd, unsigned char result)
 {
 	int fd = sd->fd;
 
@@ -12229,7 +12229,7 @@ void clif_npc_sell_result(struct map_session_data* sd, unsigned char result)
 
 /// Request to sell chosen items to npc shop (CZ_PC_SELL_ITEMLIST).
 /// 00c9 <packet len>.W { <index>.W <amount>.W }*
-void clif_parse_NpcSellListSend(int fd,struct map_session_data *sd)
+void clif_parse_NpcSellListSend(int fd,map_session_data *sd)
 {
 	int fail=0,n;
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
@@ -12252,7 +12252,7 @@ void clif_parse_NpcSellListSend(int fd,struct map_session_data *sd)
 /// type:
 ///     0 = private
 ///     1 = public
-void clif_parse_CreateChatRoom(int fd, struct map_session_data* sd)
+void clif_parse_CreateChatRoom(int fd, map_session_data* sd)
 {
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	int len = RFIFOW(fd,info->pos[0])-15;
@@ -12291,7 +12291,7 @@ void clif_parse_CreateChatRoom(int fd, struct map_session_data* sd)
 
 /// Chatroom join request (CZ_REQ_ENTER_ROOM).
 /// 00d9 <chat ID>.L <passwd>.8B
-void clif_parse_ChatAddMember(int fd, struct map_session_data* sd){
+void clif_parse_ChatAddMember(int fd, map_session_data* sd){
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	int chatid = RFIFOL(fd,info->pos[0]);
 	const char* password = RFIFOCP(fd,info->pos[1]); // not zero-terminated
@@ -12305,7 +12305,7 @@ void clif_parse_ChatAddMember(int fd, struct map_session_data* sd){
 /// type:
 ///     0 = private
 ///     1 = public
-void clif_parse_ChatRoomStatusChange(int fd, struct map_session_data* sd){
+void clif_parse_ChatRoomStatusChange(int fd, map_session_data* sd){
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	int len = RFIFOW(fd,info->pos[0])-15;
 	int limit = RFIFOW(fd,info->pos[1]);
@@ -12330,7 +12330,7 @@ void clif_parse_ChatRoomStatusChange(int fd, struct map_session_data* sd){
 /// role:
 ///     0 = owner
 ///     1 = normal
-void clif_parse_ChangeChatOwner(int fd, struct map_session_data* sd)
+void clif_parse_ChangeChatOwner(int fd, map_session_data* sd)
 {
 	//int role = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
 	chat_changechatowner(sd,RFIFOCP(fd,packet_db[RFIFOW(fd,0)].pos[1]));
@@ -12339,7 +12339,7 @@ void clif_parse_ChangeChatOwner(int fd, struct map_session_data* sd)
 
 /// Request to expel a player from chat room (CZ_REQ_EXPEL_MEMBER).
 /// 00e2 <name>.24B
-void clif_parse_KickFromChat(int fd,struct map_session_data *sd)
+void clif_parse_KickFromChat(int fd,map_session_data *sd)
 {
 	chat_kickchat(sd,RFIFOCP(fd,packet_db[RFIFOW(fd,0)].pos[0]));
 }
@@ -12347,7 +12347,7 @@ void clif_parse_KickFromChat(int fd,struct map_session_data *sd)
 
 /// Request to leave the current chatroom (CZ_EXIT_ROOM).
 /// 00e3
-void clif_parse_ChatLeave(int fd, struct map_session_data* sd)
+void clif_parse_ChatLeave(int fd, map_session_data* sd)
 {
 	chat_leavechat(sd,0);
 }
@@ -12356,7 +12356,7 @@ void clif_parse_ChatLeave(int fd, struct map_session_data* sd)
 //Handles notifying asker and rejecter of what has just ocurred.
 //Type is used to determine the correct msg_txt to use:
 //0:
-static void clif_noask_sub(struct map_session_data *sd, struct map_session_data *tsd, int type)
+static void clif_noask_sub(map_session_data *sd, map_session_data *tsd, int type)
 {
 	const char* msg;
 	char output[256];
@@ -12371,9 +12371,9 @@ static void clif_noask_sub(struct map_session_data *sd, struct map_session_data
 
 /// Request to begin a trade (CZ_REQ_EXCHANGE_ITEM).
 /// 00e4 <account id>.L
-void clif_parse_TradeRequest(int fd,struct map_session_data *sd)
+void clif_parse_TradeRequest(int fd,map_session_data *sd)
 {
-	struct map_session_data *t_sd;
+	map_session_data *t_sd;
 
 	t_sd = map_id2sd(RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]));
 
@@ -12414,7 +12414,7 @@ void clif_parse_TradeRequest(int fd,struct map_session_data *sd)
 /// result:
 ///     3 = accepted
 ///     4 = rejected
-void clif_parse_TradeAck(int fd,struct map_session_data *sd)
+void clif_parse_TradeAck(int fd,map_session_data *sd)
 {
 	trade_tradeack(sd,RFIFOB(fd,packet_db[RFIFOW(fd,0)].pos[0]));
 }
@@ -12422,7 +12422,7 @@ void clif_parse_TradeAck(int fd,struct map_session_data *sd)
 
 /// Request to add an item to current trade (CZ_ADD_EXCHANGE_ITEM).
 /// 00e8 <index>.W <amount>.L
-void clif_parse_TradeAddItem(int fd,struct map_session_data *sd)
+void clif_parse_TradeAddItem(int fd,map_session_data *sd)
 {
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	short index = RFIFOW(fd,info->pos[0]);
@@ -12437,7 +12437,7 @@ void clif_parse_TradeAddItem(int fd,struct map_session_data *sd)
 
 /// Request to lock items in current trade (CZ_CONCLUDE_EXCHANGE_ITEM).
 /// 00eb
-void clif_parse_TradeOk(int fd,struct map_session_data *sd)
+void clif_parse_TradeOk(int fd,map_session_data *sd)
 {
 	trade_tradeok(sd);
 }
@@ -12445,7 +12445,7 @@ void clif_parse_TradeOk(int fd,struct map_session_data *sd)
 
 /// Request to cancel current trade (CZ_CANCEL_EXCHANGE_ITEM).
 /// 00ed
-void clif_parse_TradeCancel(int fd,struct map_session_data *sd)
+void clif_parse_TradeCancel(int fd,map_session_data *sd)
 {
 	trade_tradecancel(sd);
 }
@@ -12453,7 +12453,7 @@ void clif_parse_TradeCancel(int fd,struct map_session_data *sd)
 
 /// Request to commit current trade (CZ_EXEC_EXCHANGE_ITEM).
 /// 00ef
-void clif_parse_TradeCommit(int fd,struct map_session_data *sd)
+void clif_parse_TradeCommit(int fd,map_session_data *sd)
 {
 	trade_tradecommit(sd);
 }
@@ -12461,7 +12461,7 @@ void clif_parse_TradeCommit(int fd,struct map_session_data *sd)
 
 /// Request to stop chasing/attacking an unit (CZ_CANCEL_LOCKON).
 /// 0118
-void clif_parse_StopAttack(int fd,struct map_session_data *sd)
+void clif_parse_StopAttack(int fd,map_session_data *sd)
 {
 	pc_stop_attack(sd);
 	if (sd) sd->ud.state.attack_continue = 0;
@@ -12470,7 +12470,7 @@ void clif_parse_StopAttack(int fd,struct map_session_data *sd)
 
 /// Request to move an item from inventory to cart (CZ_MOVE_ITEM_FROM_BODY_TO_CART).
 /// 0126 <index>.W <amount>.L
-void clif_parse_PutItemToCart( int fd, struct map_session_data *sd ){
+void clif_parse_PutItemToCart( int fd, map_session_data *sd ){
 	if (pc_istrading(sd))
 		return;
 	if (!pc_iscarton(sd))
@@ -12486,7 +12486,7 @@ void clif_parse_PutItemToCart( int fd, struct map_session_data *sd ){
 
 /// Request to move an item from cart to inventory (CZ_MOVE_ITEM_FROM_CART_TO_BODY).
 /// 0127 <index>.W <amount>.L
-void clif_parse_GetItemFromCart(int fd,struct map_session_data *sd)
+void clif_parse_GetItemFromCart(int fd,map_session_data *sd)
 {
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	if (!pc_iscarton(sd))
@@ -12499,7 +12499,7 @@ void clif_parse_GetItemFromCart(int fd,struct map_session_data *sd)
 
 /// Request to remove cart/falcon/peco/dragon/mado (CZ_REQ_CARTOFF).
 /// 012a
-void clif_parse_RemoveOption(int fd,struct map_session_data *sd)
+void clif_parse_RemoveOption(int fd,map_session_data *sd)
 {
 	if( !(sd->sc.option&(OPTION_RIDING|OPTION_FALCON|OPTION_DRAGON|OPTION_MADOGEAR))
 #ifdef NEW_CARTS
@@ -12516,7 +12516,7 @@ void clif_parse_RemoveOption(int fd,struct map_session_data *sd)
 
 /// Request to select cart's visual look for new cart design (ZC_SELECTCART).
 /// 097f <Length>.W <identity>.L <type>.B
-void clif_SelectCart(struct map_session_data *sd) {
+void clif_SelectCart(map_session_data *sd) {
 #if PACKETVER >= 20150826
 	int i = 0, carts = 3;
 
@@ -12536,7 +12536,7 @@ void clif_SelectCart(struct map_session_data *sd) {
 
 /// Request to select cart's visual look for new cart design (CZ_SELECTCART).
 /// 0980 <identity>.L <type>.B
-void clif_parse_SelectCart(int fd,struct map_session_data *sd) {
+void clif_parse_SelectCart(int fd,map_session_data *sd) {
 #if PACKETVER >= 20150826
 	int type;
 
@@ -12557,7 +12557,7 @@ void clif_parse_SelectCart(int fd,struct map_session_data *sd) {
 
 /// Request to change cart's visual look (CZ_REQ_CHANGECART).
 /// 01af <num>.W
-void clif_parse_ChangeCart(int fd,struct map_session_data *sd)
+void clif_parse_ChangeCart(int fd,map_session_data *sd)
 {// TODO: State tracking?
 	int type;
 
@@ -12599,7 +12599,7 @@ void clif_parse_ChangeCart(int fd,struct map_session_data *sd)
 /// amount:
 ///     Old clients always send 1 for this, even when using /str+ and the like.
 ///     Newer clients (2013-12-23 and newer) send the correct amount.
-void clif_parse_StatusUp(int fd,struct map_session_data *sd)
+void clif_parse_StatusUp(int fd,map_session_data *sd)
 {
 	int increase_amount = RFIFOB(fd,packet_db[RFIFOW(fd,0)].pos[1]);
 
@@ -12617,7 +12617,7 @@ void clif_parse_StatusUp(int fd,struct map_session_data *sd)
 ///     SP_POW ~ SP_CON
 /// amount:
 ///     The amount to increase the trait status
-void clif_parse_traitstatus_up( int fd, struct map_session_data *sd ){
+void clif_parse_traitstatus_up( int fd, map_session_data *sd ){
 #if PACKETVER_MAIN_NUM >= 20200916 || PACKETVER_RE_NUM >= 20200724
 	struct PACKET_CZ_UNCONFIRMED_TSTATUS_UP* p = (struct PACKET_CZ_UNCONFIRMED_TSTATUS_UP*)RFIFOP( fd, 0 );
 
@@ -12633,12 +12633,12 @@ void clif_parse_traitstatus_up( int fd, struct map_session_data *sd ){
 
 /// Request to increase level of a skill (CZ_UPGRADE_SKILLLEVEL).
 /// 0112 <skill id>.W
-void clif_parse_SkillUp(int fd,struct map_session_data *sd)
+void clif_parse_SkillUp(int fd,map_session_data *sd)
 {
 	pc_skillup(sd,RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0]));
 }
 
-static void clif_parse_UseSkillToId_homun(struct homun_data *hd, struct map_session_data *sd, t_tick tick, uint16 skill_id, uint16 skill_lv, int target_id)
+static void clif_parse_UseSkillToId_homun(struct homun_data *hd, map_session_data *sd, t_tick tick, uint16 skill_id, uint16 skill_lv, int target_id)
 {
 	int lv;
 
@@ -12666,7 +12666,7 @@ static void clif_parse_UseSkillToId_homun(struct homun_data *hd, struct map_sess
 		unit_skilluse_id(&hd->bl, target_id, skill_id, skill_lv);
 }
 
-static void clif_parse_UseSkillToPos_homun(struct homun_data *hd, struct map_session_data *sd, t_tick tick, uint16 skill_id, uint16 skill_lv, short x, short y, int skillmoreinfo)
+static void clif_parse_UseSkillToPos_homun(struct homun_data *hd, map_session_data *sd, t_tick tick, uint16 skill_id, uint16 skill_lv, short x, short y, int skillmoreinfo)
 {
 	int lv;
 	if( !hd )
@@ -12697,7 +12697,7 @@ static void clif_parse_UseSkillToPos_homun(struct homun_data *hd, struct map_ses
 		unit_skilluse_pos(&hd->bl, x, y, skill_id, skill_lv);
 }
 
-static void clif_parse_UseSkillToId_mercenary(s_mercenary_data *md, struct map_session_data *sd, t_tick tick, uint16 skill_id, uint16 skill_lv, int target_id)
+static void clif_parse_UseSkillToId_mercenary(s_mercenary_data *md, map_session_data *sd, t_tick tick, uint16 skill_id, uint16 skill_lv, int target_id)
 {
 	int lv;
 
@@ -12721,7 +12721,7 @@ static void clif_parse_UseSkillToId_mercenary(s_mercenary_data *md, struct map_s
 		unit_skilluse_id(&md->bl, target_id, skill_id, skill_lv);
 }
 
-static void clif_parse_UseSkillToPos_mercenary(s_mercenary_data *md, struct map_session_data *sd, t_tick tick, uint16 skill_id, uint16 skill_lv, short x, short y, int skillmoreinfo)
+static void clif_parse_UseSkillToPos_mercenary(s_mercenary_data *md, map_session_data *sd, t_tick tick, uint16 skill_id, uint16 skill_lv, short x, short y, int skillmoreinfo)
 {
 	int lv;
 	if( !md )
@@ -12750,7 +12750,7 @@ static void clif_parse_UseSkillToPos_mercenary(s_mercenary_data *md, struct map_
 		unit_skilluse_pos(&md->bl, x, y, skill_id, skill_lv);
 }
 
-void clif_parse_skill_toid( struct map_session_data* sd, uint16 skill_id, uint16 skill_lv, int target_id ){
+void clif_parse_skill_toid( map_session_data* sd, uint16 skill_id, uint16 skill_lv, int target_id ){
 	t_tick tick = gettick();
 
 	if( skill_lv < 1 ) skill_lv = 1; //No clue, I have seen the client do this with guild skills :/ [Skotlex]
@@ -12869,7 +12869,7 @@ void clif_parse_skill_toid( struct map_session_data* sd, uint16 skill_id, uint16
 /// 0113 <skill lv>.W <skill id>.W <target id>.L (CZ_USE_SKILL)
 /// 0438 <skill lv>.W <skill id>.W <target id>.L (CZ_USE_SKILL2)
 /// There are various variants of this packet, some of them have padding between fields.
-void clif_parse_UseSkillToId( int fd, struct map_session_data *sd ){
+void clif_parse_UseSkillToId( int fd, map_session_data *sd ){
 	struct s_packet_db* info = &packet_db[RFIFOW(fd, 0)];
 
 	clif_parse_skill_toid( sd, RFIFOW(fd, info->pos[1]), RFIFOW(fd, info->pos[0]), RFIFOL(fd, info->pos[2]) );
@@ -12878,7 +12878,7 @@ void clif_parse_UseSkillToId( int fd, struct map_session_data *sd ){
 /*==========================================
  * Client tells server he'd like to use AoE skill id 'skill_id' of level 'skill_lv' on 'x','y' location
  *------------------------------------------*/
-static void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, uint16 skill_lv, uint16 skill_id, short x, short y, int skillmoreinfo)
+static void clif_parse_UseSkillToPosSub(int fd, map_session_data *sd, uint16 skill_lv, uint16 skill_id, short x, short y, int skillmoreinfo)
 {
 	t_tick tick = gettick();
 
@@ -12976,7 +12976,7 @@ static void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, uin
 /// 0366 <skill lv>.W <skill id>.W <x>.W <y>.W (CZ_USE_SKILL_TOGROUND2)
 /// 0AF4 <skill lv>.W <skill id>.W <x>.W <y>.W <unknown>.B (CZ_USE_SKILL_TOGROUND3)
 /// There are various variants of this packet, some of them have padding between fields.
-void clif_parse_UseSkillToPos(int fd, struct map_session_data *sd)
+void clif_parse_UseSkillToPos(int fd, map_session_data *sd)
 {
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	if (pc_cant_act(sd))
@@ -13000,7 +13000,7 @@ void clif_parse_UseSkillToPos(int fd, struct map_session_data *sd)
 /// 0190 <skill lv>.W <skill id>.W <x>.W <y>.W <contents>.80B (CZ_USE_SKILL_TOGROUND_WITHTALKBOX)
 /// 0367 <skill lv>.W <skill id>.W <x>.W <y>.W <contents>.80B (CZ_USE_SKILL_TOGROUND_WITHTALKBOX2)
 /// There are various variants of this packet, some of them have padding between fields.
-void clif_parse_UseSkillToPosMoreInfo(int fd, struct map_session_data *sd)
+void clif_parse_UseSkillToPosMoreInfo(int fd, map_session_data *sd)
 {
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	if (pc_cant_act(sd))
@@ -13020,7 +13020,7 @@ void clif_parse_UseSkillToPosMoreInfo(int fd, struct map_session_data *sd)
 
 /// Answer to map selection dialog (CZ_SELECT_WARPPOINT).
 /// 011b <skill id>.W <map name>.16B
-void clif_parse_UseSkillMap(int fd, struct map_session_data* sd)
+void clif_parse_UseSkillMap(int fd, map_session_data* sd)
 {
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	uint16 skill_id = RFIFOW(fd,info->pos[0]);
@@ -13045,7 +13045,7 @@ void clif_parse_UseSkillMap(int fd, struct map_session_data* sd)
 
 /// Request to set a memo on current map (CZ_REMEMBER_WARPPOINT).
 /// 011d
-void clif_parse_RequestMemo(int fd,struct map_session_data *sd)
+void clif_parse_RequestMemo(int fd,map_session_data *sd)
 {
 	if (!pc_isdead(sd))
 		pc_memo(sd,-1);
@@ -13054,7 +13054,7 @@ void clif_parse_RequestMemo(int fd,struct map_session_data *sd)
 
 /// Answer to pharmacy item selection dialog (CZ_REQMAKINGITEM).
 /// 018e <name id>.W { <material id>.W }*3
-void clif_parse_ProduceMix(int fd,struct map_session_data *sd){
+void clif_parse_ProduceMix(int fd,map_session_data *sd){
 	const struct PACKET_CZ_REQMAKINGITEM *p = (struct PACKET_CZ_REQMAKINGITEM*)RFIFOP( fd, 0 );
 
 	switch( sd->menuskill_id ) {
@@ -13092,7 +13092,7 @@ void clif_parse_ProduceMix(int fd,struct map_session_data *sd){
 ///     6 = GN_S_PHARMACY
 ///     7 = MT_M_MACHINE - Unconfirmed
 ///     8 = BO_BIONIC_PHARMACY - Unconfirmed
-void clif_parse_Cooking(int fd,struct map_session_data *sd) {
+void clif_parse_Cooking(int fd,map_session_data *sd) {
 	const struct PACKET_CZ_REQ_MAKINGITEM *p = (struct PACKET_CZ_REQ_MAKINGITEM *)RFIFOP( fd, 0 );
 
 	int amount = sd->menuskill_val2 ? sd->menuskill_val2 : 1;
@@ -13116,7 +13116,7 @@ void clif_parse_Cooking(int fd,struct map_session_data *sd) {
 /// Answer to repair weapon item selection dialog
 /// 01fd <index> W (CZ_REQ_ITEMREPAIR)
 /// 01fd <index>.W <name id>.W <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W ???
-void clif_parse_RepairItem( int fd, struct map_session_data *sd ){
+void clif_parse_RepairItem( int fd, map_session_data *sd ){
 // Hercules has wrong date -> use correct one here
 #if PACKETVER_MAIN_NUM >= 20200916 || PACKETVER_RE_NUM >= 20200724
 	const struct PACKET_CZ_REQ_ITEMREPAIR2 *p = (struct PACKET_CZ_REQ_ITEMREPAIR2 *)RFIFOP( fd, 0 );
@@ -13139,7 +13139,7 @@ void clif_parse_RepairItem( int fd, struct map_session_data *sd ){
 
 /// Answer to refine weapon item selection dialog (CZ_REQ_WEAPONREFINE).
 /// 0222 <index>.L
-void clif_parse_WeaponRefine( int fd, struct map_session_data *sd ){
+void clif_parse_WeaponRefine( int fd, map_session_data *sd ){
 	if (sd->menuskill_id != WS_WEAPONREFINE) //Packet exploit?
 		return;
 	if (pc_istrading(sd)) {
@@ -13160,7 +13160,7 @@ void clif_parse_WeaponRefine( int fd, struct map_session_data *sd ){
 ///     255   = cancel
 /// NOTE: If there were more than 254 items in the list, choice
 ///     overflows to choice%256.
-void clif_parse_NpcSelectMenu(int fd,struct map_session_data *sd){
+void clif_parse_NpcSelectMenu(int fd,map_session_data *sd){
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	int npc_id = RFIFOL(fd,info->pos[0]);
 	uint8 select = RFIFOB(fd,info->pos[1]);
@@ -13189,7 +13189,7 @@ void clif_parse_NpcSelectMenu(int fd,struct map_session_data *sd){
 
 /// NPC dialog 'next' click (CZ_REQ_NEXT_SCRIPT).
 /// 00b9 <npc id>.L
-void clif_parse_NpcNextClicked(int fd,struct map_session_data *sd)
+void clif_parse_NpcNextClicked(int fd,map_session_data *sd)
 {
 	if( battle_config.idletime_option&IDLE_NPC_NEXT ){
 		sd->idletime = last_tick;
@@ -13201,7 +13201,7 @@ void clif_parse_NpcNextClicked(int fd,struct map_session_data *sd)
 
 /// NPC numeric input dialog value (CZ_INPUT_EDITDLG).
 /// 0143 <npc id>.L <value>.L
-void clif_parse_NpcAmountInput(int fd,struct map_session_data *sd){
+void clif_parse_NpcAmountInput(int fd,map_session_data *sd){
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	int npcid = RFIFOL(fd,info->pos[0]);
 	int amount = (int)RFIFOL(fd,info->pos[1]);
@@ -13218,7 +13218,7 @@ void clif_parse_NpcAmountInput(int fd,struct map_session_data *sd){
 
 /// NPC text input dialog value (CZ_INPUT_EDITDLGSTR).
 /// 01d5 <packet len>.W <npc id>.L <string>.?B
-void clif_parse_NpcStringInput(int fd, struct map_session_data* sd){
+void clif_parse_NpcStringInput(int fd, map_session_data* sd){
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	int message_len = RFIFOW(fd,info->pos[0])-8;
 	int npcid = RFIFOL(fd,info->pos[1]);
@@ -13243,7 +13243,7 @@ void clif_parse_NpcStringInput(int fd, struct map_session_data* sd){
 
 /// NPC dialog 'close' click (CZ_CLOSE_DIALOG).
 /// 0146 <npc id>.L
-void clif_parse_NpcCloseClicked(int fd,struct map_session_data *sd)
+void clif_parse_NpcCloseClicked(int fd,map_session_data *sd)
 {
 	if (!sd->npc_id) //Avoid parsing anything when the script was done with. [Skotlex]
 		return;
@@ -13260,7 +13260,7 @@ void clif_parse_NpcCloseClicked(int fd,struct map_session_data *sd)
 /// 0178 <index>.W
 /// index:
 ///     -1 = cancel
-void clif_parse_ItemIdentify(int fd,struct map_session_data *sd) {
+void clif_parse_ItemIdentify(int fd,map_session_data *sd) {
 	short idx = RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0]) - 2;
 
 	if (sd->menuskill_id != MC_IDENTIFY)
@@ -13285,7 +13285,7 @@ void clif_parse_ItemIdentify(int fd,struct map_session_data *sd) {
 
 /// Answer to arrow crafting item selection dialog (CZ_REQ_MAKINGARROW).
 /// 01ae <name id>.W
-void clif_parse_SelectArrow(int fd,struct map_session_data *sd) {
+void clif_parse_SelectArrow(int fd,map_session_data *sd) {
 	if (pc_istrading(sd)) {
 		//Make it fail to avoid shop exploits where you sell something different than you see.
 		clif_skill_fail(sd,sd->ud.skill_id,USESKILL_FAIL_LEVEL,0);
@@ -13316,7 +13316,7 @@ void clif_parse_SelectArrow(int fd,struct map_session_data *sd) {
 
 /// Answer to SA_AUTOSPELL skill selection dialog (CZ_SELECTAUTOSPELL).
 /// 01ce <skill id>.L
-void clif_parse_AutoSpell(int fd,struct map_session_data *sd)
+void clif_parse_AutoSpell(int fd,map_session_data *sd)
 {
 	if (sd->menuskill_id != SA_AUTOSPELL)
 		return;
@@ -13328,7 +13328,7 @@ void clif_parse_AutoSpell(int fd,struct map_session_data *sd)
 
 /// Request to display item carding/composition list (CZ_REQ_ITEMCOMPOSITION_LIST).
 /// 017a <card index>.W
-void clif_parse_UseCard(int fd,struct map_session_data *sd)
+void clif_parse_UseCard(int fd,map_session_data *sd)
 {
 	if (sd->state.trading != 0)
 		return;
@@ -13338,7 +13338,7 @@ void clif_parse_UseCard(int fd,struct map_session_data *sd)
 
 /// Answer to carding/composing item selection dialog (CZ_REQ_ITEMCOMPOSITION).
 /// 017c <card index>.W <equip index>.W
-void clif_parse_InsertCard(int fd,struct map_session_data *sd)
+void clif_parse_InsertCard(int fd,map_session_data *sd)
 {
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	if (sd->state.trading != 0)
@@ -13351,7 +13351,7 @@ void clif_parse_InsertCard(int fd,struct map_session_data *sd)
 /// 0193 <char id>.L (CZ_REQNAME_BYGID)
 /// 0369 <char id>.L (CZ_REQNAME_BYGID2)
 /// There are various variants of this packet, some of them have padding between fields.
-void clif_parse_SolveCharName(int fd, struct map_session_data *sd)
+void clif_parse_SolveCharName(int fd, map_session_data *sd)
 {
 	int charid;
 
@@ -13366,7 +13366,7 @@ void clif_parse_SolveCharName(int fd, struct map_session_data *sd)
 /// type:
 ///     0 = state
 ///     1 = skill
-void clif_parse_ResetChar(int fd, struct map_session_data *sd) {
+void clif_parse_ResetChar(int fd, map_session_data *sd) {
 	char cmd[15];
 
 	if( RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0]) )
@@ -13381,7 +13381,7 @@ void clif_parse_ResetChar(int fd, struct map_session_data *sd) {
 /// /lb /nlb (CZ_LOCALBROADCAST).
 /// Request to broadcast a message on current map.
 /// 019c <packet len>.W <text>.?B
-void clif_parse_LocalBroadcast(int fd, struct map_session_data* sd)
+void clif_parse_LocalBroadcast(int fd, map_session_data* sd)
 {
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	char command[CHAT_SIZE_MAX+16];
@@ -13400,7 +13400,7 @@ void clif_parse_LocalBroadcast(int fd, struct map_session_data* sd)
 /// 00f3 <index>.W <amount>.L (CZ_MOVE_ITEM_FROM_BODY_TO_STORE)
 /// 0364 <index>.W <amount>.L (CZ_MOVE_ITEM_FROM_BODY_TO_STORE2)
 /// There are various variants of this packet, some of them have padding between fields.
-void clif_parse_MoveToKafra(int fd, struct map_session_data *sd)
+void clif_parse_MoveToKafra(int fd, map_session_data *sd)
 {
 	int item_index, item_amount;
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
@@ -13431,7 +13431,7 @@ void clif_parse_MoveToKafra(int fd, struct map_session_data *sd)
 /// 00f5 <index>.W <amount>.L (CZ_MOVE_ITEM_FROM_STORE_TO_BODY)
 /// 0365 <index>.W <amount>.L (CZ_MOVE_ITEM_FROM_STORE_TO_BODY2)
 /// There are various variants of this packet, some of them have padding between fields.
-void clif_parse_MoveFromKafra(int fd,struct map_session_data *sd)
+void clif_parse_MoveFromKafra(int fd,map_session_data *sd)
 {
 	int item_index, item_amount;
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
@@ -13450,7 +13450,7 @@ void clif_parse_MoveFromKafra(int fd,struct map_session_data *sd)
 
 /// Request to move an item from cart to storage (CZ_MOVE_ITEM_FROM_CART_TO_STORE).
 /// 0129 <index>.W <amount>.L
-void clif_parse_MoveToKafraFromCart(int fd, struct map_session_data *sd){
+void clif_parse_MoveToKafraFromCart(int fd, map_session_data *sd){
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 
 	int idx = RFIFOW(fd,info->pos[0]) - 2;
@@ -13481,7 +13481,7 @@ void clif_parse_MoveToKafraFromCart(int fd, struct map_session_data *sd){
 
 /// Request to move an item from storage to cart (CZ_MOVE_ITEM_FROM_STORE_TO_CART).
 /// 0128 <index>.W <amount>.L
-void clif_parse_MoveFromKafraToCart(int fd, struct map_session_data *sd){
+void clif_parse_MoveFromKafraToCart(int fd, map_session_data *sd){
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	int idx = RFIFOW(fd,info->pos[0]) - 1;
 	int amount = RFIFOL(fd,info->pos[1]);
@@ -13505,7 +13505,7 @@ void clif_parse_MoveFromKafraToCart(int fd, struct map_session_data *sd){
 
 /// Request to close storage (CZ_CLOSE_STORE).
 /// 00f7
-void clif_parse_CloseKafra(int fd, struct map_session_data *sd)
+void clif_parse_CloseKafra(int fd, map_session_data *sd)
 {
 	if( sd->state.storage_flag == 1 )
 		storage_storageclose(sd);
@@ -13525,7 +13525,7 @@ void clif_parse_CloseKafra(int fd, struct map_session_data *sd)
 ///     8 = too many wrong passwords
 ///     ? = ignored
 /// NOTE: This packet is only available on certain non-kRO clients.
-void clif_storagepassword(struct map_session_data* sd, short info)
+void clif_storagepassword(map_session_data* sd, short info)
 {
 	int fd = sd->fd;
 
@@ -13542,7 +13542,7 @@ void clif_storagepassword(struct map_session_data* sd, short info)
 ///     2 = change password
 ///     3 = check password
 /// NOTE: This packet is only available on certain non-kRO clients.
-void clif_parse_StoragePassword(int fd, struct map_session_data *sd){ //@TODO
+void clif_parse_StoragePassword(int fd, map_session_data *sd){ //@TODO
 //	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 //	int type = RFIFOW(fd,info->pos[0]);
 //	char* password = RFIFOP(fd,info->pos[1]);
@@ -13562,7 +13562,7 @@ void clif_parse_StoragePassword(int fd, struct map_session_data *sd){ //@TODO
 ///     8 = too many wrong passwords
 ///     ? = ignored
 /// NOTE: This packet is only available on certain non-kRO clients.
-void clif_storagepassword_result(struct map_session_data* sd, short result, short error_count)
+void clif_storagepassword_result(map_session_data* sd, short result, short error_count)
 {
 	int fd = sd->fd;
 
@@ -13576,7 +13576,7 @@ void clif_storagepassword_result(struct map_session_data* sd, short result, shor
 
 /// Party creation request
 /// 00f9 <party name>.24B (CZ_MAKE_GROUP)
-void clif_parse_CreateParty(int fd, struct map_session_data *sd){
+void clif_parse_CreateParty(int fd, map_session_data *sd){
 	char* name = RFIFOCP(fd,packet_db[RFIFOW(fd,0)].pos[0]);
 	name[NAME_LENGTH-1] = '\0';
 
@@ -13593,7 +13593,7 @@ void clif_parse_CreateParty(int fd, struct map_session_data *sd){
 }
 
 /// 01e8 <party name>.24B <item pickup rule>.B <item share rule>.B (CZ_MAKE_GROUP2)
-void clif_parse_CreateParty2(int fd, struct map_session_data *sd){
+void clif_parse_CreateParty2(int fd, map_session_data *sd){
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	char* name = RFIFOCP(fd,info->pos[0]);
 	int item1 = RFIFOB(fd,info->pos[1]);
@@ -13615,9 +13615,9 @@ void clif_parse_CreateParty2(int fd, struct map_session_data *sd){
 
 /// Party invitation request
 /// 00fc <account id>.L (CZ_REQ_JOIN_GROUP)
-void clif_parse_PartyInvite(int fd, struct map_session_data *sd)
+void clif_parse_PartyInvite(int fd, map_session_data *sd)
 {
-	struct map_session_data *t_sd;
+	map_session_data *t_sd;
 
 	if(map_getmapflag(sd->bl.m, MF_PARTYLOCK)) {// Party locked.
 		clif_displaymessage(fd, msg_txt(sd,227));
@@ -13635,8 +13635,8 @@ void clif_parse_PartyInvite(int fd, struct map_session_data *sd)
 }
 
 /// 02c4 <char name>.24B (CZ_PARTY_JOIN_REQ)
-void clif_parse_PartyInvite2(int fd, struct map_session_data *sd){
-	struct map_session_data *t_sd;
+void clif_parse_PartyInvite2(int fd, map_session_data *sd){
+	map_session_data *t_sd;
 	char *name = RFIFOCP(fd,packet_db[RFIFOW(fd,0)].pos[0]);
 	name[NAME_LENGTH-1] = '\0';
 
@@ -13662,14 +13662,14 @@ void clif_parse_PartyInvite2(int fd, struct map_session_data *sd){
 /// flag:
 ///     0 = reject
 ///     1 = accept
-void clif_parse_ReplyPartyInvite(int fd,struct map_session_data *sd)
+void clif_parse_ReplyPartyInvite(int fd,map_session_data *sd)
 {
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	party_reply_invite(sd,RFIFOL(fd,info->pos[0]),
 	    RFIFOL(fd,info->pos[1]));
 }
 //(CZ_PARTY_JOIN_REQ_ACK)
-void clif_parse_ReplyPartyInvite2(int fd,struct map_session_data *sd)
+void clif_parse_ReplyPartyInvite2(int fd,map_session_data *sd)
 {
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	party_reply_invite(sd,RFIFOL(fd,info->pos[0]),
@@ -13679,7 +13679,7 @@ void clif_parse_ReplyPartyInvite2(int fd,struct map_session_data *sd)
 
 /// Request to leave party (CZ_REQ_LEAVE_GROUP).
 /// 0100
-void clif_parse_LeaveParty(int fd, struct map_session_data *sd)
+void clif_parse_LeaveParty(int fd, map_session_data *sd)
 {
 	if(map_getmapflag(sd->bl.m, MF_PARTYLOCK)) {// Party locked.
 		clif_displaymessage(fd, msg_txt(sd,227));
@@ -13691,7 +13691,7 @@ void clif_parse_LeaveParty(int fd, struct map_session_data *sd)
 
 /// Request to expel a party member (CZ_REQ_EXPEL_GROUP_MEMBER).
 /// 0103 <account id>.L <char name>.24B
-void clif_parse_RemovePartyMember(int fd, struct map_session_data *sd)
+void clif_parse_RemovePartyMember(int fd, map_session_data *sd)
 {
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	if(map_getmapflag(sd->bl.m, MF_PARTYLOCK)) {// Party locked.
@@ -13706,7 +13706,7 @@ void clif_parse_RemovePartyMember(int fd, struct map_session_data *sd)
 /// Request to change party options.
 /// 0102 <exp share rule>.L (CZ_CHANGE_GROUPEXPOPTION)
 /// 07d7 <exp share rule>.L <item pickup rule>.B <item share rule>.B (CZ_GROUPINFO_CHANGE_V2)
-void clif_parse_PartyChangeOption(int fd, struct map_session_data *sd)
+void clif_parse_PartyChangeOption(int fd, map_session_data *sd)
 {
 	struct party_data *p;
 	int i,expflag;
@@ -13738,7 +13738,7 @@ void clif_parse_PartyChangeOption(int fd, struct map_session_data *sd)
 
 /// Validates and processes party messages (CZ_REQUEST_CHAT_PARTY).
 /// 0108 <packet len>.W <text>.?B (<name> : <message>) 00
-void clif_parse_PartyMessage(int fd, struct map_session_data* sd){
+void clif_parse_PartyMessage(int fd, map_session_data* sd){
 	char name[NAME_LENGTH], message[CHAT_SIZE_MAX], output[CHAT_SIZE_MAX+NAME_LENGTH*2];
 
 	// validate packet and retrieve name and message
@@ -13751,7 +13751,7 @@ void clif_parse_PartyMessage(int fd, struct map_session_data* sd){
 
 /// Changes Party Leader (CZ_CHANGE_GROUP_MASTER).
 /// 07da <account id>.L
-void clif_parse_PartyChangeLeader(int fd, struct map_session_data* sd){
+void clif_parse_PartyChangeLeader(int fd, map_session_data* sd){
 	party_changeleader(sd, map_id2sd(RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0])),NULL);
 }
 
@@ -13761,7 +13761,7 @@ void clif_parse_PartyChangeLeader(int fd, struct map_session_data* sd){
 
 /// Request to register a party booking advertisment (CZ_PARTY_BOOKING_REQ_REGISTER).
 /// 0802 <level>.W <map id>.W { <job>.W }*6
-void clif_parse_PartyBookingRegisterReq(int fd, struct map_session_data* sd){
+void clif_parse_PartyBookingRegisterReq(int fd, map_session_data* sd){
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	short level = RFIFOW(fd,info->pos[0]);
 	short mapid = RFIFOW(fd,info->pos[1]);
@@ -13782,7 +13782,7 @@ void clif_parse_PartyBookingRegisterReq(int fd, struct map_session_data* sd){
 ///     0 = success
 ///     1 = failure
 ///     2 = already registered
-void clif_PartyBookingRegisterAck(struct map_session_data *sd, int flag)
+void clif_PartyBookingRegisterAck(map_session_data *sd, int flag)
 {
 	int fd = sd->fd;
 
@@ -13795,7 +13795,7 @@ void clif_PartyBookingRegisterAck(struct map_session_data *sd, int flag)
 
 /// Request to search for party booking advertisments (CZ_PARTY_BOOKING_REQ_SEARCH).
 /// 0804 <level>.W <map id>.W <job>.W <last index>.L <result count>.W
-void clif_parse_PartyBookingSearchReq(int fd, struct map_session_data* sd){
+void clif_parse_PartyBookingSearchReq(int fd, map_session_data* sd){
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	short level = RFIFOW(fd,info->pos[0]);
 	short mapid = RFIFOW(fd,info->pos[1]);
@@ -13838,7 +13838,7 @@ void clif_PartyBookingSearchAck(int fd, struct party_booking_ad_info** results,
 
 /// Request to delete own party booking advertisment (CZ_PARTY_BOOKING_REQ_DELETE).
 /// 0806
-void clif_parse_PartyBookingDeleteReq(int fd, struct map_session_data* sd)
+void clif_parse_PartyBookingDeleteReq(int fd, map_session_data* sd)
 {
 	if(party_booking_delete(sd))
 		clif_PartyBookingDeleteAck(sd, 0);
@@ -13852,7 +13852,7 @@ void clif_parse_PartyBookingDeleteReq(int fd, struct map_session_data* sd)
 ///     1 = success (auto-removed expired ad)
 ///     2 = failure
 ///     3 = nothing registered
-void clif_PartyBookingDeleteAck(struct map_session_data* sd, int flag)
+void clif_PartyBookingDeleteAck(map_session_data* sd, int flag)
 {
 	int fd = sd->fd;
 
@@ -13865,7 +13865,7 @@ void clif_PartyBookingDeleteAck(struct map_session_data* sd, int flag)
 
 /// Request to update party booking advertisment (CZ_PARTY_BOOKING_REQ_UPDATE).
 /// 0808 { <job>.W }*6
-void clif_parse_PartyBookingUpdateReq(int fd, struct map_session_data* sd)
+void clif_parse_PartyBookingUpdateReq(int fd, map_session_data* sd)
 {
 	short job[MAX_PARTY_BOOKING_JOBS];
 	int i;
@@ -13880,7 +13880,7 @@ void clif_parse_PartyBookingUpdateReq(int fd, struct map_session_data* sd)
 
 /// Notification about new party booking advertisment (ZC_PARTY_BOOKING_NOTIFY_INSERT).
 /// 0809 <index>.L <char name>.24B <expire time>.L <level>.W <map id>.W { <job>.W }*6
-void clif_PartyBookingInsertNotify(struct map_session_data* sd, struct party_booking_ad_info* pb_ad)
+void clif_PartyBookingInsertNotify(map_session_data* sd, struct party_booking_ad_info* pb_ad)
 {
 	int i;
 	uint8 buf[38+MAX_PARTY_BOOKING_JOBS*2];
@@ -13902,7 +13902,7 @@ void clif_PartyBookingInsertNotify(struct map_session_data* sd, struct party_boo
 
 /// Notification about updated party booking advertisment (ZC_PARTY_BOOKING_NOTIFY_UPDATE).
 /// 080a <index>.L { <job>.W }*6
-void clif_PartyBookingUpdateNotify(struct map_session_data* sd, struct party_booking_ad_info* pb_ad)
+void clif_PartyBookingUpdateNotify(map_session_data* sd, struct party_booking_ad_info* pb_ad)
 {
 	int i;
 	uint8 buf[6+MAX_PARTY_BOOKING_JOBS*2];
@@ -13919,7 +13919,7 @@ void clif_PartyBookingUpdateNotify(struct map_session_data* sd, struct party_boo
 
 /// Notification about deleted party booking advertisment (ZC_PARTY_BOOKING_NOTIFY_DELETE).
 /// 080b <index>.L
-void clif_PartyBookingDeleteNotify(struct map_session_data* sd, int index)
+void clif_PartyBookingDeleteNotify(map_session_data* sd, int index)
 {
 	uint8 buf[6];
 
@@ -13932,7 +13932,7 @@ void clif_PartyBookingDeleteNotify(struct map_session_data* sd, int index)
 
 /// Request to close own vending (CZ_REQ_CLOSESTORE).
 /// 012e
-void clif_parse_CloseVending(int fd, struct map_session_data* sd)
+void clif_parse_CloseVending(int fd, map_session_data* sd)
 {
 	vending_closevending(sd);
 }
@@ -13940,7 +13940,7 @@ void clif_parse_CloseVending(int fd, struct map_session_data* sd)
 
 /// Request to open a vending shop (CZ_REQ_BUY_FROMMC).
 /// 0130 <account id>.L
-void clif_parse_VendingListReq(int fd, struct map_session_data* sd)
+void clif_parse_VendingListReq(int fd, map_session_data* sd)
 {
 	if( sd->npc_id ) {// using an NPC
 		return;
@@ -13951,7 +13951,7 @@ void clif_parse_VendingListReq(int fd, struct map_session_data* sd)
 
 /// Shop item(s) purchase request (CZ_PC_PURCHASE_ITEMLIST_FROMMC).
 /// 0134 <packet len>.W <account id>.L { <amount>.W <index>.W }*
-void clif_parse_PurchaseReq(int fd, struct map_session_data* sd){
+void clif_parse_PurchaseReq(int fd, map_session_data* sd){
 	struct PACKET_CZ_PC_PURCHASE_ITEMLIST_FROMMC* p = (struct PACKET_CZ_PC_PURCHASE_ITEMLIST_FROMMC*)RFIFOP( fd, 0 );
 
 	vending_purchasereq( sd, p->AID, sd->vended_id, (uint8*)p->list, ( p->packetLength - sizeof( *p ) ) / sizeof( struct CZ_PURCHASE_ITEM_FROMMC ) );
@@ -13963,7 +13963,7 @@ void clif_parse_PurchaseReq(int fd, struct map_session_data* sd){
 
 /// Shop item(s) purchase request (CZ_PC_PURCHASE_ITEMLIST_FROMMC2).
 /// 0801 <packet len>.W <account id>.L <unique id>.L { <amount>.W <index>.W }*
-void clif_parse_PurchaseReq2(int fd, struct map_session_data* sd){
+void clif_parse_PurchaseReq2(int fd, map_session_data* sd){
 #if PACKETVER >= 20100105
 	struct PACKET_CZ_PC_PURCHASE_ITEMLIST_FROMMC2* p = (struct PACKET_CZ_PC_PURCHASE_ITEMLIST_FROMMC2*)RFIFOP( fd, 0 );
 
@@ -13981,7 +13981,7 @@ void clif_parse_PurchaseReq2(int fd, struct map_session_data* sd){
 /// result:
 ///     0 = canceled
 ///     1 = open
-void clif_parse_OpenVending(int fd, struct map_session_data* sd){
+void clif_parse_OpenVending(int fd, map_session_data* sd){
 	int cmd = RFIFOW(fd,0);
 	struct s_packet_db* info = &packet_db[cmd];
 	short len = (short)RFIFOW(fd,info->pos[0]);
@@ -14022,7 +14022,7 @@ void clif_parse_OpenVending(int fd, struct map_session_data* sd){
 
 /// Guild creation request (CZ_REQ_MAKE_GUILD).
 /// 0165 <char id>.L <guild name>.24B
-void clif_parse_CreateGuild(int fd,struct map_session_data *sd){
+void clif_parse_CreateGuild(int fd,map_session_data *sd){
 	//int charid = RFIFOL(fd,packet_db[cmd].pos[0]);
 	char* name = RFIFOCP(fd,packet_db[RFIFOW(fd,0)].pos[1]);
 	name[NAME_LENGTH-1] = '\0';
@@ -14043,7 +14043,7 @@ void clif_parse_CreateGuild(int fd,struct map_session_data *sd){
 
 /// Request for guild window interface permissions (CZ_REQ_GUILD_MENUINTERFACE).
 /// 014d
-void clif_parse_GuildCheckMaster(int fd, struct map_session_data *sd)
+void clif_parse_GuildCheckMaster(int fd, map_session_data *sd)
 {
 	clif_guild_masterormember(sd);
 }
@@ -14059,7 +14059,7 @@ void clif_parse_GuildCheckMaster(int fd, struct map_session_data *sd)
 ///     4 = expulsion list
 ///     5 = unknown (GM_ALLGUILDLIST)
 ///     6 = notice
-void clif_parse_GuildRequestInfo(int fd, struct map_session_data *sd)
+void clif_parse_GuildRequestInfo(int fd, map_session_data *sd)
 {
 	int type = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
 	if( !sd->status.guild_id && !sd->bg_id )
@@ -14094,7 +14094,7 @@ void clif_parse_GuildRequestInfo(int fd, struct map_session_data *sd)
 
 /// Request to update guild positions (CZ_REG_CHANGE_GUILD_POSITIONINFO).
 /// 0161 <packet len>.W { <position id>.L <mode>.L <ranking>.L <pay rate>.L <name>.24B }*
-void clif_parse_GuildChangePositionInfo(int fd, struct map_session_data *sd)
+void clif_parse_GuildChangePositionInfo(int fd, map_session_data *sd)
 {
 	int i;
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
@@ -14112,7 +14112,7 @@ void clif_parse_GuildChangePositionInfo(int fd, struct map_session_data *sd)
 
 /// Request to update the position of guild members (CZ_REQ_CHANGE_MEMBERPOS).
 /// 0155 <packet len>.W { <account id>.L <char id>.L <position id>.L }*
-void clif_parse_GuildChangeMemberPosition( int fd, struct map_session_data *sd ){
+void clif_parse_GuildChangeMemberPosition( int fd, map_session_data *sd ){
 	if(!sd->state.gmaster_flag)
 		return;
 
@@ -14148,7 +14148,7 @@ void clif_parse_GuildChangeMemberPosition( int fd, struct map_session_data *sd )
 
 /// Request for guild emblem data (CZ_REQ_GUILD_EMBLEM_IMG).
 /// 0151 <guild id>.L
-void clif_parse_GuildRequestEmblem(int fd,struct map_session_data *sd)
+void clif_parse_GuildRequestEmblem(int fd,map_session_data *sd)
 {
 	struct guild* g;
 	int guild_id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
@@ -14196,7 +14196,7 @@ static enum e_result_validate_emblem clif_validate_emblem(const uint8* emblem, u
 
 /// Request to update the guild emblem (CZ_REGISTER_GUILD_EMBLEM_IMG).
 /// 0153 <packet len>.W <emblem data>.?B
-void clif_parse_GuildChangeEmblem(int fd,struct map_session_data *sd){
+void clif_parse_GuildChangeEmblem(int fd,map_session_data *sd){
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	unsigned long emblem_len = RFIFOW(fd,info->pos[0])-4;
 	const uint8* emblem = RFIFOP(fd,info->pos[1]);
@@ -14226,7 +14226,7 @@ void clif_parse_GuildChangeEmblem(int fd,struct map_session_data *sd){
 
 /// Request to update the guild emblem id (version, according to Gravity)
 /// 0b46 <guild id>.L <version>.L
-void clif_parse_GuildChangeEmblem2(int fd, struct map_session_data* sd) {
+void clif_parse_GuildChangeEmblem2(int fd, map_session_data* sd) {
 	nullpo_retv(sd);
 
 #if PACKETVER >= 20190724
@@ -14250,7 +14250,7 @@ void clif_parse_GuildChangeEmblem2(int fd, struct map_session_data* sd) {
 
 /// Guild notice update request (CZ_GUILD_NOTICE).
 /// 016e <guild id>.L <msg1>.60B <msg2>.120B
-void clif_parse_GuildChangeNotice(int fd, struct map_session_data* sd){
+void clif_parse_GuildChangeNotice(int fd, map_session_data* sd){
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	int guild_id = RFIFOL(fd,info->pos[0]);
 	char* msg1 = RFIFOCP(fd,info->pos[1]);
@@ -14268,7 +14268,7 @@ void clif_parse_GuildChangeNotice(int fd, struct map_session_data* sd){
 }
 
 // Helper function for guild invite functions
-int clif_sub_guild_invite(int fd, struct map_session_data *sd, struct map_session_data *t_sd)
+int clif_sub_guild_invite(int fd, map_session_data *sd, map_session_data *t_sd)
 {
 	if (t_sd == NULL) // not online or does not exist
 		return 1;
@@ -14294,9 +14294,9 @@ int clif_sub_guild_invite(int fd, struct map_session_data *sd, struct map_sessio
 
 /// Guild invite request (CZ_REQ_JOIN_GUILD).
 /// 0168 <account id>.L <inviter account id>.L <inviter char id>.L
-void clif_parse_GuildInvite(int fd,struct map_session_data *sd){
+void clif_parse_GuildInvite(int fd,map_session_data *sd){
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
-	struct map_session_data *t_sd = map_id2sd(RFIFOL(fd,info->pos[0]));
+	map_session_data *t_sd = map_id2sd(RFIFOL(fd,info->pos[0]));
 //	int inv_aid = RFIFOL(fd,info->pos[1]);
 //	int inv_cid = RFIFOL(fd,info->pos[2]);
 
@@ -14307,8 +14307,8 @@ void clif_parse_GuildInvite(int fd,struct map_session_data *sd){
 /// Guild invite request (/guildinvite)
 /// 0916 <char name>.24B (CZ_REQ_JOIN_GUILD2)
 void
-clif_parse_GuildInvite2(int fd, struct map_session_data *sd) {
-	struct map_session_data *t_sd = map_nick2sd(RFIFOCP(fd, packet_db[RFIFOW(fd,0)].pos[0]),false);
+clif_parse_GuildInvite2(int fd, map_session_data *sd) {
+	map_session_data *t_sd = map_nick2sd(RFIFOCP(fd, packet_db[RFIFOW(fd,0)].pos[0]),false);
 
 	if (clif_sub_guild_invite(fd, sd, t_sd))
 		return;
@@ -14320,7 +14320,7 @@ clif_parse_GuildInvite2(int fd, struct map_session_data *sd) {
 /// answer:
 ///     0 = refuse
 ///     1 = accept
-void clif_parse_GuildReplyInvite(int fd,struct map_session_data *sd){
+void clif_parse_GuildReplyInvite(int fd,map_session_data *sd){
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	guild_reply_invite(sd,RFIFOL(fd,info->pos[0]),
 	    RFIFOL(fd,info->pos[1]));
@@ -14329,7 +14329,7 @@ void clif_parse_GuildReplyInvite(int fd,struct map_session_data *sd){
 
 /// Request to leave guild (CZ_REQ_LEAVE_GUILD).
 /// 0159 <guild id>.L <account id>.L <char id>.L <reason>.40B
-void clif_parse_GuildLeave(int fd,struct map_session_data *sd){
+void clif_parse_GuildLeave(int fd,map_session_data *sd){
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	if(map_getmapflag(sd->bl.m, MF_GUILDLOCK)) { //Guild locked.
 		clif_displaymessage(fd, msg_txt(sd,228));
@@ -14349,7 +14349,7 @@ void clif_parse_GuildLeave(int fd,struct map_session_data *sd){
 
 /// Request to expel a member of a guild (CZ_REQ_BAN_GUILD).
 /// 015b <guild id>.L <account id>.L <char id>.L <reason>.40B
-void clif_parse_GuildExpulsion(int fd,struct map_session_data *sd){
+void clif_parse_GuildExpulsion(int fd,map_session_data *sd){
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	if( map_getmapflag(sd->bl.m, MF_GUILDLOCK) || sd->bg_id )
 	{ // Guild locked.
@@ -14365,7 +14365,7 @@ void clif_parse_GuildExpulsion(int fd,struct map_session_data *sd){
 
 /// Validates and processes guild messages (CZ_GUILD_CHAT).
 /// 017e <packet len>.W <text>.?B (<name> : <message>) 00
-void clif_parse_GuildMessage(int fd, struct map_session_data* sd){
+void clif_parse_GuildMessage(int fd, map_session_data* sd){
 	char name[NAME_LENGTH], message[CHAT_SIZE_MAX], output[CHAT_SIZE_MAX+NAME_LENGTH*2];
 
 	// validate packet and retrieve name and message
@@ -14381,9 +14381,9 @@ void clif_parse_GuildMessage(int fd, struct map_session_data* sd){
 
 /// Guild alliance request (CZ_REQ_ALLY_GUILD).
 /// 0170 <account id>.L <inviter account id>.L <inviter char id>.L
-void clif_parse_GuildRequestAlliance(int fd, struct map_session_data *sd)
+void clif_parse_GuildRequestAlliance(int fd, map_session_data *sd)
 {
-	struct map_session_data *t_sd;
+	map_session_data *t_sd;
 
 	if(!sd->state.gmaster_flag)
 		return;
@@ -14412,7 +14412,7 @@ void clif_parse_GuildRequestAlliance(int fd, struct map_session_data *sd)
 /// answer:
 ///     0 = refuse
 ///     1 = accept
-void clif_parse_GuildReplyAlliance(int fd, struct map_session_data *sd){
+void clif_parse_GuildReplyAlliance(int fd, map_session_data *sd){
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	guild_reply_reqalliance(sd,
 	    RFIFOL(fd,info->pos[0]),
@@ -14425,7 +14425,7 @@ void clif_parse_GuildReplyAlliance(int fd, struct map_session_data *sd){
 /// relation:
 ///     0 = Ally
 ///     1 = Enemy
-void clif_parse_GuildDelAlliance(int fd, struct map_session_data *sd){
+void clif_parse_GuildDelAlliance(int fd, map_session_data *sd){
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	if(!sd->state.gmaster_flag)
 		return;
@@ -14442,9 +14442,9 @@ void clif_parse_GuildDelAlliance(int fd, struct map_session_data *sd){
 
 /// Request to set a guild as opposition (CZ_REQ_HOSTILE_GUILD).
 /// 0180 <account id>.L
-void clif_parse_GuildOpposition(int fd, struct map_session_data *sd)
+void clif_parse_GuildOpposition(int fd, map_session_data *sd)
 {
-	struct map_session_data *t_sd;
+	map_session_data *t_sd;
 
 	if(!sd->state.gmaster_flag)
 		return;
@@ -14471,7 +14471,7 @@ void clif_parse_GuildOpposition(int fd, struct map_session_data *sd)
 /// key:
 ///     now guild name; might have been (intended) email, since the
 ///     field name and size is same as the one in CH_DELETE_CHAR.
-void clif_parse_GuildBreak(int fd, struct map_session_data *sd)
+void clif_parse_GuildBreak(int fd, map_session_data *sd)
 {
 	if( map_getmapflag(sd->bl.m, MF_GUILDLOCK) ) { //Guild locked.
 		clif_displaymessage(fd, msg_txt(sd,228));
@@ -14492,21 +14492,21 @@ void clif_parse_GuildBreak(int fd, struct map_session_data *sd)
 ///     2 = performance
 ///     3 = return to egg
 ///     4 = unequip accessory
-void clif_parse_PetMenu(int fd, struct map_session_data *sd){
+void clif_parse_PetMenu(int fd, map_session_data *sd){
 	pet_menu(sd,RFIFOB(fd,packet_db[RFIFOW(fd,0)].pos[0]));
 }
 
 
 /// Attempt to tame a monster (CZ_TRYCAPTURE_MONSTER).
 /// 019f <id>.L
-void clif_parse_CatchPet(int fd, struct map_session_data *sd){
+void clif_parse_CatchPet(int fd, map_session_data *sd){
 	pet_catch_process2(sd,RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]));
 }
 
 
 /// Answer to pet incubator egg selection dialog (CZ_SELECT_PETEGG).
 /// 01a7 <index>.W
-void clif_parse_SelectEgg(int fd, struct map_session_data *sd){
+void clif_parse_SelectEgg(int fd, map_session_data *sd){
 	if (sd->menuskill_id != SA_TAMINGMONSTER || sd->menuskill_val != -1)
 		return;
 
@@ -14539,7 +14539,7 @@ void clif_parse_SelectEgg(int fd, struct map_session_data *sd){
 ///         2 = satisfied (noting)
 ///         3 = stuffed (full)
 ///         4 = full (so_full)
-void clif_parse_SendEmotion(int fd, struct map_session_data *sd)
+void clif_parse_SendEmotion(int fd, map_session_data *sd)
 {
 	if(sd->pd)
 		clif_pet_emotion(sd->pd,RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]));
@@ -14548,7 +14548,7 @@ void clif_parse_SendEmotion(int fd, struct map_session_data *sd)
 
 /// Request to change pet's name (CZ_RENAME_PET).
 /// 01a5 <name>.24B
-void clif_parse_ChangePetName(int fd, struct map_session_data *sd)
+void clif_parse_ChangePetName(int fd, map_session_data *sd)
 {
 	pet_change_name(sd,RFIFOCP(fd,packet_db[RFIFOW(fd,0)].pos[0]));
 }
@@ -14558,7 +14558,7 @@ void clif_parse_ChangePetName(int fd, struct map_session_data *sd)
 /// Request to disconnect a character.
 /// 00cc <account id>.L
 /// NOTE: Also sent when using GM right click menu "(name) force to quit"
-void clif_parse_GMKick(int fd, struct map_session_data *sd)
+void clif_parse_GMKick(int fd, map_session_data *sd)
 {
 	struct block_list *target;
 	int tid;
@@ -14615,7 +14615,7 @@ void clif_parse_GMKick(int fd, struct map_session_data *sd)
 /// /killall (CZ_DISCONNECT_ALL_CHARACTER).
 /// Request to disconnect all characters.
 /// 00ce
-void clif_parse_GMKickAll(int fd, struct map_session_data* sd) {
+void clif_parse_GMKickAll(int fd, map_session_data* sd) {
 	char cmd[15];
 	safesnprintf(cmd,sizeof(cmd),"%ckickall",atcommand_symbol);
 	is_atcommand(fd, sd, cmd, 1);
@@ -14629,7 +14629,7 @@ void clif_parse_GMKickAll(int fd, struct map_session_data* sd) {
 /// /shift (CZ_SHIFT).
 /// Request to warp to a character with given name.
 /// 01bb <char name>.24B
-void clif_parse_GMShift(int fd, struct map_session_data *sd)
+void clif_parse_GMShift(int fd, map_session_data *sd)
 {// FIXME: remove is supposed to receive account name for clients prior 20100803RE
 	char *player_name;
 	char command[NAME_LENGTH+8];
@@ -14645,10 +14645,10 @@ void clif_parse_GMShift(int fd, struct map_session_data *sd)
 /// /remove (CZ_REMOVE_AID_SSO).
 /// Request to warp to a character with given account ID.
 /// 0843 <account id>.L
-void clif_parse_GMRemove2(int fd, struct map_session_data* sd)
+void clif_parse_GMRemove2(int fd, map_session_data* sd)
 {
 	uint32 account_id;
-	struct map_session_data* pl_sd;
+	map_session_data* pl_sd;
 
 	account_id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
 	if( (pl_sd = map_id2sd(account_id)) != NULL ) {
@@ -14666,7 +14666,7 @@ void clif_parse_GMRemove2(int fd, struct map_session_data* sd)
 /// /summon (CZ_RECALL_GID).
 /// Request to summon a player with given name to own position.
 /// 01bd <char name>.24B
-void clif_parse_GMRecall(int fd, struct map_session_data *sd)
+void clif_parse_GMRecall(int fd, map_session_data *sd)
 {// FIXME: recall is supposed to receive account name for clients prior 20100803RE
 	char *player_name;
 	char command [NAME_LENGTH+8];
@@ -14682,10 +14682,10 @@ void clif_parse_GMRecall(int fd, struct map_session_data *sd)
 /// /recall (CZ_RECALL_SSO).
 /// Request to summon a player with given account ID to own position.
 /// 0842 <account id>.L
-void clif_parse_GMRecall2(int fd, struct map_session_data* sd)
+void clif_parse_GMRecall2(int fd, map_session_data* sd)
 {
 	uint32 account_id;
-	struct map_session_data* pl_sd;
+	map_session_data* pl_sd;
 
 	account_id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
 	if( (pl_sd = map_id2sd(account_id)) != NULL ) {
@@ -14709,7 +14709,7 @@ void clif_parse_GMRecall2(int fd, struct map_session_data* sd)
 /// /item agitinvest - reset current global agit investments.(not yet implemented)
 /// 013f <item/mob name>.24B
 /// 09ce <item/mob name>.100B [Ind/Yommy]
-void clif_parse_GM_Item_Monster(int fd, struct map_session_data *sd)
+void clif_parse_GM_Item_Monster(int fd, map_session_data *sd)
 {
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	int mob_id = 0;
@@ -14775,7 +14775,7 @@ void clif_parse_GM_Item_Monster(int fd, struct map_session_data *sd)
 /// 019d <effect state>.L
 /// effect state:
 ///     TODO: Any OPTION_* ?
-void clif_parse_GMHide(int fd, struct map_session_data *sd) {
+void clif_parse_GMHide(int fd, map_session_data *sd) {
 	char cmd[6];
 	//int eff_st = RFIFOL(packet_db[RFIFOW(fd,0)].pos[0]);
 
@@ -14790,10 +14790,10 @@ void clif_parse_GMHide(int fd, struct map_session_data *sd) {
 ///     0 = positive points
 ///     1 = negative points
 ///     2 = self mute (+10 minutes)
-void clif_parse_GMReqNoChat(int fd,struct map_session_data *sd)
+void clif_parse_GMReqNoChat(int fd,map_session_data *sd)
 {
 	int id, type, value;
-	struct map_session_data *dstsd;
+	map_session_data *dstsd;
 	char command[NAME_LENGTH+15];
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 
@@ -14822,7 +14822,7 @@ void clif_parse_GMReqNoChat(int fd,struct map_session_data *sd)
 /// /rc (CZ_REQ_GIVE_MANNER_BYNAME).
 /// GM adjustment of a player's manner value by -60.
 /// 0212 <char name>.24B
-void clif_parse_GMRc(int fd, struct map_session_data* sd)
+void clif_parse_GMRc(int fd, map_session_data* sd)
 {
 	char command[NAME_LENGTH+15];
 	char *name = RFIFOCP(fd,packet_db[RFIFOW(fd,0)].pos[0]);
@@ -14848,7 +14848,7 @@ void clif_account_name(int fd, uint32 account_id, const char* accname)
 /// GM requesting account name (for right-click gm menu) (CZ_REQ_ACCOUNTNAME).
 /// 01df <account id>.L
 //! TODO: Figure out how does this actually work
-void clif_parse_GMReqAccountName(int fd, struct map_session_data *sd)
+void clif_parse_GMReqAccountName(int fd, map_session_data *sd)
 {
 	uint32 account_id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
 	/*
@@ -14867,7 +14867,7 @@ void clif_parse_GMReqAccountName(int fd, struct map_session_data *sd)
 /// type:
 ///     0 = not walkable
 ///     1 = walkable
-void clif_parse_GMChangeMapType(int fd, struct map_session_data *sd)
+void clif_parse_GMChangeMapType(int fd, map_session_data *sd)
 {
 	int x,y,type;
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
@@ -14891,7 +14891,7 @@ void clif_parse_GMChangeMapType(int fd, struct map_session_data *sd)
 /// type:
 ///     0 = (/ex nick) deny speech from nick
 ///     1 = (/in nick) allow speech from nick
-void clif_parse_PMIgnore(int fd, struct map_session_data* sd)
+void clif_parse_PMIgnore(int fd, map_session_data* sd)
 {
 	char* nick;
 	uint8 type;
@@ -14945,7 +14945,7 @@ void clif_parse_PMIgnore(int fd, struct map_session_data* sd)
 /// type:
 ///     0 = (/exall) deny all speech
 ///     1 = (/inall) allow all speech
-void clif_parse_PMIgnoreAll(int fd, struct map_session_data *sd)
+void clif_parse_PMIgnoreAll(int fd, map_session_data *sd)
 {
 	int type = RFIFOB(fd,packet_db[RFIFOW(fd,0)].pos[0]), flag;
 
@@ -14977,7 +14977,7 @@ void clif_parse_PMIgnoreAll(int fd, struct map_session_data *sd)
 
 /// Whisper ignore list (ZC_WHISPER_LIST).
 /// 00d4 <packet len>.W { <char name>.24B }*
-void clif_PMIgnoreList(struct map_session_data* sd)
+void clif_PMIgnoreList(map_session_data* sd)
 {
 	int i, fd = sd->fd;
 
@@ -14995,7 +14995,7 @@ void clif_PMIgnoreList(struct map_session_data* sd)
 
 /// Whisper ignore list request (CZ_REQ_WHISPER_LIST).
 /// 00d3
-void clif_parse_PMIgnoreList(int fd,struct map_session_data *sd)
+void clif_parse_PMIgnoreList(int fd,map_session_data *sd)
 {
 	clif_PMIgnoreList(sd);
 }
@@ -15003,7 +15003,7 @@ void clif_parse_PMIgnoreList(int fd,struct map_session_data *sd)
 
 /// Request to invoke the /doridori recovery bonus (CZ_DORIDORI).
 /// 01e7
-void clif_parse_NoviceDoriDori(int fd, struct map_session_data *sd)
+void clif_parse_NoviceDoriDori(int fd, map_session_data *sd)
 {
 	if (sd->state.doridori) return;
 
@@ -15031,7 +15031,7 @@ void clif_parse_NoviceDoriDori(int fd, struct map_session_data *sd)
 ///       "Dear angel, can you hear my voice?"
 ///       "I am" (space separated player name) "Super Novice~"
 ///       "Help me out~ Please~ T_T"
-void clif_parse_NoviceExplosionSpirits(int fd, struct map_session_data *sd)
+void clif_parse_NoviceExplosionSpirits(int fd, map_session_data *sd)
 {
 	if( (sd->class_&MAPID_UPPERMASK) == MAPID_SUPER_NOVICE ) {
 		t_exp next = pc_nextbaseexp(sd);
@@ -15057,7 +15057,7 @@ void clif_parse_NoviceExplosionSpirits(int fd, struct map_session_data *sd)
 /// state:
 ///     0 = online
 ///     1 = offline
-void clif_friendslist_toggle(struct map_session_data *sd,uint32 account_id, uint32 char_id, int online)
+void clif_friendslist_toggle(map_session_data *sd,uint32 account_id, uint32 char_id, int online)
 {
 	int i, fd = sd->fd;
 
@@ -15081,7 +15081,7 @@ void clif_friendslist_toggle(struct map_session_data *sd,uint32 account_id, uint
 
 
 //Subfunction called from clif_foreachclient to toggle friends on/off [Skotlex]
-int clif_friendslist_toggle_sub(struct map_session_data *sd,va_list ap)
+int clif_friendslist_toggle_sub(map_session_data *sd,va_list ap)
 {
 	uint32 account_id, char_id, online;
 	account_id = va_arg(ap, int);
@@ -15095,7 +15095,7 @@ int clif_friendslist_toggle_sub(struct map_session_data *sd,va_list ap)
 /// Sends the whole friends list (ZC_FRIENDS_LIST).
 /// 0201 <packet len>.W { <account id>.L <char id>.L <name>.24B }*
 /// 0201 <packet len>.W { <account id>.L <char id>.L }* >= 20180221
-void clif_friendslist_send( struct map_session_data& sd ){
+void clif_friendslist_send( map_session_data& sd ){
 	struct PACKET_ZC_FRIENDS_LIST* p = (struct PACKET_ZC_FRIENDS_LIST*)packet_buffer;
 
 	p->packetType = HEADER_ZC_FRIENDS_LIST;
@@ -15132,7 +15132,7 @@ void clif_friendslist_send( struct map_session_data& sd ){
 ///     1 = MsgStringTable[822]="(%s) does not want to be friends with you."
 ///     2 = MsgStringTable[819]="Your Friend List is full."
 ///     3 = MsgStringTable[820]="(%s)'s Friend List is full."
-void clif_friendslist_reqack(struct map_session_data *sd, struct map_session_data *f_sd, int type)
+void clif_friendslist_reqack(map_session_data *sd, map_session_data *f_sd, int type)
 {
 	int fd;
 	nullpo_retv(sd);
@@ -15152,7 +15152,7 @@ void clif_friendslist_reqack(struct map_session_data *sd, struct map_session_dat
 
 /// Asks a player for permission to be added as friend (ZC_REQ_ADD_FRIENDS).
 /// 0207 <req account id>.L <req char id>.L <req char name>.24B
-void clif_friendlist_req(struct map_session_data* sd, uint32 account_id, uint32 char_id, const char* name)
+void clif_friendlist_req(map_session_data* sd, uint32 account_id, uint32 char_id, const char* name)
 {
 	int fd = sd->fd;
 
@@ -15167,9 +15167,9 @@ void clif_friendlist_req(struct map_session_data* sd, uint32 account_id, uint32
 
 /// Request to add a player as friend (CZ_ADD_FRIENDS).
 /// 0202 <name>.24B
-void clif_parse_FriendsListAdd(int fd, struct map_session_data *sd)
+void clif_parse_FriendsListAdd(int fd, map_session_data *sd)
 {
-	struct map_session_data *f_sd;
+	map_session_data *f_sd;
 	int i;
 
 	f_sd = map_nick2sd(RFIFOCP(fd,packet_db[RFIFOW(fd,0)].pos[0]),false);
@@ -15219,9 +15219,9 @@ void clif_parse_FriendsListAdd(int fd, struct map_session_data *sd)
 /// reply:
 ///     0 = rejected
 ///     1 = accepted
-void clif_parse_FriendsListReply(int fd, struct map_session_data *sd)
+void clif_parse_FriendsListReply(int fd, map_session_data *sd)
 {
-	struct map_session_data *f_sd;
+	map_session_data *f_sd;
 	uint32 account_id;
 	char reply;
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
@@ -15288,9 +15288,9 @@ void clif_parse_FriendsListReply(int fd, struct map_session_data *sd)
 
 /// Request to delete a friend (CZ_DELETE_FRIENDS).
 /// 0203 <account id>.L <char id>.L
-void clif_parse_FriendsListRemove(int fd, struct map_session_data *sd)
+void clif_parse_FriendsListRemove(int fd, map_session_data *sd)
 {
-	struct map_session_data *f_sd = NULL;
+	map_session_data *f_sd = NULL;
 	uint32 account_id, char_id;
 	int i, j;
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
@@ -15353,7 +15353,7 @@ void clif_parse_FriendsListRemove(int fd, struct map_session_data *sd)
 
 /// /pvpinfo list (ZC_ACK_PVPPOINT).
 /// 0210 <char id>.L <account id>.L <win point>.L <lose point>.L <point>.L
-void clif_PVPInfo(struct map_session_data* sd)
+void clif_PVPInfo(map_session_data* sd)
 {
 	int fd = sd->fd;
 
@@ -15370,7 +15370,7 @@ void clif_PVPInfo(struct map_session_data* sd)
 
 /// /pvpinfo (CZ_REQ_PVPPOINT).
 /// 020f <char id>.L <account id>.L
-void clif_parse_PVPInfo(int fd,struct map_session_data *sd)
+void clif_parse_PVPInfo(int fd,map_session_data *sd)
 {
 	// TODO: Is there a way to use this on an another player (char/acc id)?
 	//int cid = RFIFOB(fd,packet_db[RFIFOW(fd,0)].pos[0]);
@@ -15384,7 +15384,7 @@ void clif_parse_PVPInfo(int fd,struct map_session_data *sd)
 ///     0 = sun
 ///     1 = moon
 ///     2 = star
-void clif_parse_FeelSaveOk(int fd,struct map_session_data *sd)
+void clif_parse_FeelSaveOk(int fd,map_session_data *sd)
 {
 	int i;
 	//int wich = RFIFOB(fd,packet_db[RFIFOW(fd,0)].pos[0]);
@@ -15411,7 +15411,7 @@ void clif_parse_FeelSaveOk(int fd,struct map_session_data *sd)
 ///     0 = sun
 ///     1 = moon
 ///     2 = star
-void clif_feel_req(int fd, struct map_session_data *sd, uint16 skill_lv)
+void clif_feel_req(int fd, map_session_data *sd, uint16 skill_lv)
 {
 	WFIFOHEAD(fd,packet_len(0x253));
 	WFIFOW(fd,0)=0x253;
@@ -15424,14 +15424,14 @@ void clif_feel_req(int fd, struct map_session_data *sd, uint16 skill_lv)
 
 /// Request to change homunculus' name (CZ_RENAME_MER).
 /// 0231 <name>.24B
-void clif_parse_ChangeHomunculusName(int fd, struct map_session_data *sd){
+void clif_parse_ChangeHomunculusName(int fd, map_session_data *sd){
 	hom_change_name(sd,RFIFOCP(fd,packet_db[RFIFOW(fd,0)].pos[0]));
 }
 
 
 /// Request to warp/move homunculus/mercenary to it's owner (CZ_REQUEST_MOVETOOWNER).
 /// 0234 <id>.L
-void clif_parse_HomMoveToMaster(int fd, struct map_session_data *sd){
+void clif_parse_HomMoveToMaster(int fd, map_session_data *sd){
 	int id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]); // Mercenary or Homunculus
 	struct block_list *bl = NULL;
 	struct unit_data *ud = NULL;
@@ -15451,7 +15451,7 @@ void clif_parse_HomMoveToMaster(int fd, struct map_session_data *sd){
 
 /// Request to move homunculus/mercenary (CZ_REQUEST_MOVENPC).
 /// 0232 <id>.L <position data>.3B
-void clif_parse_HomMoveTo(int fd, struct map_session_data *sd){
+void clif_parse_HomMoveTo(int fd, map_session_data *sd){
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	int id = RFIFOL(fd,info->pos[0]); // Mercenary or Homunculus
 	struct block_list *bl = NULL;
@@ -15474,7 +15474,7 @@ void clif_parse_HomMoveTo(int fd, struct map_session_data *sd){
 /// 0233 <id>.L <target id>.L <action>.B
 /// action:
 ///     always 0
-void clif_parse_HomAttack(int fd,struct map_session_data *sd)
+void clif_parse_HomAttack(int fd,map_session_data *sd)
 {
 	struct block_list *bl = NULL;
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
@@ -15501,7 +15501,7 @@ void clif_parse_HomAttack(int fd,struct map_session_data *sd)
 ///     0 = homunculus information
 ///     1 = feed
 ///     2 = delete
-void clif_parse_HomMenu(int fd, struct map_session_data *sd)
+void clif_parse_HomMenu(int fd, map_session_data *sd)
 {	//[orn]
 	int cmd = RFIFOW(fd,0);
 	//int type = RFIFOW(fd,packet_db[cmd].pos[0]);
@@ -15514,7 +15514,7 @@ void clif_parse_HomMenu(int fd, struct map_session_data *sd)
 
 /// Request to resurrect oneself using Token of Siegfried (CZ_STANDING_RESURRECTION).
 /// 0292
-void clif_parse_AutoRevive(int fd, struct map_session_data *sd)
+void clif_parse_AutoRevive(int fd, map_session_data *sd)
 {
 	pc_revive_item(sd);
 }
@@ -15527,7 +15527,7 @@ void clif_parse_AutoRevive(int fd, struct map_session_data *sd)
 ///      <itemdefPower>.W <plusdefPower>.W <mdefPower>.W <plusmdefPower>.W
 ///      <hitSuccessValue>.W <avoidSuccessValue>.W <plusAvoidSuccessValue>.W
 ///      <criticalSuccessValue>.W <ASPD>.W <plusASPD>.W
-void clif_check(int fd, struct map_session_data* pl_sd)
+void clif_check(int fd, map_session_data* pl_sd)
 {
 	WFIFOHEAD(fd,packet_len(0x214));
 	WFIFOW(fd, 0) = 0x214;
@@ -15564,10 +15564,10 @@ void clif_check(int fd, struct map_session_data* pl_sd)
 /// /check (CZ_REQ_STATUS_GM).
 /// Request character's status values.
 /// 0213 <char name>.24B
-void clif_parse_Check(int fd, struct map_session_data *sd)
+void clif_parse_Check(int fd, map_session_data *sd)
 {
 	char charname[NAME_LENGTH];
-	struct map_session_data* pl_sd;
+	map_session_data* pl_sd;
 
 	if(!pc_has_permission(sd, PC_PERM_USE_CHECK))
 		return;
@@ -15599,7 +15599,7 @@ void clif_parse_Check(int fd, struct map_session_data *sd)
 ///		0 = success
 ///		1 = over weight
 ///		2 = fatal error
-void clif_Mail_setattachment( struct map_session_data* sd, int index, int amount, uint8 flag ){
+void clif_Mail_setattachment( map_session_data* sd, int index, int amount, uint8 flag ){
 	int fd = sd->fd;
 
 #if PACKETVER < 20150513
@@ -15657,7 +15657,7 @@ void clif_Mail_setattachment( struct map_session_data* sd, int index, int amount
 ///     2 = too many items
 /// 09f2 <mail id>.Q <mail tab>.B <result>.B (ZC_ACK_ZENY_FROM_MAIL)
 /// 09f4 <mail id>.Q <mail tab>.B <result>.B (ZC_ACK_ITEM_FROM_MAIL)
-void clif_mail_getattachment(struct map_session_data* sd, struct mail_message *msg, uint8 result, enum mail_attachment_type type) {
+void clif_mail_getattachment(map_session_data* sd, struct mail_message *msg, uint8 result, enum mail_attachment_type type) {
 #if PACKETVER < 20150513
 	int fd = sd->fd;
 
@@ -15693,7 +15693,7 @@ void clif_mail_getattachment(struct map_session_data* sd, struct mail_message *m
 ///     0 = success
 ///     1 = recipinent does not exist
 /// 09ed <result>.B (ZC_ACK_WRITE_MAIL)
-void clif_Mail_send(struct map_session_data* sd, enum mail_send_result result){
+void clif_Mail_send(map_session_data* sd, enum mail_send_result result){
 #if PACKETVER < 20150513
 	int fd = sd->fd;
 
@@ -15717,7 +15717,7 @@ void clif_Mail_send(struct map_session_data* sd, enum mail_send_result result){
 ///     0 = success
 ///     1 = failure
 // 09f6 <mail tab>.B <mail id>.Q (ZC_ACK_DELETE_MAIL)
-void clif_mail_delete( struct map_session_data* sd, struct mail_message *msg, bool success ){
+void clif_mail_delete( map_session_data* sd, struct mail_message *msg, bool success ){
 #if PACKETVER < 20150513
 	int fd = sd->fd;
 
@@ -15757,7 +15757,7 @@ void clif_Mail_return(int fd, int mail_id, short fail)
 /// Notification about new mail.
 /// 024a <mail id>.L <title>.40B <sender>.24B (ZC_MAIL_RECEIVE)
 /// 09e7 <result>.B (ZC_NOTIFY_UNREADMAIL)
-void clif_Mail_new(struct map_session_data* sd, int mail_id, const char *sender, const char *title){
+void clif_Mail_new(map_session_data* sd, int mail_id, const char *sender, const char *title){
 #if PACKETVER < 20150513
 	int fd = sd->fd;
 
@@ -15800,7 +15800,7 @@ void clif_Mail_window(int fd, int flag)
 ///		{ <mail id>.Q <read>.B <type>.B <sender>.24B <received>.L <expires>.L <title length>.W <title>.?B }*
 /// 0ac2 <packet len>.W <unknown>.B (ZC_ACK_MAIL_LIST3)
 ///		{ <type>.B <mail id>.Q <read>.B <type>.B <sender>.24B <expires>.L <title length>.W <title>.?B }*
-void clif_Mail_refreshinbox(struct map_session_data *sd,enum mail_inbox_type type,int64 mailID){
+void clif_Mail_refreshinbox(map_session_data *sd,enum mail_inbox_type type,int64 mailID){
 #if PACKETVER < 20150513
 	int fd = sd->fd;
 	struct mail_data *md = &sd->mail.inbox;
@@ -15993,7 +15993,7 @@ void clif_Mail_refreshinbox(struct map_session_data *sd,enum mail_inbox_type typ
 /// 09ef <mail tab>.B <mail id>.Q (CZ_REQ_REFRESH_MAIL_LIST)
 /// 0ac0 <mail id>.Q <unknown>.16B (CZ_OPEN_MAILBOX2)
 /// 0ac1 <mail id>.Q <unknown>.16B (CZ_REQ_REFRESH_MAIL_LIST2)
-void clif_parse_Mail_refreshinbox(int fd, struct map_session_data *sd){
+void clif_parse_Mail_refreshinbox(int fd, map_session_data *sd){
 	if( mail_invalid_operation( sd ) ){
 		return;
 	}
@@ -16060,7 +16060,7 @@ void clif_parse_Mail_refreshinbox(int fd, struct map_session_data *sd){
 /// 09eb <packet len>.W <type>.B <mail id>.Q <message length>.W <zeny>.Q <item count>.B (ZC_ACK_READ_MAIL)
 ///		{  }*n
 // TODO: Packet description => for repeated block
-void clif_Mail_read( struct map_session_data *sd, int mail_id ){
+void clif_Mail_read( map_session_data *sd, int mail_id ){
 	int i, fd = sd->fd;
 
 	ARR_FIND(0, MAIL_MAX_INBOX, i, sd->mail.inbox.msg[i].id == mail_id);
@@ -16173,7 +16173,7 @@ void clif_Mail_read( struct map_session_data *sd, int mail_id ){
 /// Request to open a mail.
 /// 0241 <mail id>.L (CZ_MAIL_OPEN)
 /// 09ea <mail tab>.B <mail id>.Q (CZ_REQ_READ_MAIL)
-void clif_parse_Mail_read(int fd, struct map_session_data *sd){
+void clif_parse_Mail_read(int fd, map_session_data *sd){
 #if PACKETVER < 20150513
 	int mail_id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
 #else
@@ -16191,7 +16191,7 @@ void clif_parse_Mail_read(int fd, struct map_session_data *sd){
 
 /// Allow a player to begin writing a mail
 /// 0a12 <receiver>.24B <success>.B (ZC_ACK_OPEN_WRITE_MAIL)
-void clif_send_Mail_beginwrite_ack( struct map_session_data *sd, char* name, bool success ){
+void clif_send_Mail_beginwrite_ack( map_session_data *sd, char* name, bool success ){
 	PACKET_ZC_ACK_OPEN_WRITE_MAIL p = { 0 };
 
 	p.PacketType = rodexopenwrite;
@@ -16202,7 +16202,7 @@ void clif_send_Mail_beginwrite_ack( struct map_session_data *sd, char* name, boo
 
 /// Request to start writing a mail
 /// 0a08 <receiver>.24B (CZ_REQ_OPEN_WRITE_MAIL)
-void clif_parse_Mail_beginwrite( int fd, struct map_session_data *sd ){
+void clif_parse_Mail_beginwrite( int fd, map_session_data *sd ){
 	char name[NAME_LENGTH];
 
 	safestrncpy(name, RFIFOCP(fd, 2), NAME_LENGTH);
@@ -16224,14 +16224,14 @@ void clif_parse_Mail_beginwrite( int fd, struct map_session_data *sd ){
 
 /// Notification that the client cancelled writing a mail
 /// 0a03 (CZ_REQ_CANCEL_WRITE_MAIL)
-void clif_parse_Mail_cancelwrite( int fd, struct map_session_data *sd ){
+void clif_parse_Mail_cancelwrite( int fd, map_session_data *sd ){
 	sd->state.mail_writing = false;
 }
 
 /// Give the client information about the recipient, if available
 /// 0a14 <char id>.L <class>.W <base level>.W (ZC_CHECK_RECEIVE_CHARACTER_NAME)
 /// 0a51 <char id>.L <class>.W <base level>.W <name>.24B (ZC_CHECK_RECEIVE_CHARACTER_NAME2)
-void clif_Mail_Receiver_Ack( struct map_session_data* sd, uint32 char_id, short class_, uint32 level, const char* name ){
+void clif_Mail_Receiver_Ack( map_session_data* sd, uint32 char_id, short class_, uint32 level, const char* name ){
 #if PACKETVER >= 20141119
 	PACKET_ZC_CHECKNAME p = { 0 };
 
@@ -16248,7 +16248,7 @@ void clif_Mail_Receiver_Ack( struct map_session_data* sd, uint32 char_id, short
 
 /// Request information about the recipient
 /// 0a13 <name>.24B (CZ_CHECK_RECEIVE_CHARACTER_NAME)
-void clif_parse_Mail_Receiver_Check(int fd, struct map_session_data *sd) {
+void clif_parse_Mail_Receiver_Check(int fd, map_session_data *sd) {
 #if PACKETVER >= 20140423
 #if PACKETVER_MAIN_NUM >= 20201104 || PACKETVER_RE_NUM >= 20211103 || PACKETVER_ZERO_NUM >= 20201118
 	struct PACKET_CZ_CHECKNAME2* p = (struct PACKET_CZ_CHECKNAME2*)RFIFOP( fd, 0 );
@@ -16271,7 +16271,7 @@ void clif_parse_Mail_Receiver_Check(int fd, struct map_session_data *sd) {
 /// 0244 <mail id>.L (CZ_MAIL_GET_ITEM)
 /// 09f1 <mail id>.Q <mail tab>.B (CZ_REQ_ZENY_FROM_MAIL)
 /// 09f3 <mail id>.Q <mail tab>.B (CZ_REQ_ITEM_FROM_MAIL)
-void clif_parse_Mail_getattach( int fd, struct map_session_data *sd ){
+void clif_parse_Mail_getattach( int fd, map_session_data *sd ){
 	int i;
 	struct mail_message* msg;
 #if PACKETVER < 20150513
@@ -16377,7 +16377,7 @@ void clif_parse_Mail_getattach( int fd, struct map_session_data *sd ){
 /// Request to delete a mail.
 /// 0243 <mail id>.L (CZ_MAIL_DELETE)
 /// 09f5 <mail tab>.B <mail id>.Q (CZ_REQ_DELETE_MAIL)
-void clif_parse_Mail_delete(int fd, struct map_session_data *sd){
+void clif_parse_Mail_delete(int fd, map_session_data *sd){
 #if PACKETVER < 20150513
 	int mail_id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
 #else
@@ -16421,7 +16421,7 @@ void clif_parse_Mail_delete(int fd, struct map_session_data *sd){
 
 /// Request to return a mail (CZ_REQ_MAIL_RETURN).
 /// 0273 <mail id>.L <receive name>.24B
-void clif_parse_Mail_return(int fd, struct map_session_data *sd){
+void clif_parse_Mail_return(int fd, map_session_data *sd){
 #if PACKETVER_MAIN_NUM >= 20201104 || PACKETVER_RE_NUM >= 20211103 || PACKETVER_ZERO_NUM >= 20201118
 	struct PACKET_CZ_UNCONFIRMED_RODEX_RETURN* p = (struct PACKET_CZ_UNCONFIRMED_RODEX_RETURN*)RFIFOP( fd, 0 );
 
@@ -16453,7 +16453,7 @@ void clif_parse_Mail_return(int fd, struct map_session_data *sd){
 /// Request to add an item or Zeny to mail.
 /// 0247 <index>.W <amount>.L (CZ_MAIL_ADD_ITEM)
 /// 0a04 <index>.W <amount>.W (CZ_REQ_ADD_ITEM_TO_MAIL)
-void clif_parse_Mail_setattach(int fd, struct map_session_data *sd){
+void clif_parse_Mail_setattach(int fd, map_session_data *sd){
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	uint16 idx = RFIFOW(fd,info->pos[0]);
 #if PACKETVER < 20150513
@@ -16486,7 +16486,7 @@ void clif_parse_Mail_setattach(int fd, struct map_session_data *sd){
 
 /// Remove an item from a mail
 /// 0a07 <result>.B <index>.W <amount>.W <weight>.W
-void clif_mail_removeitem( struct map_session_data* sd, bool success, int index, int amount ){
+void clif_mail_removeitem( map_session_data* sd, bool success, int index, int amount ){
 	PACKET_ZC_ACK_REMOVE_ITEM_MAIL p = { 0 };
 
 	p.PacketType = rodexremoveitem;
@@ -16514,7 +16514,7 @@ void clif_mail_removeitem( struct map_session_data* sd, bool success, int index,
 ///     1 = remove item
 ///     2 = remove zeny
 /// 0a06 <index>.W <amount>.W (CZ_REQ_REMOVE_ITEM_MAIL)
-void clif_parse_Mail_winopen(int fd, struct map_session_data *sd)
+void clif_parse_Mail_winopen(int fd, map_session_data *sd)
 {
 #if PACKETVER < 20150513
 	int type = RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0]);
@@ -16535,7 +16535,7 @@ void clif_parse_Mail_winopen(int fd, struct map_session_data *sd)
 /// 0248 <packet len>.W <recipient>.24B <title>.40B <body len>.B <body>.?B (CZ_MAIL_SEND)
 /// 09ec <packet len>.W <recipient>.24B <sender>.24B <zeny>.Q <title length>.W <body length>.W <title>.?B <body>.?B (CZ_REQ_WRITE_MAIL)
 /// 0a6e <packet len>.W <recipient>.24B <sender>.24B <zeny>.Q <title length>.W <body length>.W <char id>.L <title>.?B <body>.?B (CZ_REQ_WRITE_MAIL2)
-void clif_parse_Mail_send(int fd, struct map_session_data *sd){
+void clif_parse_Mail_send(int fd, map_session_data *sd){
 #if PACKETVER < 20150513
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 
@@ -16613,7 +16613,7 @@ void clif_parse_Mail_send(int fd, struct map_session_data *sd){
 /// type:
 ///     0 = open
 ///     1 = close
-void clif_Auction_openwindow(struct map_session_data *sd)
+void clif_Auction_openwindow(map_session_data *sd)
 {
 	int fd = sd->fd;
 
@@ -16632,7 +16632,7 @@ void clif_Auction_openwindow(struct map_session_data *sd)
 
 /// Returns auction item search results (ZC_AUCTION_ITEM_REQ_SEARCH).
 /// 0252 <packet len>.W <pages>.L <count>.L { <auction id>.L <seller name>.24B <name id>.W <type>.L <amount>.W <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W <now price>.L <max price>.L <buyer name>.24B <delete time>.L }*
-void clif_Auction_results(struct map_session_data *sd, short count, short pages, uint8 *buf)
+void clif_Auction_results(map_session_data *sd, short count, short pages, uint8 *buf)
 {
 	int i, fd = sd->fd, len = sizeof(struct auction_data);
 	struct auction_data auction;
@@ -16689,7 +16689,7 @@ static void clif_Auction_setitem(int fd, int index, bool fail)
 ///     0 = create (any other action in auction window)
 ///     1 = cancel (cancel pressed on register tab)
 ///     ? = junk, uninitialized value (ex. when switching between list filters)
-void clif_parse_Auction_cancelreg(int fd, struct map_session_data *sd){
+void clif_parse_Auction_cancelreg(int fd, map_session_data *sd){
 	//int type = RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0]);
 	if( sd->auction.amount > 0 )
 		clif_additem(sd, sd->auction.index, sd->auction.amount, 0);
@@ -16700,7 +16700,7 @@ void clif_parse_Auction_cancelreg(int fd, struct map_session_data *sd){
 
 /// Request to add an item to the action (CZ_AUCTION_ADD_ITEM).
 /// 024c <index>.W <count>.L
-void clif_parse_Auction_setitem(int fd, struct map_session_data *sd){
+void clif_parse_Auction_setitem(int fd, map_session_data *sd){
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	int idx = RFIFOW(fd,info->pos[0]) - 2;
 	int amount = RFIFOL(fd,info->pos[1]); // Always 1
@@ -16782,7 +16782,7 @@ void clif_Auction_close(int fd, unsigned char flag)
 
 /// Request to add an auction (CZ_AUCTION_ADD).
 /// 024d <now money>.L <max money>.L <delete hour>.W
-void clif_parse_Auction_register(int fd, struct map_session_data *sd)
+void clif_parse_Auction_register(int fd, map_session_data *sd)
 {
 	struct auction_data auction;
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
@@ -16869,7 +16869,7 @@ void clif_parse_Auction_register(int fd, struct map_session_data *sd)
 
 /// Cancels an auction (CZ_AUCTION_ADD_CANCEL).
 /// 024e <auction id>.L
-void clif_parse_Auction_cancel(int fd, struct map_session_data *sd){
+void clif_parse_Auction_cancel(int fd, map_session_data *sd){
 	unsigned int auction_id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
 	intif_Auction_cancel(sd->status.char_id, auction_id);
 }
@@ -16877,7 +16877,7 @@ void clif_parse_Auction_cancel(int fd, struct map_session_data *sd){
 
 /// Closes an auction (CZ_AUCTION_REQ_MY_SELL_STOP).
 /// 025d <auction id>.L
-void clif_parse_Auction_close(int fd, struct map_session_data *sd){
+void clif_parse_Auction_close(int fd, map_session_data *sd){
 	unsigned int auction_id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
 	intif_Auction_close(sd->status.char_id, auction_id);
 }
@@ -16885,7 +16885,7 @@ void clif_parse_Auction_close(int fd, struct map_session_data *sd){
 
 /// Places a bid on an auction (CZ_AUCTION_BUY).
 /// 024f <auction id>.L <money>.L
-void clif_parse_Auction_bid(int fd, struct map_session_data *sd){
+void clif_parse_Auction_bid(int fd, map_session_data *sd){
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	unsigned int auction_id = RFIFOL(fd,info->pos[0]);
 	int bid = RFIFOL(fd,info->pos[1]);
@@ -16917,7 +16917,7 @@ void clif_parse_Auction_bid(int fd, struct map_session_data *sd){
 ///     3 = misc
 ///     4 = name search
 ///     5 = auction id search
-void clif_parse_Auction_search(int fd, struct map_session_data* sd){
+void clif_parse_Auction_search(int fd, map_session_data* sd){
 	char search_text[NAME_LENGTH];
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	short type = RFIFOW(fd,info->pos[0]);
@@ -16939,7 +16939,7 @@ void clif_parse_Auction_search(int fd, struct map_session_data* sd){
 /// type:
 ///     0 = sell (own auctions)
 ///     1 = buy (own bids)
-void clif_parse_Auction_buysell(int fd, struct map_session_data* sd)
+void clif_parse_Auction_buysell(int fd, map_session_data* sd)
 {
 	short type = RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0]) + 6;
 
@@ -16955,7 +16955,7 @@ void clif_parse_Auction_buysell(int fd, struct map_session_data* sd)
 /// CASH/POINT SHOP
 ///
 
-void clif_cashshop_open( struct map_session_data* sd, int tab ){
+void clif_cashshop_open( map_session_data* sd, int tab ){
 #if PACKETVER_MAIN_NUM >= 20101123 || PACKETVER_RE_NUM >= 20120328 || defined(PACKETVER_ZERO)
 	nullpo_retv( sd );
 
@@ -16972,7 +16972,7 @@ void clif_cashshop_open( struct map_session_data* sd, int tab ){
 #endif
 }
 
-void clif_parse_cashshop_open_request( int fd, struct map_session_data* sd ){
+void clif_parse_cashshop_open_request( int fd, map_session_data* sd ){
 #if PACKETVER_MAIN_NUM >= 20101123 || PACKETVER_RE_NUM >= 20120328 || defined(PACKETVER_ZERO)
 	nullpo_retv( sd );
 
@@ -16996,7 +16996,7 @@ void clif_parse_cashshop_open_request( int fd, struct map_session_data* sd ){
 #endif
 }
 
-void clif_parse_cashshop_close( int fd, struct map_session_data* sd ){
+void clif_parse_cashshop_close( int fd, map_session_data* sd ){
 #if PACKETVER_MAIN_NUM >= 20101123 || PACKETVER_RE_NUM >= 20120328 || defined(PACKETVER_ZERO)
 	sd->state.cashshop_open = false;
 	sd->npc_shopid = 0; // Reset npc_shopid when using cash shop from "cash shop" button [Aelys|Susu] bugreport:96
@@ -17006,7 +17006,7 @@ void clif_parse_cashshop_close( int fd, struct map_session_data* sd ){
 
 //0846 <tabid>.W (CZ_REQ_SE_CASH_TAB_CODE))
 //08c0 <len>.W <openIdentity>.L <itemcount>.W (ZC_ACK_SE_CASH_ITEM_LIST2)
-void clif_parse_CashShopReqTab(int fd, struct map_session_data *sd) {
+void clif_parse_CashShopReqTab(int fd, map_session_data *sd) {
 // [4144] packet exists only in 2011 and was dropped after
 #if PACKETVER >= 20110222 && PACKETVER < 20120000
 	short tab = RFIFOW(fd, packet_db[RFIFOW(fd,0)].pos[0]);
@@ -17031,7 +17031,7 @@ void clif_parse_CashShopReqTab(int fd, struct map_session_data *sd) {
 }
 
 //08ca <len>.W <itemcount> W <tabcode>.W (ZC_ACK_SCHEDULER_CASHITEM)
-void clif_cashshop_list( struct map_session_data* sd ){
+void clif_cashshop_list( map_session_data* sd ){
 	nullpo_retv( sd );
 
 	int fd = sd->fd;
@@ -17075,7 +17075,7 @@ void clif_cashshop_list( struct map_session_data* sd ){
 	}
 }
 
-void clif_parse_cashshop_list_request( int fd, struct map_session_data* sd ){
+void clif_parse_cashshop_list_request( int fd, map_session_data* sd ){
 	if( !sd->status.cashshop_sent ) {
 		clif_cashshop_list( sd );
 #if PACKETVER_SUPPORTS_SALES
@@ -17088,7 +17088,7 @@ void clif_parse_cashshop_list_request( int fd, struct map_session_data* sd ){
 /// List of items offered in a cash shop (ZC_PC_CASH_POINT_ITEMLIST).
 /// 0287 <packet len>.W <cash point>.L { <sell price>.L <discount price>.L <item type>.B <name id>.W }*
 /// 0287 <packet len>.W <cash point>.L <kafra point>.L { <sell price>.L <discount price>.L <item type>.B <name id>.W }* (PACKETVER >= 20070711)
-void clif_cashshop_show( struct map_session_data *sd, struct npc_data *nd ){
+void clif_cashshop_show( map_session_data *sd, struct npc_data *nd ){
 	nullpo_retv( sd );
 	nullpo_retv( nd );
 
@@ -17145,7 +17145,7 @@ void clif_cashshop_show( struct map_session_data *sd, struct npc_data *nd ){
 ///     6 = You do not have enough Kafra Credit Points. (ERROR_TYPE_MONEY)
 ///     7 = You can purchase up to 10 items. (ERROR_TYPE_AMOUNT)
 ///     8 = Some items could not be purchased. (ERROR_TYPE_PURCHASE_FAIL)
-void clif_cashshop_ack(struct map_session_data* sd, int error)
+void clif_cashshop_ack(map_session_data* sd, int error)
 {
 	int fd, cost[2] = { 0, 0 };
 	struct npc_data *nd;
@@ -17169,7 +17169,7 @@ void clif_cashshop_ack(struct map_session_data* sd, int error)
 	WFIFOSET(fd, packet_len(0x289));
 }
 
-void clif_cashshop_result( struct map_session_data *sd, t_itemid item_id, uint16 result ){
+void clif_cashshop_result( map_session_data *sd, t_itemid item_id, uint16 result ){
 #if PACKETVER_MAIN_NUM >= 20101123 || PACKETVER_RE_NUM >= 20120328 || defined( PACKETVER_ZERO )
 	nullpo_retv( sd );
 
@@ -17193,7 +17193,7 @@ void clif_cashshop_result( struct map_session_data *sd, t_itemid item_id, uint16
 /// 0288 <name id>.W <amount>.W (CZ_PC_BUY_CASH_POINT_ITEM)
 /// 0288 <name id>.W <amount>.W <kafra points>.L (PACKETVER >= 20070711)
 /// 0288 <packet len>.W <kafra points>.L <count>.W { <amount>.W <name id>.W }.4B*count (PACKETVER >= 20100803)
-void clif_parse_npccashshop_buy( int fd, struct map_session_data *sd ){
+void clif_parse_npccashshop_buy( int fd, map_session_data *sd ){
 	nullpo_retv( sd );
 
 	if( sd->state.trading || !sd->npc_shopid ){
@@ -17234,7 +17234,7 @@ void clif_parse_npccashshop_buy( int fd, struct map_session_data *sd ){
 
 /// Request to buy item(s) from cash shop.
 /// 0848 <packet len>.W <count>.W <packet len>.W <kafra points>.L <count>.W { <amount>.W <name id>.W <tab>.W }.6B*count (CZ_SE_PC_BUY_CASHITEM_LIST)
-void clif_parse_cashshop_buy( int fd, struct map_session_data *sd ){
+void clif_parse_cashshop_buy( int fd, map_session_data *sd ){
 	struct PACKET_CZ_SE_PC_BUY_CASHITEM_LIST* p = (struct PACKET_CZ_SE_PC_BUY_CASHITEM_LIST*)RFIFOP( fd, 0 );
 
 	int s_itl = sizeof( struct PACKET_CZ_SE_PC_BUY_CASHITEM_LIST_sub );
@@ -17256,7 +17256,7 @@ void clif_parse_cashshop_buy( int fd, struct map_session_data *sd ){
 ///     ADOPT_REPLY_MORE_CHILDREN = "You cannot adopt more than 1 child."
 ///     ADOPT_REPLY_LEVEL_70 = "You must be at least character level 70 in order to adopt someone."
 ///     ADOPT_REPLY_MARRIED = "You cannot adopt a married person."
-void clif_Adopt_reply(struct map_session_data *sd, int type)
+void clif_Adopt_reply(map_session_data *sd, int type)
 {
 	int fd = sd->fd;
 
@@ -17269,7 +17269,7 @@ void clif_Adopt_reply(struct map_session_data *sd, int type)
 
 /// Adoption confirmation (ZC_REQ_BABY).
 /// 01f6 <account id>.L <char id>.L <name>.B
-void clif_Adopt_request(struct map_session_data *sd, struct map_session_data *src, int p_id)
+void clif_Adopt_request(map_session_data *sd, map_session_data *src, int p_id)
 {
 	int fd = sd->fd;
 
@@ -17284,7 +17284,7 @@ void clif_Adopt_request(struct map_session_data *sd, struct map_session_data *sr
 
 /// Request to adopt a player (CZ_REQ_JOIN_BABY).
 /// 01f9 <account id>.L
-void clif_parse_Adopt_request(int fd, struct map_session_data *sd)
+void clif_parse_Adopt_request(int fd, map_session_data *sd)
 {
 	TBL_PC *tsd = map_id2sd(RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]));
 	TBL_PC *p_sd = map_charid2sd(sd->status.partner_id);
@@ -17302,13 +17302,13 @@ void clif_parse_Adopt_request(int fd, struct map_session_data *sd)
 /// answer:
 ///     0 = rejected
 ///     1 = accepted
-void clif_parse_Adopt_reply(int fd, struct map_session_data *sd){
+void clif_parse_Adopt_reply(int fd, map_session_data *sd){
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	int p1_id = RFIFOL(fd,info->pos[0]);
 	int p2_id = RFIFOL(fd,info->pos[1]);
 	int result = RFIFOL(fd,info->pos[2]);
-	struct map_session_data* p1_sd = map_id2sd(p1_id);
-	struct map_session_data* p2_sd = map_id2sd(p2_id);
+	map_session_data* p1_sd = map_id2sd(p1_id);
+	map_session_data* p2_sd = map_id2sd(p2_id);
 
 	int pid = sd->adopt_invite;
 	sd->adopt_invite = 0;
@@ -17333,7 +17333,7 @@ void clif_parse_Adopt_reply(int fd, struct map_session_data *sd){
 ///     BOSS_INFO_ALIVE = Boss is alive (position update).
 ///     BOSS_INFO_ALIVE_WITHMSG = Boss is alive (initial announce).
 ///     BOSS_INFO_DEAD = Boss is dead.
-void clif_bossmapinfo(struct map_session_data *sd, struct mob_data *md, enum e_bossmap_info flag)
+void clif_bossmapinfo(map_session_data *sd, struct mob_data *md, enum e_bossmap_info flag)
 {
 	int fd = sd->fd;
 
@@ -17386,10 +17386,10 @@ void clif_bossmapinfo(struct map_session_data *sd, struct mob_data *md, enum e_b
 
 /// Requesting equip of a player (CZ_EQUIPWIN_MICROSCOPE).
 /// 02d6 <account id>.L
-void clif_parse_ViewPlayerEquip(int fd, struct map_session_data* sd)
+void clif_parse_ViewPlayerEquip(int fd, map_session_data* sd)
 {
 	int aid = RFIFOL(fd, packet_db[RFIFOW(fd,0)].pos[0]);
-	struct map_session_data* tsd = map_id2sd(aid);
+	map_session_data* tsd = map_id2sd(aid);
 
 	if (!tsd)
 		return;
@@ -17409,7 +17409,7 @@ void clif_parse_ViewPlayerEquip(int fd, struct map_session_data* sd)
 /// flag:
 ///     false = disabled
 ///     true = enabled
-void clif_parse_configuration( int fd, struct map_session_data* sd ){
+void clif_parse_configuration( int fd, map_session_data* sd ){
 	int cmd = RFIFOW(fd,0);
 	int type = RFIFOL(fd,packet_db[cmd].pos[0]);
 	bool flag = RFIFOL(fd,packet_db[cmd].pos[1]) != 0;
@@ -17449,7 +17449,7 @@ void clif_parse_configuration( int fd, struct map_session_data* sd ){
 /// value:
 ///	 0 = disabled
 ///	 1 = enabled
-void clif_parse_PartyTick(int fd, struct map_session_data* sd)
+void clif_parse_PartyTick(int fd, map_session_data* sd)
 {
 	bool flag = RFIFOB(fd,6) ? true : false;
 	sd->status.allow_party = flag;
@@ -17561,7 +17561,7 @@ std::string clif_quest_string( std::shared_ptr<s_quest_objective> objective ){
 /// 02b1 <packet len>.W <num>.L { <quest id>.L <active>.B }*num (ZC_ALL_QUEST_LIST)
 /// 097a <packet len>.W <num>.L { <quest id>.L <active>.B <remaining time>.L <time>.L <count>.W { <mob_id>.L <killed>.W <total>.W <mob name>.24B }*count }*num (ZC_ALL_QUEST_LIST2)
 /// 09f8 <packet len>.W <num>.L { <quest id>.L <active>.B <remaining time>.L <time>.L <count>.W { <hunt identification>.L <mob type>.L <mob_id>.L <min level>.W <max level>.W <killed>.W <total>.W <mob name>.24B }*count }*num  (ZC_ALL_QUEST_LIST3)
-void clif_quest_send_list(struct map_session_data *sd)
+void clif_quest_send_list(map_session_data *sd)
 {
 	nullpo_retv(sd);
 
@@ -17659,7 +17659,7 @@ void clif_quest_send_list(struct map_session_data *sd)
 
 /// Sends list of all quest missions (ZC_ALL_QUEST_MISSION).
 /// 02b2 <packet len>.W <num>.L { <quest id>.L <start time>.L <expire time>.L <mobs>.W { <mob id>.L <mob count>.W <mob name>.24B }*3 }*num
-void clif_quest_send_mission(struct map_session_data *sd)
+void clif_quest_send_mission(map_session_data *sd)
 {
 	nullpo_retv(sd);
 
@@ -17701,7 +17701,7 @@ void clif_quest_send_mission(struct map_session_data *sd)
 /// 02b3 <quest id>.L <active>.B <start time>.L <expire time>.L <mobs>.W { <mob id>.L <mob count>.W <mob name>.24B }*3 (ZC_ADD_QUEST)
 /// 08fe <packet len>.W  { <quest id>.L <mob id>.L <total count>.W <current count>.W }*3 (ZC_HUNTING_QUEST_INFO)
 /// 09f9 <quest id>.L <active>.B <start time>.L <expire time>.L <mobs>.W { <hunt identification>.L <mob type>.L <mob id>.L <min level>.W <max level>.W <mob count>.W <mob name>.24B }*3 (ZC_ADD_QUEST_EX)
-void clif_quest_add(struct map_session_data *sd, struct quest *qd)
+void clif_quest_add(map_session_data *sd, struct quest *qd)
 {
 	nullpo_retv(sd);
 	nullpo_retv(qd);
@@ -17777,7 +17777,7 @@ void clif_quest_add(struct map_session_data *sd, struct quest *qd)
 
 /// Notification about a quest being removed (ZC_DEL_QUEST).
 /// 02b4 <quest id>.L
-void clif_quest_delete(struct map_session_data *sd, int quest_id)
+void clif_quest_delete(map_session_data *sd, int quest_id)
 {
 	int fd = sd->fd;
 
@@ -17791,7 +17791,7 @@ void clif_quest_delete(struct map_session_data *sd, int quest_id)
 /// Notification of an update to the hunting mission counter
 /// 02b5 <packet len>.W <mobs>.W { <quest id>.L <mob id>.L <total count>.W <current count>.W }*3 (ZC_UPDATE_MISSION_HUNT)
 /// 09fa <packet len>.W <mobs>.W { <quest id>.L <hunt identification>.L <total count>.W <current count>.W }*3 (ZC_UPDATE_MISSION_HUNT_EX)
-void clif_quest_update_objective(struct map_session_data *sd, struct quest *qd)
+void clif_quest_update_objective(map_session_data *sd, struct quest *qd)
 {
 	int fd = sd->fd;
 	int offset = 6;
@@ -17830,7 +17830,7 @@ void clif_quest_update_objective(struct map_session_data *sd, struct quest *qd)
 
 /// Request to change the state of a quest (CZ_ACTIVE_QUEST).
 /// 02b6 <quest id>.L <active>.B
-void clif_parse_questStateAck(int fd, struct map_session_data *sd)
+void clif_parse_questStateAck(int fd, map_session_data *sd)
 {
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	quest_update_status(sd, RFIFOL(fd,info->pos[0]),
@@ -17840,7 +17840,7 @@ void clif_parse_questStateAck(int fd, struct map_session_data *sd)
 
 /// Notification about the change of a quest state (ZC_ACTIVE_QUEST).
 /// 02b7 <quest id>.L <active>.B
-void clif_quest_update_status(struct map_session_data *sd, int quest_id, bool active)
+void clif_quest_update_status(map_session_data *sd, int quest_id, bool active)
 {
 	int fd = sd->fd;
 
@@ -17863,7 +17863,7 @@ void clif_quest_update_status(struct map_session_data *sd, int quest_id, bool ac
 ///     1 = orange
 ///     2 = green
 ///     3 = purple
-void clif_quest_show_event(struct map_session_data *sd, struct block_list *bl, e_questinfo_types effect, e_questinfo_markcolor color)
+void clif_quest_show_event(map_session_data *sd, struct block_list *bl, e_questinfo_types effect, e_questinfo_markcolor color)
 {
 #if PACKETVER >= 20090218
 	nullpo_retv(sd);
@@ -17888,7 +17888,7 @@ void clif_quest_show_event(struct map_session_data *sd, struct block_list *bl, e
 
 /// Notification about a mercenary status parameter change (ZC_MER_PAR_CHANGE).
 /// 02a2 <var id>.W <value>.L
-void clif_mercenary_updatestatus(struct map_session_data *sd, int type)
+void clif_mercenary_updatestatus(map_session_data *sd, int type)
 {
 	s_mercenary_data *md;
 	struct status_data *status;
@@ -17956,7 +17956,7 @@ void clif_mercenary_updatestatus(struct map_session_data *sd, int type)
 /// 029b <id>.L <atk>.W <matk>.W <hit>.W <crit>.W <def>.W <mdef>.W <flee>.W <aspd>.W
 ///     <name>.24B <level>.W <hp>.L <maxhp>.L <sp>.L <maxsp>.L <expire time>.L <faith>.W
 ///     <calls>.L <kills>.L <atk range>.W
-void clif_mercenary_info(struct map_session_data *sd)
+void clif_mercenary_info(map_session_data *sd)
 {
 	int fd;
 	s_mercenary_data *md;
@@ -18000,7 +18000,7 @@ void clif_mercenary_info(struct map_session_data *sd)
 
 /// Mercenary skill tree (ZC_MER_SKILLINFO_LIST).
 /// 029d <packet len>.W { <skill id>.W <type>.L <level>.W <sp cost>.W <attack range>.W <skill name>.24B <upgradable>.B }*
-void clif_mercenary_skillblock(struct map_session_data *sd)
+void clif_mercenary_skillblock(map_session_data *sd)
 {
 	s_mercenary_data *md;
 	int fd, len = 4;
@@ -18038,7 +18038,7 @@ void clif_mercenary_skillblock(struct map_session_data *sd)
 /// 029f <command>.B
 ///     1 = mercenary information
 ///     2 = delete
-void clif_parse_mercenary_action(int fd, struct map_session_data* sd)
+void clif_parse_mercenary_action(int fd, map_session_data* sd)
 {
 	int option = RFIFOB(fd,packet_db[RFIFOW(fd,0)].pos[0]);
 	if( sd->md == NULL )
@@ -18054,14 +18054,14 @@ void clif_parse_mercenary_action(int fd, struct map_session_data* sd)
 ///     1 = Your mercenary soldier has been killed.
 ///     2 = Your mercenary soldier has been fired.
 ///     3 = Your mercenary soldier has ran away.
-void clif_mercenary_message(struct map_session_data* sd, int message){
+void clif_mercenary_message(map_session_data* sd, int message){
 	clif_msg(sd, MERC_MSG_BASE + message);
 }
 
 
 /// Notification about the remaining time of a rental item.
 /// 0298 <name id>.W <seconds>.L (ZC_CASH_TIME_COUNTER)
-void clif_rental_time( struct map_session_data* sd, t_itemid nameid, int seconds ){
+void clif_rental_time( map_session_data* sd, t_itemid nameid, int seconds ){
 	// '<ItemName>' item will disappear in <seconds/60> minutes.
 	struct PACKET_ZC_CASH_TIME_COUNTER p;
 
@@ -18075,7 +18075,7 @@ void clif_rental_time( struct map_session_data* sd, t_itemid nameid, int seconds
 
 /// Deletes a rental item from client's inventory.
 /// 0299 <index>.W <name id>.W (ZC_CASH_ITEM_DELETE)
-void clif_rental_expired( struct map_session_data* sd, int index, t_itemid nameid ){
+void clif_rental_expired( map_session_data* sd, int index, t_itemid nameid ){
 	// '<ItemName>' item has been deleted from the Inventory
 	struct PACKET_ZC_CASH_ITEM_DELETE p;
 
@@ -18105,7 +18105,7 @@ void clif_readbook(int fd, int book_id, int page)
 /// Updates HP bar of a camp member.
 /// 02e0 <account id>.L <name>.24B <hp>.W <max hp>.W (ZC_BATTLEFIELD_NOTIFY_HP)
 /// 0a0e <account id>.L <hp>.L <max hp>.L (ZC_BATTLEFIELD_NOTIFY_HP2)
-void clif_bg_hp(struct map_session_data *sd) {
+void clif_bg_hp(map_session_data *sd) {
 #if PACKETVER < 20140613
 	unsigned char buf[34];
 	const int cmd = 0x2e0;
@@ -18141,7 +18141,7 @@ void clif_bg_hp(struct map_session_data *sd) {
 
 /// Updates the position of a camp member on the minimap (ZC_BATTLEFIELD_NOTIFY_POSITION).
 /// 02df <account id>.L <name>.24B <class>.W <x>.W <y>.W
-void clif_bg_xy(struct map_session_data *sd)
+void clif_bg_xy(map_session_data *sd)
 {
 	unsigned char buf[36];
 	nullpo_retv(sd);
@@ -18156,7 +18156,7 @@ void clif_bg_xy(struct map_session_data *sd)
 	clif_send(buf, packet_len(0x2df), &sd->bl, BG_SAMEMAP_WOS);
 }
 
-void clif_bg_xy_remove(struct map_session_data *sd)
+void clif_bg_xy_remove(map_session_data *sd)
 {
 	unsigned char buf[36];
 	nullpo_retv(sd);
@@ -18174,7 +18174,7 @@ void clif_bg_xy_remove(struct map_session_data *sd)
 /// Notifies clients of a battleground message.
 /// 02DC <packet len>.W <account id>.L <name>.24B <message>.?B (ZC_BATTLEFIELD_CHAT)
 void clif_bg_message( struct s_battleground_data *bg, int src_id, const char *name, const char *mes, int len ){
-	struct map_session_data *sd = bg_getavailablesd( bg );
+	map_session_data *sd = bg_getavailablesd( bg );
 
 	if( sd == nullptr ){
 		return;
@@ -18197,7 +18197,7 @@ void clif_bg_message( struct s_battleground_data *bg, int src_id, const char *na
 /// Validates and processes battlechat messages.
 /// All messages that are sent after enabling battleground chat with /battlechat.
 /// 02DB <packet len>.W <text>.?B (CZ_BATTLEFIELD_CHAT)
-void clif_parse_BattleChat(int fd, struct map_session_data* sd){
+void clif_parse_BattleChat(int fd, map_session_data* sd){
 	char name[NAME_LENGTH], message[CHAT_SIZE_MAX], output[CHAT_SIZE_MAX+NAME_LENGTH*2];
 
 	if( !clif_process_message( sd, false, name, message, output ) )
@@ -18225,7 +18225,7 @@ void clif_bg_updatescore(int16 m)
 	clif_send(buf,packet_len(0x2de),&bl,ALL_SAMEMAP);
 }
 
-void clif_bg_updatescore_single(struct map_session_data *sd)
+void clif_bg_updatescore_single(map_session_data *sd)
 {
 	int fd;
 	nullpo_retv(sd);
@@ -18243,7 +18243,7 @@ void clif_bg_updatescore_single(struct map_session_data *sd)
 
 /// Battleground camp belong-information (ZC_BATTLEFIELD_NOTIFY_CAMPINFO).
 /// 02dd <account id>.L <name>.24B <camp>.W
-void clif_sendbgemblem_area(struct map_session_data *sd)
+void clif_sendbgemblem_area(map_session_data *sd)
 {
 	unsigned char buf[33];
 	nullpo_retv(sd);
@@ -18255,7 +18255,7 @@ void clif_sendbgemblem_area(struct map_session_data *sd)
 	clif_send(buf,packet_len(0x2dd), &sd->bl, AREA);
 }
 
-void clif_sendbgemblem_single(int fd, struct map_session_data *sd)
+void clif_sendbgemblem_single(int fd, map_session_data *sd)
 {
 	nullpo_retv(sd);
 	WFIFOHEAD(fd,32);
@@ -18269,7 +18269,7 @@ void clif_sendbgemblem_single(int fd, struct map_session_data *sd)
 /// Battlegrounds queue incoming apply request from client.
 /// Queue types: 1 solo queue, 2 party queue, 4 guild queue.
 /// 0x8d7 <queue type>.W <battleground name>.24B (CZ_REQ_ENTRY_QUEUE_APPLY)
-void clif_parse_bg_queue_apply_request(int fd, struct map_session_data *sd)
+void clif_parse_bg_queue_apply_request(int fd, map_session_data *sd)
 {
 	if (!battle_config.feature_bgqueue)
 		return;
@@ -18301,7 +18301,7 @@ void clif_parse_bg_queue_apply_request(int fd, struct map_session_data *sd)
 /// Outgoing battlegrounds queue apply result.
 /// Result types: @see e_bg_queue_apply_ack
 /// 0x8d8 <result>.B <battleground name>.24B (ZC_ACK_ENTRY_QUEUE_APPLY)
-void clif_bg_queue_apply_result(e_bg_queue_apply_ack result, const char *name, struct map_session_data *sd)
+void clif_bg_queue_apply_result(e_bg_queue_apply_ack result, const char *name, map_session_data *sd)
 {
 	nullpo_retv(sd);
 
@@ -18317,7 +18317,7 @@ void clif_bg_queue_apply_result(e_bg_queue_apply_ack result, const char *name, s
 /// Outgoing battlegrounds queue apply notification.
 /// Sends a notification at the start of the battlegrounds queue and is also used to update the queue number.
 /// 0x8d9 <battleground name>.24B <queue number>.L (ZC_NOTIFY_ENTRY_QUEUE_APPLY)
-void clif_bg_queue_apply_notify(const char *name, struct map_session_data *sd)
+void clif_bg_queue_apply_notify(const char *name, map_session_data *sd)
 {
 	nullpo_retv(sd);
 
@@ -18339,7 +18339,7 @@ void clif_bg_queue_apply_notify(const char *name, struct map_session_data *sd)
 
 /// Battlegrounds queue outgoing cancel result.
 /// 0x8db <result>.B <battleground name>.24B (ZC_ACK_ENTRY_QUEUE_CANCEL)
-void clif_bg_queue_cancel_result(bool success, const char *name, struct map_session_data *sd)
+void clif_bg_queue_cancel_result(bool success, const char *name, map_session_data *sd)
 {
 	nullpo_retv(sd);
 
@@ -18354,7 +18354,7 @@ void clif_bg_queue_cancel_result(bool success, const char *name, struct map_sess
 
 /// Battlegrounds queue incoming cancel request from client.
 /// 0x8da <battleground name>.24B (CZ_REQ_ENTRY_QUEUE_CANCEL)
-void clif_parse_bg_queue_cancel_request(int fd, struct map_session_data *sd)
+void clif_parse_bg_queue_cancel_request(int fd, map_session_data *sd)
 {
 	if (!battle_config.feature_bgqueue)
 		return;
@@ -18384,7 +18384,7 @@ void clif_parse_bg_queue_cancel_request(int fd, struct map_session_data *sd)
 
 /// Battleground is ready to be joined, send a window asking for players to accept or decline.
 /// 0x8df <battleground name>.24B <lobby name>.24B (ZC_NOTIFY_LOBBY_ADMISSION)
-void clif_bg_queue_lobby_notify(const char *name, struct map_session_data *sd)
+void clif_bg_queue_lobby_notify(const char *name, map_session_data *sd)
 {
 	nullpo_retv(sd);
 
@@ -18400,7 +18400,7 @@ void clif_bg_queue_lobby_notify(const char *name, struct map_session_data *sd)
 /// Incoming packet from client telling server whether player wants to enter battleground or cancel.
 /// Result types: 1(Accept), 2(Decline).
 /// 0x8e0 <result>.B <battleground name>.24B <lobby name>.24B (CZ_REPLY_LOBBY_ADMISSION)
-void clif_parse_bg_queue_lobby_reply(int fd, struct map_session_data *sd)
+void clif_parse_bg_queue_lobby_reply(int fd, map_session_data *sd)
 {
 	nullpo_retv(sd);
 
@@ -18418,7 +18418,7 @@ void clif_parse_bg_queue_lobby_reply(int fd, struct map_session_data *sd)
 
 /// Plays a gong sound, signaling that someone has accepted the invite to enter a battleground.
 /// 0x8e1 <result>.B <battleground name>.24B <lobby name>.24B (ZC_REPLY_ACK_LOBBY_ADMISSION)
-void clif_bg_queue_ack_lobby(bool result, const char *name, const char *lobbyname, struct map_session_data *sd)
+void clif_bg_queue_ack_lobby(bool result, const char *name, const char *lobbyname, map_session_data *sd)
 {
 	nullpo_retv(sd);
 
@@ -18434,7 +18434,7 @@ void clif_bg_queue_ack_lobby(bool result, const char *name, const char *lobbynam
 
 /// Battlegrounds queue incoming queue number request from client.
 /// 0x90a <battleground name>.24B (CZ_REQ_ENTRY_QUEUE_RANKING)
-void clif_parse_bg_queue_request_queue_number(int fd, struct map_session_data *sd)
+void clif_parse_bg_queue_request_queue_number(int fd, map_session_data *sd)
 {
 	nullpo_retv(sd);
 
@@ -18448,7 +18448,7 @@ void clif_parse_bg_queue_request_queue_number(int fd, struct map_session_data *s
 /// Silently removes all the battlegrounds stuff client side so that you will open the first BG window when you press battle on the interface.
 /// Send this when a player joins a battleground so that it will remove all the queue stuff upon warping in.
 /// 0x90e (ZC_ENTRY_QUEUE_INIT)
-void clif_bg_queue_entry_init(struct map_session_data *sd)
+void clif_bg_queue_entry_init(map_session_data *sd)
 {
 	nullpo_retv(sd);
 
@@ -18461,7 +18461,7 @@ void clif_bg_queue_entry_init(struct map_session_data *sd)
 
 /// Custom Fonts (ZC_NOTIFY_FONT).
 /// 02ef <account_id>.L <font id>.W
-void clif_font(struct map_session_data *sd)
+void clif_font(map_session_data *sd)
 {
 #if PACKETVER >= 20080102
 	unsigned char buf[8];
@@ -18480,7 +18480,7 @@ void clif_font(struct map_session_data *sd)
 void clif_instance_create(int instance_id, int num)
 {
 #if PACKETVER >= 20071128
-	struct map_session_data *sd = NULL;
+	map_session_data *sd = NULL;
 	enum send_target target = PARTY;
 	unsigned char buf[65];
 
@@ -18508,7 +18508,7 @@ void clif_instance_create(int instance_id, int num)
 void clif_instance_changewait(int instance_id, int num)
 {
 #if PACKETVER >= 20071128
-	struct map_session_data *sd = NULL;
+	map_session_data *sd = NULL;
 	enum send_target target = PARTY;
 	unsigned char buf[4];
 
@@ -18530,7 +18530,7 @@ void clif_instance_changewait(int instance_id, int num)
 void clif_instance_status(int instance_id, unsigned int limit1, unsigned int limit2)
 {
 #if PACKETVER >= 20071128
-	struct map_session_data *sd = NULL;
+	map_session_data *sd = NULL;
 	enum send_target target = PARTY;
 	unsigned char buf[71];
 
@@ -18564,7 +18564,7 @@ void clif_instance_status(int instance_id, unsigned int limit1, unsigned int lim
 void clif_instance_changestatus(int instance_id, e_instance_notify type, unsigned int limit)
 {
 #if PACKETVER >= 20071128
-	struct map_session_data *sd = NULL;
+	map_session_data *sd = NULL;
 	enum send_target target = PARTY;
 	unsigned char buf[10];
 
@@ -18598,7 +18598,7 @@ void clif_parse_MemorialDungeonCommand(int fd, map_session_data *sd)
 	}
 }
 
-void clif_instance_info( struct map_session_data& sd ){
+void clif_instance_info( map_session_data& sd ){
 	if( sd.instance_id > 0 ){
 		instance_reqinfo( &sd, sd.instance_id );
 	}
@@ -18622,7 +18622,7 @@ void clif_instance_info( struct map_session_data& sd ){
 
 /// Notifies clients about item picked up by a party member.
 /// 02b8 <account id>.L <name id>.W <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W <equip location>.W <item type>.B (ZC_ITEM_PICKUP_PARTY)
-void clif_party_show_picker( struct map_session_data* sd, struct item* item_data ){
+void clif_party_show_picker( map_session_data* sd, struct item* item_data ){
 #if PACKETVER >= 20071002
 	nullpo_retv( sd );
 	nullpo_retv( item_data );
@@ -18663,7 +18663,7 @@ void clif_party_show_picker( struct map_session_data* sd, struct item* item_data
  * @param quest False:Normal EXP; True:Quest EXP (displayed in purple color)
  * @param lost True:if losing EXP
  */
-void clif_displayexp(struct map_session_data *sd, t_exp exp, char type, bool quest, bool lost)
+void clif_displayexp(map_session_data *sd, t_exp exp, char type, bool quest, bool lost)
 {
 	int fd;
 	int offset;
@@ -18701,7 +18701,7 @@ void clif_displayexp(struct map_session_data *sd, t_exp exp, char type, bool que
 ///     3 = Decremental counter (1 tick/second), 'value' specifies start value (stops when reaching 0, displays at most 2 digits).
 /// value:
 ///     Except for type 3 it is interpreted as seconds for displaying as DD:HH:MM:SS, HH:MM:SS, MM:SS or SS (leftmost '00' is not displayed).
-void clif_showdigit(struct map_session_data* sd, unsigned char type, int value)
+void clif_showdigit(map_session_data* sd, unsigned char type, int value)
 {
 	WFIFOHEAD(sd->fd, packet_len(0x1b1));
 	WFIFOW(sd->fd,0) = 0x1b1;
@@ -18723,13 +18723,13 @@ void clif_showdigit(struct map_session_data* sd, unsigned char type, int value)
 ///         constructed, this state tracking was rendered useless,
 ///         as the only skill unit, that is sent with 0x1c9 is
 ///         Graffiti.
-void clif_parse_LessEffect(int fd, struct map_session_data* sd){
+void clif_parse_LessEffect(int fd, map_session_data* sd){
 	int isLess = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
 	sd->state.lesseffect = ( isLess != 0 );
 }
 
 /// 07e4 <length>.w <option>.l <val>.l {<index>.w <amount>.w).4b* (CZ_ITEMLISTWIN_RES)
-void clif_parse_ItemListWindowSelected(int fd, struct map_session_data* sd) {
+void clif_parse_ItemListWindowSelected(int fd, map_session_data* sd) {
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	int n = (RFIFOW(fd,info->pos[0])-12) / 4;
 	int type = RFIFOL(fd,info->pos[1]);
@@ -18766,7 +18766,7 @@ void clif_parse_ItemListWindowSelected(int fd, struct map_session_data* sd) {
 /*==========================================
  * Elemental System
  *==========================================*/
-void clif_elemental_updatestatus(struct map_session_data *sd, int type) {
+void clif_elemental_updatestatus(map_session_data *sd, int type) {
 	s_elemental_data *ed;
 	struct status_data *status;
 	int fd;
@@ -18796,7 +18796,7 @@ void clif_elemental_updatestatus(struct map_session_data *sd, int type) {
 	WFIFOSET(fd,8);
 }
 
-void clif_elemental_info(struct map_session_data *sd) {
+void clif_elemental_info(map_session_data *sd) {
 	int fd;
 	s_elemental_data *ed;
 	struct status_data *status;
@@ -18823,7 +18823,7 @@ void clif_elemental_info(struct map_session_data *sd) {
 
 /// Opens preparation window for buying store (ZC_OPEN_BUYING_STORE).
 /// 0810 <slots>.B
-void clif_buyingstore_open(struct map_session_data* sd)
+void clif_buyingstore_open(map_session_data* sd)
 {
 	int fd = sd->fd;
 
@@ -18839,7 +18839,7 @@ void clif_buyingstore_open(struct map_session_data* sd)
 /// result:
 ///     0 = cancel
 ///     1 = open
-static void clif_parse_ReqOpenBuyingStore( int fd, struct map_session_data* sd ){
+static void clif_parse_ReqOpenBuyingStore( int fd, map_session_data* sd ){
 	const struct PACKET_CZ_REQ_OPEN_BUYING_STORE *p = (struct PACKET_CZ_REQ_OPEN_BUYING_STORE *)RFIFOP( fd, 0 );
 
 	// TODO: Make this check global for all variable length packets.
@@ -18881,7 +18881,7 @@ static void clif_parse_ReqOpenBuyingStore( int fd, struct map_session_data* sd )
 ///     2 = "Total amount of then possessed items exceeds the weight limit by <weight/10-maxweight*90%>. Please re-enter." (0x6ce, MSI_BUYINGSTORE_OVERWEIGHT)
 ///     8 = "No sale (purchase) information available." (0x705)
 ///     ? = nothing
-void clif_buyingstore_open_failed(struct map_session_data* sd, unsigned short result, unsigned int weight)
+void clif_buyingstore_open_failed(map_session_data* sd, unsigned short result, unsigned int weight)
 {
 	int fd = sd->fd;
 
@@ -18895,7 +18895,7 @@ void clif_buyingstore_open_failed(struct map_session_data* sd, unsigned short re
 
 /// Notification, that the requested buying store was created (ZC_MYITEMLIST_BUYING_STORE).
 /// 0813 <packet len>.W <account id>.L <limit zeny>.L { <price>.L <count>.W <type>.B <name id>.W }*
-void clif_buyingstore_myitemlist( struct map_session_data* sd ){
+void clif_buyingstore_myitemlist( map_session_data* sd ){
 	nullpo_retv( sd );
 
 	int fd = sd->fd;
@@ -18925,7 +18925,7 @@ void clif_buyingstore_myitemlist( struct map_session_data* sd ){
 
 /// Notifies clients in area of a buying store (ZC_BUYING_STORE_ENTRY).
 /// 0814 <account id>.L <store name>.80B
-void clif_buyingstore_entry( struct map_session_data& sd, struct block_list* tbl ){
+void clif_buyingstore_entry( map_session_data& sd, struct block_list* tbl ){
 #if PACKETVER >= 20100420
 	enum send_target target;
 
@@ -18948,7 +18948,7 @@ void clif_buyingstore_entry( struct map_session_data& sd, struct block_list* tbl
 
 /// Request to close own buying store (CZ_REQ_CLOSE_BUYING_STORE).
 /// 0815
-static void clif_parse_ReqCloseBuyingStore(int fd, struct map_session_data* sd)
+static void clif_parse_ReqCloseBuyingStore(int fd, map_session_data* sd)
 {
 	buyingstore_close(sd);
 }
@@ -18956,7 +18956,7 @@ static void clif_parse_ReqCloseBuyingStore(int fd, struct map_session_data* sd)
 
 /// Notifies clients in area that a buying store was closed (ZC_DISAPPEAR_BUYING_STORE_ENTRY).
 /// 0816 <account id>.L
-void clif_buyingstore_disappear_entry( struct map_session_data& sd, struct block_list* tbl ){
+void clif_buyingstore_disappear_entry( map_session_data& sd, struct block_list* tbl ){
 #if PACKETVER >= 20100309
 	enum send_target target;
 
@@ -18978,7 +18978,7 @@ void clif_buyingstore_disappear_entry( struct map_session_data& sd, struct block
 
 /// Request to open someone else's buying store (CZ_REQ_CLICK_TO_BUYING_STORE).
 /// 0817 <account id>.L
-static void clif_parse_ReqClickBuyingStore(int fd, struct map_session_data* sd)
+static void clif_parse_ReqClickBuyingStore(int fd, map_session_data* sd)
 {
 	uint32 account_id;
 
@@ -18990,7 +18990,7 @@ static void clif_parse_ReqClickBuyingStore(int fd, struct map_session_data* sd)
 
 /// Sends buying store item list.
 /// 0818 <packet len>.W <account id>.L <store id>.L <limit zeny>.L { <price>.L <amount>.W <type>.B <name id>.W }* (ZC_ACK_ITEMLIST_BUYING_STORE)
-void clif_buyingstore_itemlist( struct map_session_data* sd, struct map_session_data* pl_sd ){
+void clif_buyingstore_itemlist( map_session_data* sd, map_session_data* pl_sd ){
 	nullpo_retv( sd );
 	nullpo_retv( pl_sd );
 
@@ -19022,7 +19022,7 @@ void clif_buyingstore_itemlist( struct map_session_data* sd, struct map_session_
 
 /// Request to sell items to a buying store.
 /// 0819 <packet len>.W <account id>.L <store id>.L { <index>.W <name id>.W <amount>.W }* (CZ_REQ_TRADE_BUYING_STORE)
-static void clif_parse_ReqTradeBuyingStore( int fd, struct map_session_data* sd ){
+static void clif_parse_ReqTradeBuyingStore( int fd, map_session_data* sd ){
 	const struct PACKET_CZ_REQ_TRADE_BUYING_STORE *p = (struct PACKET_CZ_REQ_TRADE_BUYING_STORE *)RFIFOP( fd, 0 );
 
 	// minimum packet length
@@ -19049,7 +19049,7 @@ static void clif_parse_ReqTradeBuyingStore( int fd, struct map_session_data* sd
 ///     3 = "All items within the buy limit were purchased." (0x6cf, MSI_BUYINGSTORE_TRADE_OVERLIMITZENY)
 ///     4 = "All items were purchased." (0x6d0, MSI_BUYINGSTORE_TRADE_BUYCOMPLETE)
 ///     ? = nothing
-void clif_buyingstore_trade_failed_buyer(struct map_session_data* sd, short result)
+void clif_buyingstore_trade_failed_buyer(map_session_data* sd, short result)
 {
 	int fd = sd->fd;
 
@@ -19063,7 +19063,7 @@ void clif_buyingstore_trade_failed_buyer(struct map_session_data* sd, short resu
 /// Updates the zeny limit and an item in the buying store item list.
 /// 081b <name id>.W <amount>.W <limit zeny>.L (ZC_UPDATE_ITEM_FROM_BUYING_STORE)
 /// 09e6 <name id>.W <amount>.W <zeny>.L <limit zeny>.L <GID>.L <Date>.L (ZC_UPDATE_ITEM_FROM_BUYING_STORE2)
-void clif_buyingstore_update_item( struct map_session_data* sd, t_itemid nameid, unsigned short amount, uint32 char_id, int zeny ){
+void clif_buyingstore_update_item( map_session_data* sd, t_itemid nameid, unsigned short amount, uint32 char_id, int zeny ){
 	struct PACKET_ZC_UPDATE_ITEM_FROM_BUYING_STORE p;
 
 	p.packetType = buyingStoreUpdateItemType;
@@ -19086,7 +19086,7 @@ void clif_buyingstore_update_item( struct map_session_data* sd, t_itemid nameid,
 ///     "%s (%d) were sold at %dz." (0x6d2, MSI_BUYINGSTORE_TRADE_SELLCOMPLETE)
 ///
 /// NOTE:   This function has to be called _instead_ of clif_delitem/clif_dropitem.
-void clif_buyingstore_delete_item(struct map_session_data* sd, short index, unsigned short amount, int price)
+void clif_buyingstore_delete_item(map_session_data* sd, short index, unsigned short amount, int price)
 {
 	int fd = sd->fd;
 
@@ -19106,7 +19106,7 @@ void clif_buyingstore_delete_item(struct map_session_data* sd, short index, unsi
 ///     6 = "The trade failed, because the entered amount of item %s is higher, than the buyer is willing to buy." (0x6d3, MSI_BUYINGSTORE_TRADE_OVERCOUNT)
 ///     7 = "The trade failed, because the buyer is lacking required balance." (0x6d1, MSI_BUYINGSTORE_TRADE_LACKBUYERZENY)
 ///     ? = nothing
-void clif_buyingstore_trade_failed_seller( struct map_session_data* sd, short result, t_itemid nameid ){
+void clif_buyingstore_trade_failed_seller( map_session_data* sd, short result, t_itemid nameid ){
 	struct PACKET_ZC_FAILED_TRADE_BUYING_STORE_TO_SELLER p;
 
 	p.packetType = HEADER_ZC_FAILED_TRADE_BUYING_STORE_TO_SELLER;
@@ -19129,7 +19129,7 @@ void clif_buyingstore_trade_failed_seller( struct map_session_data* sd, short re
 /// NOTE:   The client determines the item ids by specifying a name and optionally,
 ///         amount of card slots. If the client does not know about the item it
 ///         cannot be searched.
-static void clif_parse_SearchStoreInfo( int fd, struct map_session_data *sd ){
+static void clif_parse_SearchStoreInfo( int fd, map_session_data *sd ){
 	const struct PACKET_CZ_SEARCH_STORE_INFO *p = (struct PACKET_CZ_SEARCH_STORE_INFO *)RFIFOP( fd, 0 );
 
 	// minimum packet length
@@ -19165,7 +19165,7 @@ static void clif_parse_SearchStoreInfo( int fd, struct map_session_data *sd ){
 /// is next page:
 ///     0 = no "next" label
 ///     1 = "next" label to retrieve more results
-void clif_search_store_info_ack( struct map_session_data* sd ){
+void clif_search_store_info_ack( map_session_data* sd ){
 #if PACKETVER_MAIN_NUM >= 20100817 || PACKETVER_RE_NUM >= 20100706 || defined(PACKETVER_ZERO)
 	nullpo_retv( sd );
 
@@ -19232,7 +19232,7 @@ void clif_search_store_info_ack( struct map_session_data* sd ){
 ///     2 = "You cannot search anymore." (0x706)
 ///     3 = "You cannot search yet." (0x708)
 ///     4 = "No sale (purchase) information available." (0x705)
-void clif_search_store_info_failed(struct map_session_data* sd, unsigned char reason)
+void clif_search_store_info_failed(map_session_data* sd, unsigned char reason)
 {
 	int fd = sd->fd;
 
@@ -19245,7 +19245,7 @@ void clif_search_store_info_failed(struct map_session_data* sd, unsigned char re
 
 /// Request to display next page of results (CZ_SEARCH_STORE_INFO_NEXT_PAGE).
 /// 0838
-static void clif_parse_SearchStoreInfoNextPage(int fd, struct map_session_data* sd)
+static void clif_parse_SearchStoreInfoNextPage(int fd, map_session_data* sd)
 {
 	searchstore_next(sd);
 }
@@ -19256,7 +19256,7 @@ static void clif_parse_SearchStoreInfoNextPage(int fd, struct map_session_data*
 /// type:
 ///     0 = Search Stores
 ///     1 = Search Stores (Cash), asks for confirmation, when clicking a store
-void clif_open_search_store_info(struct map_session_data* sd)
+void clif_open_search_store_info(map_session_data* sd)
 {
 	int fd = sd->fd;
 
@@ -19272,7 +19272,7 @@ void clif_open_search_store_info(struct map_session_data* sd)
 
 /// Request to close the store search window (CZ_CLOSE_SEARCH_STORE_INFO).
 /// 083b
-static void clif_parse_CloseSearchStoreInfo(int fd, struct map_session_data* sd)
+static void clif_parse_CloseSearchStoreInfo(int fd, map_session_data* sd)
 {
 	searchstore_close(sd);
 }
@@ -19280,7 +19280,7 @@ static void clif_parse_CloseSearchStoreInfo(int fd, struct map_session_data* sd)
 
 /// Request to invoke catalog effect on a store from search results (CZ_SSILIST_ITEM_CLICK).
 /// 083c <account id>.L <store id>.L <nameid>.W
-static void clif_parse_SearchStoreInfoListItemClick( int fd, struct map_session_data* sd ){
+static void clif_parse_SearchStoreInfoListItemClick( int fd, map_session_data* sd ){
 	const struct PACKET_CZ_SSILIST_ITEM_CLICK *p = (struct PACKET_CZ_SSILIST_ITEM_CLICK *)RFIFOP( fd, 0 );
 
 	searchstore_click( sd, p->AID, p->storeId, p->itemId );
@@ -19289,7 +19289,7 @@ static void clif_parse_SearchStoreInfoListItemClick( int fd, struct map_session_
 
 /// Notification of the store position on current map (ZC_SSILIST_ITEM_CLICK_ACK).
 /// 083d <xPos>.W <yPos>.W
-void clif_search_store_info_click_ack(struct map_session_data* sd, short x, short y)
+void clif_search_store_info_click_ack(map_session_data* sd, short x, short y)
 {
 	int fd = sd->fd;
 
@@ -19302,7 +19302,7 @@ void clif_search_store_info_click_ack(struct map_session_data* sd, short x, shor
 
 
 /// Parse function for packet debugging.
-void clif_parse_debug(int fd,struct map_session_data *sd)
+void clif_parse_debug(int fd,map_session_data *sd)
 {
 	int cmd, packet_len;
 
@@ -19334,7 +19334,7 @@ void clif_parse_debug(int fd,struct map_session_data *sd)
  * Server tells client to display a window similar to Magnifier (item) one
  * Server populates the window with avilable elemental converter options according to player's inventory
  *------------------------------------------*/
-void clif_elementalconverter_list( struct map_session_data *sd ){
+void clif_elementalconverter_list( map_session_data *sd ){
 	nullpo_retv( sd );
 
 	struct PACKET_ZC_MAKINGARROW_LIST *p = (struct PACKET_ZC_MAKINGARROW_LIST *)packet_buffer;
@@ -19379,7 +19379,7 @@ void clif_millenniumshield(struct block_list *bl, short shields) {
 /*==========================================
  * Magic Decoy Material List
  *------------------------------------------*/
-void clif_magicdecoy_list( struct map_session_data *sd, uint16 skill_lv, short x, short y ){
+void clif_magicdecoy_list( map_session_data *sd, uint16 skill_lv, short x, short y ){
 	nullpo_retv( sd );
 
 	int fd = sd->fd;
@@ -19414,7 +19414,7 @@ void clif_magicdecoy_list( struct map_session_data *sd, uint16 skill_lv, short x
 /*==========================================
  * Guillotine Cross Poisons List
  *------------------------------------------*/
-void clif_poison_list( struct map_session_data *sd, uint16 skill_lv ){
+void clif_poison_list( map_session_data *sd, uint16 skill_lv ){
 	nullpo_retv( sd );
 
 	int fd = sd->fd;
@@ -19446,7 +19446,7 @@ void clif_poison_list( struct map_session_data *sd, uint16 skill_lv ){
 }
 
 /// 0442 <Length>.W <count>.L <Skill_list>.W (ZC_SKILL_SELECT_REQUEST).
-int clif_autoshadowspell_list(struct map_session_data *sd) {
+int clif_autoshadowspell_list(map_session_data *sd) {
 	int fd, i, c;
 	nullpo_ret(sd);
 	fd = sd->fd;
@@ -19488,7 +19488,7 @@ int clif_autoshadowspell_list(struct map_session_data *sd) {
  * and Change Material skills.
  * 07e3 <type>.L (ZC_ITEMLISTWIN_OPEN).
  *------------------------------------------*/
-int clif_skill_itemlistwindow( struct map_session_data *sd, uint16 skill_id, uint16 skill_lv ) {
+int clif_skill_itemlistwindow( map_session_data *sd, uint16 skill_id, uint16 skill_lv ) {
 #if PACKETVER >= 20090922
 	int fd = sd->fd;
 
@@ -19514,7 +19514,7 @@ int clif_skill_itemlistwindow( struct map_session_data *sd, uint16 skill_id, uin
  * 0443 <type>.L <skill_id>.W (CZ_SKILL_SELECT_RESPONSE)
  * RFIFOL(fd,2) - type (currently not used)
  *------------------------------------------*/
-void clif_parse_SkillSelectMenu(int fd, struct map_session_data *sd) {
+void clif_parse_SkillSelectMenu(int fd, map_session_data *sd) {
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	//int type = RFIFOL(fd,info->pos[0]); //WHY_LOWERVER_COMPATIBILITY =  0x0, WHY_SC_AUTOSHADOWSPELL =  0x1,
 
@@ -19538,7 +19538,7 @@ void clif_parse_SkillSelectMenu(int fd, struct map_session_data *sd) {
 
 /// Kagerou/Oboro amulet spirit (ZC_SPIRITS_ATTRIBUTE).
 /// 08cf <id>.L <type>.W <num>.W
-void clif_spiritcharm(struct map_session_data *sd) {
+void clif_spiritcharm(map_session_data *sd) {
 	unsigned char buf[10];
 
 	nullpo_retv(sd);
@@ -19558,7 +19558,7 @@ void clif_spiritcharm(struct map_session_data *sd) {
 /// type:
 /// 	0 = move item to personal tab
 /// 	1 = move item to normal tab
-void clif_parse_MoveItem(int fd, struct map_session_data *sd) {
+void clif_parse_MoveItem(int fd, map_session_data *sd) {
 #if PACKETVER >= 20111122
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	int index = RFIFOW(fd,info->pos[0]) - 2;
@@ -19586,7 +19586,7 @@ void clif_parse_MoveItem(int fd, struct map_session_data *sd) {
 
 /// Items that are in favorite tab of inventory (ZC_ITEM_FAVORITE).
 /// 0900 <index>.W <favorite>.B
-void clif_favorite_item(struct map_session_data* sd, unsigned short index) {
+void clif_favorite_item(map_session_data* sd, unsigned short index) {
 	int fd = sd->fd;
 
 	WFIFOHEAD(fd,packet_len(0x908));
@@ -19630,11 +19630,11 @@ void clif_monster_hp_bar( struct mob_data* md, int fd ) {
 }
 
 /* [Ind] placeholder for unsupported incoming packets (avoids server disconnecting client) */
-void __attribute__ ((unused)) clif_parse_dull(int fd, struct map_session_data *sd) {
+void __attribute__ ((unused)) clif_parse_dull(int fd, map_session_data *sd) {
 	return;
 }
 
-void clif_partytickack(struct map_session_data* sd, bool flag) {
+void clif_partytickack(map_session_data* sd, bool flag) {
 	WFIFOHEAD(sd->fd, packet_len(0x2c9));
 	WFIFOW(sd->fd,0) = 0x2c9; 
 	WFIFOB(sd->fd,2) = flag;
@@ -19643,7 +19643,7 @@ void clif_partytickack(struct map_session_data* sd, bool flag) {
 
 /// Ack world info (ZC_ACK_BEFORE_WORLD_INFO)
 /// 0979 <world name>.24B <char name>.24B
-void clif_ackworldinfo(struct map_session_data* sd) {
+void clif_ackworldinfo(map_session_data* sd) {
 	int fd;
 
 	nullpo_retv(sd);
@@ -19659,13 +19659,13 @@ void clif_ackworldinfo(struct map_session_data* sd) {
 
 /// req world info (CZ_REQ_BEFORE_WORLD_INFO)
 /// 0978 <AID>.L
-void clif_parse_reqworldinfo(int fd,struct map_session_data *sd) {
+void clif_parse_reqworldinfo(int fd,map_session_data *sd) {
 	//uint32 aid = RFIFOL(fd,2); //should we trust client ?
 	if(sd) 
 		clif_ackworldinfo(sd);
 }
 
-static void clif_loadConfirm( struct map_session_data *sd ){
+static void clif_loadConfirm( map_session_data *sd ){
 #if PACKETVER_MAIN_NUM >= 20190403 || PACKETVER_RE_NUM >= 20190320 || PACKETVER_ZERO_NUM >= 20190410
 	nullpo_retv( sd );
 
@@ -19681,13 +19681,13 @@ static void clif_loadConfirm( struct map_session_data *sd ){
 
 /// unknown usage (CZ_BLOCKING_PLAY_CANCEL)
 /// 0447
-void clif_parse_blocking_playcancel( int fd, struct map_session_data *sd ){
+void clif_parse_blocking_playcancel( int fd, map_session_data *sd ){
 	clif_loadConfirm( sd );
 }
 
 /// req world info (CZ_CLIENT_VERSION)
 /// 044A <version>.L
-void clif_parse_client_version(int fd, struct map_session_data *sd) {
+void clif_parse_client_version(int fd, map_session_data *sd) {
 	//if(sd)
 	;
 }
@@ -19695,7 +19695,7 @@ void clif_parse_client_version(int fd, struct map_session_data *sd) {
 /// Ranking list
 
 /// ranking pointlist  { <name>.24B <point>.L }*10
-void clif_sub_ranklist(unsigned char *buf,int idx,struct map_session_data* sd, enum e_rank rankingtype){
+void clif_sub_ranklist(unsigned char *buf,int idx,map_session_data* sd, enum e_rank rankingtype){
 	struct fame_list* list;
 	int i, size = MAX_FAME_LIST;
 
@@ -19736,28 +19736,28 @@ void clif_sub_ranklist(unsigned char *buf,int idx,struct map_session_data* sd, e
 /// Request for the blacksmith ranklist.
 /// /blacksmith command sends this packet to the server.
 /// 0217 (CZ_BLACKSMITH_RANK)
-void clif_parse_Blacksmith( int fd, struct map_session_data *sd ){
+void clif_parse_Blacksmith( int fd, map_session_data *sd ){
 	clif_ranklist(sd,RANK_BLACKSMITH);
 }
 
 /// Request for the alchemist ranklist.
 /// /alchemist command sends this packet to the server.
 /// 0218 (CZ_ALCHEMIST_RANK)
-void clif_parse_Alchemist( int fd, struct map_session_data *sd ){
+void clif_parse_Alchemist( int fd, map_session_data *sd ){
 	clif_ranklist(sd,RANK_ALCHEMIST);
 }
 
 /// Request for the taekwon ranklist.
 /// /taekwon command sends this packet to the server.
 /// 0225 (CZ_TAEKWON_RANK)
-void clif_parse_Taekwon( int fd, struct map_session_data *sd ){
+void clif_parse_Taekwon( int fd, map_session_data *sd ){
 	clif_ranklist(sd,RANK_TAEKWON);
 }
 
 /// Request for the killer ranklist.
 /// /pk command sends this packet to the server.
 /// 0237 (CZ_KILLER_RANK)
-void clif_parse_RankingPk( int fd, struct map_session_data *sd ){
+void clif_parse_RankingPk( int fd, map_session_data *sd ){
 	clif_ranklist(sd,RANK_KILLER);
 }
 
@@ -19766,7 +19766,7 @@ void clif_parse_RankingPk( int fd, struct map_session_data *sd ){
 /// 0226 { <name>.24B }*10 { <point>.L }*10 (ZC_TAEKWON_RANK)
 /// 0238 { <name>.24B }*10 { <point>.L }*10 (ZC_KILLER_RANK)
 /// 097d <RankingType>.W {<CharName>.24B <point>L}*10 <mypoint>L (ZC_ACK_RANKING)
-void clif_ranklist(struct map_session_data *sd, int16 rankingType) {
+void clif_ranklist(map_session_data *sd, int16 rankingType) {
 	enum e_rank rank;
 
 #if PACKETVER < 20130710
@@ -19831,7 +19831,7 @@ void clif_ranklist(struct map_session_data *sd, int16 rankingType) {
  *  2: /taekwon
  *  3: /pk
  * */
-void clif_parse_ranklist(int fd,struct map_session_data *sd) {
+void clif_parse_ranklist(int fd,map_session_data *sd) {
 	struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
 	int16 rankingtype = RFIFOW(fd,info->pos[0]); //type
 
@@ -19884,7 +19884,7 @@ void clif_update_rankingpoint(map_session_data &sd, int rankingtype, int point)
  *   0 - map adjustment (bexp mapflag), 1 - Premium/VIP adjustment, 2 - Server rate adjustment, 3 - None
 */
 #ifdef VIP_ENABLE
-void clif_display_pinfo( struct map_session_data& sd ){
+void clif_display_pinfo( map_session_data& sd ){
 #if PACKETVER_MAIN_NUM >= 20110627 || PACKETVER_RE_NUM >= 20110628 || defined(PACKETVER_ZERO)
 	// TODO: Whoever wants to take the blame, fix this crappy logic below - and yes I know indentation is wrong, but CANT TOUCH THIS! *sings* [Lemongrass]
 		int details_bexp[PINFO_MAX], details_drop[PINFO_MAX], details_penalty[PINFO_MAX];
@@ -20032,7 +20032,7 @@ void clif_display_pinfo( struct map_session_data& sd ){
 }
 #endif
 
-void clif_parse_GMFullStrip(int fd, struct map_session_data *sd) {
+void clif_parse_GMFullStrip(int fd, map_session_data *sd) {
 	char cmd[30];
 	int t_aid = RFIFOL(fd,2);
 	safesnprintf(cmd,sizeof(cmd),"%cfullstrip %d",atcommand_symbol,t_aid);
@@ -20045,7 +20045,7 @@ void clif_parse_GMFullStrip(int fd, struct map_session_data *sd) {
 * @param fd
 * @param bl Crimson Marker target
 **/
-void clif_crimson_marker( struct map_session_data& sd, struct block_list& bl, bool remove ){
+void clif_crimson_marker( map_session_data& sd, struct block_list& bl, bool remove ){
 #if PACKETVER_MAIN_NUM >= 20130731 || PACKETVER_RE_NUM >= 20130707 || defined(PACKETVER_ZERO)
 	struct PACKET_ZC_C_MARKERINFO p = {};
 
@@ -20066,7 +20066,7 @@ void clif_crimson_marker( struct map_session_data& sd, struct block_list& bl, bo
 /**
  * 02d3 <index>.W (ZC_NOTIFY_BIND_ON_EQUIP)
  **/
-void clif_notify_bindOnEquip( struct map_session_data& sd, int16 index ){
+void clif_notify_bindOnEquip( map_session_data& sd, int16 index ){
 #if PACKETVER >= 20070227
 	struct PACKET_ZC_NOTIFY_BIND_ON_EQUIP p = {};
 
@@ -20107,7 +20107,7 @@ void clif_showscript(struct block_list* bl, const char* message, enum send_targe
 * [Ind/Hercules]
 * 07fc <OldMasterAID>.L <NewMasterAID>.L (ZC_CHANGE_GROUP_MASTER)
 **/
-void clif_party_leaderchanged(struct map_session_data *sd, int prev_leader_aid, int new_leader_aid) {
+void clif_party_leaderchanged(map_session_data *sd, int prev_leader_aid, int new_leader_aid) {
 	unsigned char buf[10];
 
 	nullpo_retv(sd);
@@ -20124,7 +20124,7 @@ void clif_party_leaderchanged(struct map_session_data *sd, int prev_leader_aid,
 **/
 void clif_clan_message(struct clan *clan,const char *mes,int len){
 #if PACKETVER >= 20131223
-	struct map_session_data *sd;
+	map_session_data *sd;
 	uint8 buf[256];
 
 	if( len == 0 ){
@@ -20150,7 +20150,7 @@ void clif_clan_message(struct clan *clan,const char *mes,int len){
 * Parses a clan message from a player.
 * 098d <length>.W <text>.?B (<name> : <message>) (CZ_CLAN_CHAT)
 **/
-void clif_parse_clan_chat( int fd, struct map_session_data* sd ){
+void clif_parse_clan_chat( int fd, map_session_data* sd ){
 #if PACKETVER >= 20131223
 	char name[NAME_LENGTH], message[CHAT_SIZE_MAX], output[CHAT_SIZE_MAX+NAME_LENGTH*2];
 
@@ -20167,7 +20167,7 @@ void clif_parse_clan_chat( int fd, struct map_session_data* sd ){
 * 098a <length>.W <clan id>.L <clan name>.24B <clan master>.24B <clan map>.16B <alliance count>.B
 *      <antagonist count>.B { <alliance>.24B } * alliance count { <antagonist>.24B } * antagonist count (ZC_CLANINFO)
 **/
-void clif_clan_basicinfo( struct map_session_data *sd ){
+void clif_clan_basicinfo( map_session_data *sd ){
 #if PACKETVER >= 20131223
 	int fd, offset, length, i, flag;
 	struct clan* clan;
@@ -20223,7 +20223,7 @@ void clif_clan_basicinfo( struct map_session_data *sd ){
 void clif_clan_onlinecount( struct clan* clan ){
 #if PACKETVER >= 20131223
 	uint8 buf[6];
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	WBUFW(buf,0) = 0x988;
 	WBUFW(buf,2) = clan->connect_member;
@@ -20238,7 +20238,7 @@ void clif_clan_onlinecount( struct clan* clan ){
 * Notifies the client that the player has left his clan.
 * 0989 (ZC_ACK_CLAN_LEAVE)
 **/
-void clif_clan_leave( struct map_session_data* sd ){
+void clif_clan_leave( map_session_data* sd ){
 #if PACKETVER >= 20131223
 	int fd;
 	
@@ -20260,7 +20260,7 @@ void clif_clan_leave( struct map_session_data* sd ){
  * Acknowledge the client about change title result (ZC_ACK_CHANGE_TITLE).
  * 0A2F <result>.B <title_id>.L
  */
-void clif_change_title_ack(struct map_session_data *sd, unsigned char result, unsigned long title_id)
+void clif_change_title_ack(map_session_data *sd, unsigned char result, unsigned long title_id)
 {
 #if PACKETVER >= 20150513
 	int fd;
@@ -20283,7 +20283,7 @@ void clif_change_title_ack(struct map_session_data *sd, unsigned char result, un
  * Parsing a request from the client change title (CZ_REQ_CHANGE_TITLE).
  * 0A2E <title_id>.L
  */
-void clif_parse_change_title(int fd, struct map_session_data *sd)
+void clif_parse_change_title(int fd, map_session_data *sd)
 {
 	int title_id;
 
@@ -20352,7 +20352,7 @@ void DumpUnknown(int fd,TBL_PC *sd,int cmd,int packet_len)
 
 /// Opens the roulette window
 /// 0A1A <result>.B <serial>.L <stage>.B <price index>.B <additional item id>.W <gold>.L <silver>.L <bronze>.L (ZC_ACK_OPEN_ROULETTE)
-void clif_roulette_open( struct map_session_data* sd ){
+void clif_roulette_open( map_session_data* sd ){
 	nullpo_retv( sd );
 
 	struct packet_roulette_open_ack p;
@@ -20374,7 +20374,7 @@ void clif_roulette_open( struct map_session_data* sd ){
 
 /// Request to open the roulette window
 /// 0A19 (CZ_REQ_OPEN_ROULETTE)
-void clif_parse_roulette_open( int fd, struct map_session_data* sd ){
+void clif_parse_roulette_open( int fd, map_session_data* sd ){
 	nullpo_retv(sd);
 
 	if (!battle_config.feature_roulette) {
@@ -20388,7 +20388,7 @@ void clif_parse_roulette_open( int fd, struct map_session_data* sd ){
 /// Sends the info about the available roulette rewards to the client
 /// 0A1C <length>.W <serial>.L { { <level>.W <column>.W <item>.W <amount>.W } * MAX_ROULETTE_COLUMNS } * MAX_ROULETTE_LEVEL (ZC_ACK_ROULEITTE_INFO)
 /// 0A1C <length>.W <serial>.L { { <level>.W <column>.W <item>.L <amount>.L } * MAX_ROULETTE_COLUMNS } * MAX_ROULETTE_LEVEL (ZC_ACK_ROULEITTE_INFO) >= 20180516
-void clif_roulette_info( struct map_session_data* sd ){
+void clif_roulette_info( map_session_data* sd ){
 	nullpo_retv(sd);
 
 	struct packet_roulette_info_ack p;
@@ -20415,7 +20415,7 @@ void clif_roulette_info( struct map_session_data* sd ){
 
 /// Request the roulette reward data
 /// 0A1B (CZ_REQ_ROULETTE_INFO)
-void clif_parse_roulette_info( int fd, struct map_session_data* sd ){
+void clif_parse_roulette_info( int fd, map_session_data* sd ){
 	nullpo_retv(sd);
 
 	if (!battle_config.feature_roulette) {
@@ -20428,7 +20428,7 @@ void clif_parse_roulette_info( int fd, struct map_session_data* sd ){
 
 /// Notification of the client that the roulette window was closed
 /// 0A1D (CZ_REQ_CLOSE_ROULETTE)
-void clif_parse_roulette_close( int fd, struct map_session_data* sd ){
+void clif_parse_roulette_close( int fd, map_session_data* sd ){
 	nullpo_retv(sd);
 
 	if (!battle_config.feature_roulette) {
@@ -20441,7 +20441,7 @@ void clif_parse_roulette_close( int fd, struct map_session_data* sd ){
 
 /// Response to a item reward request
 /// 0A22 <type>.B <bonus item>.W (ZC_RECV_ROULETTE_ITEM)
-static void clif_roulette_recvitem_ack(struct map_session_data *sd, enum RECV_ROULETTE_ITEM_REQ type) {
+static void clif_roulette_recvitem_ack(map_session_data *sd, enum RECV_ROULETTE_ITEM_REQ type) {
 #if PACKETVER >= 20141016
 	nullpo_retv(sd);
 
@@ -20460,7 +20460,7 @@ static void clif_roulette_recvitem_ack(struct map_session_data *sd, enum RECV_RO
  * @param sd Player
  * @return 0:Success
  **/
-static uint8 clif_roulette_getitem(struct map_session_data *sd) {
+static uint8 clif_roulette_getitem(map_session_data *sd) {
 	struct item it;
 	uint8 res = 1;
 
@@ -20487,7 +20487,7 @@ static uint8 clif_roulette_getitem(struct map_session_data *sd) {
 
 /// Update Roulette window with current stats
 /// 0A20 <result>.B <stage>.W <price index>.W <bonus item>.W <gold>.L <silver>.L <bronze>.L (ZC_ACK_GENERATE_ROULETTE)
-void clif_roulette_generate( struct map_session_data *sd, unsigned char result, short stage, short prizeIdx, t_itemid bonusItemID ){
+void clif_roulette_generate( map_session_data *sd, unsigned char result, short stage, short prizeIdx, t_itemid bonusItemID ){
 	nullpo_retv( sd );
 
 	struct packet_roulette_generate_ack p;
@@ -20506,7 +20506,7 @@ void clif_roulette_generate( struct map_session_data *sd, unsigned char result,
 
 /// Request to start the roulette
 /// 0A1F (CZ_REQ_GENERATE_ROULETTE)
-void clif_parse_roulette_generate( int fd, struct map_session_data* sd ){
+void clif_parse_roulette_generate( int fd, map_session_data* sd ){
 	enum GENERATE_ROULETTE_ACK result;
 
 	nullpo_retv(sd);
@@ -20564,7 +20564,7 @@ void clif_parse_roulette_generate( int fd, struct map_session_data* sd ){
 
 /// Request to claim a prize
 /// 0A21 (CZ_RECV_ROULETTE_ITEM)
-void clif_parse_roulette_item( int fd, struct map_session_data* sd ){
+void clif_parse_roulette_item( int fd, map_session_data* sd ){
 	enum RECV_ROULETTE_ITEM_REQ type = RECV_ITEM_FAILED;
 	nullpo_retv(sd);
 
@@ -20608,7 +20608,7 @@ void clif_parse_roulette_item( int fd, struct map_session_data* sd ){
  * @param fd
  * @param sd
  **/
-void clif_merge_item_ack( struct map_session_data &sd, enum MERGE_ITEM_ACK type, uint16 index = 0, uint16 count = 0 ){
+void clif_merge_item_ack( map_session_data &sd, enum MERGE_ITEM_ACK type, uint16 index = 0, uint16 count = 0 ){
 #if PACKETVER_MAIN_NUM >= 20120314 || PACKETVER_RE_NUM >= 20120221 || defined(PACKETVER_ZERO)
 	struct PACKET_ZC_ACK_MERGE_ITEM p = {};
 
@@ -20631,7 +20631,7 @@ void clif_merge_item_ack( struct map_session_data &sd, enum MERGE_ITEM_ACK type,
  * @param it Item
  * @return True if has pair, False if not
  **/
-static bool clif_merge_item_has_pair(struct map_session_data *sd, struct item *it) {
+static bool clif_merge_item_has_pair(map_session_data *sd, struct item *it) {
 	struct item *it_;
 	unsigned short i;
 
@@ -20670,7 +20670,7 @@ static bool clif_merge_item_check(struct item_data *id, struct item *it) {
  * ZC 096D <size>.W { <index>.W }* (ZC_MERGE_ITEM_OPEN)
  * @param sd
  **/
-void clif_merge_item_open( struct map_session_data& sd ){
+void clif_merge_item_open( map_session_data& sd ){
 #if PACKETVER_MAIN_NUM >= 20120314 || PACKETVER_RE_NUM >= 20120221 || defined(PACKETVER_ZERO)
 	struct PACKET_ZC_MERGE_ITEM_OPEN* p = (struct PACKET_ZC_MERGE_ITEM_OPEN*)packet_buffer;
 
@@ -20709,7 +20709,7 @@ void clif_merge_item_open( struct map_session_data& sd ){
  * @param fd
  * @param sd
  **/
-void clif_parse_merge_item_req(int fd, struct map_session_data* sd) {
+void clif_parse_merge_item_req(int fd, map_session_data* sd) {
 	struct s_packet_db *info = NULL;
 	unsigned short n = 0, indexes[MAX_INVENTORY] = { 0 }, i, j;
 	unsigned int count = 0;
@@ -20775,7 +20775,7 @@ void clif_parse_merge_item_req(int fd, struct map_session_data* sd) {
  * @param fd
  * @param sd
  **/
-void clif_parse_merge_item_cancel(int fd, struct map_session_data* sd) {
+void clif_parse_merge_item_cancel(int fd, map_session_data* sd) {
 	return; // Nothing todo yet
 }
 
@@ -20864,7 +20864,7 @@ void clif_broadcast_obtain_special_item( const char *char_name, t_itemid nameid,
 /// 0A02 <view>.W
 /// Value <flag> has the following effects:
 /// 1: Open a Dress Room window.
-void clif_dressing_room(struct map_session_data *sd, int flag) {
+void clif_dressing_room(map_session_data *sd, int flag) {
 #if PACKETVER >= 20150513
 	int fd = sd->fd;
 
@@ -20879,7 +20879,7 @@ void clif_dressing_room(struct map_session_data *sd, int flag) {
 
 /// Parsing a request from the client item identify oneclick (CZ_REQ_ONECLICK_ITEMIDENTIFY).
 /// 0A35 <result>.W
-void clif_parse_Oneclick_Itemidentify(int fd, struct map_session_data *sd) {
+void clif_parse_Oneclick_Itemidentify(int fd, map_session_data *sd) {
 #if PACKETVER >= 20150513
 	short idx = RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0]) - 2, magnifier_idx;
 
@@ -20905,7 +20905,7 @@ void clif_parse_Oneclick_Itemidentify(int fd, struct map_session_data *sd) {
 }
 
 /// Starts navigation to the given target on client side
-void clif_navigateTo(struct map_session_data *sd, const char* mapname, uint16 x, uint16 y, uint8 flag, bool hideWindow, uint16 mob_id ){
+void clif_navigateTo(map_session_data *sd, const char* mapname, uint16 x, uint16 y, uint8 flag, bool hideWindow, uint16 mob_id ){
 #if PACKETVER >= 20111010
 	int fd = sd->fd;
 
@@ -20943,9 +20943,9 @@ void clif_navigateTo(struct map_session_data *sd, const char* mapname, uint16 x,
 
 /// Send hat effects to the client (ZC_HAT_EFFECT).
 /// 0A3B <Length>.W <AID>.L <Status>.B { <HatEffectId>.W }
-void clif_hat_effects( struct map_session_data* sd, struct block_list* bl, enum send_target target ){
+void clif_hat_effects( map_session_data* sd, struct block_list* bl, enum send_target target ){
 #if PACKETVER_MAIN_NUM >= 20150507 || PACKETVER_RE_NUM >= 20150429 || defined(PACKETVER_ZERO)
-	struct map_session_data *tsd;
+	map_session_data *tsd;
 	struct block_list* tbl;
 
 	if( target == SELF ){
@@ -20977,7 +20977,7 @@ void clif_hat_effects( struct map_session_data* sd, struct block_list* bl, enum
 #endif
 }
 
-void clif_hat_effect_single( struct map_session_data* sd, uint16 effectId, bool enable ){
+void clif_hat_effect_single( map_session_data* sd, uint16 effectId, bool enable ){
 #if PACKETVER_MAIN_NUM >= 20150507 || PACKETVER_RE_NUM >= 20150429 || defined(PACKETVER_ZERO)
 	nullpo_retv( sd );
 
@@ -21037,7 +21037,7 @@ void clif_sale_amount( struct sale_item_data* sale_item, struct block_list* bl,
 
 /// The client requested a refresh of the current remaining count of a sale item
 /// 09ac <account id>.L <item id>.W (CZ_REQ_CASH_BARGAIN_SALE_ITEM_INFO)
-void clif_parse_sale_refresh( int fd, struct map_session_data* sd ){
+void clif_parse_sale_refresh( int fd, map_session_data* sd ){
 #if PACKETVER_SUPPORTS_SALES
 	struct PACKET_CZ_REQ_CASH_BARGAIN_SALE_ITEM_INFO* p = (struct PACKET_CZ_REQ_CASH_BARGAIN_SALE_ITEM_INFO*)RFIFOP( fd, 0 );
 
@@ -21059,7 +21059,7 @@ void clif_parse_sale_refresh( int fd, struct map_session_data* sd ){
 
 /// Opens the sale administration window on the client
 /// 09b5 (ZC_OPEN_BARGAIN_SALE_TOOL)
-void clif_sale_open( struct map_session_data* sd ){
+void clif_sale_open( map_session_data* sd ){
 #if PACKETVER_SUPPORTS_SALES
 	nullpo_retv(sd);
 
@@ -21080,7 +21080,7 @@ void clif_sale_open( struct map_session_data* sd ){
 /// Client request to open the sale administration window.
 /// This is sent by /limitedsale
 /// 09b4 <account id>.L (CZ_OPEN_BARGAIN_SALE_TOOL)
-void clif_parse_sale_open( int fd, struct map_session_data* sd ){
+void clif_parse_sale_open( int fd, map_session_data* sd ){
 #if PACKETVER_SUPPORTS_SALES
 	nullpo_retv(sd);
 
@@ -21098,7 +21098,7 @@ void clif_parse_sale_open( int fd, struct map_session_data* sd ){
 
 /// Closes the sale administration window on the client.
 /// 09bd (ZC_CLOSE_BARGAIN_SALE_TOOL)
-void clif_sale_close(struct map_session_data* sd) {
+void clif_sale_close(map_session_data* sd) {
 #if PACKETVER_SUPPORTS_SALES
 	nullpo_retv(sd);
 
@@ -21118,7 +21118,7 @@ void clif_sale_close(struct map_session_data* sd) {
 
 /// Client request to close the sale administration window.
 /// 09bc (CZ_CLOSE_BARGAIN_SALE_TOOL)
-void clif_parse_sale_close(int fd, struct map_session_data* sd) {
+void clif_parse_sale_close(int fd, map_session_data* sd) {
 #if PACKETVER_SUPPORTS_SALES
 	nullpo_retv(sd);
 
@@ -21132,7 +21132,7 @@ void clif_parse_sale_close(int fd, struct map_session_data* sd) {
 
 /// Reply to a item search request for item sale administration.
 /// 09ad <result>.W <item id>.W <price>.L (ZC_ACK_CASH_BARGAIN_SALE_ITEM_INFO)
-void clif_sale_search_reply( struct map_session_data* sd, struct cash_item_data* item ){
+void clif_sale_search_reply( map_session_data* sd, struct cash_item_data* item ){
 #if PACKETVER_SUPPORTS_SALES
 	struct PACKET_ZC_ACK_CASH_BARGAIN_SALE_ITEM_INFO p;
 
@@ -21154,7 +21154,7 @@ void clif_sale_search_reply( struct map_session_data* sd, struct cash_item_data*
 
 /// Search request for an item sale administration.
 /// 09ac <length>.W <account id>.L <item name>.?B (CZ_REQ_CASH_BARGAIN_SALE_ITEM_INFO)
-void clif_parse_sale_search( int fd, struct map_session_data* sd ){
+void clif_parse_sale_search( int fd, map_session_data* sd ){
 #if PACKETVER_SUPPORTS_SALES
 	char item_name[ITEM_NAME_LENGTH];
 
@@ -21190,7 +21190,7 @@ void clif_parse_sale_search( int fd, struct map_session_data* sd ){
 
 /// Reply if an item was successfully put on sale or not.
 /// 09af <result>.W (ZC_ACK_APPLY_BARGAIN_SALE_ITEM)
-void clif_sale_add_reply( struct map_session_data* sd, enum e_sale_add_result result ){
+void clif_sale_add_reply( map_session_data* sd, enum e_sale_add_result result ){
 #if PACKETVER_SUPPORTS_SALES
 	int fd = sd->fd;
 
@@ -21204,7 +21204,7 @@ void clif_sale_add_reply( struct map_session_data* sd, enum e_sale_add_result re
 /// A client request to put an item on sale.
 /// 09ae <account id>.L <item id>.W <amount>.L <start time>.L <hours on sale>.B (CZ_REQ_APPLY_BARGAIN_SALE_ITEM)
 /// 0a3d <account id>.L <item id>.W <amount>.L <start time>.L <hours on sale>.W (CZ_REQ_APPLY_BARGAIN_SALE_ITEM2)
-void clif_parse_sale_add( int fd, struct map_session_data* sd ){
+void clif_parse_sale_add( int fd, map_session_data* sd ){
 #if PACKETVER_SUPPORTS_SALES
 	nullpo_retv( sd );
 
@@ -21226,7 +21226,7 @@ void clif_parse_sale_add( int fd, struct map_session_data* sd ){
 
 /// Reply to an item removal from sale.
 /// 09b1 <result>.W (ZC_ACK_REMOVE_BARGAIN_SALE_ITEM)
-void clif_sale_remove_reply( struct map_session_data* sd, bool failed ){
+void clif_sale_remove_reply( map_session_data* sd, bool failed ){
 #if PACKETVER_SUPPORTS_SALES
 	int fd = sd->fd;
 
@@ -21239,7 +21239,7 @@ void clif_sale_remove_reply( struct map_session_data* sd, bool failed ){
 
 /// Request to remove an item from sale.
 /// 09b0 <account id>.L <item id>.W (CZ_REQ_REMOVE_BARGAIN_SALE_ITEM)
-void clif_parse_sale_remove( int fd, struct map_session_data* sd ){
+void clif_parse_sale_remove( int fd, map_session_data* sd ){
 #if PACKETVER_SUPPORTS_SALES
 	nullpo_retv( sd );
 
@@ -21264,7 +21264,7 @@ void clif_parse_sale_remove( int fd, struct map_session_data* sd ){
  * Sends all achievement data to the client (ZC_ALL_ACH_LIST).
  * 0a23 <packetLength>.W <ACHCount>.L <ACHPoint>.L
  */
-void clif_achievement_list_all(struct map_session_data *sd)
+void clif_achievement_list_all(map_session_data *sd)
 {
 	nullpo_retv(sd);
 
@@ -21306,7 +21306,7 @@ void clif_achievement_list_all(struct map_session_data *sd)
  * Sends a single achievement's data to the client (ZC_ACH_UPDATE).
  * 0a24 <ACHPoint>.L
  */
-void clif_achievement_update(struct map_session_data *sd, struct achievement *ach, int count)
+void clif_achievement_update(map_session_data *sd, struct achievement *ach, int count)
 {
 	nullpo_retv(sd);
 
@@ -21340,7 +21340,7 @@ void clif_achievement_update(struct map_session_data *sd, struct achievement *ac
  * Checks if an achievement reward can be rewarded (CZ_REQ_ACH_REWARD).
  * 0a25 <achievementID>.L
  */
-void clif_parse_AchievementCheckReward(int fd, struct map_session_data *sd)
+void clif_parse_AchievementCheckReward(int fd, map_session_data *sd)
 {
 	nullpo_retv(sd);
 
@@ -21365,7 +21365,7 @@ void clif_achievement_reward_ack(int fd, unsigned char result, int achievement_i
 
 /// Process the pet evolution request
 /// 09fb <packetType>.W <packetLength>.W <evolutionPetEggITID>.W (CZ_PET_EVOLUTION)
-void clif_parse_pet_evolution( int fd, struct map_session_data *sd ){
+void clif_parse_pet_evolution( int fd, map_session_data *sd ){
 #if PACKETVER >= 20141008
 	const struct PACKET_CZ_PET_EVOLUTION *p = (struct PACKET_CZ_PET_EVOLUTION *)RFIFOP( fd, 0 );
 
@@ -21382,7 +21382,7 @@ void clif_parse_pet_evolution( int fd, struct map_session_data *sd ){
 
 /// Sends the result of the evolution to the client.
 /// 09fc <result>.L (ZC_PET_EVOLUTION_RESULT)
-void clif_pet_evolution_result( struct map_session_data* sd, e_pet_evolution_result result ){
+void clif_pet_evolution_result( map_session_data* sd, e_pet_evolution_result result ){
 #if PACKETVER >= 20141008
 	int fd = sd->fd;
 
@@ -21398,7 +21398,7 @@ void clif_pet_evolution_result( struct map_session_data* sd, e_pet_evolution_res
  *
  * 0ae8
  */
-void clif_parse_changedress( int fd, struct map_session_data* sd ){
+void clif_parse_changedress( int fd, map_session_data* sd ){
 #if PACKETVER >= 20180103
 	char command[CHAT_SIZE_MAX];
 
@@ -21410,7 +21410,7 @@ void clif_parse_changedress( int fd, struct map_session_data* sd ){
 
 /// Opens an UI window of the given type and initializes it with the given data
 /// 0AE2 <type>.B <data>.L
-void clif_ui_open( struct map_session_data& sd, enum out_ui_type ui_type, int32 data ){
+void clif_ui_open( map_session_data& sd, enum out_ui_type ui_type, int32 data ){
 #if PACKETVER >= 20151202
 	// If the UI requires state tracking
 	switch( ui_type ){
@@ -21440,7 +21440,7 @@ void clif_ui_open( struct map_session_data& sd, enum out_ui_type ui_type, int32
 
 /// Request to open an UI window of the given type
 /// 0A68 <type>.B
-void clif_parse_open_ui( int fd, struct map_session_data* sd ){
+void clif_parse_open_ui( int fd, map_session_data* sd ){
 	switch( RFIFOB(fd,2) ){
 		case IN_UI_ATTENDANCE:
 			if( !pc_has_permission( sd, PC_PERM_ATTENDANCE ) ){
@@ -21464,7 +21464,7 @@ void clif_parse_open_ui( int fd, struct map_session_data* sd ){
 
 /// Response for attedance request
 /// 0AF0 <unknown>.L <data>.L
-void clif_attendence_response( struct map_session_data *sd, int32 data ){
+void clif_attendence_response( map_session_data *sd, int32 data ){
 	nullpo_retv(sd);
 
 	int fd = sd->fd;
@@ -21478,13 +21478,13 @@ void clif_attendence_response( struct map_session_data *sd, int32 data ){
 
 /// Request from the client to retrieve today's attendance reward
 /// 0AEF
-void clif_parse_attendance_request( int fd, struct map_session_data* sd ){
+void clif_parse_attendance_request( int fd, map_session_data* sd ){
 	pc_attendance_claim_reward(sd);
 }
 
 /// Send out the percentage of weight that causes it to be displayed in red.
 /// 0ADE <percentage>.L
-void clif_weight_limit( struct map_session_data* sd ){
+void clif_weight_limit( map_session_data* sd ){
 #if PACKETVER >= 20171025
 	nullpo_retv(sd);
 
@@ -21512,7 +21512,7 @@ enum e_private_airship_response : uint32{
 
 /// Send out the response to a private airship request
 /// 0A4A <response>.L
-void clif_private_airship_response( struct map_session_data* sd, enum e_private_airship_response response ){
+void clif_private_airship_response( map_session_data* sd, enum e_private_airship_response response ){
 #if PACKETVER >= 20180321
 	nullpo_retv( sd );
 
@@ -21527,7 +21527,7 @@ void clif_private_airship_response( struct map_session_data* sd, enum e_private_
 
 /// Parses a request for a private airship
 /// 0A49 <mapname>.16B <itemid>.W
-void clif_parse_private_airship_request( int fd, struct map_session_data* sd ){
+void clif_parse_private_airship_request( int fd, map_session_data* sd ){
 #if PACKETVER >= 20180321
 	// Check if the feature is enabled
 	if( !battle_config.feature_privateairship ){
@@ -21611,7 +21611,7 @@ void clif_parse_private_airship_request( int fd, struct map_session_data* sd ){
 /// Sends out the usage history of the guild storage
 /// 09DA <size>.W <result>.W <count>.W { <id>.L <item id>.W <amount>.L <action>.B <refine>.L <unique id>.Q <identify>.B <item type>.W
 ///      { <card item id>.W }*4 <name>.24B <time>.24B <attribute>.B }*count (ZC_ACK_GUILDSTORAGE_LOG)
-void clif_guild_storage_log( struct map_session_data* sd, std::vector<struct guild_log_entry>& log, enum e_guild_storage_log result ){
+void clif_guild_storage_log( map_session_data* sd, std::vector<struct guild_log_entry>& log, enum e_guild_storage_log result ){
 #if PACKETVER >= 20140205
 	nullpo_retv( sd );
 
@@ -21658,7 +21658,7 @@ void clif_guild_storage_log( struct map_session_data* sd, std::vector<struct gui
 
 /// Activates the client camera info or updates the client camera with the given values.
 /// 0A78 <type>.B <range>.F <rotation>.F <latitude>.F
-void clif_camerainfo( struct map_session_data* sd, bool show, float range, float rotation, float latitude ){
+void clif_camerainfo( map_session_data* sd, bool show, float range, float rotation, float latitude ){
 #if PACKETVER >= 20160525
 	int fd = sd->fd;
 
@@ -21675,7 +21675,7 @@ void clif_camerainfo( struct map_session_data* sd, bool show, float range, float
 /// Activates or deactives the client camera info or updates the camera settings.
 /// This packet is triggered by /viewpointvalue or /setcamera
 /// 0A77 <type>.B <range>.F <rotation>.F <latitude>.F
-void clif_parse_camerainfo( int fd, struct map_session_data* sd ){
+void clif_parse_camerainfo( int fd, map_session_data* sd ){
 	char command[CHAT_SIZE_MAX];
 
 	// /viewpointvalue
@@ -21691,7 +21691,7 @@ void clif_parse_camerainfo( int fd, struct map_session_data* sd ){
 
 /// Send the full list of items in the equip switch window
 /// 0a9b <length>.W { <index>.W <position>.L }*
-void clif_equipswitch_list( struct map_session_data* sd ){
+void clif_equipswitch_list( map_session_data* sd ){
 #if PACKETVER >= 20170208
 	int fd = sd->fd;
 	int offset, i, position;
@@ -21714,7 +21714,7 @@ void clif_equipswitch_list( struct map_session_data* sd ){
 
 /// Acknowledgement for removing an equip to the equip switch window
 /// 0a9a <index>.W <position.>.L <failure>.W
-void clif_equipswitch_remove( struct map_session_data* sd, uint16 index, uint32 pos, bool failed ){
+void clif_equipswitch_remove( map_session_data* sd, uint16 index, uint32 pos, bool failed ){
 #if PACKETVER >= 20170208
 	int fd = sd->fd;
 
@@ -21730,7 +21730,7 @@ void clif_equipswitch_remove( struct map_session_data* sd, uint16 index, uint32
 /// Request to remove an equip from the equip switch window
 /// 0a99 <index>.W <position>.L <= 20170502
 /// 0a99 <index>.W
-void clif_parse_equipswitch_remove( int fd, struct map_session_data* sd ){
+void clif_parse_equipswitch_remove( int fd, map_session_data* sd ){
 #if PACKETVER >= 20170208
 	uint16 index = RFIFOW(fd, 2) - 2;
 	bool removed = false;
@@ -21751,7 +21751,7 @@ void clif_parse_equipswitch_remove( int fd, struct map_session_data* sd ){
 /// Acknowledgement for adding an equip to the equip switch window
 /// 0a98 <index>.W <position.>.L <flag>.L  <= 20170502
 /// 0a98 <index>.W <position.>.L <flag>.W
-void clif_equipswitch_add( struct map_session_data* sd, uint16 index, uint32 pos, uint8 flag ){
+void clif_equipswitch_add( map_session_data* sd, uint16 index, uint32 pos, uint8 flag ){
 #if PACKETVER >= 20170208
 	int fd = sd->fd;
 
@@ -21770,7 +21770,7 @@ void clif_equipswitch_add( struct map_session_data* sd, uint16 index, uint32 pos
 
 /// Request to add an equip to the equip switch window
 /// 0a97 <index>.W <position>.L
-void clif_parse_equipswitch_add( int fd, struct map_session_data* sd ){
+void clif_parse_equipswitch_add( int fd, map_session_data* sd ){
 #if PACKETVER >= 20170208
 	uint16 index = RFIFOW(fd, 2) - 2;
 	uint32 position = RFIFOL(fd, 4);
@@ -21798,7 +21798,7 @@ void clif_parse_equipswitch_add( int fd, struct map_session_data* sd ){
 
 /// Acknowledgement packet for the full equip switch
 /// 0a9d <failed>.W
-void clif_equipswitch_reply( struct map_session_data* sd, bool failed ){
+void clif_equipswitch_reply( map_session_data* sd, bool failed ){
 #if PACKETVER >= 20170208
 	int fd = sd->fd;
 
@@ -21811,7 +21811,7 @@ void clif_equipswitch_reply( struct map_session_data* sd, bool failed ){
 
 /// Request to do a full equip switch
 /// 0a9c
-void clif_parse_equipswitch_request( int fd, struct map_session_data* sd ){
+void clif_parse_equipswitch_request( int fd, map_session_data* sd ){
 #if PACKETVER >= 20170208
 	int i;
 	t_tick tick = gettick();
@@ -21846,7 +21846,7 @@ void clif_parse_equipswitch_request( int fd, struct map_session_data* sd ){
 
 /// Request to do a single equip switch
 /// 0ace <index>.W
-void clif_parse_equipswitch_request_single( int fd, struct map_session_data* sd ){
+void clif_parse_equipswitch_request_single( int fd, map_session_data* sd ){
 #if PACKETVER >= 20170502
 	uint16 index = RFIFOW(fd, 2) - 2;
 
@@ -21885,7 +21885,7 @@ void clif_parse_equipswitch_request_single( int fd, struct map_session_data* sd
 #endif
 }
 
-void clif_parse_StartUseSkillToId( int fd, struct map_session_data* sd ){
+void clif_parse_StartUseSkillToId( int fd, map_session_data* sd ){
 #if PACKETVER_MAIN_NUM >= 20181002 || PACKETVER_RE_NUM >= 20181002 || PACKETVER_ZERO_NUM >= 20181010
 	const struct PACKET_CZ_USE_SKILL_START* p = (struct PACKET_CZ_USE_SKILL_START*)RFIFOP( fd, 0 );
 
@@ -21908,7 +21908,7 @@ void clif_parse_StartUseSkillToId( int fd, struct map_session_data* sd ){
 #endif
 }
 
-void clif_parse_StopUseSkillToId( int fd, struct map_session_data* sd ){
+void clif_parse_StopUseSkillToId( int fd, map_session_data* sd ){
 #if PACKETVER_MAIN_NUM >= 20181002 || PACKETVER_RE_NUM >= 20181002 || PACKETVER_ZERO_NUM >= 20181010
 	const struct PACKET_CZ_USE_SKILL_END* p = (struct PACKET_CZ_USE_SKILL_END*)RFIFOP( fd, 0 );
 
@@ -21934,7 +21934,7 @@ void clif_parse_StopUseSkillToId( int fd, struct map_session_data* sd ){
 #endif
 }
 
-void clif_ping( struct map_session_data* sd ){
+void clif_ping( map_session_data* sd ){
 #if PACKETVER_MAIN_NUM >= 20190213 || PACKETVER_RE_NUM >= 20190213 || PACKETVER_ZERO_NUM >= 20190130
 	nullpo_retv( sd );
 
@@ -21952,7 +21952,7 @@ void clif_ping( struct map_session_data* sd ){
 #endif
 }
 
-int clif_ping_timer_sub( struct map_session_data *sd, va_list ap ){
+int clif_ping_timer_sub( map_session_data *sd, va_list ap ){
 	nullpo_ret( sd );
 
 	int fd = sd->fd;
@@ -21980,7 +21980,7 @@ TIMER_FUNC( clif_ping_timer ){
  * Opens the refine UI on the designated client.
  * 0aa0
  */
-void clif_refineui_open( struct map_session_data* sd ){
+void clif_refineui_open( map_session_data* sd ){
 #if PACKETVER >= 20161012
 	nullpo_retv( sd );
 
@@ -21998,7 +21998,7 @@ void clif_refineui_open( struct map_session_data* sd ){
  * Parses cancel/close of the refine UI on client side.
  * 0aa4
  */
-void clif_parse_refineui_close( int fd, struct map_session_data* sd ){
+void clif_parse_refineui_close( int fd, map_session_data* sd ){
 #if PACKETVER >= 20161012
 	sd->state.refineui_open = false;
 #endif
@@ -22009,7 +22009,7 @@ void clif_parse_refineui_close( int fd, struct map_session_data* sd ){
  * to the client.
  * 0aa2 <length>.W <index>.W <catalyst count>.B { <material>.W <chance>.B <price>.L }*
  */
-void clif_refineui_info( struct map_session_data* sd, uint16 index ){
+void clif_refineui_info( map_session_data* sd, uint16 index ){
 #if PACKETVER >= 20161012
 	int fd = sd->fd;
 
@@ -22076,7 +22076,7 @@ void clif_refineui_info( struct map_session_data* sd, uint16 index ){
  * Client request to add an item to the refine UI.
  * 0aa1 <index>.W
  */
-void clif_parse_refineui_add( int fd, struct map_session_data* sd ){
+void clif_parse_refineui_add( int fd, map_session_data* sd ){
 #if PACKETVER >= 20161012
 	struct PACKET_CZ_REFINING_SELECT_ITEM* p = (struct PACKET_CZ_REFINING_SELECT_ITEM*)RFIFOP( fd, 0 );
 
@@ -22101,7 +22101,7 @@ void clif_parse_refineui_add( int fd, struct map_session_data* sd ){
  * Client requests to try to refine an item.
  * 0aa3 <index>.W <material>.W <catalyst>.B
  */
-void clif_parse_refineui_refine( int fd, struct map_session_data* sd ){
+void clif_parse_refineui_refine( int fd, map_session_data* sd ){
 #if PACKETVER >= 20161012
 	struct PACKET_CZ_REQ_REFINING* p = (struct PACKET_CZ_REQ_REFINING*)RFIFOP( fd, 0 );
 
@@ -22261,7 +22261,7 @@ void clif_parse_refineui_refine( int fd, struct map_session_data* sd ){
 #endif
 }
 
-void clif_unequipall_reply( struct map_session_data* sd, bool failed ){
+void clif_unequipall_reply( map_session_data* sd, bool failed ){
 #if PACKETVER_MAIN_NUM >= 20210818 || PACKETVER_RE_NUM >= 20211103
 	struct PACKET_ZC_ACK_TAKEOFF_EQUIP_ALL p = {};
 
@@ -22272,7 +22272,7 @@ void clif_unequipall_reply( struct map_session_data* sd, bool failed ){
 #endif // PACKETVER_MAIN_NUM >= 20210818 || PACKETVER_RE_NUM >= 20211103
 }
 
-void clif_parse_unequipall( int fd, struct map_session_data* sd ){
+void clif_parse_unequipall( int fd, map_session_data* sd ){
 #if PACKETVER_MAIN_NUM >= 20210818 || PACKETVER_RE_NUM >= 20211103 || PACKETVER_ZERO_NUM >= 20210818
 	if( pc_cant_act( sd ) ){
 		clif_unequipall_reply( sd, true );
@@ -22289,7 +22289,7 @@ void clif_parse_unequipall( int fd, struct map_session_data* sd ){
 #endif
 }
 
-void clif_stylist_response( struct map_session_data* sd, bool failed ){
+void clif_stylist_response( map_session_data* sd, bool failed ){
 #if PACKETVER >= 20151104
 	struct PACKET_ZC_STYLE_CHANGE_RES p = {};
 
@@ -22304,7 +22304,7 @@ void clif_stylist_response( struct map_session_data* sd, bool failed ){
 #endif
 }
 
-bool clif_parse_stylist_buy_sub( struct map_session_data* sd, _look look, int16 index ){
+bool clif_parse_stylist_buy_sub( map_session_data* sd, _look look, int16 index ){
 	std::shared_ptr<s_stylist_list> list = stylist_db.find( look );
 
 	if( list == nullptr ){
@@ -22401,7 +22401,7 @@ bool clif_parse_stylist_buy_sub( struct map_session_data* sd, _look look, int16
 	return true;
 }
 
-void clif_parse_stylist_buy( int fd, struct map_session_data* sd ){
+void clif_parse_stylist_buy( int fd, map_session_data* sd ){
 #if PACKETVER >= 20151104
 #if PACKETVER >= 20180516
 	struct PACKET_CZ_REQ_STYLE_CHANGE2* p = (struct PACKET_CZ_REQ_STYLE_CHANGE2*)RFIFOP( fd, 0 );
@@ -22449,13 +22449,13 @@ void clif_parse_stylist_buy( int fd, struct map_session_data* sd ){
 #endif
 }
 
-void clif_parse_stylist_close( int fd, struct map_session_data* sd ){
+void clif_parse_stylist_close( int fd, map_session_data* sd ){
 #if PACKETVER >= 20151104
 	sd->state.stylist_open = false;
 #endif
 }
 
-void clif_inventory_expansion_info( struct map_session_data* sd ){
+void clif_inventory_expansion_info( map_session_data* sd ){
 #if PACKETVER_MAIN_NUM >= 20181031 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20181114
 	nullpo_retv( sd );
 
@@ -22476,7 +22476,7 @@ enum class e_inventory_expansion_response : uint8{
 	MAXIMUM_REACHED
 };
 
-void clif_inventory_expansion_response( struct map_session_data* sd, e_inventory_expansion_response response ){
+void clif_inventory_expansion_response( map_session_data* sd, e_inventory_expansion_response response ){
 #if PACKETVER_MAIN_NUM >= 20181031 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20181114
 	nullpo_retv( sd );
 
@@ -22490,7 +22490,7 @@ void clif_inventory_expansion_response( struct map_session_data* sd, e_inventory
 #endif
 }
 
-void clif_parse_inventory_expansion_request( int fd, struct map_session_data* sd ){
+void clif_parse_inventory_expansion_request( int fd, map_session_data* sd ){
 #if PACKETVER_MAIN_NUM >= 20181031 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20181114
 	// Check if player is dead or busy with other stuff
 	if( pc_isdead( sd ) || pc_cant_act( sd ) ){
@@ -22559,7 +22559,7 @@ enum class e_inventory_expansion_result : uint8{
 	MAXIMUM_REACHED
 };
 
-void clif_inventory_expansion_result( struct map_session_data* sd, e_inventory_expansion_result result ){
+void clif_inventory_expansion_result( map_session_data* sd, e_inventory_expansion_result result ){
 #if PACKETVER_MAIN_NUM >= 20181031 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20181114
 	nullpo_retv( sd );
 
@@ -22576,7 +22576,7 @@ void clif_inventory_expansion_result( struct map_session_data* sd, e_inventory_e
 #endif
 }
 
-void clif_parse_inventory_expansion_confirm( int fd, struct map_session_data* sd ){
+void clif_parse_inventory_expansion_confirm( int fd, map_session_data* sd ){
 #if PACKETVER_MAIN_NUM >= 20181031 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20181114
 	if( sd->state.inventory_expansion_confirmation == 0 ){
 		return;
@@ -22627,14 +22627,14 @@ void clif_parse_inventory_expansion_confirm( int fd, struct map_session_data* sd
 #endif
 }
 
-void clif_parse_inventory_expansion_reject( int fd, struct map_session_data* sd ){
+void clif_parse_inventory_expansion_reject( int fd, map_session_data* sd ){
 #if PACKETVER_MAIN_NUM >= 20181031 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20181114
 	sd->state.inventory_expansion_confirmation = 0;
 	sd->state.inventory_expansion_amount = 0;
 #endif
 }
 
-void clif_barter_open( struct map_session_data& sd, struct npc_data& nd ){
+void clif_barter_open( map_session_data& sd, struct npc_data& nd ){
 #if PACKETVER_MAIN_NUM >= 20190116 || PACKETVER_RE_NUM >= 20190116 || PACKETVER_ZERO_NUM >= 20181226
 	if( nd.subtype != NPCTYPE_BARTER || nd.u.barter.extended || sd.state.barter_open ){
 		return;
@@ -22691,7 +22691,7 @@ void clif_barter_open( struct map_session_data& sd, struct npc_data& nd ){
 #endif
 }
 
-void clif_parse_barter_close( int fd, struct map_session_data* sd ){
+void clif_parse_barter_close( int fd, map_session_data* sd ){
 #if PACKETVER_MAIN_NUM >= 20190116 || PACKETVER_RE_NUM >= 20190116 || PACKETVER_ZERO_NUM >= 20181226
 	if( sd->state.barter_open ){
 		sd->npc_shopid = 0;
@@ -22700,7 +22700,7 @@ void clif_parse_barter_close( int fd, struct map_session_data* sd ){
 #endif
 }
 
-void clif_parse_barter_buy( int fd, struct map_session_data* sd ){
+void clif_parse_barter_buy( int fd, map_session_data* sd ){
 #if PACKETVER_MAIN_NUM >= 20190116 || PACKETVER_RE_NUM >= 20190116 || PACKETVER_ZERO_NUM >= 20181226
 	// No shop open
 	if( sd->npc_shopid == 0 || !sd->state.barter_open ){
@@ -22783,7 +22783,7 @@ void clif_parse_barter_buy( int fd, struct map_session_data* sd ){
 #endif
 }
 
-void clif_barter_extended_open( struct map_session_data& sd, struct npc_data& nd ){
+void clif_barter_extended_open( map_session_data& sd, struct npc_data& nd ){
 #if PACKETVER_MAIN_NUM >= 20191120 || PACKETVER_RE_NUM >= 20191106 || PACKETVER_ZERO_NUM >= 20191127
 	if( nd.subtype != NPCTYPE_BARTER || !nd.u.barter.extended || sd.state.barter_extended_open ){
 		return;
@@ -22851,7 +22851,7 @@ void clif_barter_extended_open( struct map_session_data& sd, struct npc_data& nd
 #endif
 }
 
-void clif_parse_barter_extended_close( int fd, struct map_session_data* sd ){
+void clif_parse_barter_extended_close( int fd, map_session_data* sd ){
 #if PACKETVER_MAIN_NUM >= 20191120 || PACKETVER_RE_NUM >= 20191106 || PACKETVER_ZERO_NUM >= 20191127
 	if( sd->state.barter_extended_open ){
 		sd->npc_shopid = 0;
@@ -22860,7 +22860,7 @@ void clif_parse_barter_extended_close( int fd, struct map_session_data* sd ){
 #endif
 }
 
-void clif_parse_barter_extended_buy( int fd, struct map_session_data* sd ){
+void clif_parse_barter_extended_buy( int fd, map_session_data* sd ){
 #if PACKETVER_MAIN_NUM >= 20191120 || PACKETVER_RE_NUM >= 20191106 || PACKETVER_ZERO_NUM >= 20191127
 	// No shop open
 	if( sd->npc_shopid == 0 || !sd->state.barter_extended_open ){
@@ -22981,7 +22981,7 @@ void clif_summon_hp_bar(struct mob_data& md) {
 #endif
 }
 
-void clif_laphine_synthesis_open( struct map_session_data *sd, std::shared_ptr<s_laphine_synthesis> synthesis ){
+void clif_laphine_synthesis_open( map_session_data *sd, std::shared_ptr<s_laphine_synthesis> synthesis ){
 #if PACKETVER_MAIN_NUM >= 20160601 || PACKETVER_RE_NUM >= 20160525 || defined(PACKETVER_ZERO)
 	nullpo_retv( sd );
 
@@ -22996,7 +22996,7 @@ void clif_laphine_synthesis_open( struct map_session_data *sd, std::shared_ptr<s
 #endif
 }
 
-void clif_parse_laphine_synthesis_close( int fd, struct map_session_data* sd ){
+void clif_parse_laphine_synthesis_close( int fd, map_session_data* sd ){
 #if PACKETVER_MAIN_NUM >= 20160601 || PACKETVER_RE_NUM >= 20160525 || defined(PACKETVER_ZERO)
 	sd->state.laphine_synthesis = 0;
 #endif
@@ -23008,7 +23008,7 @@ enum e_laphine_synthesis_result : int16{
 	LAPHINE_SYNTHESIS_ITEM = 7
 };
 
-void clif_laphine_synthesis_result( struct map_session_data* sd, enum e_laphine_synthesis_result result ){
+void clif_laphine_synthesis_result( map_session_data* sd, enum e_laphine_synthesis_result result ){
 #if PACKETVER_MAIN_NUM >= 20160601 || PACKETVER_RE_NUM >= 20160525 || defined(PACKETVER_ZERO)
 	nullpo_retv( sd );
 
@@ -23021,7 +23021,7 @@ void clif_laphine_synthesis_result( struct map_session_data* sd, enum e_laphine_
 #endif
 }
 
-void clif_parse_laphine_synthesis( int fd, struct map_session_data* sd ){
+void clif_parse_laphine_synthesis( int fd, map_session_data* sd ){
 #if PACKETVER_MAIN_NUM >= 20160601 || PACKETVER_RE_NUM >= 20160525 || defined(PACKETVER_ZERO)
 	if( sd->state.laphine_synthesis == 0 ){
 		return;
@@ -23136,7 +23136,7 @@ void clif_parse_laphine_synthesis( int fd, struct map_session_data* sd ){
 #endif
 }
 
-void clif_laphine_upgrade_open( struct map_session_data* sd, std::shared_ptr<s_laphine_upgrade> upgrade ){
+void clif_laphine_upgrade_open( map_session_data* sd, std::shared_ptr<s_laphine_upgrade> upgrade ){
 #if PACKETVER_MAIN_NUM >= 20170726 || PACKETVER_RE_NUM >= 20170621 || defined(PACKETVER_ZERO)
 	nullpo_retv( sd );
 
@@ -23151,13 +23151,13 @@ void clif_laphine_upgrade_open( struct map_session_data* sd, std::shared_ptr<s_l
 #endif
 }
 
-void clif_parse_laphine_upgrade_close( int fd, struct map_session_data* sd ){
+void clif_parse_laphine_upgrade_close( int fd, map_session_data* sd ){
 #if PACKETVER_MAIN_NUM >= 20170726 || PACKETVER_RE_NUM >= 20170621 || defined(PACKETVER_ZERO)
 	sd->state.laphine_upgrade = 0;
 #endif
 }
 
-void clif_laphine_upgrade_result( struct map_session_data *sd, bool failed ){
+void clif_laphine_upgrade_result( map_session_data *sd, bool failed ){
 #if PACKETVER_MAIN_NUM >= 20170726 || PACKETVER_RE_NUM >= 20170621 || defined(PACKETVER_ZERO)
 	struct PACKET_ZC_ACK_RANDOM_UPGRADE_ITEM p = {};
 
@@ -23168,7 +23168,7 @@ void clif_laphine_upgrade_result( struct map_session_data *sd, bool failed ){
 #endif
 }
 
-static void clif_item_preview( struct map_session_data *sd, int16 index ){
+static void clif_item_preview( map_session_data *sd, int16 index ){
 #if PACKETVER_MAIN_NUM >= 20170726 || PACKETVER_RE_NUM >= 20170621 || defined(PACKETVER_ZERO)
 	nullpo_retv( sd );
 
@@ -23192,7 +23192,7 @@ static void clif_item_preview( struct map_session_data *sd, int16 index ){
 #endif
 }
 
-void clif_parse_laphine_upgrade( int fd, struct map_session_data* sd ){
+void clif_parse_laphine_upgrade( int fd, map_session_data* sd ){
 #if PACKETVER_MAIN_NUM >= 20170726 || PACKETVER_RE_NUM >= 20170621 || defined(PACKETVER_ZERO)
 	if( sd->state.laphine_upgrade == 0 ){
 		return;
@@ -23339,7 +23339,7 @@ void clif_parse_laphine_upgrade( int fd, struct map_session_data* sd ){
 #endif
 }
 
-void clif_enchantgrade_add( struct map_session_data& sd, uint16 index = UINT16_MAX, std::shared_ptr<s_enchantgradelevel> gradeLevel = nullptr ){
+void clif_enchantgrade_add( map_session_data& sd, uint16 index = UINT16_MAX, std::shared_ptr<s_enchantgradelevel> gradeLevel = nullptr ){
 #if PACKETVER_MAIN_NUM >= 20200916 || PACKETVER_RE_NUM >= 20200724
 	struct PACKET_ZC_GRADE_ENCHANT_MATERIAL_LIST* p = (struct PACKET_ZC_GRADE_ENCHANT_MATERIAL_LIST*)packet_buffer;
 
@@ -23389,7 +23389,7 @@ void clif_enchantgrade_add( struct map_session_data& sd, uint16 index = UINT16_M
 #endif
 }
 
-void clif_parse_enchantgrade_add( int fd, struct map_session_data* sd ){
+void clif_parse_enchantgrade_add( int fd, map_session_data* sd ){
 #if PACKETVER_MAIN_NUM >= 20200916 || PACKETVER_RE_NUM >= 20200724
 	nullpo_retv( sd );
 
@@ -23456,7 +23456,7 @@ void clif_parse_enchantgrade_add( int fd, struct map_session_data* sd ){
 ///  3= Equipment destroyed.
 ///  4= The equipment is protected.
 /// </param>
-void clif_enchantgrade_result( struct map_session_data& sd, uint16 index, e_enchantgrade_result result ){
+void clif_enchantgrade_result( map_session_data& sd, uint16 index, e_enchantgrade_result result ){
 #if PACKETVER_MAIN_NUM >= 20200916 || PACKETVER_RE_NUM >= 20200724
 	struct PACKET_ZC_GRADE_ENCHANT_ACK p = {};
 
@@ -23469,7 +23469,7 @@ void clif_enchantgrade_result( struct map_session_data& sd, uint16 index, e_ench
 #endif
 }
 
-void clif_enchantgrade_announce( struct map_session_data& sd, struct item& item, bool success ){
+void clif_enchantgrade_announce( map_session_data& sd, struct item& item, bool success ){
 #if PACKETVER_MAIN_NUM >= 20200916 || PACKETVER_RE_NUM >= 20200724
 	struct PACKET_ZC_GRADE_ENCHANT_BROADCAST_RESULT p = {};
 
@@ -23483,7 +23483,7 @@ void clif_enchantgrade_announce( struct map_session_data& sd, struct item& item,
 #endif
 }
 
-void clif_parse_enchantgrade_start( int fd, struct map_session_data* sd ){
+void clif_parse_enchantgrade_start( int fd, map_session_data* sd ){
 #if PACKETVER_MAIN_NUM >= 20200916 || PACKETVER_RE_NUM >= 20200724
 	nullpo_retv( sd );
 
@@ -23668,7 +23668,7 @@ void clif_parse_enchantgrade_start( int fd, struct map_session_data* sd ){
 #endif
 }
 
-void clif_parse_enchantgrade_close( int fd, struct map_session_data* sd ){
+void clif_parse_enchantgrade_close( int fd, map_session_data* sd ){
 #if PACKETVER_MAIN_NUM >= 20200916 || PACKETVER_RE_NUM >= 20200724
 	nullpo_retv( sd );
 
@@ -23676,7 +23676,7 @@ void clif_parse_enchantgrade_close( int fd, struct map_session_data* sd ){
 #endif
 }
 
-void clif_reputation_type( struct map_session_data& sd, int64 type, int64 points ){
+void clif_reputation_type( map_session_data& sd, int64 type, int64 points ){
 #if PACKETVER_RE_NUM >= 20211103 || PACKETVER_MAIN_NUM >= 20220330
 	struct PACKET_ZC_REPUTE_INFO* p = (struct PACKET_ZC_REPUTE_INFO*)packet_buffer;
 
@@ -23693,7 +23693,7 @@ void clif_reputation_type( struct map_session_data& sd, int64 type, int64 points
 #endif
 }
 
-void clif_reputation_list( struct map_session_data& sd ){
+void clif_reputation_list( map_session_data& sd ){
 #if PACKETVER_RE_NUM >= 20211103 || PACKETVER_MAIN_NUM >= 20220330
 	struct PACKET_ZC_REPUTE_INFO* p = (struct PACKET_ZC_REPUTE_INFO*)packet_buffer;
 
@@ -23718,7 +23718,7 @@ void clif_reputation_list( struct map_session_data& sd ){
 #endif
 }
 
-void clif_item_reform_open( struct map_session_data& sd, t_itemid item ){
+void clif_item_reform_open( map_session_data& sd, t_itemid item ){
 #if PACKETVER_RE_NUM >= 20211103 || PACKETVER_MAIN_NUM >= 20220330
 	struct PACKET_ZC_OPEN_REFORM_UI p = {};
 
@@ -23731,13 +23731,13 @@ void clif_item_reform_open( struct map_session_data& sd, t_itemid item ){
 #endif
 }
 
-void clif_parse_item_reform_close( int fd, struct map_session_data* sd ){
+void clif_parse_item_reform_close( int fd, map_session_data* sd ){
 #if PACKETVER_RE_NUM >= 20211103 || PACKETVER_MAIN_NUM >= 20220330
 	sd->state.item_reform = 0;
 #endif
 }
 
-void clif_item_reform_result( struct map_session_data& sd, uint16 index, uint8 result ){
+void clif_item_reform_result( map_session_data& sd, uint16 index, uint8 result ){
 #if PACKETVER_RE_NUM >= 20211103 || PACKETVER_MAIN_NUM >= 20220330
 	struct PACKET_ZC_ITEM_REFORM_ACK p = {};
 
@@ -23754,7 +23754,7 @@ void clif_item_reform_result( struct map_session_data& sd, uint16 index, uint8 r
 #endif
 }
 
-void clif_parse_item_reform_start( int fd, struct map_session_data* sd ){
+void clif_parse_item_reform_start( int fd, map_session_data* sd ){
 #if PACKETVER_RE_NUM >= 20211103 || PACKETVER_MAIN_NUM >= 20220330
 	// Not opened
 	if( sd->state.item_reform == 0 ){
@@ -23908,7 +23908,7 @@ void clif_parse_item_reform_start( int fd, struct map_session_data* sd ){
 #endif
 }
 
-void clif_enchantwindow_open( struct map_session_data& sd, uint64 clientLuaIndex ){
+void clif_enchantwindow_open( map_session_data& sd, uint64 clientLuaIndex ){
 #if PACKETVER_RE_NUM >= 20211103 || PACKETVER_MAIN_NUM >= 20220330
 	// Hardcoded clientside check
 	if( sd.weight > ( ( sd.max_weight * 70 ) / 100 ) ){
@@ -23930,7 +23930,7 @@ void clif_enchantwindow_open( struct map_session_data& sd, uint64 clientLuaIndex
 #endif
 }
 
-void clif_enchantwindow_result( struct map_session_data& sd, bool success, t_itemid enchant = 0 ){
+void clif_enchantwindow_result( map_session_data& sd, bool success, t_itemid enchant = 0 ){
 #if PACKETVER_RE_NUM >= 20211103 || PACKETVER_MAIN_NUM >= 20220330
 	struct PACKET_ZC_RESPONSE_ENCHANT p = {};
 
@@ -23984,7 +23984,7 @@ bool clif_parse_enchant_basecheck( struct item& selected_item, std::shared_ptr<s
 	return true;
 }
 
-void clif_parse_enchantwindow_general( int fd, struct map_session_data* sd ){
+void clif_parse_enchantwindow_general( int fd, map_session_data* sd ){
 #if PACKETVER_RE_NUM >= 20211103 || PACKETVER_MAIN_NUM >= 20220330
 	struct PACKET_CZ_REQUEST_RANDOM_ENCHANT *p = (struct PACKET_CZ_REQUEST_RANDOM_ENCHANT*)RFIFOP( fd, 0 );
 
@@ -24113,7 +24113,7 @@ void clif_parse_enchantwindow_general( int fd, struct map_session_data* sd ){
 #endif
 }
 
-void clif_parse_enchantwindow_perfect( int fd, struct map_session_data* sd ){
+void clif_parse_enchantwindow_perfect( int fd, map_session_data* sd ){
 #if PACKETVER_RE_NUM >= 20211103 || PACKETVER_MAIN_NUM >= 20220330
 	struct PACKET_CZ_REQUEST_PERFECT_ENCHANT *p = (struct PACKET_CZ_REQUEST_PERFECT_ENCHANT*)RFIFOP( fd, 0 );
 
@@ -24213,7 +24213,7 @@ void clif_parse_enchantwindow_perfect( int fd, struct map_session_data* sd ){
 #endif
 }
 
-void clif_parse_enchantwindow_upgrade( int fd, struct map_session_data* sd ){
+void clif_parse_enchantwindow_upgrade( int fd, map_session_data* sd ){
 #if PACKETVER_RE_NUM >= 20211103 || PACKETVER_MAIN_NUM >= 20220330
 	struct PACKET_CZ_REQUEST_UPGRADE_ENCHANT *p = (struct PACKET_CZ_REQUEST_UPGRADE_ENCHANT*)RFIFOP( fd, 0 );
 
@@ -24310,7 +24310,7 @@ void clif_parse_enchantwindow_upgrade( int fd, struct map_session_data* sd ){
 #endif
 }
 
-void clif_parse_enchantwindow_reset( int fd, struct map_session_data* sd ){
+void clif_parse_enchantwindow_reset( int fd, map_session_data* sd ){
 #if PACKETVER_RE_NUM >= 20211103 || PACKETVER_MAIN_NUM >= 20220330
 	struct PACKET_CZ_REQUEST_RESET_ENCHANT *p = (struct PACKET_CZ_REQUEST_RESET_ENCHANT*)RFIFOP( fd, 0 );
 
@@ -24428,13 +24428,13 @@ void clif_parse_enchantwindow_reset( int fd, struct map_session_data* sd ){
 #endif
 }
 
-void clif_parse_enchantwindow_close( int fd, struct map_session_data* sd ){
+void clif_parse_enchantwindow_close( int fd, map_session_data* sd ){
 #if PACKETVER_RE_NUM >= 20211103 || PACKETVER_MAIN_NUM >= 20220330
 	sd->state.item_enchant_index = 0;
 #endif
 }
 
-void clif_parse_itempackage_select( int fd, struct map_session_data* sd ){
+void clif_parse_itempackage_select( int fd, map_session_data* sd ){
 #if PACKETVER_MAIN_NUM >= 20220216 || PACKETVER_ZERO_NUM >= 20220316
 	struct PACKET_CZ_USE_PACKAGEITEM* p = (struct PACKET_CZ_USE_PACKAGEITEM*)RFIFOP( fd, 0 );
 
@@ -24938,7 +24938,7 @@ static int clif_parse(int fd)
 	return 0;
 }
 
-void packetdb_addpacket( uint16 cmd, uint16 length, void (*func)(int, struct map_session_data *), ... ){
+void packetdb_addpacket( uint16 cmd, uint16 length, void (*func)(int, map_session_data *), ... ){
 	va_list argp;
 	int i;
 
diff --git a/src/map/clif.hpp b/src/map/clif.hpp
index 21557da5ba..433d1c426e 100644
--- a/src/map/clif.hpp
+++ b/src/map/clif.hpp
@@ -23,7 +23,7 @@ struct s_storage;
 //#include "map.hpp"
 struct block_list;
 struct unit_data;
-struct map_session_data;
+class map_session_data;
 struct homun_data;
 struct pet_data;
 struct mob_data;
@@ -61,7 +61,7 @@ enum e_PacketDBVersion { // packet DB
 
 struct s_packet_db {
 	short len;
-	void (*func)(int, struct map_session_data *);
+	void (*func)(int, map_session_data *);
 	short pos[MAX_PACKET_POS];
 };
 
@@ -612,7 +612,7 @@ uint32 clif_getip(void);
 uint32 clif_refresh_ip(void);
 uint16 clif_getport(void);
 
-void clif_authok(struct map_session_data *sd);
+void clif_authok(map_session_data *sd);
 void clif_authrefuse(int fd, uint8 error_code);
 void clif_authfail_fd(int fd, int type);
 void clif_charselectok(int id, uint8 ok);
@@ -623,34 +623,34 @@ void clif_clearunit_single(int id, clr_type type, int fd);
 void clif_clearunit_area(struct block_list* bl, clr_type type);
 void clif_clearunit_delayed(struct block_list* bl, clr_type type, t_tick tick);
 int clif_spawn(struct block_list *bl, bool walking = false);	//area
-void clif_walkok(struct map_session_data *sd);	// self
+void clif_walkok(map_session_data *sd);	// self
 void clif_move(struct unit_data *ud); //area
-void clif_changemap(struct map_session_data *sd, short m, int x, int y);	//self
-void clif_changemapserver(struct map_session_data* sd, unsigned short map_index, int x, int y, uint32 ip, uint16 port);	//self
+void clif_changemap(map_session_data *sd, short m, int x, int y);	//self
+void clif_changemapserver(map_session_data* sd, unsigned short map_index, int x, int y, uint32 ip, uint16 port);	//self
 void clif_blown(struct block_list *bl); // area
 void clif_slide(struct block_list *bl, int x, int y); // area
 void clif_fixpos(struct block_list *bl);	// area
-void clif_npcbuysell(struct map_session_data* sd, int id);	//self
-void clif_buylist(struct map_session_data *sd, struct npc_data *nd);	//self
-void clif_selllist(struct map_session_data *sd);	//self
-void clif_npc_market_open(struct map_session_data *sd, struct npc_data *nd);
-void clif_parse_NPCMarketClosed(int fd, struct map_session_data *sd);
-void clif_parse_NPCMarketPurchase(int fd, struct map_session_data *sd);
-void clif_scriptmes( struct map_session_data& sd, uint32 npcid, const char *mes );
-void clif_scriptnext( struct map_session_data& sd, uint32 npcid );
-void clif_scriptclose(struct map_session_data *sd, int npcid);	//self
-void clif_scriptclear( struct map_session_data& sd, int npcid ); //self
-void clif_scriptmenu(struct map_session_data* sd, int npcid, const char* mes);	//self
-void clif_scriptinput(struct map_session_data *sd, int npcid);	//self
-void clif_scriptinputstr(struct map_session_data *sd, int npcid);	// self
-void clif_cutin(struct map_session_data* sd, const char* image, int type);	//self
-void clif_viewpoint(struct map_session_data *sd, int npc_id, int type, int x, int y, int id, int color);	//self
-void clif_additem(struct map_session_data *sd, int n, int amount, unsigned char fail); // self
-void clif_dropitem(struct map_session_data *sd,int n,int amount);	//self
-void clif_delitem(struct map_session_data *sd,int n,int amount, short reason); //self
+void clif_npcbuysell(map_session_data* sd, int id);	//self
+void clif_buylist(map_session_data *sd, struct npc_data *nd);	//self
+void clif_selllist(map_session_data *sd);	//self
+void clif_npc_market_open(map_session_data *sd, struct npc_data *nd);
+void clif_parse_NPCMarketClosed(int fd, map_session_data *sd);
+void clif_parse_NPCMarketPurchase(int fd, map_session_data *sd);
+void clif_scriptmes( map_session_data& sd, uint32 npcid, const char *mes );
+void clif_scriptnext( map_session_data& sd, uint32 npcid );
+void clif_scriptclose(map_session_data *sd, int npcid);	//self
+void clif_scriptclear( map_session_data& sd, int npcid ); //self
+void clif_scriptmenu(map_session_data* sd, int npcid, const char* mes);	//self
+void clif_scriptinput(map_session_data *sd, int npcid);	//self
+void clif_scriptinputstr(map_session_data *sd, int npcid);	// self
+void clif_cutin(map_session_data* sd, const char* image, int type);	//self
+void clif_viewpoint(map_session_data *sd, int npc_id, int type, int x, int y, int id, int color);	//self
+void clif_additem(map_session_data *sd, int n, int amount, unsigned char fail); // self
+void clif_dropitem(map_session_data *sd,int n,int amount);	//self
+void clif_delitem(map_session_data *sd,int n,int amount, short reason); //self
 void clif_update_hp(map_session_data &sd);
-void clif_updatestatus(struct map_session_data *sd,int type);	//self
-void clif_changestatus(struct map_session_data* sd,int type,int val);	//area
+void clif_updatestatus(map_session_data *sd,int type);	//self
+void clif_changestatus(map_session_data* sd,int type,int val);	//area
 int clif_damage(struct block_list* src, struct block_list* dst, t_tick tick, int sdelay, int ddelay, int64 sdamage, int div, enum e_damage_type type, int64 sdamage2, bool spdamage);	// area
 void clif_takeitem(struct block_list* src, struct block_list* dst);
 void clif_sitting(struct block_list* bl);
@@ -659,87 +659,87 @@ void clif_sprite_change(struct block_list *bl, int id, int type, int val, int va
 void clif_changelook(struct block_list *bl,int type,int val);	// area
 void clif_changetraplook(struct block_list *bl,int val); // area
 void clif_refreshlook(struct block_list *bl,int id,int type,int val,enum send_target target); //area specified in 'target'
-void clif_arrowequip(struct map_session_data *sd,int val); //self
-void clif_arrow_fail(struct map_session_data *sd,int type); //self
-void clif_arrow_create_list(struct map_session_data *sd);	//self
-void clif_statusupack(struct map_session_data *sd,int type,int ok,int val);	// self
-void clif_equipitemack( struct map_session_data& sd, uint8 flag, int index, int pos = 0 ); // self
-void clif_unequipitemack(struct map_session_data *sd,int n,int pos,int ok);	// self
+void clif_arrowequip(map_session_data *sd,int val); //self
+void clif_arrow_fail(map_session_data *sd,int type); //self
+void clif_arrow_create_list(map_session_data *sd);	//self
+void clif_statusupack(map_session_data *sd,int type,int ok,int val);	// self
+void clif_equipitemack( map_session_data& sd, uint8 flag, int index, int pos = 0 ); // self
+void clif_unequipitemack(map_session_data *sd,int n,int pos,int ok);	// self
 void clif_misceffect(struct block_list* bl,int type);	// area
 void clif_changeoption_target(struct block_list* bl, struct block_list* target);
 #define clif_changeoption(bl) clif_changeoption_target(bl, NULL)	// area
 void clif_changeoption2(struct block_list* bl);	// area
-void clif_useitemack(struct map_session_data *sd,int index,int amount,bool ok);	// self
+void clif_useitemack(map_session_data *sd,int index,int amount,bool ok);	// self
 void clif_GlobalMessage(struct block_list* bl, const char* message,enum send_target target);
-void clif_createchat(struct map_session_data* sd, int flag);	// self
+void clif_createchat(map_session_data* sd, int flag);	// self
 void clif_dispchat(struct chat_data* cd, int fd);	// area or fd
-void clif_joinchatfail(struct map_session_data *sd,int flag);	// self
-void clif_joinchatok(struct map_session_data *sd,struct chat_data* cd);	// self
-void clif_addchat(struct chat_data* cd,struct map_session_data *sd);	// chat
-void clif_changechatowner(struct chat_data* cd, struct map_session_data* sd);	// chat
+void clif_joinchatfail(map_session_data *sd,int flag);	// self
+void clif_joinchatok(map_session_data *sd,struct chat_data* cd);	// self
+void clif_addchat(struct chat_data* cd,map_session_data *sd);	// chat
+void clif_changechatowner(struct chat_data* cd, map_session_data* sd);	// chat
 void clif_clearchat(struct chat_data *cd,int fd);	// area or fd
-void clif_leavechat(struct chat_data* cd, struct map_session_data* sd, bool flag);	// chat
+void clif_leavechat(struct chat_data* cd, map_session_data* sd, bool flag);	// chat
 void clif_changechatstatus(struct chat_data* cd);	// chat
-void clif_refresh_storagewindow(struct map_session_data *sd);
-void clif_refresh(struct map_session_data *sd);	// self
+void clif_refresh_storagewindow(map_session_data *sd);
+void clif_refresh(map_session_data *sd);	// self
 
 void clif_emotion(struct block_list *bl,int type);
 void clif_talkiebox(struct block_list* bl, const char* talkie);
 void clif_wedding_effect(struct block_list *bl);
-void clif_divorced(struct map_session_data* sd, const char* name);
-void clif_callpartner(struct map_session_data& sd);
-void clif_playBGM( struct map_session_data& sd, const char* name );
+void clif_divorced(map_session_data* sd, const char* name);
+void clif_callpartner(map_session_data& sd);
+void clif_playBGM( map_session_data& sd, const char* name );
 void clif_soundeffect( struct block_list& bl, const char* name, int type, enum send_target target );
-void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type, int target_id, t_tick tick);
-void clif_parse_LoadEndAck(int fd,struct map_session_data *sd);
-void clif_hotkeys_send(struct map_session_data *sd, int tab);
+void clif_parse_ActionRequest_sub(map_session_data *sd, int action_type, int target_id, t_tick tick);
+void clif_parse_LoadEndAck(int fd,map_session_data *sd);
+void clif_hotkeys_send(map_session_data *sd, int tab);
 
 // trade
-void clif_traderequest(struct map_session_data* sd, const char* name);
-void clif_tradestart(struct map_session_data* sd, uint8 type);
-void clif_tradeadditem(struct map_session_data* sd, struct map_session_data* tsd, int index, int amount);
-void clif_tradeitemok(struct map_session_data& sd, int index, e_exitem_add_result result);
-void clif_tradedeal_lock(struct map_session_data* sd, int fail);
-void clif_tradecancelled(struct map_session_data* sd);
-void clif_tradecompleted(struct map_session_data* sd, int fail);
-void clif_tradeundo(struct map_session_data* sd);
+void clif_traderequest(map_session_data* sd, const char* name);
+void clif_tradestart(map_session_data* sd, uint8 type);
+void clif_tradeadditem(map_session_data* sd, map_session_data* tsd, int index, int amount);
+void clif_tradeitemok(map_session_data& sd, int index, e_exitem_add_result result);
+void clif_tradedeal_lock(map_session_data* sd, int fail);
+void clif_tradecancelled(map_session_data* sd);
+void clif_tradecompleted(map_session_data* sd, int fail);
+void clif_tradeundo(map_session_data* sd);
 
 // storage
-void clif_storagelist(struct map_session_data* sd, struct item* items, int items_length, const char *storename);
-void clif_updatestorageamount(struct map_session_data* sd, int amount, int max_amount);
-void clif_storageitemadded(struct map_session_data* sd, struct item* i, int index, int amount);
-void clif_storageitemremoved(struct map_session_data* sd, int index, int amount);
-void clif_storageclose(struct map_session_data* sd);
+void clif_storagelist(map_session_data* sd, struct item* items, int items_length, const char *storename);
+void clif_updatestorageamount(map_session_data* sd, int amount, int max_amount);
+void clif_storageitemadded(map_session_data* sd, struct item* i, int index, int amount);
+void clif_storageitemremoved(map_session_data* sd, int index, int amount);
+void clif_storageclose(map_session_data* sd);
 
 int clif_insight(struct block_list *bl,va_list ap);	// map_forallinmovearea callback
 int clif_outsight(struct block_list *bl,va_list ap);	// map_forallinmovearea callback
 
-void clif_class_change_target(struct block_list *bl,int class_, int type, enum send_target target, struct map_session_data *sd);
+void clif_class_change_target(struct block_list *bl,int class_, int type, enum send_target target, map_session_data *sd);
 #define clif_class_change(bl, class_, type) clif_class_change_target(bl, class_, type, AREA, NULL)
 #define clif_mob_class_change(md, class_) clif_class_change(&md->bl, class_, 1)
 
-void clif_skillinfoblock(struct map_session_data *sd);
-void clif_skillup(struct map_session_data *sd, uint16 skill_id, int lv, int range, int upgradable);
-void clif_skillinfo(struct map_session_data *sd,int skill_id, int inf);
-void clif_addskill(struct map_session_data *sd, int skill_id);
-void clif_deleteskill(struct map_session_data *sd, int skill_id);
+void clif_skillinfoblock(map_session_data *sd);
+void clif_skillup(map_session_data *sd, uint16 skill_id, int lv, int range, int upgradable);
+void clif_skillinfo(map_session_data *sd,int skill_id, int inf);
+void clif_addskill(map_session_data *sd, int skill_id);
+void clif_deleteskill(map_session_data *sd, int skill_id);
 
 void clif_skillcasting(struct block_list* bl, int src_id, int dst_id, int dst_x, int dst_y, uint16 skill_id, uint16 skill_lv, int property, int casttime);
 void clif_skillcastcancel(struct block_list* bl);
-void clif_skill_fail(struct map_session_data *sd,uint16 skill_id,enum useskill_fail_cause cause,int btype, t_itemid itemId = 0);
-void clif_skill_cooldown(struct map_session_data *sd, uint16 skill_id, t_tick tick);
+void clif_skill_fail(map_session_data *sd,uint16 skill_id,enum useskill_fail_cause cause,int btype, t_itemid itemId = 0);
+void clif_skill_cooldown(map_session_data *sd, uint16 skill_id, t_tick tick);
 int clif_skill_damage(struct block_list *src,struct block_list *dst,t_tick tick,int sdelay,int ddelay,int64 sdamage,int div,uint16 skill_id,uint16 skill_lv,enum e_damage_type type);
 //int clif_skill_damage2(struct block_list *src,struct block_list *dst,t_tick tick,int sdelay,int ddelay,int damage,int div,uint16 skill_id,uint16 skill_lv,enum e_damage_type type);
 bool clif_skill_nodamage(struct block_list *src,struct block_list *dst,uint16 skill_id,int heal,t_tick tick);
 void clif_skill_poseffect(struct block_list *src,uint16 skill_id,int val,int x,int y,t_tick tick);
-void clif_skill_estimation(struct map_session_data *sd,struct block_list *dst);
-void clif_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 clif_skill_memomessage(struct map_session_data* sd, int type);
-void clif_skill_teleportmessage(struct map_session_data *sd, int type);
-void clif_skill_produce_mix_list(struct map_session_data *sd, int skill_id, int trigger);
-void clif_cooking_list(struct map_session_data *sd, int trigger, uint16 skill_id, int qty, int list_type);
+void clif_skill_estimation(map_session_data *sd,struct block_list *dst);
+void clif_skill_warppoint(map_session_data* sd, uint16 skill_id, uint16 skill_lv, unsigned short map1, unsigned short map2, unsigned short map3, unsigned short map4);
+void clif_skill_memomessage(map_session_data* sd, int type);
+void clif_skill_teleportmessage(map_session_data *sd, int type);
+void clif_skill_produce_mix_list(map_session_data *sd, int skill_id, int trigger);
+void clif_cooking_list(map_session_data *sd, int trigger, uint16 skill_id, int qty, int list_type);
 
-void clif_produceeffect(struct map_session_data* sd,int flag, t_itemid nameid);
+void clif_produceeffect(map_session_data* sd,int flag, t_itemid nameid);
 
 void clif_getareachar_skillunit(struct block_list *bl, struct skill_unit *unit, enum send_target target, bool visible);
 void clif_skill_delunit(struct skill_unit *unit);
@@ -747,12 +747,12 @@ void clif_skillunit_update(struct block_list* bl);
 
 void clif_skill_unit_test(struct block_list *bl, short x, short y, int unit_id, short range, short skill_lv);
 
-void clif_autospell(struct map_session_data *sd,uint16 skill_lv);
-void clif_devotion(struct block_list *src, struct map_session_data *tsd);
+void clif_autospell(map_session_data *sd,uint16 skill_lv);
+void clif_devotion(struct block_list *src, map_session_data *tsd);
 void clif_spiritball( struct block_list *bl, struct block_list* target = nullptr, enum send_target send_target = AREA );
-void clif_soulball( struct map_session_data *sd, struct block_list* target = nullptr, enum send_target send_target = AREA );
-void clif_servantball( struct map_session_data& sd, struct block_list* target = nullptr, enum send_target send_target = AREA );
-void clif_abyssball( struct map_session_data& sd, struct block_list* target = nullptr, enum send_target send_target = AREA );
+void clif_soulball( map_session_data *sd, struct block_list* target = nullptr, enum send_target send_target = AREA );
+void clif_servantball( map_session_data& sd, struct block_list* target = nullptr, enum send_target send_target = AREA );
+void clif_abyssball( map_session_data& sd, struct block_list* target = nullptr, enum send_target send_target = AREA );
 void clif_combo_delay(struct block_list *bl,t_tick wait);
 void clif_bladestop(struct block_list *src, int dst_id, int active);
 void clif_changemapcell(int fd, int16 m, int x, int y, int type, enum send_target target);
@@ -762,7 +762,7 @@ void clif_status_change(struct block_list *bl, int type, int flag, t_tick tick,
 void clif_efst_status_change(struct block_list *bl, int tid, enum send_target target, int type, t_tick tick, int val1, int val2, int val3);
 void clif_efst_status_change_sub(struct block_list *tbl, struct block_list *bl, enum send_target target);
 
-void clif_wis_message(struct map_session_data* sd, const char* nick, const char* mes, int mes_len, int gmlvl);
+void clif_wis_message(map_session_data* sd, const char* nick, const char* mes, int mes_len, int gmlvl);
 void clif_wis_end(int fd, int result);
 
 void clif_solved_charname(int fd, int charid, const char* name);
@@ -770,107 +770,107 @@ void clif_name( struct block_list* src, struct block_list *bl, send_target targe
 #define clif_name_self(bl) clif_name( (bl), (bl), SELF )
 #define clif_name_area(bl) clif_name( (bl), (bl), AREA )
 
-void clif_use_card(struct map_session_data *sd,int idx);
-void clif_insert_card(struct map_session_data *sd,int idx_equip,int idx_card,int flag);
+void clif_use_card(map_session_data *sd,int idx);
+void clif_insert_card(map_session_data *sd,int idx_equip,int idx_card,int flag);
 
-void clif_inventorylist(struct map_session_data *sd);
-void clif_equiplist(struct map_session_data *sd);
+void clif_inventorylist(map_session_data *sd);
+void clif_equiplist(map_session_data *sd);
 
-void clif_cart_additem(struct map_session_data *sd,int n,int amount);
-void clif_cart_additem_ack(struct map_session_data *sd, uint8 flag);
-void clif_cart_delitem(struct map_session_data *sd,int n,int amount);
-void clif_cartlist(struct map_session_data *sd);
+void clif_cart_additem(map_session_data *sd,int n,int amount);
+void clif_cart_additem_ack(map_session_data *sd, uint8 flag);
+void clif_cart_delitem(map_session_data *sd,int n,int amount);
+void clif_cartlist(map_session_data *sd);
 void clif_clearcart(int fd);
 
-void clif_item_identify_list(struct map_session_data *sd);
-void clif_item_identified(struct map_session_data *sd,int idx,int flag);
-void clif_item_repair_list(struct map_session_data *sd, struct map_session_data *dstsd, int lv);
-void clif_item_repaireffect(struct map_session_data *sd, int idx, int flag);
-void clif_item_damaged(struct map_session_data* sd, unsigned short position);
-void clif_item_refine_list(struct map_session_data *sd);
-void clif_hat_effects( struct map_session_data* sd, struct block_list* bl, enum send_target target );
-void clif_hat_effect_single( struct map_session_data* sd, uint16 effectId, bool enable );
+void clif_item_identify_list(map_session_data *sd);
+void clif_item_identified(map_session_data *sd,int idx,int flag);
+void clif_item_repair_list(map_session_data *sd, map_session_data *dstsd, int lv);
+void clif_item_repaireffect(map_session_data *sd, int idx, int flag);
+void clif_item_damaged(map_session_data* sd, unsigned short position);
+void clif_item_refine_list(map_session_data *sd);
+void clif_hat_effects( map_session_data* sd, struct block_list* bl, enum send_target target );
+void clif_hat_effect_single( map_session_data* sd, uint16 effectId, bool enable );
 
-void clif_item_skill(struct map_session_data *sd,uint16 skill_id,uint16 skill_lv);
+void clif_item_skill(map_session_data *sd,uint16 skill_id,uint16 skill_lv);
 
-void clif_mvp_effect(struct map_session_data *sd);
-void clif_mvp_item(struct map_session_data *sd, t_itemid nameid);
-void clif_mvp_exp(struct map_session_data *sd, t_exp exp);
-void clif_mvp_noitem(struct map_session_data* sd);
+void clif_mvp_effect(map_session_data *sd);
+void clif_mvp_item(map_session_data *sd, t_itemid nameid);
+void clif_mvp_exp(map_session_data *sd, t_exp exp);
+void clif_mvp_noitem(map_session_data* sd);
 void clif_changed_dir(struct block_list *bl, enum send_target target);
 
 // vending
-void clif_openvendingreq(struct map_session_data* sd, int num);
-void clif_showvendingboard( struct map_session_data& sd, enum send_target target = AREA_WOS, struct block_list* tbl = nullptr );
+void clif_openvendingreq(map_session_data* sd, int num);
+void clif_showvendingboard( map_session_data& sd, enum send_target target = AREA_WOS, struct block_list* tbl = nullptr );
 void clif_closevendingboard(struct block_list* bl, int fd);
-void clif_vendinglist( struct map_session_data* sd, struct map_session_data* vsd );
-void clif_buyvending(struct map_session_data* sd, int index, int amount, int fail);
-void clif_openvending(struct map_session_data* sd, int id, struct s_vending* vending);
-void clif_vendingreport(struct map_session_data* sd, int index, int amount, uint32 char_id, int zeny);
+void clif_vendinglist( map_session_data* sd, map_session_data* vsd );
+void clif_buyvending(map_session_data* sd, int index, int amount, int fail);
+void clif_openvending(map_session_data* sd, int id, struct s_vending* vending);
+void clif_vendingreport(map_session_data* sd, int index, int amount, uint32 char_id, int zeny);
 
-void clif_movetoattack(struct map_session_data *sd,struct block_list *bl);
+void clif_movetoattack(map_session_data *sd,struct block_list *bl);
 
 // party
-void clif_party_created( struct map_session_data& sd, int result );
-void clif_party_member_info( struct party_data& party, struct map_session_data& sd );
-void clif_party_info( struct party_data& party, struct map_session_data *sd = nullptr );
-void clif_party_invite( struct map_session_data& sd, struct map_session_data& tsd );
-void clif_party_invite_reply( struct map_session_data& sd, const char* nick, enum e_party_invite_reply reply );
-void clif_party_option(struct party_data *p,struct map_session_data *sd,int flag);
-void clif_party_withdraw( struct map_session_data& sd, uint32 account_id, const char* name, enum e_party_member_withdraw result, enum send_target target );
+void clif_party_created( map_session_data& sd, int result );
+void clif_party_member_info( struct party_data& party, map_session_data& sd );
+void clif_party_info( struct party_data& party, map_session_data *sd = nullptr );
+void clif_party_invite( map_session_data& sd, map_session_data& tsd );
+void clif_party_invite_reply( map_session_data& sd, const char* nick, enum e_party_invite_reply reply );
+void clif_party_option(struct party_data *p,map_session_data *sd,int flag);
+void clif_party_withdraw( map_session_data& sd, uint32 account_id, const char* name, enum e_party_member_withdraw result, enum send_target target );
 void clif_party_message( struct party_data& party, uint32 account_id, const char* mes, int len );
-void clif_party_xy( struct map_session_data& sd );
-void clif_party_xy_single( struct map_session_data& sd, struct map_session_data& tsd );
-void clif_party_hp( struct map_session_data& sd );
-void clif_hpmeter_single( struct map_session_data& sd, uint32 id, uint32 hp, uint32 maxhp );
-void clif_party_job_and_level( struct map_session_data& sd );
-void clif_party_dead( struct map_session_data& sd );
+void clif_party_xy( map_session_data& sd );
+void clif_party_xy_single( map_session_data& sd, map_session_data& tsd );
+void clif_party_hp( map_session_data& sd );
+void clif_hpmeter_single( map_session_data& sd, uint32 id, uint32 hp, uint32 maxhp );
+void clif_party_job_and_level( map_session_data& sd );
+void clif_party_dead( map_session_data& sd );
 
 // guild
-void clif_guild_created(struct map_session_data *sd,int flag);
-void clif_guild_belonginfo( struct map_session_data& sd );
-void clif_guild_masterormember(struct map_session_data *sd);
-void clif_guild_basicinfo( struct map_session_data& sd );
-void clif_guild_allianceinfo(struct map_session_data *sd);
-void clif_guild_memberlist( struct map_session_data& sd );
-void clif_guild_skillinfo(struct map_session_data* sd);
-void clif_guild_send_onlineinfo(struct map_session_data *sd); //[LuzZza]
+void clif_guild_created(map_session_data *sd,int flag);
+void clif_guild_belonginfo( map_session_data& sd );
+void clif_guild_masterormember(map_session_data *sd);
+void clif_guild_basicinfo( map_session_data& sd );
+void clif_guild_allianceinfo(map_session_data *sd);
+void clif_guild_memberlist( map_session_data& sd );
+void clif_guild_skillinfo(map_session_data* sd);
+void clif_guild_send_onlineinfo(map_session_data *sd); //[LuzZza]
 void clif_guild_memberlogin_notice(struct guild *g,int idx,int flag);
-void clif_guild_invite(struct map_session_data *sd,struct guild *g);
-void clif_guild_inviteack(struct map_session_data *sd,int flag);
-void clif_guild_leave(struct map_session_data *sd,const char *name,const char *mes);
-void clif_guild_expulsion(struct map_session_data* sd, const char* name, const char* mes, uint32 account_id);
+void clif_guild_invite(map_session_data *sd,struct guild *g);
+void clif_guild_inviteack(map_session_data *sd,int flag);
+void clif_guild_leave(map_session_data *sd,const char *name,const char *mes);
+void clif_guild_expulsion(map_session_data* sd, const char* name, const char* mes, uint32 account_id);
 void clif_guild_positionchanged(struct guild *g,int idx);
 void clif_guild_memberpositionchanged(struct guild *g,int idx);
-void clif_guild_emblem(struct map_session_data *sd,struct guild *g);
+void clif_guild_emblem(map_session_data *sd,struct guild *g);
 void clif_guild_emblem_area(struct block_list* bl);
-void clif_guild_notice(struct map_session_data* sd);
+void clif_guild_notice(map_session_data* sd);
 void clif_guild_message(struct guild *g,uint32 account_id,const char *mes,int len);
-void clif_guild_reqalliance(struct map_session_data *sd,uint32 account_id,const char *name);
-void clif_guild_allianceack(struct map_session_data *sd,int flag);
-void clif_guild_delalliance(struct map_session_data *sd,int guild_id,int flag);
-void clif_guild_oppositionack(struct map_session_data *sd,int flag);
-void clif_guild_broken(struct map_session_data *sd,int flag);
-void clif_guild_xy(struct map_session_data *sd);
-void clif_guild_xy_single(int fd, struct map_session_data *sd);
-void clif_guild_xy_remove(struct map_session_data *sd);
+void clif_guild_reqalliance(map_session_data *sd,uint32 account_id,const char *name);
+void clif_guild_allianceack(map_session_data *sd,int flag);
+void clif_guild_delalliance(map_session_data *sd,int guild_id,int flag);
+void clif_guild_oppositionack(map_session_data *sd,int flag);
+void clif_guild_broken(map_session_data *sd,int flag);
+void clif_guild_xy(map_session_data *sd);
+void clif_guild_xy_single(int fd, map_session_data *sd);
+void clif_guild_xy_remove(map_session_data *sd);
 
 // Battleground
-void clif_bg_hp(struct map_session_data *sd);
-void clif_bg_xy(struct map_session_data *sd);
-void clif_bg_xy_remove(struct map_session_data *sd);
+void clif_bg_hp(map_session_data *sd);
+void clif_bg_xy(map_session_data *sd);
+void clif_bg_xy_remove(map_session_data *sd);
 void clif_bg_message(struct s_battleground_data *bg, int src_id, const char *name, const char *mes, int len);
 void clif_bg_updatescore(int16 m);
-void clif_bg_updatescore_single(struct map_session_data *sd);
-void clif_sendbgemblem_area(struct map_session_data *sd);
-void clif_sendbgemblem_single(int fd, struct map_session_data *sd);
+void clif_bg_updatescore_single(map_session_data *sd);
+void clif_sendbgemblem_area(map_session_data *sd);
+void clif_sendbgemblem_single(int fd, map_session_data *sd);
 
 // Battleground Queue
-void clif_bg_queue_apply_result(e_bg_queue_apply_ack result, const char *name, struct map_session_data *sd);
-void clif_bg_queue_apply_notify(const char *name, struct map_session_data *sd);
-void clif_bg_queue_entry_init(struct map_session_data *sd);
-void clif_bg_queue_lobby_notify(const char *name, struct map_session_data *sd);
-void clif_bg_queue_ack_lobby(bool result, const char *name, const char *lobbyname, struct map_session_data *sd);
+void clif_bg_queue_apply_result(e_bg_queue_apply_ack result, const char *name, map_session_data *sd);
+void clif_bg_queue_apply_notify(const char *name, map_session_data *sd);
+void clif_bg_queue_entry_init(map_session_data *sd);
+void clif_bg_queue_lobby_notify(const char *name, map_session_data *sd);
+void clif_bg_queue_ack_lobby(bool result, const char *name, const char *lobbyname, map_session_data *sd);
 
 // Instancing
 void clif_instance_create(int instance_id, int num);
@@ -878,10 +878,10 @@ void clif_instance_changewait(int instance_id, int num);
 void clif_instance_status(int instance_id, unsigned int limit1, unsigned int limit2);
 void clif_instance_changestatus(int instance_id, e_instance_notify type, unsigned int limit);
 void clif_parse_MemorialDungeonCommand(int fd, map_session_data *sd);
-void clif_instance_info( struct map_session_data& sd );
+void clif_instance_info( map_session_data& sd );
 
 // Custom Fonts
-void clif_font(struct map_session_data *sd);
+void clif_font(map_session_data *sd);
 
 // atcommand
 void clif_displaymessage(const int fd, const char* mes);
@@ -891,82 +891,82 @@ void clif_broadcast2(struct block_list* bl, const char* mes, int len, unsigned l
 void clif_heal(int fd,int type,int val);
 void clif_resurrection(struct block_list *bl,int type);
 void clif_map_property(struct block_list *bl, enum map_property property, enum send_target t);
-void clif_pvpset(struct map_session_data *sd, int pvprank, int pvpnum,int type);
+void clif_pvpset(map_session_data *sd, int pvprank, int pvpnum,int type);
 void clif_map_property_mapall(int map, enum map_property property);
 void clif_refine(int fd, int fail, int index, int val);
-void clif_upgrademessage( struct map_session_data* sd, int result, t_itemid item_id );
+void clif_upgrademessage( map_session_data* sd, int result, t_itemid item_id );
 
 //petsystem
-void clif_catch_process(struct map_session_data *sd);
-void clif_pet_roulette(struct map_session_data *sd,int data);
-void clif_sendegg(struct map_session_data *sd);
-void clif_send_petstatus(struct map_session_data *sd);
-void clif_send_petdata(struct map_session_data* sd, struct pet_data* pd, int type, int param);
+void clif_catch_process(map_session_data *sd);
+void clif_pet_roulette(map_session_data *sd,int data);
+void clif_sendegg(map_session_data *sd);
+void clif_send_petstatus(map_session_data *sd);
+void clif_send_petdata(map_session_data* sd, struct pet_data* pd, int type, int param);
 #define clif_pet_equip(sd, pd) clif_send_petdata(sd, pd, 3, (pd)->vd.head_bottom)
 #define clif_pet_equip_area(pd) clif_send_petdata(NULL, pd, 3, (pd)->vd.head_bottom)
 #define clif_pet_performance(pd, param) clif_send_petdata(NULL, pd, 4, param)
 void clif_pet_emotion(struct pet_data *pd,int param);
-void clif_pet_food(struct map_session_data *sd,int foodid,int fail);
-void clif_pet_autofeed_status(struct map_session_data* sd, bool force);
+void clif_pet_food(map_session_data *sd,int foodid,int fail);
+void clif_pet_autofeed_status(map_session_data* sd, bool force);
 
 //friends list
-int clif_friendslist_toggle_sub(struct map_session_data *sd,va_list ap);
-void clif_friendslist_send( struct map_session_data& sd );
-void clif_friendslist_reqack(struct map_session_data *sd, struct map_session_data *f_sd, int type);
+int clif_friendslist_toggle_sub(map_session_data *sd,va_list ap);
+void clif_friendslist_send( map_session_data& sd );
+void clif_friendslist_reqack(map_session_data *sd, map_session_data *f_sd, int type);
 
 void clif_weather(int16 m); // [Valaris]
 void clif_specialeffect(struct block_list* bl, int type, enum send_target target); // special effects [Valaris]
 void clif_specialeffect_single(struct block_list* bl, int type, int fd);
 void clif_specialeffect_remove(struct block_list* bl_src, int effect, enum send_target e_target, struct block_list* bl_target);
-void clif_messagecolor_target(struct block_list *bl, unsigned long color, const char *msg, bool rgb2bgr, enum send_target type, struct map_session_data *sd);
+void clif_messagecolor_target(struct block_list *bl, unsigned long color, const char *msg, bool rgb2bgr, enum send_target type, map_session_data *sd);
 #define clif_messagecolor(bl, color, msg, rgb2bgr, type) clif_messagecolor_target(bl, color, msg, rgb2bgr, type, NULL) // Mob/Npc color talk [SnakeDrak]
 void clif_specialeffect_value(struct block_list* bl, int effect_id, int num, send_target target);
 
-void clif_GM_kickack(struct map_session_data *sd, int id);
-void clif_GM_kick(struct map_session_data *sd,struct map_session_data *tsd);
-void clif_manner_message(struct map_session_data* sd, uint32 type);
-void clif_GM_silence(struct map_session_data* sd, struct map_session_data* tsd, uint8 type);
+void clif_GM_kickack(map_session_data *sd, int id);
+void clif_GM_kick(map_session_data *sd,map_session_data *tsd);
+void clif_manner_message(map_session_data* sd, uint32 type);
+void clif_GM_silence(map_session_data* sd, map_session_data* tsd, uint8 type);
 
 void clif_disp_overhead_(struct block_list *bl, const char* mes, enum send_target flag);
 #define clif_disp_overhead(bl, mes) clif_disp_overhead_(bl, mes, AREA)
 
-void clif_get_weapon_view(struct map_session_data* sd, t_itemid *rhand, t_itemid *lhand);
+void clif_get_weapon_view(map_session_data* sd, t_itemid *rhand, t_itemid *lhand);
 
-void clif_party_xy_remove(struct map_session_data *sd); //Fix for minimap [Kevin]
-void clif_gospel_info(struct map_session_data *sd, int type);
-void clif_feel_req(int fd, struct map_session_data *sd, uint16 skill_lv);
-void clif_starskill(struct map_session_data* sd, const char* mapname, int monster_id, unsigned char star, unsigned char result);
-void clif_feel_info(struct map_session_data* sd, unsigned char feel_level, unsigned char type);
-void clif_hate_info(struct map_session_data *sd, unsigned char hate_level,int class_, unsigned char type);
-void clif_mission_info(struct map_session_data *sd, int mob_id, unsigned char progress);
-void clif_feel_hate_reset(struct map_session_data *sd);
+void clif_party_xy_remove(map_session_data *sd); //Fix for minimap [Kevin]
+void clif_gospel_info(map_session_data *sd, int type);
+void clif_feel_req(int fd, map_session_data *sd, uint16 skill_lv);
+void clif_starskill(map_session_data* sd, const char* mapname, int monster_id, unsigned char star, unsigned char result);
+void clif_feel_info(map_session_data* sd, unsigned char feel_level, unsigned char type);
+void clif_hate_info(map_session_data *sd, unsigned char hate_level,int class_, unsigned char type);
+void clif_mission_info(map_session_data *sd, int mob_id, unsigned char progress);
+void clif_feel_hate_reset(map_session_data *sd);
 
 // [blackhole89]
-void clif_hominfo(struct map_session_data *sd, struct homun_data *hd, int flag);
-int clif_homskillinfoblock(struct map_session_data *sd);
-void clif_homskillup(struct map_session_data *sd, uint16 skill_id);	//[orn]
-void clif_hom_food(struct map_session_data *sd,int foodid,int fail);	//[orn]
-void clif_send_homdata(struct map_session_data *sd, int state, int param);	//[orn]
+void clif_hominfo(map_session_data *sd, struct homun_data *hd, int flag);
+int clif_homskillinfoblock(map_session_data *sd);
+void clif_homskillup(map_session_data *sd, uint16 skill_id);	//[orn]
+void clif_hom_food(map_session_data *sd,int foodid,int fail);	//[orn]
+void clif_send_homdata(map_session_data *sd, int state, int param);	//[orn]
 
-void clif_configuration( struct map_session_data* sd, enum e_config_type type, bool enabled );
-void clif_partytickack(struct map_session_data* sd, bool flag);
-void clif_viewequip_ack(struct map_session_data* sd, struct map_session_data* tsd);
-void clif_equipcheckbox(struct map_session_data* sd);
+void clif_configuration( map_session_data* sd, enum e_config_type type, bool enabled );
+void clif_partytickack(map_session_data* sd, bool flag);
+void clif_viewequip_ack(map_session_data* sd, map_session_data* tsd);
+void clif_equipcheckbox(map_session_data* sd);
 
-void clif_msg(struct map_session_data* sd, unsigned short id);
-void clif_msg_value(struct map_session_data* sd, unsigned short id, int value);
-void clif_msg_skill(struct map_session_data* sd, uint16 skill_id, int msg_id);
-void clif_msg_color( struct map_session_data* sd, uint16 msg_id, uint32 color );
+void clif_msg(map_session_data* sd, unsigned short id);
+void clif_msg_value(map_session_data* sd, unsigned short id, int value);
+void clif_msg_skill(map_session_data* sd, uint16 skill_id, int msg_id);
+void clif_msg_color( map_session_data* sd, uint16 msg_id, uint32 color );
 
 //quest system [Kevin] [Inkfish]
-void clif_quest_send_list(struct map_session_data * sd);
-void clif_quest_send_mission(struct map_session_data * sd);
-void clif_quest_add(struct map_session_data * sd, struct quest * qd);
-void clif_quest_delete(struct map_session_data * sd, int quest_id);
-void clif_quest_update_status(struct map_session_data * sd, int quest_id, bool active);
-void clif_quest_update_objective(struct map_session_data * sd, struct quest * qd);
-void clif_quest_show_event(struct map_session_data *sd, struct block_list *bl, e_questinfo_types effect, e_questinfo_markcolor color);
-void clif_displayexp(struct map_session_data *sd, t_exp exp, char type, bool quest, bool lost);
+void clif_quest_send_list(map_session_data * sd);
+void clif_quest_send_mission(map_session_data * sd);
+void clif_quest_add(map_session_data * sd, struct quest * qd);
+void clif_quest_delete(map_session_data * sd, int quest_id);
+void clif_quest_update_status(map_session_data * sd, int quest_id, bool active);
+void clif_quest_update_objective(map_session_data * sd, struct quest * qd);
+void clif_quest_show_event(map_session_data *sd, struct block_list *bl, e_questinfo_types effect, e_questinfo_markcolor color);
+void clif_displayexp(map_session_data *sd, t_exp exp, char type, bool quest, bool lost);
 
 int clif_send(const void* buf, int len, struct block_list* bl, enum send_target type);
 void do_init_clif(void);
@@ -983,132 +983,132 @@ enum mail_send_result : uint8_t {
 };
 
 void clif_Mail_window(int fd, int flag);
-void clif_Mail_read(struct map_session_data *sd, int mail_id);
-void clif_mail_delete(struct map_session_data* sd, struct mail_message *msg, bool success);
+void clif_Mail_read(map_session_data *sd, int mail_id);
+void clif_mail_delete(map_session_data* sd, struct mail_message *msg, bool success);
 void clif_Mail_return(int fd, int mail_id, short fail);
-void clif_Mail_send(struct map_session_data* sd, enum mail_send_result result);
-void clif_Mail_new(struct map_session_data* sd, int mail_id, const char *sender, const char *title);
-void clif_Mail_refreshinbox(struct map_session_data *sd,enum mail_inbox_type type,int64 mailID);
-void clif_mail_getattachment(struct map_session_data* sd, struct mail_message *msg, uint8 result, enum mail_attachment_type type);
-void clif_Mail_Receiver_Ack(struct map_session_data* sd, uint32 char_id, short class_, uint32 level, const char* name);
-void clif_mail_removeitem(struct map_session_data* sd, bool success, int index, int amount);
+void clif_Mail_send(map_session_data* sd, enum mail_send_result result);
+void clif_Mail_new(map_session_data* sd, int mail_id, const char *sender, const char *title);
+void clif_Mail_refreshinbox(map_session_data *sd,enum mail_inbox_type type,int64 mailID);
+void clif_mail_getattachment(map_session_data* sd, struct mail_message *msg, uint8 result, enum mail_attachment_type type);
+void clif_Mail_Receiver_Ack(map_session_data* sd, uint32 char_id, short class_, uint32 level, const char* name);
+void clif_mail_removeitem(map_session_data* sd, bool success, int index, int amount);
 // AUCTION SYSTEM
-void clif_Auction_openwindow(struct map_session_data *sd);
-void clif_Auction_results(struct map_session_data *sd, short count, short pages, uint8 *buf);
+void clif_Auction_openwindow(map_session_data *sd);
+void clif_Auction_results(map_session_data *sd, short count, short pages, uint8 *buf);
 void clif_Auction_message(int fd, unsigned char flag);
 void clif_Auction_close(int fd, unsigned char flag);
-void clif_parse_Auction_cancelreg(int fd, struct map_session_data *sd);
+void clif_parse_Auction_cancelreg(int fd, map_session_data *sd);
 
-void clif_bossmapinfo(struct map_session_data *sd, struct mob_data *md, enum e_bossmap_info flag);
-void clif_cashshop_show(struct map_session_data *sd, struct npc_data *nd);
+void clif_bossmapinfo(map_session_data *sd, struct mob_data *md, enum e_bossmap_info flag);
+void clif_cashshop_show(map_session_data *sd, struct npc_data *nd);
 
 // ADOPTION
-void clif_Adopt_reply(struct map_session_data *sd, int type);
-void clif_Adopt_request(struct map_session_data *sd, struct map_session_data *src, int p_id);
+void clif_Adopt_reply(map_session_data *sd, int type);
+void clif_Adopt_request(map_session_data *sd, map_session_data *src, int p_id);
 
 // MERCENARIES
-void clif_mercenary_info(struct map_session_data *sd);
-void clif_mercenary_skillblock(struct map_session_data *sd);
-void clif_mercenary_message(struct map_session_data* sd, int message);
-void clif_mercenary_updatestatus(struct map_session_data *sd, int type);
+void clif_mercenary_info(map_session_data *sd);
+void clif_mercenary_skillblock(map_session_data *sd);
+void clif_mercenary_message(map_session_data* sd, int message);
+void clif_mercenary_updatestatus(map_session_data *sd, int type);
 
 // RENTAL SYSTEM
-void clif_rental_time( struct map_session_data* sd, t_itemid nameid, int seconds );
-void clif_rental_expired( struct map_session_data* sd, int index, t_itemid nameid );
+void clif_rental_time( map_session_data* sd, t_itemid nameid, int seconds );
+void clif_rental_expired( map_session_data* sd, int index, t_itemid nameid );
 
 // BOOK READING
 void clif_readbook(int fd, int book_id, int page);
 
 // Show Picker
-void clif_party_show_picker(struct map_session_data * sd, struct item * item_data);
+void clif_party_show_picker(map_session_data * sd, struct item * item_data);
 
 // Progress Bar [Inkfish]
-void clif_progressbar(struct map_session_data * sd, unsigned long color, unsigned int second);
-void clif_progressbar_abort(struct map_session_data * sd);
-void clif_progressbar_npc(struct npc_data *nd, struct map_session_data* sd);
+void clif_progressbar(map_session_data * sd, unsigned long color, unsigned int second);
+void clif_progressbar_abort(map_session_data * sd);
+void clif_progressbar_npc(struct npc_data *nd, map_session_data* sd);
 #define clif_progressbar_npc_area(nd) clif_progressbar_npc((nd),NULL)
 
-void clif_PartyBookingRegisterAck(struct map_session_data *sd, int flag);
-void clif_PartyBookingDeleteAck(struct map_session_data* sd, int flag);
+void clif_PartyBookingRegisterAck(map_session_data *sd, int flag);
+void clif_PartyBookingDeleteAck(map_session_data* sd, int flag);
 void clif_PartyBookingSearchAck(int fd, struct party_booking_ad_info** results, int count, bool more_result);
-void clif_PartyBookingUpdateNotify(struct map_session_data* sd, struct party_booking_ad_info* pb_ad);
-void clif_PartyBookingDeleteNotify(struct map_session_data* sd, int index);
-void clif_PartyBookingInsertNotify(struct map_session_data* sd, struct party_booking_ad_info* pb_ad);
+void clif_PartyBookingUpdateNotify(map_session_data* sd, struct party_booking_ad_info* pb_ad);
+void clif_PartyBookingDeleteNotify(map_session_data* sd, int index);
+void clif_PartyBookingInsertNotify(map_session_data* sd, struct party_booking_ad_info* pb_ad);
 
 /* Bank System [Yommy/Hercules] */
-void clif_parse_BankDeposit (int fd, struct map_session_data *sd);
-void clif_parse_BankWithdraw (int fd, struct map_session_data *sd);
-void clif_parse_BankCheck (int fd, struct map_session_data *sd);
-void clif_parse_BankOpen (int fd, struct map_session_data *sd);
-void clif_parse_BankClose (int fd, struct map_session_data *sd);
+void clif_parse_BankDeposit (int fd, map_session_data *sd);
+void clif_parse_BankWithdraw (int fd, map_session_data *sd);
+void clif_parse_BankCheck (int fd, map_session_data *sd);
+void clif_parse_BankOpen (int fd, map_session_data *sd);
+void clif_parse_BankClose (int fd, map_session_data *sd);
 
-void clif_showdigit(struct map_session_data* sd, unsigned char type, int value);
+void clif_showdigit(map_session_data* sd, unsigned char type, int value);
 
 /// Buying Store System
-void clif_buyingstore_open(struct map_session_data* sd);
-void clif_buyingstore_open_failed(struct map_session_data* sd, unsigned short result, unsigned int weight);
-void clif_buyingstore_myitemlist(struct map_session_data* sd);
-void clif_buyingstore_entry( struct map_session_data& sd, struct block_list* tbl = nullptr );
-void clif_buyingstore_disappear_entry( struct map_session_data& sd, struct block_list* tbl = nullptr );
-void clif_buyingstore_itemlist(struct map_session_data* sd, struct map_session_data* pl_sd);
-void clif_buyingstore_trade_failed_buyer(struct map_session_data* sd, short result);
-void clif_buyingstore_update_item(struct map_session_data* sd, t_itemid nameid, unsigned short amount, uint32 char_id, int zeny);
-void clif_buyingstore_delete_item(struct map_session_data* sd, short index, unsigned short amount, int price);
-void clif_buyingstore_trade_failed_seller(struct map_session_data* sd, short result, t_itemid nameid);
+void clif_buyingstore_open(map_session_data* sd);
+void clif_buyingstore_open_failed(map_session_data* sd, unsigned short result, unsigned int weight);
+void clif_buyingstore_myitemlist(map_session_data* sd);
+void clif_buyingstore_entry( map_session_data& sd, struct block_list* tbl = nullptr );
+void clif_buyingstore_disappear_entry( map_session_data& sd, struct block_list* tbl = nullptr );
+void clif_buyingstore_itemlist(map_session_data* sd, map_session_data* pl_sd);
+void clif_buyingstore_trade_failed_buyer(map_session_data* sd, short result);
+void clif_buyingstore_update_item(map_session_data* sd, t_itemid nameid, unsigned short amount, uint32 char_id, int zeny);
+void clif_buyingstore_delete_item(map_session_data* sd, short index, unsigned short amount, int price);
+void clif_buyingstore_trade_failed_seller(map_session_data* sd, short result, t_itemid nameid);
 
 /// Search Store System
-void clif_search_store_info_ack(struct map_session_data* sd);
-void clif_search_store_info_failed(struct map_session_data* sd, unsigned char reason);
-void clif_open_search_store_info(struct map_session_data* sd);
-void clif_search_store_info_click_ack(struct map_session_data* sd, short x, short y);
+void clif_search_store_info_ack(map_session_data* sd);
+void clif_search_store_info_failed(map_session_data* sd, unsigned char reason);
+void clif_open_search_store_info(map_session_data* sd);
+void clif_search_store_info_click_ack(map_session_data* sd, short x, short y);
 
 /// Cash Shop
-void clif_cashshop_result( struct map_session_data* sd, t_itemid item_id, uint16 result );
-void clif_cashshop_open( struct map_session_data* sd, int tab );
+void clif_cashshop_result( map_session_data* sd, t_itemid item_id, uint16 result );
+void clif_cashshop_open( map_session_data* sd, int tab );
 
-void clif_display_pinfo( struct map_session_data& sd );
+void clif_display_pinfo( map_session_data& sd );
 
 /// Roulette
-void clif_roulette_open(struct map_session_data* sd);
-void clif_parse_roulette_open(int fd, struct map_session_data *sd);
-void clif_parse_roulette_info(int fd, struct map_session_data *sd);
-void clif_parse_roulette_close(int fd, struct map_session_data *sd);
-void clif_parse_roulette_generate(int fd, struct map_session_data *sd);
-void clif_parse_roulette_item(int fd, struct map_session_data *sd);
+void clif_roulette_open(map_session_data* sd);
+void clif_parse_roulette_open(int fd, map_session_data *sd);
+void clif_parse_roulette_info(int fd, map_session_data *sd);
+void clif_parse_roulette_close(int fd, map_session_data *sd);
+void clif_parse_roulette_generate(int fd, map_session_data *sd);
+void clif_parse_roulette_item(int fd, map_session_data *sd);
 
-void clif_elementalconverter_list(struct map_session_data *sd);
+void clif_elementalconverter_list(map_session_data *sd);
 
 void clif_millenniumshield(struct block_list *bl, short shields);
 
-void clif_magicdecoy_list(struct map_session_data *sd, uint16 skill_lv, short x, short y);
+void clif_magicdecoy_list(map_session_data *sd, uint16 skill_lv, short x, short y);
 
-void clif_poison_list(struct map_session_data *sd, uint16 skill_lv);
+void clif_poison_list(map_session_data *sd, uint16 skill_lv);
 
-int clif_autoshadowspell_list(struct map_session_data *sd);
+int clif_autoshadowspell_list(map_session_data *sd);
 
-int clif_skill_itemlistwindow( struct map_session_data *sd, uint16 skill_id, uint16 skill_lv );
-void clif_elemental_info(struct map_session_data *sd);
-void clif_elemental_updatestatus(struct map_session_data *sd, int type);
+int clif_skill_itemlistwindow( map_session_data *sd, uint16 skill_id, uint16 skill_lv );
+void clif_elemental_info(map_session_data *sd);
+void clif_elemental_updatestatus(map_session_data *sd, int type);
 
-void clif_spiritcharm(struct map_session_data *sd);
+void clif_spiritcharm(map_session_data *sd);
 
 void clif_snap( struct block_list *bl, short x, short y );
 void clif_monster_hp_bar( struct mob_data* md, int fd );
 
 // Clan System
-void clif_clan_basicinfo( struct map_session_data *sd );
+void clif_clan_basicinfo( map_session_data *sd );
 void clif_clan_message(struct clan *clan,const char *mes,int len);
 void clif_clan_onlinecount( struct clan* clan );
-void clif_clan_leave( struct map_session_data* sd );
+void clif_clan_leave( map_session_data* sd );
 
 // Bargain Tool
 void clif_sale_start(struct sale_item_data* sale_item, struct block_list* bl, enum send_target target);
 void clif_sale_end(struct sale_item_data* sale_item, struct block_list* bl, enum send_target target);
 void clif_sale_amount(struct sale_item_data* sale_item, struct block_list* bl, enum send_target target);
-void clif_sale_open(struct map_session_data* sd);
+void clif_sale_open(map_session_data* sd);
 
 // Refine UI
-void clif_refineui_open( struct map_session_data* sd );
+void clif_refineui_open( map_session_data* sd );
 
 /**
  * Color Table
@@ -1129,28 +1129,28 @@ void clif_channel_msg(struct Channel *channel, const char *msg, unsigned long co
 
 #define clif_menuskill_clear(sd) (sd)->menuskill_id = (sd)->menuskill_val = (sd)->menuskill_val2 = 0;
 
-void clif_ranklist(struct map_session_data *sd, int16 rankingType);
+void clif_ranklist(map_session_data *sd, int16 rankingType);
 void clif_update_rankingpoint(map_session_data &sd, int rankingtype, int point);
 
-void clif_crimson_marker( struct map_session_data& sd, struct block_list& bl, bool remove );
+void clif_crimson_marker( map_session_data& sd, struct block_list& bl, bool remove );
 
 void clif_showscript(struct block_list* bl, const char* message, enum send_target flag);
-void clif_party_leaderchanged(struct map_session_data *sd, int prev_leader_aid, int new_leader_aid);
+void clif_party_leaderchanged(map_session_data *sd, int prev_leader_aid, int new_leader_aid);
 
 void clif_account_name(int fd, uint32 account_id, const char* accname);
-void clif_notify_bindOnEquip( struct map_session_data& sd, int16 index );
+void clif_notify_bindOnEquip( map_session_data& sd, int16 index );
 
-void clif_merge_item_open( struct map_session_data& sd );
+void clif_merge_item_open( map_session_data& sd );
 
 void clif_broadcast_obtain_special_item(const char *char_name, t_itemid nameid, t_itemid container, enum BROADCASTING_SPECIAL_ITEM_OBTAIN type);
 
-void clif_dressing_room(struct map_session_data *sd, int flag);
-void clif_navigateTo(struct map_session_data *sd, const char* mapname, uint16 x, uint16 y, uint8 flag, bool hideWindow, uint16 mob_id );
-void clif_SelectCart(struct map_session_data *sd);
+void clif_dressing_room(map_session_data *sd, int flag);
+void clif_navigateTo(map_session_data *sd, const char* mapname, uint16 x, uint16 y, uint8 flag, bool hideWindow, uint16 mob_id );
+void clif_SelectCart(map_session_data *sd);
 
 /// Achievement System
-void clif_achievement_list_all(struct map_session_data *sd);
-void clif_achievement_update(struct map_session_data *sd, struct achievement *ach, int count);
+void clif_achievement_list_all(map_session_data *sd);
+void clif_achievement_update(map_session_data *sd, struct achievement *ach, int count);
 void clif_achievement_reward_ack(int fd, unsigned char result, int ach_id);
 
 /// Attendance System
@@ -1171,53 +1171,53 @@ enum out_ui_type : int8 {
 	OUT_UI_ENCHANT = 10,
 };
 
-void clif_ui_open( struct map_session_data& sd, enum out_ui_type ui_type, int32 data );
-void clif_attendence_response( struct map_session_data *sd, int32 data );
+void clif_ui_open( map_session_data& sd, enum out_ui_type ui_type, int32 data );
+void clif_attendence_response( map_session_data *sd, int32 data );
 
-void clif_weight_limit( struct map_session_data* sd );
+void clif_weight_limit( map_session_data* sd );
 
-void clif_guild_storage_log( struct map_session_data* sd, std::vector<struct guild_log_entry>& log, enum e_guild_storage_log result );
+void clif_guild_storage_log( map_session_data* sd, std::vector<struct guild_log_entry>& log, enum e_guild_storage_log result );
 
-void clif_camerainfo( struct map_session_data* sd, bool show, float range = 0.0f, float rotation = 0.0f, float latitude = 0.0f );
+void clif_camerainfo( map_session_data* sd, bool show, float range = 0.0f, float rotation = 0.0f, float latitude = 0.0f );
 
 /// Equip Switch System
-void clif_equipswitch_list( struct map_session_data* sd );
-void clif_equipswitch_add( struct map_session_data* sd,uint16 index, uint32 pos, uint8 flag );
-void clif_equipswitch_remove( struct map_session_data* sd, uint16 index, uint32 pos, bool failed );
-void clif_equipswitch_reply( struct map_session_data* sd, bool failed );
+void clif_equipswitch_list( map_session_data* sd );
+void clif_equipswitch_add( map_session_data* sd,uint16 index, uint32 pos, uint8 flag );
+void clif_equipswitch_remove( map_session_data* sd, uint16 index, uint32 pos, bool failed );
+void clif_equipswitch_reply( map_session_data* sd, bool failed );
 
 /// Pet evolution
-void clif_pet_evolution_result( struct map_session_data* sd, e_pet_evolution_result result );
+void clif_pet_evolution_result( map_session_data* sd, e_pet_evolution_result result );
 
-void clif_parse_skill_toid( struct map_session_data* sd, uint16 skill_id, uint16 skill_lv, int target_id );
+void clif_parse_skill_toid( map_session_data* sd, uint16 skill_id, uint16 skill_lv, int target_id );
 
-void clif_inventory_expansion_info( struct map_session_data* sd );
+void clif_inventory_expansion_info( map_session_data* sd );
 
 // Barter System
-void clif_barter_open( struct map_session_data& sd, struct npc_data& nd );
-void clif_barter_extended_open( struct map_session_data& sd, struct npc_data& nd );
+void clif_barter_open( map_session_data& sd, struct npc_data& nd );
+void clif_barter_extended_open( map_session_data& sd, struct npc_data& nd );
 
 void clif_summon_init(struct mob_data& md);
 void clif_summon_hp_bar(struct mob_data& md);
 
 // Laphine System
-void clif_laphine_synthesis_open( struct map_session_data *sd, std::shared_ptr<s_laphine_synthesis> synthesis );
-void clif_laphine_upgrade_open( struct map_session_data* sd, std::shared_ptr<s_laphine_upgrade> upgrade );
+void clif_laphine_synthesis_open( map_session_data *sd, std::shared_ptr<s_laphine_synthesis> synthesis );
+void clif_laphine_upgrade_open( map_session_data* sd, std::shared_ptr<s_laphine_upgrade> upgrade );
 
 // Reputation System
-void clif_reputation_type( struct map_session_data& sd, int64 type, int64 points );
-void clif_reputation_list( struct map_session_data& sd );
+void clif_reputation_type( map_session_data& sd, int64 type, int64 points );
+void clif_reputation_list( map_session_data& sd );
 
 // Item Reform UI
-void clif_item_reform_open( struct map_session_data& sd, t_itemid item );
+void clif_item_reform_open( map_session_data& sd, t_itemid item );
 
 // Item Enchant UI
-void clif_enchantwindow_open( struct map_session_data& sd, uint64 clientLuaIndex );
+void clif_enchantwindow_open( map_session_data& sd, uint64 clientLuaIndex );
 
 // Enchanting Shadow / Shadow Scar Spirit
 void clif_enchantingshadow_spirit(unit_data &ud);
 
-void clif_broadcast_refine_result(struct map_session_data& sd, t_itemid itemId, int8 level, bool success);
+void clif_broadcast_refine_result(map_session_data& sd, t_itemid itemId, int8 level, bool success);
 
 // Captcha Register
 void clif_captcha_upload_request(map_session_data &sd);
diff --git a/src/map/duel.cpp b/src/map/duel.cpp
index 912b3772ce..cd9f982380 100644
--- a/src/map/duel.cpp
+++ b/src/map/duel.cpp
@@ -42,12 +42,12 @@ size_t duel_countactives()
 	return count; 
 } 
 
-static void duel_set(const size_t did, struct map_session_data* sd);
+static void duel_set(const size_t did, map_session_data* sd);
 
 /*
  * Save the current time of the duel in PC_LAST_DUEL_TIME
  */
-void duel_savetime(struct map_session_data* sd)
+void duel_savetime(map_session_data* sd)
 {
 	time_t timer;
 	struct tm *t;
@@ -61,7 +61,7 @@ void duel_savetime(struct map_session_data* sd)
 /*
  * Check if the time elapsed between last duel is enough to launch another.
  */
-bool duel_checktime(struct map_session_data* sd)
+bool duel_checktime(map_session_data* sd)
 {
 	int64 diff;
 	time_t timer;
@@ -90,9 +90,9 @@ bool duel_check_player_limit(struct duel& pDuel)
 /*
  * Display opponents name of sd
  */
-static int duel_showinfo_sub(struct map_session_data* sd, va_list va)
+static int duel_showinfo_sub(map_session_data* sd, va_list va)
 {
-	struct map_session_data *ssd = va_arg(va, struct map_session_data*);
+	map_session_data *ssd = va_arg(va, map_session_data*);
 	int *p = va_arg(va, int*);
 
 	if (sd->duel_group != ssd->duel_group) 
@@ -108,7 +108,7 @@ static int duel_showinfo_sub(struct map_session_data* sd, va_list va)
  * Display duel infos,
  * Number of duely...
  */
-void duel_showinfo(const size_t did, struct map_session_data* sd)
+void duel_showinfo(const size_t did, map_session_data* sd)
 {
 	//std::lock_guard<std::recursive_mutex> _(duel_list_mutex); //or shared_ptr	
 	if ( !duel_exist( did ) )
@@ -136,7 +136,7 @@ void duel_showinfo(const size_t did, struct map_session_data* sd)
 /*
 * Moves sd to duel
 */
-static void duel_set(const size_t did, struct map_session_data* sd) {
+static void duel_set(const size_t did, map_session_data* sd) {
 	sd->state.changemap = 1;
 	sd->state.warping = 1;
 
@@ -157,7 +157,7 @@ static void duel_set(const size_t did, struct map_session_data* sd) {
  * Create a new duel for sd
  * return new duel_id or 0 when fail
  */
-size_t duel_create(struct map_session_data* sd, const unsigned int maxpl)
+size_t duel_create(map_session_data* sd, const unsigned int maxpl)
 {
 	static size_t lastID=0;
 	lastID++;
@@ -184,7 +184,7 @@ size_t duel_create(struct map_session_data* sd, const unsigned int maxpl)
  * @sd = inviting player
  * @target_sd = invited player
  */
-bool duel_invite(const size_t did, struct map_session_data* sd, struct map_session_data* target_sd)
+bool duel_invite(const size_t did, map_session_data* sd, map_session_data* target_sd)
 {
 	//std::lock_guard<std::recursive_mutex> _(duel_list_mutex);
 	if ( !duel_exist( did ) )
@@ -208,7 +208,7 @@ bool duel_invite(const size_t did, struct map_session_data* sd, struct map_sessi
  * @sd = leaving player
  * @va = list(only contain duel_id atm)
  */
-static int duel_leave_sub(struct map_session_data* sd, va_list va)
+static int duel_leave_sub(map_session_data* sd, va_list va)
 {
 	size_t did = va_arg(va, size_t);
 	if (sd->duel_invite == did)
@@ -221,7 +221,7 @@ static int duel_leave_sub(struct map_session_data* sd, va_list va)
  * @did = duel id
  * @sd = leaving player
  */
-bool duel_leave(const size_t did, struct map_session_data* sd)
+bool duel_leave(const size_t did, map_session_data* sd)
 {
 	//std::lock_guard<std::recursive_mutex> _(duel_list_mutex);
 	if ( !duel_exist( did ) )
@@ -249,7 +249,7 @@ bool duel_leave(const size_t did, struct map_session_data* sd)
  * @did = duel id
  * @sd = player accepting duel
  */
-bool duel_accept(const size_t did, struct map_session_data* sd)
+bool duel_accept(const size_t did, map_session_data* sd)
 {
 	{ //mutex scope
 		//std::lock_guard<std::recursive_mutex> _(duel_list_mutex);
@@ -276,7 +276,7 @@ bool duel_accept(const size_t did, struct map_session_data* sd)
  * @did = duel id
  * @sd = player refusing duel
  */
-bool duel_reject(const size_t did, struct map_session_data* sd)
+bool duel_reject(const size_t did, map_session_data* sd)
 {
 	{
 		//std::lock_guard<std::recursive_mutex> _(duel_list_mutex);
diff --git a/src/map/duel.hpp b/src/map/duel.hpp
index bfbeef709a..b71ec8a454 100644
--- a/src/map/duel.hpp
+++ b/src/map/duel.hpp
@@ -5,7 +5,7 @@
 #define DUEL_HPP
 
 #include "../common/cbasetypes.hpp"
-
+class map_session_data;
 struct duel {
 	int members_count;
 	int invites_count;
@@ -18,13 +18,13 @@ size_t duel_counttotal();
 size_t duel_countactives();
 
 //Duel functions // [LuzZza]
-size_t duel_create(struct map_session_data* sd, const unsigned int maxpl);
-bool duel_invite(const size_t did, struct map_session_data* sd, struct map_session_data* target_sd);
-bool duel_accept(const size_t did, struct map_session_data* sd);
-bool duel_reject(const size_t did, struct map_session_data* sd);
-bool duel_leave(const size_t did, struct map_session_data* sd);
-void duel_showinfo(const size_t did, struct map_session_data* sd);
-bool duel_checktime(struct map_session_data* sd);
+size_t duel_create(map_session_data* sd, const unsigned int maxpl);
+bool duel_invite(const size_t did, map_session_data* sd, map_session_data* target_sd);
+bool duel_accept(const size_t did, map_session_data* sd);
+bool duel_reject(const size_t did, map_session_data* sd);
+bool duel_leave(const size_t did, map_session_data* sd);
+void duel_showinfo(const size_t did, map_session_data* sd);
+bool duel_checktime(map_session_data* sd);
 bool duel_check_player_limit( struct duel& pDuel );
 
 void do_init_duel(void);
diff --git a/src/map/guild.cpp b/src/map/guild.cpp
index a53e3f0e53..bcdc6a3ae6 100644
--- a/src/map/guild.cpp
+++ b/src/map/guild.cpp
@@ -369,7 +369,7 @@ std::shared_ptr<guild_castle> CastleDatabase::mapname2gc(const char* mapname) {
 	return castle_db.mapindex2gc(mapindex_name2id(mapname));
 }
 
-struct map_session_data* guild_getavailablesd(struct guild* g) {
+map_session_data* guild_getavailablesd(struct guild* g) {
 	int i;
 
 	nullpo_retr(NULL, g);
@@ -390,7 +390,7 @@ int guild_getindex(struct guild *g,uint32 account_id,uint32 char_id) {
 }
 
 /// lookup: player sd -> member position
-int guild_getposition(struct map_session_data* sd) {
+int guild_getposition(map_session_data* sd) {
 	int i;
 	struct guild *g;
 
@@ -401,7 +401,7 @@ int guild_getposition(struct map_session_data* sd) {
 }
 
 //Creation of member information
-void guild_makemember(struct guild_member *m,struct map_session_data *sd) {
+void guild_makemember(struct guild_member *m,map_session_data *sd) {
 	nullpo_retv(sd);
 
 	memset(m,0,sizeof(struct guild_member));
@@ -469,7 +469,7 @@ int guild_send_xy_timer_sub(DBKey key, DBData *data, va_list ap) {
 	}
 
 	for(i=0;i<g->max_member;i++){
-		struct map_session_data* sd = g->member[i].sd;
+		map_session_data* sd = g->member[i].sd;
 		if( sd != NULL && sd->fd && (sd->guild_x != sd->bl.x || sd->guild_y != sd->bl.y) && !sd->bg_id ) {
 			clif_guild_xy(sd);
 			sd->guild_x = sd->bl.x;
@@ -485,14 +485,14 @@ static TIMER_FUNC(guild_send_xy_timer){
 	return 0;
 }
 
-int guild_send_dot_remove(struct map_session_data *sd) {
+int guild_send_dot_remove(map_session_data *sd) {
 	if (sd->status.guild_id)
 		clif_guild_xy_remove(sd);
 	return 0;
 }
 //------------------------------------------------------------------------
 
-int guild_create(struct map_session_data *sd, const char *name) {
+int guild_create(map_session_data *sd, const char *name) {
 	char tname[NAME_LENGTH];
 	struct guild_member m;
 	nullpo_ret(sd);
@@ -522,7 +522,7 @@ int guild_create(struct map_session_data *sd, const char *name) {
 
 //Whether or not to create guild
 int guild_created(uint32 account_id,int guild_id) {
-	struct map_session_data *sd=map_id2sd(account_id);
+	map_session_data *sd=map_id2sd(account_id);
 
 	if(sd==NULL)
 		return 0;
@@ -573,7 +573,7 @@ int guild_npc_request_info(int guild_id,const char *event) {
  * Close trade window if party member is kicked when trade a party bound item
  * @param sd
  **/
-static void guild_trade_bound_cancel(struct map_session_data *sd) {
+static void guild_trade_bound_cancel(map_session_data *sd) {
 #ifdef BOUND_ITEMS
 	nullpo_retv(sd);
 	if (sd->state.isBoundTrading&(1<<BOUND_GUILD))
@@ -586,7 +586,7 @@ static void guild_trade_bound_cancel(struct map_session_data *sd) {
 //Confirmation of the character belongs to guild
 int guild_check_member(struct guild *g) {
 	int i;
-	struct map_session_data *sd;
+	map_session_data *sd;
 	struct s_mapiterator* iter;
 
 	nullpo_ret(g);
@@ -611,7 +611,7 @@ int guild_check_member(struct guild *g) {
 
 //Delete association with guild_id for all characters
 int guild_recv_noinfo(int guild_id) {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	struct s_mapiterator* iter;
 
 	iter = mapit_getallusers();
@@ -629,7 +629,7 @@ int guild_recv_info(struct guild *sg) {
 	struct guild *g,before;
 	int i,bm,m;
 	DBData data;
-	struct map_session_data *sd;
+	map_session_data *sd;
 	bool guild_new = false;
 
 	nullpo_ret(sg);
@@ -729,7 +729,7 @@ int guild_recv_info(struct guild *sg) {
 /*=============================================
  * Player sd send a guild invatation to player tsd to join his guild
  *--------------------------------------------*/
-int guild_invite(struct map_session_data *sd, struct map_session_data *tsd) {
+int guild_invite(map_session_data *sd, map_session_data *tsd) {
 	struct guild *g;
 	int i;
 
@@ -779,8 +779,8 @@ int guild_invite(struct map_session_data *sd, struct map_session_data *tsd) {
 
 /// Guild invitation reply.
 /// flag: 0:rejected, 1:accepted
-int guild_reply_invite(struct map_session_data* sd, int guild_id, int flag) {
-	struct map_session_data* tsd;
+int guild_reply_invite(map_session_data* sd, int guild_id, int flag) {
+	map_session_data* tsd;
 
 	nullpo_ret(sd);
 
@@ -832,7 +832,7 @@ int guild_reply_invite(struct map_session_data* sd, int guild_id, int flag) {
 //- If guild is not in memory, it is requested
 //- Otherwise sd pointer is set up.
 //- Player must be authed and must belong to a guild before invoking this method
-void guild_member_joined(struct map_session_data *sd) {
+void guild_member_joined(map_session_data *sd) {
 	struct guild* g;
 	int i;
 	g=guild_search(sd->status.guild_id);
@@ -865,7 +865,7 @@ void guild_member_joined(struct map_session_data *sd) {
  * Add a player to a given guild_id
  *----------------------------------------*/
 int guild_member_added(int guild_id,uint32 account_id,uint32 char_id,int flag) {
-	struct map_session_data *sd= map_id2sd(account_id),*sd2;
+	map_session_data *sd= map_id2sd(account_id),*sd2;
 	struct guild *g;
 
 	if( (g=guild_search(guild_id))==NULL )
@@ -914,7 +914,7 @@ int guild_member_added(int guild_id,uint32 account_id,uint32 char_id,int flag) {
 /*==========================================
  * Player request leaving a given guild_id
  *----------------------------------------*/
-int guild_leave(struct map_session_data* sd, int guild_id, uint32 account_id, uint32 char_id, const char* mes) {
+int guild_leave(map_session_data* sd, int guild_id, uint32 account_id, uint32 char_id, const char* mes) {
 	struct guild *g;
 
 	nullpo_ret(sd);
@@ -937,8 +937,8 @@ int guild_leave(struct map_session_data* sd, int guild_id, uint32 account_id, ui
 /*==========================================
  * Request remove a player to a given guild_id
  *----------------------------------------*/
-int guild_expulsion(struct map_session_data* sd, int guild_id, uint32 account_id, uint32 char_id, const char* mes) {
-	struct map_session_data *tsd;
+int guild_expulsion(map_session_data* sd, int guild_id, uint32 account_id, uint32 char_id, const char* mes) {
+	map_session_data *tsd;
 	struct guild *g;
 	int i,ps;
 
@@ -984,8 +984,8 @@ int guild_expulsion(struct map_session_data* sd, int guild_id, uint32 account_id
 int guild_member_withdraw(int guild_id, uint32 account_id, uint32 char_id, int flag, const char* name, const char* mes) {
 	int i;
 	struct guild* g = guild_search(guild_id);
-	struct map_session_data* sd = map_charid2sd(char_id);
-	struct map_session_data* online_member_sd;
+	map_session_data* sd = map_charid2sd(char_id);
+	map_session_data* online_member_sd;
 
 	if(g == NULL)
 		return 0; // no such guild (error!)
@@ -1094,7 +1094,7 @@ void guild_retrieveitembound(uint32 char_id, uint32 account_id, int guild_id) {
 }
 #endif
 
-int guild_send_memberinfoshort(struct map_session_data *sd,int online) { // cleaned up [LuzZza]
+int guild_send_memberinfoshort(map_session_data *sd,int online) { // cleaned up [LuzZza]
 	struct guild *g;
 
 	nullpo_ret(sd);
@@ -1150,7 +1150,7 @@ int guild_recv_memberinfoshort(int guild_id,uint32 account_id,uint32 char_id,int
 
 	if(idx == -1 || c == 0) {
         //Treat char_id who doesn't match guild_id (not found as member)
-		struct map_session_data *sd = map_id2sd(account_id);
+		map_session_data *sd = map_id2sd(account_id);
 		if(sd && sd->status.char_id == char_id) {
 			sd->status.guild_id=0;
 			sd->guild_emblem_id=0;
@@ -1189,7 +1189,7 @@ int guild_recv_memberinfoshort(int guild_id,uint32 account_id,uint32 char_id,int
 /*====================================================
  * Send a message to whole guild
  *---------------------------------------------------*/
-int guild_send_message(struct map_session_data *sd,const char *mes,int len) {
+int guild_send_message(map_session_data *sd,const char *mes,int len) {
 	nullpo_ret(sd);
 
 	if(sd->status.guild_id==0)
@@ -1270,7 +1270,7 @@ int guild_position_changed(int guild_id,int idx,struct guild_position *p) {
 /*====================================================
  * Change guild notice
  *---------------------------------------------------*/
-int guild_change_notice(struct map_session_data *sd,int guild_id,const char *mes1,const char *mes2) {
+int guild_change_notice(map_session_data *sd,int guild_id,const char *mes1,const char *mes2) {
 	nullpo_ret(sd);
 
 	if(guild_id!=sd->status.guild_id)
@@ -1291,7 +1291,7 @@ int guild_notice_changed(int guild_id,const char *mes1,const char *mes2) {
 	memcpy(g->mes2,mes2,MAX_GUILDMES2);
 
 	for(i=0;i<g->max_member;i++){
-		struct map_session_data *sd = g->member[i].sd;
+		map_session_data *sd = g->member[i].sd;
 		if(sd != NULL)
 			clif_guild_notice(sd);
 	}
@@ -1317,7 +1317,7 @@ bool guild_check_emblem_change_condition(map_session_data *sd)
 /*====================================================
  * Change guild emblem
  *---------------------------------------------------*/
-int guild_change_emblem(struct map_session_data *sd,int len,const char *data) {
+int guild_change_emblem(map_session_data *sd,int len,const char *data) {
 	nullpo_ret(sd);
 
 	if (!guild_check_emblem_change_condition(sd)) {
@@ -1346,7 +1346,7 @@ int guild_change_emblem_version(map_session_data* sd, int version)
  *---------------------------------------------------*/
 int guild_emblem_changed(int len,int guild_id,int emblem_id,const char *data) {
 	int i;
-	struct map_session_data *sd;
+	map_session_data *sd;
 	struct guild *g=guild_search(guild_id);
 	if(g==NULL)
 		return 0;
@@ -1403,7 +1403,7 @@ int guild_emblem_changed(int len,int guild_id,int emblem_id,const char *data) {
  */
 static DBData create_expcache(DBKey key, va_list args) {
 	struct guild_expcache *c;
-	struct map_session_data *sd = va_arg(args, struct map_session_data*);
+	map_session_data *sd = va_arg(args, map_session_data*);
 
 	c = ers_alloc(expcache_ers, struct guild_expcache);
 	c->guild_id = sd->status.guild_id;
@@ -1416,7 +1416,7 @@ static DBData create_expcache(DBKey key, va_list args) {
 /*====================================================
  * Return taxed experience from player sd to guild
  *---------------------------------------------------*/
-t_exp guild_payexp(struct map_session_data *sd,t_exp exp) {
+t_exp guild_payexp(map_session_data *sd,t_exp exp) {
 	struct guild *g;
 	struct guild_expcache *c;
 	int per;
@@ -1447,7 +1447,7 @@ t_exp guild_payexp(struct map_session_data *sd,t_exp exp) {
  * Add this experience to guild exp
  * [Celest]
  *---------------------------------------------------*/
-t_exp guild_getexp(struct map_session_data *sd,t_exp exp) {
+t_exp guild_getexp(map_session_data *sd,t_exp exp) {
 	struct guild_expcache *c;
 	nullpo_ret(sd);
 
@@ -1463,7 +1463,7 @@ t_exp guild_getexp(struct map_session_data *sd,t_exp exp) {
 /*====================================================
  * Ask to increase guildskill skill_id
  *---------------------------------------------------*/
-void guild_skillup(struct map_session_data* sd, uint16 skill_id) {
+void guild_skillup(map_session_data* sd, uint16 skill_id) {
 	struct guild* g;
 	short idx = guild_skill_get_index(skill_id);
 	short max = 0;
@@ -1489,7 +1489,7 @@ void guild_skillup(struct map_session_data* sd, uint16 skill_id) {
  * Notification of guildskill skill_id increase request
  *---------------------------------------------------*/
 int guild_skillupack(int guild_id,uint16 skill_id,uint32 account_id) {
-	struct map_session_data *sd = map_id2sd(account_id);
+	map_session_data *sd = map_id2sd(account_id);
 	struct guild *g = guild_search(guild_id);
 	int i;
 	short idx = guild_skill_get_index(skill_id);
@@ -1520,7 +1520,7 @@ int guild_skillupack(int guild_id,uint16 skill_id,uint32 account_id) {
 	return 0;
 }
 
-void guild_guildaura_refresh(struct map_session_data *sd, uint16 skill_id, uint16 skill_lv) {
+void guild_guildaura_refresh(map_session_data *sd, uint16 skill_id, uint16 skill_lv) {
 	if( !(battle_config.guild_aura&(is_agit_start()?2:1)) &&
 			!(battle_config.guild_aura&(map_flag_gvg2(sd->bl.m)?8:4)) )
 		return;
@@ -1561,7 +1561,7 @@ int guild_get_alliance_count(struct guild *g,int flag) {
 }
 
 // Blocks all guild skills which have a common delay time.
-void guild_block_skill(struct map_session_data *sd, int time) {
+void guild_block_skill(map_session_data *sd, int time) {
 	uint16 skill_id[] = { GD_BATTLEORDER, GD_REGENERATION, GD_RESTORE, GD_EMERGENCYCALL };
 	int i;
 	for (i = 0; i < 4; i++)
@@ -1590,7 +1590,7 @@ int guild_check_alliance(int guild_id1, int guild_id2, int flag) {
 /*====================================================
  * Player sd, asking player tsd an alliance between their 2 guilds
  *---------------------------------------------------*/
-int guild_reqalliance(struct map_session_data *sd,struct map_session_data *tsd) {
+int guild_reqalliance(map_session_data *sd,map_session_data *tsd) {
 	struct guild *g[2];
 	int i;
 
@@ -1653,8 +1653,8 @@ int guild_reqalliance(struct map_session_data *sd,struct map_session_data *tsd)
 /*====================================================
  * Player sd, answer to player tsd (account_id) for an alliance request
  *---------------------------------------------------*/
-int guild_reply_reqalliance(struct map_session_data *sd,uint32 account_id,int flag) {
-	struct map_session_data *tsd;
+int guild_reply_reqalliance(map_session_data *sd,uint32 account_id,int flag) {
+	map_session_data *tsd;
 
 	nullpo_ret(sd);
 	tsd= map_id2sd( account_id );
@@ -1713,7 +1713,7 @@ int guild_reply_reqalliance(struct map_session_data *sd,uint32 account_id,int fl
 /*====================================================
  * Player sd asking to break alliance with guild guild_id
  *---------------------------------------------------*/
-int guild_delalliance(struct map_session_data *sd,int guild_id,int flag) {
+int guild_delalliance(map_session_data *sd,int guild_id,int flag) {
 	nullpo_ret(sd);
 
 	if(is_agit_start()) {	// Disable alliance breaking during woe [Valaris]
@@ -1728,7 +1728,7 @@ int guild_delalliance(struct map_session_data *sd,int guild_id,int flag) {
 /*====================================================
  * Player sd, asking player tsd a formal enemy relation between their 2 guilds
  *---------------------------------------------------*/
-int guild_opposition(struct map_session_data *sd,struct map_session_data *tsd) {
+int guild_opposition(map_session_data *sd,map_session_data *tsd) {
 	struct guild *g;
 	int i;
 
@@ -1775,7 +1775,7 @@ int guild_allianceack(int guild_id1,int guild_id2,uint32 account_id1,uint32 acco
 	struct guild *g[2];
 	int guild_id[2];
 	const char *guild_name[2];
-	struct map_session_data *sd[2];
+	map_session_data *sd[2];
 	int j,i;
 
 	guild_id[0] = guild_id1;
@@ -1836,7 +1836,7 @@ int guild_allianceack(int guild_id1,int guild_id2,uint32 account_id1,uint32 acco
 	for (i = 0; i < 2 - (flag & 1); i++) { // Retransmission of the relationship list to all members
 		if(g[i]!=NULL)
 			for(j=0;j<g[i]->max_member;j++) {
-				struct map_session_data *sd_mem = g[i]->member[j].sd;
+				map_session_data *sd_mem = g[i]->member[j].sd;
 				if( sd_mem!=NULL){
 					clif_guild_allianceinfo(sd_mem);
 
@@ -1858,7 +1858,7 @@ int guild_broken_sub(DBKey key, DBData *data, va_list ap) {
 	struct guild *g = (struct guild *)db_data2ptr(data);
 	int guild_id=va_arg(ap,int);
 	int i,j;
-	struct map_session_data *sd=NULL;
+	map_session_data *sd=NULL;
 
 	nullpo_ret(g);
 
@@ -1903,7 +1903,7 @@ int guild_broken(int guild_id,int flag) {
 		return 0;
 
 	for (i = 0; i < g->max_member; i++){	// Destroy all relationships
-		struct map_session_data *sd = g->member[i].sd;
+		map_session_data *sd = g->member[i].sd;
 		if(sd != NULL){
 			if(sd->state.storage_flag == 2)
 				storage_guild_storage_quit(sd,1);
@@ -2026,7 +2026,7 @@ int guild_gm_changed(int guild_id, uint32 account_id, uint32 char_id, time_t tim
 * @param sd Player who breaks the guild
 * @param name Guild name
 */
-int guild_break(struct map_session_data *sd,char *name) {
+int guild_break(map_session_data *sd,char *name) {
 	struct guild *g;
 	struct unit_data *ud;
 	int i;
diff --git a/src/map/guild.hpp b/src/map/guild.hpp
index 14450bb529..6100d464a0 100644
--- a/src/map/guild.hpp
+++ b/src/map/guild.hpp
@@ -14,7 +14,7 @@ struct guild;
 struct guild_member;
 struct guild_position;
 struct guild_castle;
-struct map_session_data;
+class map_session_data;
 struct mob_data;
 
 //For quick linking to a guardian's info. [Skotlex]
@@ -38,54 +38,54 @@ void do_init_guild(void);
 struct guild *guild_search(int guild_id);
 struct guild *guild_searchname(char *str);
 
-struct map_session_data *guild_getavailablesd(struct guild *g);
+map_session_data *guild_getavailablesd(struct guild *g);
 int guild_getindex(struct guild *g,uint32 account_id,uint32 char_id);
-int guild_getposition(struct map_session_data *sd);
-t_exp guild_payexp(struct map_session_data *sd,t_exp exp);
-t_exp guild_getexp(struct map_session_data *sd,t_exp exp); // [Celest]
+int guild_getposition(map_session_data *sd);
+t_exp guild_payexp(map_session_data *sd,t_exp exp);
+t_exp guild_getexp(map_session_data *sd,t_exp exp); // [Celest]
 
-int guild_create(struct map_session_data *sd, const char *name);
+int guild_create(map_session_data *sd, const char *name);
 int guild_created(uint32 account_id,int guild_id);
 int guild_request_info(int guild_id);
 int guild_recv_noinfo(int guild_id);
 int guild_recv_info(struct guild *sg);
 int guild_npc_request_info(int guild_id,const char *ev);
-int guild_invite(struct map_session_data *sd,struct map_session_data *tsd);
-int guild_reply_invite(struct map_session_data *sd,int guild_id,int flag);
-void guild_member_joined(struct map_session_data *sd);
+int guild_invite(map_session_data *sd,map_session_data *tsd);
+int guild_reply_invite(map_session_data *sd,int guild_id,int flag);
+void guild_member_joined(map_session_data *sd);
 int guild_member_added(int guild_id,uint32 account_id,uint32 char_id,int flag);
-int guild_leave(struct map_session_data *sd,int guild_id,
+int guild_leave(map_session_data *sd,int guild_id,
 	uint32 account_id,uint32 char_id,const char *mes);
 int guild_member_withdraw(int guild_id,uint32 account_id,uint32 char_id,int flag,
 	const char *name,const char *mes);
-int guild_expulsion(struct map_session_data *sd,int guild_id,
+int guild_expulsion(map_session_data *sd,int guild_id,
 	uint32 account_id,uint32 char_id,const char *mes);
-void guild_skillup(struct map_session_data* sd, uint16 skill_id);
-void guild_block_skill(struct map_session_data *sd, int time);
-int guild_reqalliance(struct map_session_data *sd,struct map_session_data *tsd);
-int guild_reply_reqalliance(struct map_session_data *sd,uint32 account_id,int flag);
+void guild_skillup(map_session_data* sd, uint16 skill_id);
+void guild_block_skill(map_session_data *sd, int time);
+int guild_reqalliance(map_session_data *sd,map_session_data *tsd);
+int guild_reply_reqalliance(map_session_data *sd,uint32 account_id,int flag);
 int guild_allianceack(int guild_id1,int guild_id2,uint32 account_id1,uint32 account_id2,
 	int flag,const char *name1,const char *name2);
-int guild_delalliance(struct map_session_data *sd,int guild_id,int flag);
-int guild_opposition(struct map_session_data *sd,struct map_session_data *tsd);
+int guild_delalliance(map_session_data *sd,int guild_id,int flag);
+int guild_opposition(map_session_data *sd,map_session_data *tsd);
 int guild_check_alliance(int guild_id1, int guild_id2, int flag);
 
-int guild_send_memberinfoshort(struct map_session_data *sd,int online);
+int guild_send_memberinfoshort(map_session_data *sd,int online);
 int guild_recv_memberinfoshort(int guild_id,uint32 account_id,uint32 char_id,int online,int lv,int class_);
 int guild_change_memberposition(int guild_id,uint32 account_id,uint32 char_id,short idx);
 int guild_memberposition_changed(struct guild *g,int idx,int pos);
 int guild_change_position(int guild_id,int idx,int mode,int exp_mode,const char *name);
 int guild_position_changed(int guild_id,int idx,struct guild_position *p);
-int guild_change_notice(struct map_session_data *sd,int guild_id,const char *mes1,const char *mes2);
+int guild_change_notice(map_session_data *sd,int guild_id,const char *mes1,const char *mes2);
 int guild_notice_changed(int guild_id,const char *mes1,const char *mes2);
-int guild_change_emblem(struct map_session_data *sd,int len,const char *data);
+int guild_change_emblem(map_session_data *sd,int len,const char *data);
 int guild_change_emblem_version(map_session_data* sd, int version);
 int guild_emblem_changed(int len,int guild_id,int emblem_id,const char *data);
-int guild_send_message(struct map_session_data *sd,const char *mes,int len);
+int guild_send_message(map_session_data *sd,const char *mes,int len);
 int guild_recv_message(int guild_id,uint32 account_id,const char *mes,int len);
-int guild_send_dot_remove(struct map_session_data *sd);
+int guild_send_dot_remove(map_session_data *sd);
 int guild_skillupack(int guild_id,uint16 skill_id,uint32 account_id);
-int guild_break(struct map_session_data *sd,char *name);
+int guild_break(map_session_data *sd,char *name);
 int guild_broken(int guild_id,int flag);
 int guild_gm_change(int guild_id, uint32 char_id);
 int guild_gm_changed(int guild_id, uint32 account_id, uint32 char_id, time_t time);
@@ -109,7 +109,7 @@ void guild_flag_add(struct npc_data *nd);
 void guild_flag_remove(struct npc_data *nd);
 void guild_flags_clear(void);
 
-void guild_guildaura_refresh(struct map_session_data *sd, uint16 skill_id, uint16 skill_lv);
+void guild_guildaura_refresh(map_session_data *sd, uint16 skill_id, uint16 skill_lv);
 #ifdef BOUND_ITEMS
 void guild_retrieveitembound(uint32 char_id,uint32 account_id,int guild_id);
 #endif
diff --git a/src/map/homunculus.cpp b/src/map/homunculus.cpp
index 3901c3c0c5..05be16f4f0 100644
--- a/src/map/homunculus.cpp
+++ b/src/map/homunculus.cpp
@@ -256,7 +256,7 @@ void hom_damage(struct homun_data *hd) {
 int hom_dead(struct homun_data *hd)
 {
 	//There's no intimacy penalties on death (from Tharis)
-	struct map_session_data *sd = hd->master;
+	map_session_data *sd = hd->master;
 
 	clif_emotion(&hd->bl, ET_KEK);
 
@@ -282,7 +282,7 @@ int hom_dead(struct homun_data *hd)
 * @param sd
 * @param flag 1: then HP needs to be 80% or above. 2: then set to morph state.
 */
-int hom_vaporize(struct map_session_data *sd, int flag)
+int hom_vaporize(map_session_data *sd, int flag)
 {
 	struct homun_data *hd;
 
@@ -324,7 +324,7 @@ int hom_vaporize(struct map_session_data *sd, int flag)
 */
 int hom_delete(struct homun_data *hd, int emote)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	nullpo_ret(hd);
 	sd = hd->master;
 
@@ -630,7 +630,7 @@ int hom_evolution(struct homun_data *hd)
 {
 	struct s_homunculus *hom;
 	struct h_stats *max, *min;
-	struct map_session_data *sd;
+	map_session_data *sd;
 	nullpo_ret(hd);
 
 	if(!hd->homunculusDB->evo_class || hd->homunculus.class_ == hd->homunculusDB->evo_class) {
@@ -688,7 +688,7 @@ int hom_evolution(struct homun_data *hd)
 int hom_mutate(struct homun_data *hd, int homun_id)
 {
 	struct s_homunculus *hom;
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int m_class, m_id, prev_class = 0;
 	nullpo_ret(hd);
 
@@ -852,7 +852,7 @@ void hom_save(struct homun_data *hd)
 * @param sd
 * @param type
 */
-void hom_menu(struct map_session_data *sd, int type)
+void hom_menu(map_session_data *sd, int type)
 {
 	nullpo_retv(sd);
 	if (sd->hd == NULL)
@@ -878,7 +878,7 @@ void hom_menu(struct map_session_data *sd, int type)
 * @param sd
 * @param hd
 */
-int hom_food(struct map_session_data *sd, struct homun_data *hd)
+int hom_food(map_session_data *sd, struct homun_data *hd)
 {
 	int i, foodID, emotion;
 
@@ -935,7 +935,7 @@ int hom_food(struct map_session_data *sd, struct homun_data *hd)
 * Timer to reduce hunger level
 */
 static TIMER_FUNC(hom_hungry){
-	struct map_session_data *sd;
+	map_session_data *sd;
 	struct homun_data *hd;
 
 	sd = map_id2sd(id);
@@ -998,7 +998,7 @@ int hom_hungry_timer_delete(struct homun_data *hd)
 /**
 * Change homunculus name
 */
-int hom_change_name(struct map_session_data *sd,char *name)
+int hom_change_name(map_session_data *sd,char *name)
 {
 	int i;
 	struct homun_data *hd;
@@ -1024,7 +1024,7 @@ int hom_change_name(struct map_session_data *sd,char *name)
 * @param name
 * @param flag
 */
-void hom_change_name_ack(struct map_session_data *sd, char* name, int flag)
+void hom_change_name_ack(map_session_data *sd, char* name, int flag)
 {
 	struct homun_data *hd = sd->hd;
 	if (!hom_is_active(hd))
@@ -1077,7 +1077,7 @@ int hom_search(int key, int type)
 * @param sd
 * @param hom
 */
-void hom_alloc(struct map_session_data *sd, struct s_homunculus *hom)
+void hom_alloc(map_session_data *sd, struct s_homunculus *hom)
 {
 	struct homun_data *hd;
 	int i = 0;
@@ -1147,7 +1147,7 @@ void hom_init_timers(struct homun_data * hd)
  * @param sd
  * @return False:failure, True:sucess
  */
-bool hom_call(struct map_session_data *sd)
+bool hom_call(map_session_data *sd)
 {
 	struct homun_data *hd;
 
@@ -1203,7 +1203,7 @@ bool hom_call(struct map_session_data *sd)
  */
 int hom_recv_data(uint32 account_id, struct s_homunculus *sh, int flag)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	struct homun_data *hd;
 	bool created = false;
 
@@ -1260,7 +1260,7 @@ int hom_recv_data(uint32 account_id, struct s_homunculus *sh, int flag)
 * @param class_
 * @return True:Success; False:Failed
 */
-bool hom_create_request(struct map_session_data *sd, int class_)
+bool hom_create_request(map_session_data *sd, int class_)
 {
 	struct s_homunculus homun;
 	struct h_stats *base;
@@ -1305,7 +1305,7 @@ bool hom_create_request(struct map_session_data *sd, int class_)
  * @param y : Y map coordinate
  * @return 0:failure, 1:success
  */
-int hom_ressurect(struct map_session_data* sd, unsigned char per, short x, short y)
+int hom_ressurect(map_session_data* sd, unsigned char per, short x, short y)
 {
 	struct homun_data* hd;
 	nullpo_ret(sd);
@@ -1353,7 +1353,7 @@ int hom_ressurect(struct map_session_data* sd, unsigned char per, short x, short
 */
 void hom_revive(struct homun_data *hd, unsigned int hp, unsigned int sp)
 {
-	struct map_session_data *sd = hd->master;
+	map_session_data *sd = hd->master;
 	hd->homunculus.hp = hd->battle_status.hp;
 	if (!sd)
 		return;
@@ -1399,7 +1399,7 @@ void hom_reset_stats(struct homun_data *hd)
 */
 int hom_shuffle(struct homun_data *hd)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int lv, i, skillpts;
 	struct s_skill b_skill[MAX_HOMUNSKILL];
 
diff --git a/src/map/homunculus.hpp b/src/map/homunculus.hpp
index 2f2096da00..4d7a0753fd 100644
--- a/src/map/homunculus.hpp
+++ b/src/map/homunculus.hpp
@@ -77,13 +77,13 @@ struct homun_data {
 	struct unit_data  ud;
 	struct view_data *vd;
 	struct status_data base_status, battle_status;
-	struct status_change sc;
+	status_change sc;
 	struct regen_data regen;
 	struct s_homunculus_db *homunculusDB;	//[orn]
 	struct s_homunculus homunculus;	//[orn]
 
 	int masterteleport_timer;
-	struct map_session_data *master; //pointer back to its master
+	map_session_data *master; //pointer back to its master
 	int hungry_timer;	//[orn]
 	t_exp exp_next;
 	std::vector<uint16> blockskill;	// [orn]
@@ -178,20 +178,20 @@ int hom_levelup(struct homun_data *hd);
 int hom_evolution(struct homun_data *hd);
 int hom_mutate(struct homun_data *hd,int homun_id);
 void hom_heal(struct homun_data *hd);
-int hom_vaporize(struct map_session_data *sd, int flag);
-int hom_ressurect(struct map_session_data *sd, unsigned char per, short x, short y);
+int hom_vaporize(map_session_data *sd, int flag);
+int hom_ressurect(map_session_data *sd, unsigned char per, short x, short y);
 void hom_revive(struct homun_data *hd, unsigned int hp, unsigned int sp);
 void hom_reset_stats(struct homun_data *hd);
 int hom_shuffle(struct homun_data *hd); // [Zephyrus]
 void hom_save(struct homun_data *hd);
-bool hom_call(struct map_session_data *sd);
-bool hom_create_request(struct map_session_data *sd, int class_);
+bool hom_call(map_session_data *sd);
+bool hom_create_request(map_session_data *sd, int class_);
 int hom_search(int key,int type);
-void hom_menu(struct map_session_data *sd,int type);
-int hom_food(struct map_session_data *sd, struct homun_data *hd);
+void hom_menu(map_session_data *sd,int type);
+int hom_food(map_session_data *sd, struct homun_data *hd);
 int hom_hungry_timer_delete(struct homun_data *hd);
-int hom_change_name(struct map_session_data *sd,char *name);
-void hom_change_name_ack(struct map_session_data *sd, char* name, int flag);
+int hom_change_name(map_session_data *sd,char *name);
+void hom_change_name_ack(map_session_data *sd, char* name, int flag);
 #define hom_stop_walking(hd, type) unit_stop_walking(&(hd)->bl, type)
 #define hom_stop_attack(hd) unit_stop_attack(&(hd)->bl)
 int hom_increase_intimacy(struct homun_data * hd, unsigned int value);
diff --git a/src/map/instance.cpp b/src/map/instance.cpp
index caddae136c..717b924d62 100644
--- a/src/map/instance.cpp
+++ b/src/map/instance.cpp
@@ -256,7 +256,7 @@ std::shared_ptr<s_instance_db> instance_search_db_name(const char *instance_name
  * @param sd: Pointer to player data
  * @param target: Target display type
  */
-void instance_getsd(int instance_id, struct map_session_data *&sd, enum send_target *target) {
+void instance_getsd(int instance_id, map_session_data *&sd, enum send_target *target) {
 	std::shared_ptr<s_instance_data> idata = util::umap_find(instances, instance_id);
 
 	if (!idata) {
@@ -311,7 +311,7 @@ static TIMER_FUNC(instance_subscription_timer){
 	if (!idata)
 		return 0;
 
-	struct map_session_data *sd;
+	map_session_data *sd;
 	struct party_data *pd;
 	struct guild *gd;
 	struct clan *cd;
@@ -568,7 +568,7 @@ int instance_create(int owner_id, const char *name, e_instance_mode mode) {
 		return -1;
 	}
 
-	struct map_session_data *sd = nullptr;
+	map_session_data *sd = nullptr;
 	struct party_data *pd;
 	struct guild *gd;
 	struct clan* cd;
@@ -891,7 +891,7 @@ bool instance_destroy(int instance_id)
 	if (!idata)
 		return false;
 
-	struct map_session_data *sd;
+	map_session_data *sd;
 	struct party_data *pd;
 	struct guild *gd;
 	struct clan *cd;
@@ -1001,7 +1001,7 @@ bool instance_destroy(int instance_id)
  * @param y: Y coordinate
  * @return e_instance_enter value
  */
-e_instance_enter instance_enter(struct map_session_data *sd, int instance_id, const char *name, short x, short y)
+e_instance_enter instance_enter(map_session_data *sd, int instance_id, const char *name, short x, short y)
 {
 	nullpo_retr(IE_OTHER, sd);
 	
@@ -1096,7 +1096,7 @@ e_instance_enter instance_enter(struct map_session_data *sd, int instance_id, co
  * @param instance_id: Instance to request
  * @return True on success or false on failure
  */
-bool instance_reqinfo(struct map_session_data *sd, int instance_id)
+bool instance_reqinfo(map_session_data *sd, int instance_id)
 {
 	nullpo_retr(false, sd);
 
@@ -1197,7 +1197,7 @@ void do_reload_instance(void)
 
 	// Reset player to instance beginning
 	struct s_mapiterator *iter = mapit_getallusers();
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	for (sd = (TBL_PC *)mapit_first(iter); mapit_exists(iter); sd = (TBL_PC *)mapit_next(iter)) {
 		struct map_data *mapdata = map_getmapdata(sd->bl.m);
diff --git a/src/map/instance.hpp b/src/map/instance.hpp
index 391aa95709..d9ef1be566 100644
--- a/src/map/instance.hpp
+++ b/src/map/instance.hpp
@@ -113,13 +113,13 @@ extern InstanceDatabase instance_db;
 extern std::unordered_map<int, std::shared_ptr<s_instance_data>> instances;
 
 std::shared_ptr<s_instance_db> instance_search_db_name(const char* name);
-void instance_getsd(int instance_id, struct map_session_data *&sd, enum send_target *target);
+void instance_getsd(int instance_id, map_session_data *&sd, enum send_target *target);
 
 int instance_create(int owner_id, const char *name, e_instance_mode mode);
 bool instance_destroy(int instance_id);
 void instance_destroy_command(map_session_data *sd);
-e_instance_enter instance_enter(struct map_session_data *sd, int instance_id, const char *name, short x, short y);
-bool instance_reqinfo(struct map_session_data *sd, int instance_id);
+e_instance_enter instance_enter(map_session_data *sd, int instance_id, const char *name, short x, short y);
+bool instance_reqinfo(map_session_data *sd, int instance_id);
 bool instance_addusers(int instance_id);
 bool instance_delusers(int instance_id);
 void instance_generate_mapname(int map_id, int instance_id, char outname[MAP_NAME_LENGTH]);
diff --git a/src/map/intif.cpp b/src/map/intif.cpp
index a3a7610723..b3d557c273 100644
--- a/src/map/intif.cpp
+++ b/src/map/intif.cpp
@@ -69,9 +69,9 @@ int CheckForCharServer(void)
  * @param char_id
  * @return sd Found sd or NULL if not found
  */
-struct map_session_data *inter_search_sd(uint32 account_id, uint32 char_id)
+map_session_data *inter_search_sd(uint32 account_id, uint32 char_id)
 {
-	struct map_session_data *sd = NULL;
+	map_session_data *sd = NULL;
 	struct auth_node *node = chrif_auth_check(account_id, char_id, ST_LOGIN);
 	if (node)
 		sd = node->sd;
@@ -182,7 +182,7 @@ int intif_delete_petdata(int pet_id)
  * @param name
  * @return 
  */
-int intif_rename(struct map_session_data *sd, int type, char *name)
+int intif_rename(map_session_data *sd, int type, char *name)
 {
 	if (CheckForCharServer())
 		return 0;
@@ -283,7 +283,7 @@ int intif_broadcast2(const char* mes, int len, unsigned long fontColor, short fo
  * @param message : the message to sent
  * @return 
  */
-int intif_main_message(struct map_session_data* sd, const char* message)
+int intif_main_message(map_session_data* sd, const char* message)
 {
 	char output[256];
 
@@ -310,7 +310,7 @@ int intif_main_message(struct map_session_data* sd, const char* message)
  * @param mes_len : Size of message
  * @return 0=Message not send, 1=Message send
  */
-int intif_wis_message(struct map_session_data *sd, char *nick, char *mes, int mes_len)
+int intif_wis_message(map_session_data *sd, char *nick, char *mes, int mes_len)
 {
 	int headersize = 8 + 2 * NAME_LENGTH;
 
@@ -393,7 +393,7 @@ int intif_wis_message_to_gm(char *wisp_name, int permission, char *mes)
  * @param sd : Player to save registry
  * @return 1=msg sent, -1=error
  */
-int intif_saveregistry(struct map_session_data *sd)
+int intif_saveregistry(map_session_data *sd)
 {
 	DBIterator *iter;
 	DBKey key;
@@ -521,7 +521,7 @@ int intif_saveregistry(struct map_session_data *sd)
  * @param flag : Type of registry to load, &1=acc (login-serv), &2=acc (char-serv), &4=char
  * @return 
  */
-int intif_request_registry(struct map_session_data *sd, int flag)
+int intif_request_registry(map_session_data *sd, int flag)
 {
 	nullpo_ret(sd);
 
@@ -690,7 +690,7 @@ int intif_party_leave(int party_id, uint32 account_id, uint32 char_id, const cha
  * @param online : If the player will stay online or no
  * @return 0=error, 1=msg sent
  */
-int intif_party_changemap(struct map_session_data *sd,int online)
+int intif_party_changemap(map_session_data *sd,int online)
 {
 	int16 m, mapindex;
 
@@ -1280,7 +1280,7 @@ int intif_homunculus_requestdelete(int homun_id)
  */
 int intif_parse_WisMessage(int fd)
 {
-	struct map_session_data* sd;
+	map_session_data* sd;
 	char *wisp_source;
 	char name[NAME_LENGTH];
 	int id, i, gmlvl;
@@ -1323,11 +1323,11 @@ int intif_parse_WisMessage(int fd)
  */
 int intif_parse_WisEnd(int fd)
 {
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if (battle_config.etc_log)
 		ShowInfo("intif_parse_wisend: player: %s, flag: %d\n", RFIFOP(fd,2), RFIFOB(fd,26)); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
-	sd = (struct map_session_data *)map_nick2sd(RFIFOCP(fd,2),false);
+	sd = (map_session_data *)map_nick2sd(RFIFOCP(fd,2),false);
 	if (sd != NULL)
 		clif_wis_end(sd->fd, RFIFOB(fd,26));
 
@@ -1340,7 +1340,7 @@ int intif_parse_WisEnd(int fd)
  * @param va : list of arguments ( wisp_name, message, len)
  * @return 0=error, 1=msg sent
  */
-static int mapif_parse_WisToGM_sub(struct map_session_data* sd,va_list va)
+static int mapif_parse_WisToGM_sub(map_session_data* sd,va_list va)
 {
 	e_pc_permission permission = static_cast<e_pc_permission>(va_arg(va, uint32));
 	char *wisp_name;
@@ -1390,7 +1390,7 @@ int mapif_parse_WisToGM(int fd)
 void intif_parse_Registers(int fd)
 {
 	int flag;
-	struct map_session_data *sd;
+	map_session_data *sd;
 	uint32 account_id = RFIFOL(fd,4), char_id = RFIFOL(fd,8);
 	struct auth_node *node = chrif_auth_check(account_id, char_id, ST_LOGIN);
 	char type = RFIFOB(fd, 13);
@@ -1489,7 +1489,7 @@ void intif_parse_Registers(int fd)
 int intif_parse_LoadGuildStorage(int fd)
 {
 	struct s_storage *gstor;
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int guild_id, flag;
 
 	guild_id = RFIFOL(fd,8);
@@ -1942,7 +1942,7 @@ int intif_parse_DeletePetOk(int fd)
  */
 int intif_parse_ChangeNameOk(int fd)
 {
-	struct map_session_data *sd = NULL;
+	map_session_data *sd = NULL;
 	if((sd=map_id2sd(RFIFOL(fd,2)))==NULL ||
 		sd->status.char_id != RFIFOL(fd,6))
 		return 0;
@@ -2037,7 +2037,7 @@ QUESTLOG SYSTEM FUNCTIONS
  * Requests a character's quest log entries to the inter server.
  * @param sd Character's data
  */
-void intif_request_questlog(struct map_session_data *sd)
+void intif_request_questlog(map_session_data *sd)
 {
 	if (CheckForCharServer())
 		return;
@@ -2120,7 +2120,7 @@ void intif_parse_questsave(int fd)
  * @param sd Character's data
  * @return 0 in case of success, nonzero otherwise
  */
-int intif_quest_save(struct map_session_data *sd)
+int intif_quest_save(map_session_data *sd)
 {
 	int len = sizeof(struct quest) * sd->num_quests + 8;
 
@@ -2164,7 +2164,7 @@ void intif_request_achievements(uint32 char_id)
 void intif_parse_achievements(int fd)
 {
 	uint32 char_id = RFIFOL(fd, 4), num_received = (RFIFOW(fd, 2) - 8) / sizeof(struct achievement);
-	struct map_session_data *sd = map_charid2sd(char_id);
+	map_session_data *sd = map_charid2sd(char_id);
 
 	if (!sd) // User not online anymore
 		return;
@@ -2229,7 +2229,7 @@ void intif_parse_achievements(int fd)
 void intif_parse_achievementsave(int fd)
 {
 	int cid = RFIFOL(fd, 2);
-	struct map_session_data *sd = map_charid2sd(cid);
+	map_session_data *sd = map_charid2sd(cid);
 
 	if (!sd) // User not online anymore
 		return;
@@ -2243,7 +2243,7 @@ void intif_parse_achievementsave(int fd)
  * @param sd: Character's data
  * @return 0 in case of success, nonzero otherwise
  */
-int intif_achievement_save(struct map_session_data *sd)
+int intif_achievement_save(map_session_data *sd)
 {
 	int len = sizeof(struct achievement) * sd->achievement_data.count + 8;
 
@@ -2269,7 +2269,7 @@ int intif_achievement_save(struct map_session_data *sd)
  * @param fd : char-serv link
  */
 void intif_parse_achievementreward(int fd){
-	struct map_session_data *sd = map_charid2sd(RFIFOL(fd,2));
+	map_session_data *sd = map_charid2sd(RFIFOL(fd,2));
 
 	// User not online anymore
 	if( !sd ){
@@ -2282,7 +2282,7 @@ void intif_parse_achievementreward(int fd){
 /**
  * Request the achievement rewards from the inter server.
  */
-int intif_achievement_reward(struct map_session_data *sd, struct s_achievement_db *adb){
+int intif_achievement_reward(map_session_data *sd, struct s_achievement_db *adb){
 	if( CheckForCharServer() ){
 		return 0;
 	}
@@ -2334,7 +2334,7 @@ int intif_Mail_requestinbox(uint32 char_id, unsigned char flag, enum mail_inbox_
  */
 int intif_parse_Mail_inboxreceived(int fd)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	unsigned char flag = RFIFOB(fd,8);
 
 	sd = map_charid2sd(RFIFOL(fd,4));
@@ -2396,7 +2396,7 @@ int intif_Mail_read(int mail_id)
  * @param mail_id : Mail identification
  * @return 0=error, 1=msg sent
  */
-bool intif_mail_getattach( struct map_session_data* sd, struct mail_message *msg, enum mail_attachment_type type){
+bool intif_mail_getattach( map_session_data* sd, struct mail_message *msg, enum mail_attachment_type type){
 	if (CheckForCharServer())
 		return false;
 
@@ -2417,7 +2417,7 @@ bool intif_mail_getattach( struct map_session_data* sd, struct mail_message *msg
  */
 int intif_parse_Mail_getattach(int fd)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	struct item item[MAIL_MAX_ITEM];
 	int i, mail_id, zeny;
 
@@ -2480,7 +2480,7 @@ int intif_parse_Mail_delete(int fd)
 	int mail_id = RFIFOL(fd,6);
 	bool failed = RFIFOB(fd,10) > 0;
 
-	struct map_session_data *sd = map_charid2sd(char_id);
+	map_session_data *sd = map_charid2sd(char_id);
 	if (sd == NULL)
 	{
 		ShowError("intif_parse_Mail_delete: char not found %d\n", char_id);
@@ -2537,7 +2537,7 @@ int intif_Mail_return(uint32 char_id, int mail_id)
  */
 int intif_parse_Mail_return(int fd)
 {
-	struct map_session_data *sd = map_charid2sd(RFIFOL(fd,2));
+	map_session_data *sd = map_charid2sd(RFIFOL(fd,2));
 	int mail_id = RFIFOL(fd,6);
 	short fail = RFIFOB(fd,10);
 
@@ -2600,7 +2600,7 @@ int intif_Mail_send(uint32 account_id, struct mail_message *msg)
 static void intif_parse_Mail_send(int fd)
 {
 	struct mail_message msg;
-	struct map_session_data *sd;
+	map_session_data *sd;
 	bool fail;
 
 	if( RFIFOW(fd,2) - 4 != sizeof(struct mail_message) )
@@ -2633,7 +2633,7 @@ static void intif_parse_Mail_send(int fd)
  */
 static void intif_parse_Mail_new(int fd)
 {
-	struct map_session_data *sd = map_charid2sd(RFIFOL(fd,2));
+	map_session_data *sd = map_charid2sd(RFIFOL(fd,2));
 	int mail_id = RFIFOL(fd,6);
 	const char* sender_name = RFIFOCP(fd,10);
 	const char* title = RFIFOCP(fd,34);
@@ -2650,7 +2650,7 @@ static void intif_parse_Mail_new(int fd)
 }
 
 static void intif_parse_Mail_receiver( int fd ){
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	sd = map_charid2sd( RFIFOL( fd, 2 ) );
 
@@ -2660,8 +2660,8 @@ static void intif_parse_Mail_receiver( int fd ){
 	}
 }
 
-bool intif_mail_checkreceiver( struct map_session_data* sd, char* name ){
-	struct map_session_data *tsd;
+bool intif_mail_checkreceiver( map_session_data* sd, char* name ){
+	map_session_data *tsd;
 
 	tsd = map_nick2sd( name, false );
 
@@ -2723,7 +2723,7 @@ int intif_Auction_requestlist(uint32 char_id, short type, int price, const char*
  */
 static void intif_parse_Auction_results(int fd)
 {
-	struct map_session_data *sd = map_charid2sd(RFIFOL(fd,4));
+	map_session_data *sd = map_charid2sd(RFIFOL(fd,4));
 	short count = RFIFOW(fd,8);
 	short pages = RFIFOW(fd,10);
 	uint8* data = RFIFOP(fd,12);
@@ -2761,7 +2761,7 @@ int intif_Auction_register(struct auction_data *auction)
  */
 static void intif_parse_Auction_register(int fd)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	struct auction_data auction;
 
 	if( RFIFOW(fd,2) - 4 != sizeof(struct auction_data) )
@@ -2817,7 +2817,7 @@ int intif_Auction_cancel(uint32 char_id, unsigned int auction_id)
  */
 static void intif_parse_Auction_cancel(int fd)
 {
-	struct map_session_data *sd = map_charid2sd(RFIFOL(fd,2));
+	map_session_data *sd = map_charid2sd(RFIFOL(fd,2));
 	int result = RFIFOB(fd,6);
 
 	if( sd == NULL )
@@ -2858,7 +2858,7 @@ int intif_Auction_close(uint32 char_id, unsigned int auction_id)
  */
 static void intif_parse_Auction_close(int fd)
 {
-	struct map_session_data *sd = map_charid2sd(RFIFOL(fd,2));
+	map_session_data *sd = map_charid2sd(RFIFOL(fd,2));
 	unsigned char result = RFIFOB(fd,6);
 
 	if( sd == NULL )
@@ -2907,7 +2907,7 @@ int intif_Auction_bid(uint32 char_id, const char* name, unsigned int auction_id,
  */
 static void intif_parse_Auction_bid(int fd)
 {
-	struct map_session_data *sd = map_charid2sd(RFIFOL(fd,2));
+	map_session_data *sd = map_charid2sd(RFIFOL(fd,2));
 	int bid = RFIFOL(fd,6);
 	unsigned char result = RFIFOB(fd,10);
 
@@ -2932,7 +2932,7 @@ static void intif_parse_Auction_bid(int fd)
  */
 static void intif_parse_Auction_message(int fd)
 {
-	struct map_session_data *sd = map_charid2sd(RFIFOL(fd,2));
+	map_session_data *sd = map_charid2sd(RFIFOL(fd,2));
 	unsigned char result = RFIFOB(fd,6);
 
 	if( sd == NULL )
@@ -3239,7 +3239,7 @@ void intif_parse_MessageToFD(int fd) {
 
 	if( session[u_fd] && session[u_fd]->session_data ) { //check if the player still online
 		int aid = RFIFOL(fd,8);
-		struct map_session_data * sd = (struct map_session_data *)session[u_fd]->session_data;
+		map_session_data * sd = (map_session_data *)session[u_fd]->session_data;
 		/* matching e.g. previous fd owner didn't dc during request or is still the same */
 		if( sd->bl.id == aid ) {
 			char msg[512];
@@ -3263,7 +3263,7 @@ void intif_parse_MessageToFD(int fd) {
  * @param type Obtain type @see enum BROADCASTING_SPECIAL_ITEM_OBTAIN
  * @return
  **/
-int intif_broadcast_obtain_special_item(struct map_session_data *sd, t_itemid nameid, t_itemid sourceid, unsigned char type) {
+int intif_broadcast_obtain_special_item(map_session_data *sd, t_itemid nameid, t_itemid sourceid, unsigned char type) {
 	nullpo_retr(0, sd);
 
 	// Should not be here!
@@ -3302,7 +3302,7 @@ int intif_broadcast_obtain_special_item(struct map_session_data *sd, t_itemid na
  * @param srcname Source name
  * @return
  **/
-int intif_broadcast_obtain_special_item_npc(struct map_session_data *sd, t_itemid nameid) {
+int intif_broadcast_obtain_special_item_npc(map_session_data *sd, t_itemid nameid) {
 	nullpo_retr(0, sd);
 
 	// Send local
@@ -3424,7 +3424,7 @@ static bool intif_parse_StorageReceived(int fd)
 {
 	char type =  RFIFOB(fd,4);
 	uint32 account_id = RFIFOL(fd, 5);
-	struct map_session_data *sd = map_id2sd(account_id);
+	map_session_data *sd = map_id2sd(account_id);
 	struct s_storage *stor, *p; //storage
 	size_t sz_stor = sizeof(struct s_storage);
 
@@ -3547,7 +3547,7 @@ static void intif_parse_StorageSaved(int fd)
 				break;
 			case TABLE_STORAGE: //storage
 				{
-					struct map_session_data *sd = map_id2sd( RFIFOL( fd, 2 ) );
+					map_session_data *sd = map_id2sd( RFIFOL( fd, 2 ) );
 					struct s_storage* stor = nullptr;
 
 					if( RFIFOB( fd, 8 ) ){
@@ -3572,7 +3572,7 @@ static void intif_parse_StorageSaved(int fd)
 			case TABLE_CART: // cart
 				//ShowInfo("Cart has been saved (AID: %d).\n", RFIFOL(fd, 2));
 				{
-					struct map_session_data *sd = map_id2sd(RFIFOL(fd, 2));
+					map_session_data *sd = map_id2sd(RFIFOL(fd, 2));
 
 					if( sd && sd->state.prevend ){
 						intif_storage_request(sd,TABLE_CART,0,STOR_MODE_ALL);
@@ -3620,7 +3620,7 @@ void intif_parse_StorageInfo_recv(int fd) {
  * @param mode: Storage mode
  * @return false - error, true - message sent
  */
-bool intif_storage_request(struct map_session_data *sd, enum storage_type type, uint8 stor_id, uint8 mode)
+bool intif_storage_request(map_session_data *sd, enum storage_type type, uint8 stor_id, uint8 mode)
 {
 	if (CheckForCharServer())
 		return false;
@@ -3643,7 +3643,7 @@ bool intif_storage_request(struct map_session_data *sd, enum storage_type type,
  * @param stor: Storage data
  * @ return false - error, true - message sent
  */
-bool intif_storage_save(struct map_session_data *sd, struct s_storage *stor)
+bool intif_storage_save(map_session_data *sd, struct s_storage *stor)
 {
 	int stor_size = sizeof(struct s_storage);
 
diff --git a/src/map/intif.hpp b/src/map/intif.hpp
index b2c4de1a66..1a6bc5ee4f 100644
--- a/src/map/intif.hpp
+++ b/src/map/intif.hpp
@@ -19,21 +19,21 @@ struct s_elemental;
 struct mail_message;
 struct auction_data;
 struct s_achievement_db;
-struct map_session_data;
+class map_session_data;
 
 int intif_parse(int fd);
 
 int intif_broadcast(const char* mes, int len, int type);
 int intif_broadcast2(const char* mes, int len, unsigned long fontColor, short fontType, short fontSize, short fontAlign, short fontY);
-int intif_broadcast_obtain_special_item(struct map_session_data *sd, t_itemid nameid, unsigned int sourceid, unsigned char type);
-int intif_broadcast_obtain_special_item_npc(struct map_session_data *sd, t_itemid nameid);
-int intif_main_message(struct map_session_data* sd, const char* message);
+int intif_broadcast_obtain_special_item(map_session_data *sd, t_itemid nameid, unsigned int sourceid, unsigned char type);
+int intif_broadcast_obtain_special_item_npc(map_session_data *sd, t_itemid nameid);
+int intif_main_message(map_session_data* sd, const char* message);
 
-int intif_wis_message(struct map_session_data *sd,char *nick,char *mes,int mes_len);
+int intif_wis_message(map_session_data *sd,char *nick,char *mes,int mes_len);
 int intif_wis_message_to_gm(char *Wisp_name, int permission, char *mes);
 
-int intif_saveregistry(struct map_session_data *sd);
-int intif_request_registry(struct map_session_data *sd, int flag);
+int intif_saveregistry(map_session_data *sd);
+int intif_request_registry(map_session_data *sd, int flag);
 
 bool intif_request_guild_storage(uint32 account_id, int guild_id);
 bool intif_send_guild_storage(uint32 account_id, struct s_storage *gstor);
@@ -44,7 +44,7 @@ int intif_request_partyinfo(int party_id, uint32 char_id);
 int intif_party_addmember(int party_id,struct party_member *member);
 int intif_party_changeoption(int party_id, uint32 account_id, int exp, int item);
 int intif_party_leave(int party_id, uint32 account_id, uint32 char_id, const char *name, enum e_party_member_withdraw type);
-int intif_party_changemap(struct map_session_data *sd, int online);
+int intif_party_changemap(map_session_data *sd, int online);
 int intif_break_party(int party_id);
 int intif_party_message(int party_id, uint32 account_id, const char *mes,int len);
 int intif_party_leaderchange(int party_id,uint32 account_id,uint32 char_id);
@@ -76,7 +76,7 @@ int intif_create_pet(uint32 account_id, uint32 char_id, short pet_type, short pe
 int intif_request_petdata(uint32 account_id, uint32 char_id, int pet_id);
 int intif_save_petdata(uint32 account_id, struct s_pet *p);
 int intif_delete_petdata(int pet_id);
-int intif_rename(struct map_session_data *sd, int type, char *name);
+int intif_rename(map_session_data *sd, int type, char *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)
@@ -86,8 +86,8 @@ int intif_homunculus_requestsave(uint32 account_id, struct s_homunculus* sh);
 int intif_homunculus_requestdelete(int homun_id);
 
 /******QUEST SYTEM*******/
-void intif_request_questlog(struct map_session_data * sd);
-int intif_quest_save(struct map_session_data * sd);
+void intif_request_questlog(map_session_data * sd);
+int intif_quest_save(map_session_data * sd);
 
 // MERCENARY SYSTEM
 int intif_mercenary_create(struct s_mercenary *merc);
@@ -98,11 +98,11 @@ int intif_mercenary_save(struct s_mercenary *merc);
 // MAIL SYSTEM
 int intif_Mail_requestinbox(uint32 char_id, unsigned char flag, enum mail_inbox_type type);
 int intif_Mail_read(int mail_id);
-bool intif_mail_getattach( struct map_session_data* sd, struct mail_message *msg, enum mail_attachment_type type );
+bool intif_mail_getattach( map_session_data* sd, struct mail_message *msg, enum mail_attachment_type type );
 int intif_Mail_delete(uint32 char_id, int mail_id);
 int intif_Mail_return(uint32 char_id, int mail_id);
 int intif_Mail_send(uint32 account_id, struct mail_message *msg);
-bool intif_mail_checkreceiver(struct map_session_data* sd, char* name);
+bool intif_mail_checkreceiver(map_session_data* sd, char* name);
 // AUCTION SYSTEM
 int intif_Auction_requestlist(uint32 char_id, short type, int price, const char* searchtext, short page);
 int intif_Auction_register(struct auction_data *auction);
@@ -121,14 +121,14 @@ int intif_clan_member_joined( int clan_id );
 int intif_clan_member_left( int clan_id );
 // ACHIEVEMENT SYSTEM
 void intif_request_achievements(uint32 char_id);
-int intif_achievement_save(struct map_session_data *sd);
-int intif_achievement_reward(struct map_session_data *sd, struct s_achievement_db *adb);
+int intif_achievement_save(map_session_data *sd);
+int intif_achievement_reward(map_session_data *sd, struct s_achievement_db *adb);
 
 int intif_request_accinfo(int u_fd, int aid, int group_lv, char* query, char type);
 
 // STORAGE
-bool intif_storage_request(struct map_session_data *sd, enum storage_type type, uint8 stor_id, uint8 mode);
-bool intif_storage_save(struct map_session_data *sd, struct s_storage *stor);
+bool intif_storage_request(map_session_data *sd, enum storage_type type, uint8 stor_id, uint8 mode);
+bool intif_storage_save(map_session_data *sd, struct s_storage *stor);
 
 int CheckForCharServer(void);
 
diff --git a/src/map/itemdb.cpp b/src/map/itemdb.cpp
index 4fdff60a08..3eb5cc27f1 100644
--- a/src/map/itemdb.cpp
+++ b/src/map/itemdb.cpp
@@ -4629,7 +4629,7 @@ void itemdb_gen_itemmoveinfo()
 */
 void itemdb_reload(void) {
 	struct s_mapiterator* iter;
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	do_final_itemdb();
 
@@ -4641,7 +4641,7 @@ void itemdb_reload(void) {
 
 	// readjust itemdb pointer cache for each player
 	iter = mapit_geteachpc();
-	for( sd = (struct map_session_data*)mapit_first(iter); mapit_exists(iter); sd = (struct map_session_data*)mapit_next(iter) ) {
+	for( sd = (map_session_data*)mapit_first(iter); mapit_exists(iter); sd = (map_session_data*)mapit_next(iter) ) {
 		memset(sd->item_delay, 0, sizeof(sd->item_delay));  // reset item delays
 		sd->combos.clear(); // clear combo bonuses
 		pc_setinventorydata(sd);
diff --git a/src/map/log.cpp b/src/map/log.cpp
index eb06d7d78b..70650d2c68 100644
--- a/src/map/log.cpp
+++ b/src/map/log.cpp
@@ -170,7 +170,7 @@ static bool should_log_item(t_itemid nameid, int amount, int refine)
 
 
 /// logs items, that summon monsters
-void log_branch(struct map_session_data* sd)
+void log_branch(map_session_data* sd)
 {
 	nullpo_retv(sd);
 
@@ -263,7 +263,7 @@ void log_pick(int id, int16 m, e_log_pick_type type, int amount, struct item* it
 }
 
 /// logs item transactions (players)
-void log_pick_pc(struct map_session_data* sd, e_log_pick_type type, int amount, struct item* itm)
+void log_pick_pc(map_session_data* sd, e_log_pick_type type, int amount, struct item* itm)
 {
 	nullpo_retv(sd);
 	log_pick(sd->status.char_id, sd->bl.m, type, amount, itm);
@@ -278,7 +278,7 @@ void log_pick_mob(struct mob_data* md, e_log_pick_type type, int amount, struct
 }
 
 /// logs zeny transactions
-void log_zeny(struct map_session_data* sd, e_log_pick_type type, struct map_session_data* src_sd, int amount)
+void log_zeny(map_session_data* sd, e_log_pick_type type, map_session_data* src_sd, int amount)
 {
 	nullpo_retv(sd);
 
@@ -311,7 +311,7 @@ void log_zeny(struct map_session_data* sd, e_log_pick_type type, struct map_sess
 
 
 /// logs MVP monster rewards
-void log_mvpdrop(struct map_session_data* sd, int monster_id, t_itemid nameid, t_exp exp )
+void log_mvpdrop(map_session_data* sd, int monster_id, t_itemid nameid, t_exp exp )
 {
 	nullpo_retv(sd);
 
@@ -344,7 +344,7 @@ void log_mvpdrop(struct map_session_data* sd, int monster_id, t_itemid nameid, t
 
 
 /// logs used atcommands
-void log_atcommand(struct map_session_data* sd, const char* message)
+void log_atcommand(map_session_data* sd, const char* message)
 {
 	nullpo_retv(sd);
 
@@ -421,7 +421,7 @@ void log_npc( struct npc_data* nd, const char* message ){
 }
 
 /// logs messages passed to script command 'logmes'
-void log_npc(struct map_session_data* sd, const char* message)
+void log_npc(map_session_data* sd, const char* message)
 {
 	nullpo_retv(sd);
 
@@ -507,7 +507,7 @@ void log_chat(e_log_chat_type type, int type_id, int src_charid, int src_accid,
 }
 
 /// logs cash transactions
-void log_cash( struct map_session_data* sd, e_log_pick_type type, e_log_cash_type cash_type, int amount ){
+void log_cash( map_session_data* sd, e_log_pick_type type, e_log_cash_type cash_type, int amount ){
 	nullpo_retv( sd );
 
 	if( !log_config.cash )
@@ -540,7 +540,7 @@ void log_cash( struct map_session_data* sd, e_log_pick_type type, e_log_cash_typ
  * @param type Log type, @see e_log_feeding_type
  * @param nameid Item used as food
  **/
-void log_feeding(struct map_session_data *sd, e_log_feeding_type type, t_itemid nameid) {
+void log_feeding(map_session_data *sd, e_log_feeding_type type, t_itemid nameid) {
 	unsigned int target_id = 0, intimacy = 0;
 	unsigned short target_class = 0;
 
diff --git a/src/map/log.hpp b/src/map/log.hpp
index 02b091af3a..b4a5f079f9 100644
--- a/src/map/log.hpp
+++ b/src/map/log.hpp
@@ -8,7 +8,7 @@
 #include "../common/mmo.hpp"
 
 struct block_list;
-struct map_session_data;
+class map_session_data;
 struct mob_data;
 struct item;
 
@@ -76,19 +76,19 @@ enum e_log_feeding_type : uint8
 };
 
 /// new logs
-void log_pick_pc(struct map_session_data* sd, e_log_pick_type type, int amount, struct item* itm);
+void log_pick_pc(map_session_data* sd, e_log_pick_type type, int amount, struct item* itm);
 void log_pick_mob(struct mob_data* md, e_log_pick_type type, int amount, struct item* itm);
-void log_zeny(struct map_session_data* sd, e_log_pick_type type, struct map_session_data* src_sd, int amount);
-void log_cash( struct map_session_data* sd, e_log_pick_type type, e_log_cash_type cash_type, int amount );
+void log_zeny(map_session_data* sd, e_log_pick_type type, map_session_data* src_sd, int amount);
+void log_cash( map_session_data* sd, e_log_pick_type type, e_log_cash_type cash_type, int amount );
 void log_npc( struct npc_data* nd, const char* message );
-void log_npc(struct map_session_data* sd, const char *message);
+void log_npc(map_session_data* sd, const char *message);
 void log_chat(e_log_chat_type type, int type_id, int src_charid, int src_accid, const char* map, int x, int y, const char* dst_charname, const char* message);
-void log_atcommand(struct map_session_data* sd, const char* message);
-void log_feeding(struct map_session_data *sd, e_log_feeding_type type, t_itemid nameid);
+void log_atcommand(map_session_data* sd, const char* message);
+void log_feeding(map_session_data *sd, e_log_feeding_type type, t_itemid nameid);
 
 /// old, but useful logs
-void log_branch(struct map_session_data* sd);
-void log_mvpdrop(struct map_session_data* sd, int monster_id, t_itemid nameid, t_exp exp);
+void log_branch(map_session_data* sd);
+void log_mvpdrop(map_session_data* sd, int monster_id, t_itemid nameid, t_exp exp);
 
 int log_config_read(const char* cfgName);
 
diff --git a/src/map/mail.cpp b/src/map/mail.cpp
index 549f318a70..7e6991cc0d 100644
--- a/src/map/mail.cpp
+++ b/src/map/mail.cpp
@@ -18,7 +18,7 @@
 #include "pc.hpp"
 #include "pet.hpp"
 
-void mail_clear(struct map_session_data *sd)
+void mail_clear(map_session_data *sd)
 {
 	int i;
 
@@ -32,7 +32,7 @@ void mail_clear(struct map_session_data *sd)
 	return;
 }
 
-int mail_removeitem(struct map_session_data *sd, short flag, int idx, int amount)
+int mail_removeitem(map_session_data *sd, short flag, int idx, int amount)
 {
 	int i;
 
@@ -99,7 +99,7 @@ int mail_removeitem(struct map_session_data *sd, short flag, int idx, int amount
 	return 1;
 }
 
-bool mail_removezeny( struct map_session_data *sd, bool flag ){
+bool mail_removezeny( map_session_data *sd, bool flag ){
 	nullpo_retr( false, sd );
 
 	if( sd->mail.zeny > 0 ){
@@ -126,7 +126,7 @@ bool mail_removezeny( struct map_session_data *sd, bool flag ){
 * @param amount : amout of zeny or number of item
 * @return see enum mail_attach_result in mail.hpp
 */
-enum mail_attach_result mail_setitem(struct map_session_data *sd, short idx, uint32 amount) {
+enum mail_attach_result mail_setitem(map_session_data *sd, short idx, uint32 amount) {
 	if( pc_istrading(sd) )
 		return MAIL_ATTACH_ERROR;
 
@@ -241,7 +241,7 @@ enum mail_attach_result mail_setitem(struct map_session_data *sd, short idx, uin
 	}
 }
 
-bool mail_setattachment(struct map_session_data *sd, struct mail_message *msg)
+bool mail_setattachment(map_session_data *sd, struct mail_message *msg)
 {
 	int i, amount;
 
@@ -290,7 +290,7 @@ bool mail_setattachment(struct map_session_data *sd, struct mail_message *msg)
 	return true;
 }
 
-void mail_getattachment(struct map_session_data* sd, struct mail_message* msg, int zeny, struct item* item){
+void mail_getattachment(map_session_data* sd, struct mail_message* msg, int zeny, struct item* item){
 	int i;
 	bool item_received = false;
 
@@ -360,7 +360,7 @@ void mail_getattachment(struct map_session_data* sd, struct mail_message* msg, i
 	}
 }
 
-int mail_openmail(struct map_session_data *sd)
+int mail_openmail(map_session_data *sd)
 {
 	nullpo_ret(sd);
 
@@ -372,7 +372,7 @@ int mail_openmail(struct map_session_data *sd)
 	return 1;
 }
 
-void mail_deliveryfail(struct map_session_data *sd, struct mail_message *msg){
+void mail_deliveryfail(map_session_data *sd, struct mail_message *msg){
 	int i, zeny = 0;
 
 	nullpo_retv(sd);
@@ -394,7 +394,7 @@ void mail_deliveryfail(struct map_session_data *sd, struct mail_message *msg){
 }
 
 // This function only check if the mail operations are valid
-bool mail_invalid_operation(struct map_session_data *sd)
+bool mail_invalid_operation(map_session_data *sd)
 {
 #if PACKETVER < 20150513
 	if( !map_getmapflag(sd->bl.m, MF_TOWN) && !pc_can_use_command(sd, "mail", COMMAND_ATCOMMAND) )
@@ -420,7 +420,7 @@ bool mail_invalid_operation(struct map_session_data *sd)
 * @param body_msg Mail message
 * @param body_len Message's length
 */
-void mail_send(struct map_session_data *sd, const char *dest_name, const char *title, const char *body_msg, int body_len) {
+void mail_send(map_session_data *sd, const char *dest_name, const char *title, const char *body_msg, int body_len) {
 	struct mail_message msg;
 
 	nullpo_retv(sd);
@@ -484,7 +484,7 @@ void mail_send(struct map_session_data *sd, const char *dest_name, const char *t
 	sd->cansendmail_tick = gettick() + battle_config.mail_delay; // Flood Protection
 }
 
-void mail_refresh_remaining_amount( struct map_session_data* sd ){
+void mail_refresh_remaining_amount( map_session_data* sd ){
 	int doy = date_get_dayofyear();
 
 	nullpo_retv(sd);
diff --git a/src/map/mail.hpp b/src/map/mail.hpp
index f6638f9357..90262396a8 100644
--- a/src/map/mail.hpp
+++ b/src/map/mail.hpp
@@ -24,16 +24,16 @@ enum mail_attach_result {
 	MAIL_ATTACH_EQUIPSWITCH = 99,
 };
 
-void mail_clear(struct map_session_data *sd);
-int mail_removeitem(struct map_session_data *sd, short flag, int idx, int amount);
-bool mail_removezeny(struct map_session_data *sd, bool flag);
-enum mail_attach_result mail_setitem(struct map_session_data *sd, short idx, uint32 amount);
-bool mail_setattachment(struct map_session_data *sd, struct mail_message *msg);
-void mail_getattachment(struct map_session_data* sd, struct mail_message* msg, int zeny, struct item* item);
-int mail_openmail(struct map_session_data *sd);
-void mail_deliveryfail(struct map_session_data *sd, struct mail_message *msg);
-bool mail_invalid_operation(struct map_session_data *sd);
-void mail_send(struct map_session_data *sd, const char *dest_name, const char *title, const char *body_msg, int body_len);
-void mail_refresh_remaining_amount( struct map_session_data* sd );
+void mail_clear(map_session_data *sd);
+int mail_removeitem(map_session_data *sd, short flag, int idx, int amount);
+bool mail_removezeny(map_session_data *sd, bool flag);
+enum mail_attach_result mail_setitem(map_session_data *sd, short idx, uint32 amount);
+bool mail_setattachment(map_session_data *sd, struct mail_message *msg);
+void mail_getattachment(map_session_data* sd, struct mail_message* msg, int zeny, struct item* item);
+int mail_openmail(map_session_data *sd);
+void mail_deliveryfail(map_session_data *sd, struct mail_message *msg);
+bool mail_invalid_operation(map_session_data *sd);
+void mail_send(map_session_data *sd, const char *dest_name, const char *title, const char *body_msg, int body_len);
+void mail_refresh_remaining_amount( map_session_data* sd );
 
 #endif /* MAIL_HPP */
diff --git a/src/map/map.cpp b/src/map/map.cpp
index a090a9f5f2..be25f83017 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -106,12 +106,12 @@ struct inter_conf inter_config {};
 
 // DBMap declaration
 static DBMap* id_db=NULL; /// int id -> struct block_list*
-static DBMap* pc_db=NULL; /// int id -> struct map_session_data*
+static DBMap* pc_db=NULL; /// int id -> map_session_data*
 static DBMap* mobid_db=NULL; /// int id -> struct mob_data*
 static DBMap* bossid_db=NULL; /// int id -> struct mob_data* (MVP db)
 static DBMap* map_db=NULL; /// unsigned int mapindex -> struct map_data*
 static DBMap* nick_db=NULL; /// uint32 char_id -> struct charid2nick* (requested names of offline characters)
-static DBMap* charid_db=NULL; /// uint32 char_id -> struct map_session_data*
+static DBMap* charid_db=NULL; /// uint32 char_id -> map_session_data*
 static DBMap* regen_db=NULL; /// int id -> struct block_list* (status_natural_heal processing)
 static DBMap* map_msg_db=NULL;
 
@@ -437,7 +437,7 @@ int map_delblock(struct block_list* bl)
 int map_moveblock(struct block_list *bl, int x1, int y1, t_tick tick)
 {
 	int x0 = bl->x, y0 = bl->y;
-	struct status_change *sc = NULL;
+	status_change *sc = NULL;
 	int moveblock = ( x0/BLOCK_SIZE != x1/BLOCK_SIZE || y0/BLOCK_SIZE != y1/BLOCK_SIZE);
 
 	if (!bl->prev) {
@@ -1931,7 +1931,7 @@ void map_addnickdb(int charid, const char* nick)
 	safestrncpy(p->nick, nick, sizeof(p->nick));
 
 	while( p->requests ) {
-		struct map_session_data* sd;
+		map_session_data* sd;
 		struct charid_request* req;
 		req = p->requests;
 		p->requests = req->next;
@@ -1954,7 +1954,7 @@ void map_delnickdb(int charid, const char* name)
 
 	while( p->requests ) {
 		struct charid_request* req;
-		struct map_session_data* sd;
+		map_session_data* sd;
 		req = p->requests;
 		p->requests = req->next;
 		sd = map_charid2sd(req->charid);
@@ -1968,11 +1968,11 @@ void map_delnickdb(int charid, const char* name)
 /// Notifies sd of the nick of charid.
 /// Uses the name in the character if online.
 /// Uses the name in nick_db if offline.
-void map_reqnickdb(struct map_session_data * sd, int charid)
+void map_reqnickdb(map_session_data * sd, int charid)
 {
 	struct charid2nick* p;
 	struct charid_request* req;
-	struct map_session_data* tsd;
+	map_session_data* tsd;
 
 	nullpo_retv(sd);
 
@@ -2052,7 +2052,7 @@ void map_deliddb(struct block_list *bl)
 /*==========================================
  * Standard call when a player connection is closed.
  *------------------------------------------*/
-int map_quit(struct map_session_data *sd) {
+int map_quit(map_session_data *sd) {
 	int i;
 
 	if (sd->state.keepshop == false) { // Close vending/buyingstore
@@ -2183,9 +2183,9 @@ int map_quit(struct map_session_data *sd) {
 /*==========================================
  * Lookup, id to session (player,mob,npc,homon,merc..)
  *------------------------------------------*/
-struct map_session_data * map_id2sd(int id){
+map_session_data * map_id2sd(int id){
 	if (id <= 0) return NULL;
-	return (struct map_session_data*)idb_get(pc_db,id);
+	return (map_session_data*)idb_get(pc_db,id);
 }
 
 struct mob_data * map_id2md(int id){
@@ -2227,7 +2227,7 @@ struct chat_data* map_id2cd(int id){
 const char* map_charid2nick(int charid)
 {
 	struct charid2nick *p;
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	sd = map_charid2sd(charid);
 	if( sd )
@@ -2241,10 +2241,10 @@ const char* map_charid2nick(int charid)
 	return NULL;
 }
 
-/// Returns the struct map_session_data of the charid or NULL if the char is not online.
-struct map_session_data* map_charid2sd(int charid)
+/// Returns the map_session_data of the charid or NULL if the char is not online.
+map_session_data* map_charid2sd(int charid)
 {
-	return (struct map_session_data*)uidb_get(charid_db, charid);
+	return (map_session_data*)uidb_get(charid_db, charid);
 }
 
 /*==========================================
@@ -2252,10 +2252,10 @@ struct map_session_data* map_charid2sd(int charid)
  * (without sensitive case if necessary)
  * return map_session_data pointer or NULL
  *------------------------------------------*/
-struct map_session_data * map_nick2sd(const char *nick, bool allow_partial)
+map_session_data * map_nick2sd(const char *nick, bool allow_partial)
 {
-	struct map_session_data* sd;
-	struct map_session_data* found_sd;
+	map_session_data* sd;
+	map_session_data* found_sd;
 	struct s_mapiterator* iter;
 	size_t nicklen;
 	int qty = 0;
@@ -2344,13 +2344,13 @@ struct mob_data * map_id2boss(int id)
 
 /// Applies func to all the players in the db.
 /// Stops iterating if func returns -1.
-void map_foreachpc(int (*func)(struct map_session_data* sd, va_list args), ...)
+void map_foreachpc(int (*func)(map_session_data* sd, va_list args), ...)
 {
 	DBIterator* iter;
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	iter = db_iterator(pc_db);
-	for( sd = (struct map_session_data*)dbi_first(iter); dbi_exists(iter); sd = (struct map_session_data*)dbi_next(iter) )
+	for( sd = (map_session_data*)dbi_first(iter); dbi_exists(iter); sd = (map_session_data*)dbi_next(iter) )
 	{
 		va_list args;
 		int ret;
@@ -2746,10 +2746,10 @@ int map_addinstancemap(int src_m, int instance_id, bool no_mapflag)
  *------------------------------------------*/
 static int map_instancemap_leave(struct block_list *bl, va_list ap)
 {
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	nullpo_retr(0, bl);
-	nullpo_retr(0, sd = (struct map_session_data *)bl);
+	nullpo_retr(0, sd = (map_session_data *)bl);
 
 	pc_setpos(sd, sd->status.save_point.map, sd->status.save_point.x, sd->status.save_point.y, CLR_TELEPORT);
 
@@ -2765,7 +2765,7 @@ static int map_instancemap_clean(struct block_list *bl, va_list ap)
 	switch(bl->type) {
 		/*case BL_PC:
 		// BL_PET, BL_HOM, BL_MER, and BL_ELEM are moved when BL_PC warped out in map_instancemap_leave
-			map_quit((struct map_session_data *) bl);
+			map_quit((map_session_data *) bl);
 			break;*/
 		case BL_NPC:
 			npc_unload((struct npc_data *)bl,true);
@@ -3366,7 +3366,7 @@ bool map_iwall_set(int16 m, int16 x, int16 y, int size, int8 dir, bool shootable
 	return true;
 }
 
-void map_iwall_get(struct map_session_data *sd) {
+void map_iwall_get(map_session_data *sd) {
 	struct iwall_data *iwall;
 	DBIterator* iter;
 	int16 x1, y1;
@@ -3893,7 +3893,7 @@ int parse_console(const char* buf){
 	int16 x = 0;
 	int16 y = 0;
 	int n;
-	struct map_session_data sd;
+	map_session_data sd;
 
 	strcpy(sd.status.name, "console");
 
@@ -4372,7 +4372,7 @@ int cleanup_sub(struct block_list *bl, va_list ap)
 
 	switch(bl->type) {
 		case BL_PC:
-			map_quit((struct map_session_data *) bl);
+			map_quit((map_session_data *) bl);
 			break;
 		case BL_NPC:
 			npc_unload((struct npc_data *)bl,false);
@@ -4436,7 +4436,7 @@ void map_skill_duration_add(struct map_data *mapd, uint16 skill_id, uint16 per)
  */
 static int map_mapflag_pvp_start_sub(struct block_list *bl, va_list ap)
 {
-	struct map_session_data *sd = map_id2sd(bl->id);
+	map_session_data *sd = map_id2sd(bl->id);
 
 	nullpo_retr(0, sd);
 
@@ -4461,7 +4461,7 @@ static int map_mapflag_pvp_start_sub(struct block_list *bl, va_list ap)
  */
 static int map_mapflag_pvp_stop_sub(struct block_list *bl, va_list ap)
 {
-	struct map_session_data* sd = map_id2sd(bl->id);
+	map_session_data* sd = map_id2sd(bl->id);
 
 	clif_pvpset(sd, 0, 0, 2);
 
@@ -4850,7 +4850,7 @@ void do_final(void){
 
 	//Ladies and babies first.
 	struct s_mapiterator* iter = mapit_getallusers();
-	for( struct map_session_data* sd = (TBL_PC*)mapit_first(iter); mapit_exists(iter); sd = (TBL_PC*)mapit_next(iter) )
+	for( map_session_data* sd = (TBL_PC*)mapit_first(iter); mapit_exists(iter); sd = (TBL_PC*)mapit_next(iter) )
 		map_quit(sd);
 	mapit_free(iter);
 
@@ -4944,7 +4944,7 @@ void do_final(void){
 	ShowStatus("Finished.\n");
 }
 
-static int map_abort_sub(struct map_session_data* sd, va_list ap)
+static int map_abort_sub(map_session_data* sd, va_list ap)
 {
 	chrif_save(sd, CSAVE_QUIT|CSAVE_INVENTORY|CSAVE_CART);
 	return 1;
@@ -5069,7 +5069,7 @@ int map_msg_config_read(const char *cfgName, int lang){
 	}
 	return 0;
 }
-const char* map_msg_txt(struct map_session_data *sd, int msg_number){
+const char* map_msg_txt(map_session_data *sd, int msg_number){
 	struct msg_data *mdb;
 	uint8 lang = 0; //default
 	if(sd && sd->langtype) lang = sd->langtype;
@@ -5135,7 +5135,7 @@ void do_shutdown(void)
 		runflag = MAPSERVER_ST_SHUTDOWN;
 		ShowStatus("Shutting down...\n");
 		{
-			struct map_session_data* sd;
+			map_session_data* sd;
 			struct s_mapiterator* iter = mapit_getallusers();
 			for( sd = (TBL_PC*)mapit_first(iter); mapit_exists(iter); sd = (TBL_PC*)mapit_next(iter) )
 				clif_GM_kick(NULL, sd);
diff --git a/src/map/map.hpp b/src/map/map.hpp
index 9d6ccc507e..5e2f107a2f 100644
--- a/src/map/map.hpp
+++ b/src/map/map.hpp
@@ -38,7 +38,7 @@ struct map_data *map_getmapdata(int16 m);
 #define msg_txt(sd,msg_number) map_msg_txt(sd,msg_number)
 #define do_final_msg() map_do_final_msg()
 int map_msg_config_read(const char *cfgName,int lang);
-const char* map_msg_txt(struct map_session_data *sd,int msg_number);
+const char* map_msg_txt(map_session_data *sd,int msg_number);
 void map_do_final_msg(void);
 void map_msg_reload(void);
 
@@ -1094,7 +1094,7 @@ int map_get_new_object_id(void);
 int map_search_freecell(struct block_list *src, int16 m, int16 *x, int16 *y, int16 rx, int16 ry, int flag);
 bool map_closest_freecell(int16 m, int16 *x, int16 *y, int type, int flag);
 //
-int map_quit(struct map_session_data *);
+int map_quit(map_session_data *);
 // npc
 bool map_addnpc(int16 m,struct npc_data *);
 
@@ -1113,11 +1113,11 @@ void map_data_copy(struct map_data *dst_map, struct map_data *src_map);
 // player to map session
 void map_addnickdb(int charid, const char* nick);
 void map_delnickdb(int charid, const char* nick);
-void map_reqnickdb(struct map_session_data* sd,int charid);
+void map_reqnickdb(map_session_data* sd,int charid);
 const char* map_charid2nick(int charid);
-struct map_session_data* map_charid2sd(int charid);
+map_session_data* map_charid2sd(int charid);
 
-struct map_session_data * map_id2sd(int id);
+map_session_data * map_id2sd(int id);
 struct mob_data * map_id2md(int id);
 struct npc_data * map_id2nd(int id);
 struct homun_data* map_id2hd(int id);
@@ -1138,12 +1138,12 @@ int map_eraseipport(unsigned short map, uint32 ip, uint16 port);
 int map_eraseallipport(void);
 void map_addiddb(struct block_list *);
 void map_deliddb(struct block_list *bl);
-void map_foreachpc(int (*func)(struct map_session_data* sd, va_list args), ...);
+void map_foreachpc(int (*func)(map_session_data* sd, va_list args), ...);
 void map_foreachmob(int (*func)(struct mob_data* md, va_list args), ...);
 void map_foreachnpc(int (*func)(struct npc_data* nd, va_list args), ...);
 void map_foreachregen(int (*func)(struct block_list* bl, va_list args), ...);
 void map_foreachiddb(int (*func)(struct block_list* bl, va_list args), ...);
-struct map_session_data * map_nick2sd(const char* nick, bool allow_partial);
+map_session_data * map_nick2sd(const char* nick, bool allow_partial);
 struct mob_data * map_getmob_boss(int16 m);
 struct mob_data * map_id2boss(int id);
 
@@ -1184,7 +1184,7 @@ void map_flags_init(void);
 
 bool map_iwall_exist(const char* wall_name);
 bool map_iwall_set(int16 m, int16 x, int16 y, int size, int8 dir, bool shootable, const char* wall_name);
-void map_iwall_get(struct map_session_data *sd);
+void map_iwall_get(map_session_data *sd);
 bool map_iwall_remove(const char *wall_name);
 
 int map_addmobtolist(unsigned short m, struct spawn_data *spawn);	// [Wizputer]
@@ -1221,7 +1221,7 @@ extern const char*MSG_CONF_NAME_POR;
 extern const char*MSG_CONF_NAME_THA;
 
 //Useful typedefs from jA [Skotlex]
-typedef struct map_session_data TBL_PC;
+typedef map_session_data TBL_PC;
 typedef struct npc_data         TBL_NPC;
 typedef struct mob_data         TBL_MOB;
 typedef struct flooritem_data   TBL_ITEM;
diff --git a/src/map/mob.cpp b/src/map/mob.cpp
index 2f1e6fc57b..2ccf8286d7 100644
--- a/src/map/mob.cpp
+++ b/src/map/mob.cpp
@@ -537,7 +537,7 @@ int mob_get_random_id(int type, enum e_random_monster_flags flag, int lv)
 bool mob_ksprotected (struct block_list *src, struct block_list *target)
 {
 	struct block_list *s_bl, *t_bl;
-	struct map_session_data
+	map_session_data
 		*sd,    // Source
 		*t_sd;  // Mob Target
 	struct mob_data *md;
@@ -563,7 +563,7 @@ bool mob_ksprotected (struct block_list *src, struct block_list *target)
 
 	do {
 		struct status_change_entry *sce;
-		struct map_session_data *pl_sd; // Owner
+		map_session_data *pl_sd; // Owner
 		struct map_data *mapdata = map_getmapdata(md->bl.m);
 		char output[128];
 		
@@ -662,7 +662,7 @@ struct mob_data *mob_once_spawn_sub(struct block_list *bl, int16 m, int16 x, int
 /*==========================================
  * Spawn a single mob on the specified coordinates.
  *------------------------------------------*/
-int mob_once_spawn(struct map_session_data* sd, int16 m, int16 x, int16 y, const char* mobname, int mob_id, int amount, const char* event, unsigned int size, enum mob_ai ai)
+int mob_once_spawn(map_session_data* sd, int16 m, int16 x, int16 y, const char* mobname, int mob_id, int amount, const char* event, unsigned int size, enum mob_ai ai)
 {
 	struct mob_data* md = nullptr;
 	int count, lv;
@@ -714,7 +714,7 @@ int mob_once_spawn(struct map_session_data* sd, int16 m, int16 x, int16 y, const
 /*==========================================
  * Spawn mobs in the specified area.
  *------------------------------------------*/
-int mob_once_spawn_area(struct map_session_data* sd, int16 m, int16 x0, int16 y0, int16 x1, int16 y1, const char* mobname, int mob_id, int amount, const char* event, unsigned int size, enum mob_ai ai)
+int mob_once_spawn_area(map_session_data* sd, int16 m, int16 x0, int16 y0, int16 x1, int16 y1, const char* mobname, int mob_id, int amount, const char* event, unsigned int size, enum mob_ai ai)
 {
 	int i, max, id = 0;
 	int lx = -1, ly = -1;
@@ -1994,7 +1994,7 @@ static int mob_ai_sub_hard_timer(struct block_list *bl,va_list ap)
 /*==========================================
  * Serious processing for mob in PC field of view (foreachclient)
  *------------------------------------------*/
-static int mob_ai_sub_foreachclient(struct map_session_data *sd,va_list ap)
+static int mob_ai_sub_foreachclient(map_session_data *sd,va_list ap)
 {
 	t_tick tick=va_arg(ap,t_tick);
 	map_foreachinallrange(mob_ai_sub_hard_timer,&sd->bl, AREA_SIZE+ACTIVE_AI_RANGE, BL_MOB, sd->status.char_id, tick);
@@ -2296,7 +2296,7 @@ void mob_log_damage(struct mob_data *md, struct block_list *src, int damage)
 	{
 		case BL_PC:
 		{
-			struct map_session_data *sd = (TBL_PC*)src;
+			map_session_data *sd = (TBL_PC*)src;
 			char_id = sd->status.char_id;
 			if( damage )
 				md->attacked_id = src->id;
@@ -2338,7 +2338,7 @@ void mob_log_damage(struct mob_data *md, struct block_list *src, int damage)
 			struct mob_data* md2 = (TBL_MOB*)src;
 			if( md2->special_state.ai && md2->master_id )
 			{
-				struct map_session_data* msd = map_id2sd(md2->master_id);
+				map_session_data* msd = map_id2sd(md2->master_id);
 				if( msd )
 					char_id = msd->status.char_id;
 			}
@@ -2439,7 +2439,7 @@ void mob_damage(struct mob_data *md, struct block_list *src, int damage)
 			clif_summon_hp_bar(*md);
 		}
 		for(i = 0; i < DAMAGELOG_SIZE; i++){ // must show hp bar to all char who already hit the mob.
-			struct map_session_data *sd = map_charid2sd(md->dmglog[i].id);
+			map_session_data *sd = map_charid2sd(md->dmglog[i].id);
 			if( sd && check_distance_bl(&md->bl, &sd->bl, AREA_SIZE) ) // check if in range
 				clif_monster_hp_bar(md, sd->fd);
 		}
@@ -2474,7 +2474,7 @@ int mob_getdroprate(struct block_list *src, std::shared_ptr<s_mob_db> mob, int b
 			drop_rate += (int)(0.5 + drop_rate * status_get_luk(src) * battle_config.drops_by_luk2 / 10000.);
 
 		if (src->type == BL_PC) { // Player specific drop rate adjustments
-			struct map_session_data *sd = (struct map_session_data*)src;
+			map_session_data *sd = (map_session_data*)src;
 			int drop_rate_bonus = 100;
 
 			// In PK mode players get an additional drop chance bonus of 25% if there is a 20 level difference
@@ -2532,8 +2532,8 @@ int mob_getdroprate(struct block_list *src, std::shared_ptr<s_mob_db> mob, int b
 int mob_dead(struct mob_data *md, struct block_list *src, int type)
 {
 	struct status_data *status;
-	struct map_session_data *sd = NULL, *tmpsd[DAMAGELOG_SIZE];
-	struct map_session_data *mvp_sd = NULL, *second_sd = NULL, *third_sd = NULL;
+	map_session_data *sd = NULL, *tmpsd[DAMAGELOG_SIZE];
+	map_session_data *mvp_sd = NULL, *second_sd = NULL, *third_sd = NULL;
 
 	struct {
 		struct party_data *p;
@@ -2550,7 +2550,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
 	status = &md->status;
 
 	if( src && src->type == BL_PC ) {
-		sd = (struct map_session_data *)src;
+		sd = (map_session_data *)src;
 		mvp_sd = sd;
 	}
 
@@ -2574,7 +2574,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
 	// filter out entries not eligible for exp distribution
 	memset(tmpsd,0,sizeof(tmpsd));
 	for(i = 0, count = 0, mvp_damage = 0; i < DAMAGELOG_SIZE && md->dmglog[i].id; i++) {
-		struct map_session_data* tsd = NULL;
+		map_session_data* tsd = NULL;
 		if (md->dmglog[i].flag == MDLF_SELF) {
 			//Self damage counts as exp tap
 			count++;
@@ -3405,7 +3405,7 @@ void mob_heal(struct mob_data *md,unsigned int heal)
 		}
 		for(i = 0; i < DAMAGELOG_SIZE; i++)// must show hp bar to all char who already hit the mob.
 			if( md->dmglog[i].id ) {
-				struct map_session_data *sd = map_charid2sd(md->dmglog[i].id);
+				map_session_data *sd = map_charid2sd(md->dmglog[i].id);
 				if( sd && check_distance_bl(&md->bl, &sd->bl, AREA_SIZE) ) // check if in range
 					clif_monster_hp_bar(md, sd->fd);
 			}
@@ -3994,7 +3994,7 @@ static bool mob_clone_disabled_skills(uint16 skill_id) {
 //If mode is not passed, a default aggressive mode is used.
 //If master_id is passed, clone is attached to him.
 //Returns: ID of newly crafted copy.
-int mob_clone_spawn(struct map_session_data *sd, int16 m, int16 x, int16 y, const char *event, int master_id, enum e_mode mode, int flag, unsigned int duration)
+int mob_clone_spawn(map_session_data *sd, int16 m, int16 x, int16 y, const char *event, int master_id, enum e_mode mode, int flag, unsigned int duration)
 {
 	int mob_id;
 	int inf, fd;
diff --git a/src/map/mob.hpp b/src/map/mob.hpp
index 6c280c6d3d..ad622a2888 100644
--- a/src/map/mob.hpp
+++ b/src/map/mob.hpp
@@ -319,7 +319,7 @@ struct mob_data {
 	struct view_data *vd;
 	bool vd_changed;
 	struct status_data status, *base_status; //Second one is in case of leveling up mobs, or tiny/large mobs.
-	struct status_change sc;
+	status_change sc;
 	std::shared_ptr<s_mob_db> db;	//For quick data access (saves doing mob_db(md->mob_id) all the time) [Skotlex]
 	char name[NAME_LENGTH];
 	struct s_specialState {
@@ -486,10 +486,10 @@ void mob_free_dynamic_viewdata( struct mob_data* md );
 
 struct mob_data *mob_once_spawn_sub(struct block_list *bl, int16 m, int16 x, int16 y, const char *mobname, int mob_id, const char *event, unsigned int size, enum mob_ai ai);
 
-int mob_once_spawn(struct map_session_data* sd, int16 m, int16 x, int16 y,
+int mob_once_spawn(map_session_data* sd, int16 m, int16 x, int16 y,
 	const char* mobname, int mob_id, int amount, const char* event, unsigned int size, enum mob_ai ai);
 
-int mob_once_spawn_area(struct map_session_data* sd, int16 m,
+int mob_once_spawn_area(map_session_data* sd, int16 m,
 	int16 x0, int16 y0, int16 x1, int16 y1, const char* mobname, int mob_id, int amount, const char* event, unsigned int size, enum mob_ai ai);
 
 bool mob_ksprotected (struct block_list *src, struct block_list *target);
@@ -538,7 +538,7 @@ int mob_count_sub(struct block_list *bl, va_list ap);
 
 int mob_is_clone(int mob_id);
 
-int mob_clone_spawn(struct map_session_data *sd, int16 m, int16 x, int16 y, const char *event, int master_id, enum e_mode mode, int flag, unsigned int duration);
+int mob_clone_spawn(map_session_data *sd, int16 m, int16 x, int16 y, const char *event, int master_id, enum e_mode mode, int flag, unsigned int duration);
 int mob_clone_delete(struct mob_data *md);
 
 void mob_reload_itemmob_data(void);
diff --git a/src/map/npc.cpp b/src/map/npc.cpp
index 2ad192bca6..d2bfcfe816 100644
--- a/src/map/npc.cpp
+++ b/src/map/npc.cpp
@@ -900,7 +900,7 @@ bool npc_isnear(struct block_list * bl) {
     return false;
 }
 
-int npc_ontouch_event(struct map_session_data *sd, struct npc_data *nd)
+int npc_ontouch_event(map_session_data *sd, struct npc_data *nd)
 {
 	char name[EVENT_NAME_LENGTH];
 
@@ -922,7 +922,7 @@ int npc_ontouch_event(struct map_session_data *sd, struct npc_data *nd)
 	return npc_event(sd,name,1);
 }
 
-int npc_ontouch2_event(struct map_session_data *sd, struct npc_data *nd)
+int npc_ontouch2_event(map_session_data *sd, struct npc_data *nd)
 {
 	char name[EVENT_NAME_LENGTH];
 
@@ -933,7 +933,7 @@ int npc_ontouch2_event(struct map_session_data *sd, struct npc_data *nd)
 	return npc_event(sd,name,2);
 }
 
-int npc_touch_areanpc(struct map_session_data* sd, int16 m, int16 x, int16 y, struct npc_data *nd);
+int npc_touch_areanpc(map_session_data* sd, int16 m, int16 x, int16 y, struct npc_data *nd);
 
 /*==========================================
  * Sub-function of npc_enable, runs OnTouch event when enabled
@@ -952,7 +952,7 @@ int npc_enable_sub(struct block_list *bl, va_list ap)
 	return 0;
 }
 
-bool npc_is_cloaked(struct npc_data* nd, struct map_session_data* sd) {
+bool npc_is_cloaked(struct npc_data* nd, map_session_data* sd) {
 	bool npc_cloaked = (nd->sc.option & OPTION_CLOAK) ? true : false;
 
 	if (std::find(sd->cloaked_npc.begin(), sd->cloaked_npc.end(), nd->bl.id) != sd->cloaked_npc.end())
@@ -960,17 +960,17 @@ bool npc_is_cloaked(struct npc_data* nd, struct map_session_data* sd) {
 	return npc_cloaked;
 }
 
-bool npc_is_hidden_dynamicnpc( struct npc_data& nd, struct map_session_data& tsd ){
+bool npc_is_hidden_dynamicnpc( struct npc_data& nd, map_session_data& tsd ){
 	// If the NPC is dynamic and the target character is not the owner of the dynamic NPC
 	return nd.dynamicnpc.owner_char_id != 0 && nd.dynamicnpc.owner_char_id != tsd.status.char_id;
 }
 
 static int npc_cloaked_sub(struct block_list *bl, va_list ap)
 {
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	nullpo_ret(bl);
-	nullpo_ret(sd = (struct map_session_data *)bl);
+	nullpo_ret(sd = (map_session_data *)bl);
 	int id = va_arg(ap, int);
 
 	auto it = std::find(sd->cloaked_npc.begin(), sd->cloaked_npc.end(), id);
@@ -1080,7 +1080,7 @@ struct npc_data* npc_name2id(const char* name)
  * Timer to check for idle time and timeout the dialog if necessary
  **/
 TIMER_FUNC(npc_secure_timeout_timer){
-	struct map_session_data* sd = NULL;
+	map_session_data* sd = NULL;
 	unsigned int timeout = NPC_SECURE_TIMEOUT_NEXT;
 	t_tick cur_tick = gettick(); //ensure we are on last tick
 
@@ -1120,7 +1120,7 @@ TIMER_FUNC(npc_secure_timeout_timer){
 /*==========================================
  * Dequeue event and add timer for execution (100ms)
  *------------------------------------------*/
-int npc_event_dequeue(struct map_session_data* sd,bool free_script_stack)
+int npc_event_dequeue(map_session_data* sd,bool free_script_stack)
 {
 	nullpo_ret(sd);
 
@@ -1192,7 +1192,7 @@ static int npc_event_export(struct npc_data *nd, int i)
 	return 0;
 }
 
-int npc_event_sub(struct map_session_data* sd, struct event_data* ev, const char* eventname); //[Lance]
+int npc_event_sub(map_session_data* sd, struct event_data* ev, const char* eventname); //[Lance]
 
 /**
  * Exec name (NPC events) on player or global
@@ -1421,7 +1421,7 @@ TIMER_FUNC(npc_timerevent){
 	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;
-	struct map_session_data *sd=NULL;
+	map_session_data *sd=NULL;
 
 	if( nd == NULL )
 	{
@@ -1490,7 +1490,7 @@ int npc_timerevent_start(struct npc_data* nd, int rid)
 {
 	int j;
 	t_tick tick = gettick();
-	struct map_session_data *sd = NULL; //Player to whom script is attached.
+	map_session_data *sd = NULL; //Player to whom script is attached.
 
 	nullpo_ret(nd);
 
@@ -1545,7 +1545,7 @@ int npc_timerevent_start(struct npc_data* nd, int rid)
  *------------------------------------------*/
 int npc_timerevent_stop(struct npc_data* nd)
 {
-	struct map_session_data *sd = NULL;
+	map_session_data *sd = NULL;
 	int *tid;
 
 	nullpo_ret(nd);
@@ -1583,7 +1583,7 @@ int npc_timerevent_stop(struct npc_data* nd)
 /*==========================================
  * Aborts a running NPC timer that is attached to a player.
  *------------------------------------------*/
-void npc_timerevent_quit(struct map_session_data* sd)
+void npc_timerevent_quit(map_session_data* sd)
 {
 	const struct TimerData *td;
 	struct npc_data* nd;
@@ -1669,7 +1669,7 @@ int npc_settimerevent_tick(struct npc_data* nd, int newtimer)
 {
 	bool flag;
 	int old_rid;
-	//struct map_session_data *sd = NULL;
+	//map_session_data *sd = NULL;
 
 	nullpo_ret(nd);
 
@@ -1689,7 +1689,7 @@ int npc_settimerevent_tick(struct npc_data* nd, int newtimer)
 	return 0;
 }
 
-int npc_event_sub(struct map_session_data* sd, struct event_data* ev, const char* eventname)
+int npc_event_sub(map_session_data* sd, struct event_data* ev, const char* eventname)
 {
 	if ( sd->npc_id != 0 )
 	{
@@ -1738,7 +1738,7 @@ int npc_event_sub(struct map_session_data* sd, struct event_data* ev, const char
 /*==========================================
  * NPC processing event type
  *------------------------------------------*/
-int npc_event(struct map_session_data* sd, const char* eventname, int ontouch)
+int npc_event(map_session_data* sd, const char* eventname, int ontouch)
 {
 	struct event_data* ev = (struct event_data*)strdb_get(ev_db, eventname);
 	struct npc_data *nd;
@@ -1774,7 +1774,7 @@ int npc_event(struct map_session_data* sd, const char* eventname, int ontouch)
  *------------------------------------------*/
 int npc_touch_areanpc_sub(struct block_list *bl, va_list ap)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int pc_id;
 	char *name;
 
@@ -1802,7 +1802,7 @@ int npc_touch_areanpc_sub(struct block_list *bl, va_list ap)
  * Chk if sd is still touching his assigned npc.
  * If not, it unsets it and searches for another player in range.
  *------------------------------------------*/
-int npc_touchnext_areanpc(struct map_session_data* sd, bool leavemap)
+int npc_touchnext_areanpc(map_session_data* sd, bool leavemap)
 {
 	if (sd->npc_ontouch_.empty())
 		return 0;
@@ -1840,7 +1840,7 @@ int npc_touchnext_areanpc(struct map_session_data* sd, bool leavemap)
 	return found;
 }
 
-int npc_touch_areanpc(struct map_session_data* sd, int16 m, int16 x, int16 y, struct npc_data *nd)
+int npc_touch_areanpc(map_session_data* sd, int16 m, int16 x, int16 y, struct npc_data *nd)
 {
 	nullpo_retr(0, sd);
 	nullpo_retr(0, nd);
@@ -1902,7 +1902,7 @@ int npc_touch_areanpc(struct map_session_data* sd, int16 m, int16 x, int16 y, st
 /*==========================================
  * Exec OnTouch for player if in range of area event
  *------------------------------------------*/
-int npc_touch_area_allnpc(struct map_session_data* sd, int16 m, int16 x, int16 y)
+int npc_touch_area_allnpc(map_session_data* sd, int16 m, int16 x, int16 y)
 {
 	nullpo_retr(1, sd);
 
@@ -2087,7 +2087,7 @@ int npc_check_areanpc(int flag, int16 m, int16 x, int16 y, int16 range)
  * Chk if player not too far to access the npc.
  * Returns npc_data (success) or NULL (fail).
  *------------------------------------------*/
-struct npc_data* npc_checknear(struct map_session_data* sd, struct block_list* bl)
+struct npc_data* npc_checknear(map_session_data* sd, struct block_list* bl)
 {
 	struct npc_data *nd;
 
@@ -2128,7 +2128,7 @@ int npc_globalmessage(const char* name, const char* mes)
 }
 
 // MvP tomb [GreenBox]
-void run_tomb(struct map_session_data* sd, struct npc_data* nd)
+void run_tomb(map_session_data* sd, struct npc_data* nd)
 {
 	char buffer[200];
 	char time[10];
@@ -2156,7 +2156,7 @@ void run_tomb(struct map_session_data* sd, struct npc_data* nd)
  * NPC 1st call when clicking on npc
  * Do specific action for NPC type (openshop, run scripts...)
  *------------------------------------------*/
-int npc_click(struct map_session_data* sd, struct npc_data* nd)
+int npc_click(map_session_data* sd, struct npc_data* nd)
 {
 	nullpo_retr(1, sd);
 
@@ -2236,7 +2236,7 @@ int npc_click(struct map_session_data* sd, struct npc_data* nd)
 /*==========================================
  *
  *------------------------------------------*/
-bool npc_scriptcont(struct map_session_data* sd, int id, bool closing){
+bool npc_scriptcont(map_session_data* sd, int id, bool closing){
 	struct block_list *target = map_id2bl(id);
 	struct npc_data* nd = BL_CAST( BL_NPC, target );
 
@@ -2331,7 +2331,7 @@ bool npc_scriptcont(struct map_session_data* sd, int id, bool closing){
  * @param type: 0 - Buy, 1 - Sell
  * @return 0 on success or 1 on failure
  */
-int npc_buysellsel(struct map_session_data* sd, int id, int type)
+int npc_buysellsel(map_session_data* sd, int id, int type)
 {
 	struct npc_data *nd;
 
@@ -2370,7 +2370,7 @@ int npc_buysellsel(struct map_session_data* sd, int id, int type)
  * @param sd Player data
  * @return e_CASHSHOP_ACK
  **/
-static enum e_CASHSHOP_ACK npc_cashshop_process_payment(struct npc_data *nd, int price, int points, struct map_session_data *sd) {
+static enum e_CASHSHOP_ACK npc_cashshop_process_payment(struct npc_data *nd, int price, int points, map_session_data *sd) {
 	int cost[2] = { 0, 0 };
 
 	npc_shop_currency_type(sd, nd, cost, false);
@@ -2455,7 +2455,7 @@ static enum e_CASHSHOP_ACK npc_cashshop_process_payment(struct npc_data *nd, int
  * @param item_list: List of items to purchase
  * @return clif_cashshop_ack value to display
  */
-int npc_cashshop_buylist( struct map_session_data *sd, int points, std::vector<s_npc_buy_list>& item_list ){
+int npc_cashshop_buylist( map_session_data *sd, int points, std::vector<s_npc_buy_list>& item_list ){
 	int i, j, amount, new_, w, vt;
 	t_itemid nameid;
 	struct npc_data *nd = (struct npc_data *)map_id2bl(sd->npc_shopid);
@@ -2553,7 +2553,7 @@ int npc_cashshop_buylist( struct map_session_data *sd, int points, std::vector<s
  * @param cost: Reference to cost variable
  * @param display: Display cost type to player?
  */
-void npc_shop_currency_type(struct map_session_data *sd, struct npc_data *nd, int cost[2], bool display)
+void npc_shop_currency_type(map_session_data *sd, struct npc_data *nd, int cost[2], bool display)
 {
 	nullpo_retv(sd);
 
@@ -2615,7 +2615,7 @@ void npc_shop_currency_type(struct map_session_data *sd, struct npc_data *nd, in
  * @param points: Cost of total items
  * @return clif_cashshop_ack value to display
  */
-int npc_cashshop_buy(struct map_session_data *sd, t_itemid nameid, int amount, int points)
+int npc_cashshop_buy(map_session_data *sd, t_itemid nameid, int amount, int points)
 {
 	struct npc_data *nd = (struct npc_data *)map_id2bl(sd->npc_shopid);
 	int i, price, w;
@@ -2707,7 +2707,7 @@ int npc_cashshop_buy(struct map_session_data *sd, t_itemid nameid, int amount, i
  * @param item_list: List of items
  * @param nd: Attached NPC
  */
-static int npc_buylist_sub(struct map_session_data* sd, std::vector<s_npc_buy_list>& item_list, struct npc_data* nd) {
+static int npc_buylist_sub(map_session_data* sd, std::vector<s_npc_buy_list>& item_list, struct npc_data* nd) {
 	char npc_ev[EVENT_NAME_LENGTH];
 	int key_nameid = 0, key_amount = 0;
 
@@ -2735,7 +2735,7 @@ static int npc_buylist_sub(struct map_session_data* sd, std::vector<s_npc_buy_li
  * @param item_list: List of items
  * @return result code for clif_parse_NpcBuyListSend/clif_npc_market_purchase_ack
  */
-e_purchase_result npc_buylist( struct map_session_data* sd, std::vector<s_npc_buy_list>& item_list ){
+e_purchase_result npc_buylist( map_session_data* sd, std::vector<s_npc_buy_list>& item_list ){
 	struct npc_data* nd;
 	struct npc_item_list *shop = NULL;
 	double z;
@@ -2890,7 +2890,7 @@ e_purchase_result npc_buylist( struct map_session_data* sd, std::vector<s_npc_bu
 }
 
 /// npc_selllist for script-controlled shops
-static int npc_selllist_sub(struct map_session_data* sd, int list_length, PACKET_CZ_PC_SELL_ITEMLIST_sub* item_list, struct npc_data* nd)
+static int npc_selllist_sub(map_session_data* sd, int list_length, PACKET_CZ_PC_SELL_ITEMLIST_sub* item_list, struct npc_data* nd)
 {
 	char npc_ev[EVENT_NAME_LENGTH];
 	char card_slot[NAME_LENGTH];
@@ -2974,7 +2974,7 @@ static int npc_selllist_sub(struct map_session_data* sd, int list_length, PACKET
 ///
 /// @param item_list 'n' pairs <index,amount>
 /// @return result code for clif_parse_NpcSellListSend
-uint8 npc_selllist(struct map_session_data* sd, int list_length, PACKET_CZ_PC_SELL_ITEMLIST_sub* item_list)
+uint8 npc_selllist(map_session_data* sd, int list_length, PACKET_CZ_PC_SELL_ITEMLIST_sub* item_list)
 {
 	double z;
 	int i,skill;
@@ -3083,7 +3083,7 @@ uint8 npc_selllist(struct map_session_data* sd, int list_length, PACKET_CZ_PC_SE
 	return 0;
 }
 
-e_purchase_result npc_barter_purchase( struct map_session_data& sd, std::shared_ptr<s_npc_barter> barter, std::vector<s_barter_purchase>& purchases ){
+e_purchase_result npc_barter_purchase( map_session_data& sd, std::shared_ptr<s_npc_barter> barter, std::vector<s_barter_purchase>& purchases ){
 	uint64 requiredZeny = 0;
 	uint32 requiredWeight = 0;
 	uint32 reducedWeight = 0;
@@ -3467,7 +3467,7 @@ int npc_unload(struct npc_data* nd, bool single) {
 
 		iter = mapit_geteachpc();
 		for( bl = (struct block_list*)mapit_first(iter); mapit_exists(iter); bl = (struct block_list*)mapit_next(iter) ) {
-			struct map_session_data *sd = ((TBL_PC*)bl);
+			map_session_data *sd = ((TBL_PC*)bl);
 			if( sd && sd->npc_timer_id != INVALID_TIMER ) {
 				const struct TimerData *td = get_timer(sd->npc_timer_id);
 
@@ -3525,7 +3525,7 @@ int npc_unload(struct npc_data* nd, bool single) {
 	}
 
 	if( nd->dynamicnpc.owner_char_id != 0 ){
-		struct map_session_data* owner = map_charid2sd( nd->dynamicnpc.owner_char_id );
+		map_session_data* owner = map_charid2sd( nd->dynamicnpc.owner_char_id );
 
 		if( owner != nullptr ){
 			owner->npc_id_dynamic = 0;
@@ -4446,7 +4446,7 @@ static const char* npc_parse_script(char* w1, char* w2, char* w3, char* w4, cons
 /// shop/cashshop/npc: <map name>,<x>,<y>,<facing>%TAB%duplicate(<name of target>)%TAB%<NPC Name>%TAB%<sprite id>
 /// npc: -%TAB%duplicate(<name of target>)%TAB%<NPC Name>%TAB%<sprite id>,<triggerX>,<triggerY>
 /// npc: <map name>,<x>,<y>,<facing>%TAB%duplicate(<name of target>)%TAB%<NPC Name>%TAB%<sprite id>,<triggerX>,<triggerY>
-const char* npc_parse_duplicate( char* w1, char* w2, char* w3, char* w4, const char* start, const char* buffer, const char* filepath, struct map_session_data* owner = nullptr ){
+const char* npc_parse_duplicate( char* w1, char* w2, char* w3, char* w4, const char* start, const char* buffer, const char* filepath, map_session_data* owner = nullptr ){
 	short x, y, m, xs = -1, ys = -1;
 	int16 dir;
 	char srcname[128];
@@ -4995,7 +4995,7 @@ void npc_setclass(struct npc_data* nd, short class_)
 }
 
 // @commands (script based)
-int npc_do_atcmd_event(struct map_session_data* sd, const char* command, const char* message, const char* eventname)
+int npc_do_atcmd_event(map_session_data* sd, const char* command, const char* message, const char* eventname)
 {
 	struct event_data* ev = (struct event_data*)strdb_get(ev_db, eventname);
 	struct npc_data *nd;
@@ -5698,7 +5698,7 @@ int npc_parsesrcfile(const char* filepath)
 	return 1;
 }
 
-int npc_script_event(struct map_session_data* sd, enum npce_event type){
+int npc_script_event(map_session_data* sd, enum npce_event type){
 	if (type == NPCE_MAX)
 		return 0;
 	if (!sd) {
@@ -5726,7 +5726,7 @@ int npc_script_event(struct map_session_data* sd, enum npce_event type){
  * dir: Facing direction of duplicate NPC
  * Returns duplicate NPC data on success
  */
-npc_data* npc_duplicate_npc( npc_data& nd, char name[NPC_NAME_LENGTH + 1], int16 mapid, int16 x, int16 y, int class_, uint8 dir, int16 xs, int16 ys, struct map_session_data* owner ){
+npc_data* npc_duplicate_npc( npc_data& nd, char name[NPC_NAME_LENGTH + 1], int16 mapid, int16 x, int16 y, int class_, uint8 dir, int16 xs, int16 ys, map_session_data* owner ){
 	static char w1[128], w2[128], w3[128], w4[128];
 	const char* stat_buf = "- call from duplicate subsystem -\n";
 	char exname[NPC_NAME_LENGTH + 1];
@@ -5778,7 +5778,7 @@ TIMER_FUNC(npc_dynamicnpc_removal_timer){
 
 	nd->dynamicnpc.removal_tid = INVALID_TIMER;
 
-	struct map_session_data* sd = map_charid2sd( nd->dynamicnpc.owner_char_id );
+	map_session_data* sd = map_charid2sd( nd->dynamicnpc.owner_char_id );
 
 	if( sd != nullptr ){
 		// Still talking to the NPC
@@ -5807,7 +5807,7 @@ TIMER_FUNC(npc_dynamicnpc_removal_timer){
 	return 0;
 }
 
-struct npc_data* npc_duplicate_npc_for_player( struct npc_data& nd, struct map_session_data& sd ){
+struct npc_data* npc_duplicate_npc_for_player( struct npc_data& nd, map_session_data& sd ){
 	if( sd.npc_id_dynamic != 0 ){
 		clif_msg_color( &sd, C_DYNAMICNPC_TWICE, color_table[COLOR_LIGHT_YELLOW] );
 		return nullptr;
diff --git a/src/map/npc.hpp b/src/map/npc.hpp
index 8a38fc7269..0a0c104e63 100644
--- a/src/map/npc.hpp
+++ b/src/map/npc.hpp
@@ -141,7 +141,7 @@ struct npc_data {
 	struct block_list bl;
 	struct unit_data ud; //Because they need to be able to move....
 	struct view_data vd;
-	struct status_change sc; //They can't have status changes, but.. they want the visual opt values.
+	status_change sc; //They can't have status changes, but.. they want the visual opt values.
 	struct npc_data *master_nd;
 	short class_,speed;
 	char name[NPC_NAME_LENGTH+1];// display name
@@ -1481,33 +1481,33 @@ enum e_npcv_status : uint8 {
 };
 struct view_data* npc_get_viewdata(int class_);
 int npc_chat_sub(struct block_list* bl, va_list ap);
-int npc_event_dequeue(struct map_session_data* sd,bool free_script_stack=true);
-int npc_event(struct map_session_data* sd, const char* eventname, int ontouch);
-int npc_touch_areanpc(struct map_session_data* sd, int16 m, int16 x, int16 y, struct npc_data* nd);
-int npc_touch_area_allnpc(struct map_session_data* sd, int16 m, int16 x, int16 y);
+int npc_event_dequeue(map_session_data* sd,bool free_script_stack=true);
+int npc_event(map_session_data* sd, const char* eventname, int ontouch);
+int npc_touch_areanpc(map_session_data* sd, int16 m, int16 x, int16 y, struct npc_data* nd);
+int npc_touch_area_allnpc(map_session_data* sd, int16 m, int16 x, int16 y);
 int npc_touch_areanpc2(struct mob_data *md); // [Skotlex]
 int npc_check_areanpc(int flag, int16 m, int16 x, int16 y, int16 range);
-int npc_touchnext_areanpc(struct map_session_data* sd,bool leavemap);
-int npc_click(struct map_session_data* sd, struct npc_data* nd);
-bool npc_scriptcont(struct map_session_data* sd, int id, bool closing);
-struct npc_data* npc_checknear(struct map_session_data* sd, struct block_list* bl);
-int npc_buysellsel(struct map_session_data* sd, int id, int type);
-e_purchase_result npc_buylist(struct map_session_data* sd, std::vector<s_npc_buy_list>& item_list);
-static int npc_buylist_sub(struct map_session_data* sd, std::vector<s_npc_buy_list>& item_list, struct npc_data* nd);
-uint8 npc_selllist(struct map_session_data* sd, int list_length, PACKET_CZ_PC_SELL_ITEMLIST_sub* item_list);
-e_purchase_result npc_barter_purchase( struct map_session_data& sd, std::shared_ptr<s_npc_barter> barter, std::vector<s_barter_purchase>& purchases );
+int npc_touchnext_areanpc(map_session_data* sd,bool leavemap);
+int npc_click(map_session_data* sd, struct npc_data* nd);
+bool npc_scriptcont(map_session_data* sd, int id, bool closing);
+struct npc_data* npc_checknear(map_session_data* sd, struct block_list* bl);
+int npc_buysellsel(map_session_data* sd, int id, int type);
+e_purchase_result npc_buylist(map_session_data* sd, std::vector<s_npc_buy_list>& item_list);
+static int npc_buylist_sub(map_session_data* sd, std::vector<s_npc_buy_list>& item_list, struct npc_data* nd);
+uint8 npc_selllist(map_session_data* sd, int list_length, PACKET_CZ_PC_SELL_ITEMLIST_sub* item_list);
+e_purchase_result npc_barter_purchase( map_session_data& sd, std::shared_ptr<s_npc_barter> barter, std::vector<s_barter_purchase>& purchases );
 void npc_parse_mob2(struct spawn_data* mob);
 struct npc_data* npc_add_warp(char* name, short from_mapid, short from_x, short from_y, short xs, short ys, unsigned short to_mapindex, short to_x, short to_y);
 int npc_globalmessage(const char* name,const char* mes);
 const char *npc_get_script_event_name(int npce_index);
-npc_data* npc_duplicate_npc( npc_data& nd, char name[NPC_NAME_LENGTH + 1], int16 mapid, int16 x, int16 y, int class_, uint8 dir, int16 xs, int16 ys, struct map_session_data* owner = nullptr );
-struct npc_data* npc_duplicate_npc_for_player( struct npc_data& nd, struct map_session_data& sd );
+npc_data* npc_duplicate_npc( npc_data& nd, char name[NPC_NAME_LENGTH + 1], int16 mapid, int16 x, int16 y, int class_, uint8 dir, int16 xs, int16 ys, map_session_data* owner = nullptr );
+struct npc_data* npc_duplicate_npc_for_player( struct npc_data& nd, map_session_data& sd );
 
 void npc_setcells(struct npc_data* nd);
 void npc_unsetcells(struct npc_data* nd);
 bool npc_movenpc(struct npc_data* nd, int16 x, int16 y);
-bool npc_is_cloaked(struct npc_data* nd, struct map_session_data* sd);
-bool npc_is_hidden_dynamicnpc( struct npc_data& nd, struct map_session_data& tsd );
+bool npc_is_cloaked(struct npc_data* nd, map_session_data* sd);
+bool npc_is_hidden_dynamicnpc( struct npc_data& nd, map_session_data& tsd );
 bool npc_enable_target(npc_data& nd, uint32 char_id, e_npcv_status flag);
 #define npc_enable(nd, flag) npc_enable_target(nd, 0, flag)
 void npc_setdisplayname(struct npc_data* nd, const char* newname);
@@ -1535,7 +1535,7 @@ int npc_event_doall_path(const char* event_name, const char* path);
 
 int npc_timerevent_start(struct npc_data* nd, int rid);
 int npc_timerevent_stop(struct npc_data* nd);
-void npc_timerevent_quit(struct map_session_data* sd);
+void npc_timerevent_quit(map_session_data* sd);
 t_tick npc_gettimerevent_tick(struct npc_data* nd);
 int npc_settimerevent_tick(struct npc_data* nd, int newtimer);
 int npc_remove_map(struct npc_data* nd);
@@ -1543,18 +1543,18 @@ void npc_unload_duplicates (struct npc_data* nd);
 int npc_unload(struct npc_data* nd, bool single);
 int npc_reload(void);
 void npc_read_event_script(void);
-int npc_script_event(struct map_session_data* sd, enum npce_event type);
+int npc_script_event(map_session_data* sd, enum npce_event type);
 
 int npc_duplicate4instance(struct npc_data *snd, int16 m);
 int npc_instanceinit(struct npc_data* nd);
 int npc_instancedestroy(struct npc_data* nd);
-int npc_cashshop_buy(struct map_session_data *sd, t_itemid nameid, int amount, int points);
+int npc_cashshop_buy(map_session_data *sd, t_itemid nameid, int amount, int points);
 
-void npc_shop_currency_type(struct map_session_data *sd, struct npc_data *nd, int cost[2], bool display);
+void npc_shop_currency_type(map_session_data *sd, struct npc_data *nd, int cost[2], bool display);
 
 extern struct npc_data* fake_nd;
 
-int npc_cashshop_buylist( struct map_session_data *sd, int points, std::vector<s_npc_buy_list>& item_list );
+int npc_cashshop_buylist( map_session_data *sd, int points, std::vector<s_npc_buy_list>& item_list );
 bool npc_shop_discount(struct npc_data* nd);
 
 #if PACKETVER >= 20131223
@@ -1567,7 +1567,7 @@ void npc_market_delfromsql_(const char *exname, t_itemid nameid, bool clear);
 #endif
 
 // @commands (script-based)
-int npc_do_atcmd_event(struct map_session_data* sd, const char* command, const char* message, const char* eventname);
+int npc_do_atcmd_event(map_session_data* sd, const char* command, const char* message, const char* eventname);
 
 bool npc_unloadfile( const char* path );
 
diff --git a/src/map/npc_chat.cpp b/src/map/npc_chat.cpp
index 118c50dfd4..db4b32ef8e 100644
--- a/src/map/npc_chat.cpp
+++ b/src/map/npc_chat.cpp
@@ -13,7 +13,7 @@
 #include "../common/timer.hpp"
 
 #include "mob.hpp" // struct mob_data
-#include "pc.hpp" // struct map_session_data
+#include "pc.hpp" // map_session_data
 
 /**
  *  Written by MouseJstr in a vision... (2/21/2005)
@@ -344,7 +344,7 @@ int npc_chat_sub(struct block_list* bl, va_list ap)
 	struct npc_parse* npcParse = (struct npc_parse *) nd->chatdb;
 	char* msg;
 	int len, i;
-	struct map_session_data* sd;
+	map_session_data* sd;
 	struct npc_label_list* lst;
 	struct pcrematch_set* pcreset;
 	struct pcrematch_entry* e;
@@ -355,7 +355,7 @@ int npc_chat_sub(struct block_list* bl, va_list ap)
 	
 	msg = va_arg(ap,char*);
 	len = va_arg(ap,int);
-	sd = va_arg(ap,struct map_session_data *);
+	sd = va_arg(ap,map_session_data *);
 	
 	// iterate across all active sets
 	for (pcreset = npcParse->active; pcreset != NULL; pcreset = pcreset->next)
diff --git a/src/map/party.cpp b/src/map/party.cpp
index c0dd406ecf..db3c2898f5 100644
--- a/src/map/party.cpp
+++ b/src/map/party.cpp
@@ -39,7 +39,7 @@ int party_create_byscript;
  * Fills the given party_member structure according to the sd provided.
  * Used when creating/adding people to a party. [Skotlex]
  *------------------------------------------*/
-static void party_fill_member(struct party_member* member, struct map_session_data* sd, unsigned int leader)
+static void party_fill_member(struct party_member* member, map_session_data* sd, unsigned int leader)
 {
   	member->account_id = sd->status.account_id;
 	member->char_id    = sd->status.char_id;
@@ -53,7 +53,7 @@ static void party_fill_member(struct party_member* member, struct map_session_da
 
 /// Get the member_id of a party member.
 /// Return -1 if not in party.
-int party_getmemberid(struct party_data* p, struct map_session_data* sd)
+int party_getmemberid(struct party_data* p, map_session_data* sd)
 {
 	int member_id;
 	nullpo_retr(-1, p);
@@ -70,7 +70,7 @@ int party_getmemberid(struct party_data* p, struct map_session_data* sd)
 /*==========================================
  * Request an available sd of this party
  *------------------------------------------*/
-struct map_session_data* party_getavailablesd(struct party_data *p)
+map_session_data* party_getavailablesd(struct party_data *p)
 {
 	int i;
 	nullpo_retr(NULL, p);
@@ -141,7 +141,7 @@ struct party_data* party_searchname(const char* str)
 	return p;
 }
 
-int party_create(struct map_session_data *sd,char *name,int item,int item2)
+int party_create(map_session_data *sd,char *name,int item,int item2)
 {
 	struct party_member leader;
 	char tname[NAME_LENGTH];
@@ -165,7 +165,7 @@ int party_create(struct map_session_data *sd,char *name,int item,int item2)
 
 void party_created(uint32 account_id,uint32 char_id,int fail,int party_id,char *name)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	sd = map_id2sd(account_id);
 
@@ -201,7 +201,7 @@ int party_request_info(int party_id, uint32 char_id)
  * Close trade window if party member is kicked when trade a party bound item
  * @param sd
  **/
-static void party_trade_bound_cancel(struct map_session_data *sd) {
+static void party_trade_bound_cancel(map_session_data *sd) {
 #ifdef BOUND_ITEMS
 	nullpo_retv(sd);
 	if (sd->state.isBoundTrading&(1<<BOUND_PARTY))
@@ -216,7 +216,7 @@ int party_recv_noinfo(int party_id, uint32 char_id)
 {
 	party_broken(party_id);
 	if( char_id != 0 ) { // requester
-		struct map_session_data* sd;
+		map_session_data* sd;
 
 		sd = map_charid2sd(char_id);
 
@@ -271,7 +271,7 @@ int party_recv_info(struct party* sp, uint32 char_id)
 {
 	struct party_data* p;
 	struct party_member* member;
-	struct map_session_data* sd;
+	map_session_data* sd;
 	int removed[MAX_PARTY];// member_id in old data
 	int removed_count = 0;
 	int added[MAX_PARTY];// member_id in new data
@@ -382,7 +382,7 @@ int party_recv_info(struct party* sp, uint32 char_id)
 }
 
 ///! TODO: Party invitation cross map-server through inter-server, so does with the reply.
-int party_invite(struct map_session_data *sd,struct map_session_data *tsd)
+int party_invite(map_session_data *sd,map_session_data *tsd)
 {
 	struct party_data *p;
 	int i;
@@ -452,9 +452,9 @@ int party_invite(struct map_session_data *sd,struct map_session_data *tsd)
 	return 1;
 }
 
-int party_reply_invite(struct map_session_data *sd,int party_id,int flag)
+int party_reply_invite(map_session_data *sd,int party_id,int flag)
 {
-	struct map_session_data* tsd;
+	map_session_data* tsd;
 	struct party_member member;
 
 	if( sd->party_invite != party_id ) { // forged
@@ -493,7 +493,7 @@ int party_reply_invite(struct map_session_data *sd,int party_id,int flag)
 //- Loads up party data if not in server
 //- Sets up the pointer to him
 //- Player must be authed/active and belong to a party before calling this method
-void party_member_joined(struct map_session_data *sd)
+void party_member_joined(map_session_data *sd)
 {
 	struct party_data* p = party_search(sd->status.party_id);
 	int i;
@@ -515,7 +515,7 @@ void party_member_joined(struct map_session_data *sd)
 /// flag: 0-success, 1-failure
 int party_member_added(int party_id,uint32 account_id,uint32 char_id, int flag)
 {
-	struct map_session_data *sd = map_id2sd(account_id),*sd2;
+	map_session_data *sd = map_id2sd(account_id),*sd2;
 	struct party_data *p = party_search(party_id);
 	int i;
 
@@ -570,7 +570,7 @@ int party_member_added(int party_id,uint32 account_id,uint32 char_id, int flag)
 }
 
 /// Party member 'sd' requesting kick of member with <account_id, name>.
-int party_removemember(struct map_session_data* sd, uint32 account_id, char* name)
+int party_removemember(map_session_data* sd, uint32 account_id, char* name)
 {
 	struct party_data *p;
 	int i;
@@ -597,7 +597,7 @@ int party_removemember(struct map_session_data* sd, uint32 account_id, char* nam
 	return 1;
 }
 
-int party_removemember2(struct map_session_data *sd,uint32 char_id,int party_id)
+int party_removemember2(map_session_data *sd,uint32 char_id,int party_id)
 {
 	if( sd ) {
 		if( !sd->status.party_id )
@@ -622,7 +622,7 @@ int party_removemember2(struct map_session_data *sd,uint32 char_id,int party_id)
 }
 
 /// Party member 'sd' requesting exit from party.
-int party_leave(struct map_session_data *sd)
+int party_leave(map_session_data *sd)
 {
 	struct party_data *p;
 	int i;
@@ -644,11 +644,11 @@ int party_leave(struct map_session_data *sd)
 /// Invoked (from char-server) when a party member leaves the party.
 int party_member_withdraw(int party_id, uint32 account_id, uint32 char_id, char *name, enum e_party_member_withdraw type)
 {
-	struct map_session_data* sd = map_charid2sd(char_id);
+	map_session_data* sd = map_charid2sd(char_id);
 	struct party_data* p = party_search(party_id);
 
 	if( p ) {
-		struct map_session_data* party_sd = party_getavailablesd( p );
+		map_session_data* party_sd = party_getavailablesd( p );
 
 		if( party_sd != nullptr ){
 			clif_party_withdraw( *party_sd, account_id, name, type, PARTY );
@@ -721,7 +721,7 @@ int party_broken(int party_id)
 	return 1;
 }
 
-int party_changeoption(struct map_session_data *sd,int exp,int item)
+int party_changeoption(map_session_data *sd,int exp,int item)
 {
 	nullpo_ret(sd);
 
@@ -767,7 +767,7 @@ int party_setoption(struct party_data *party, int option, int flag)
 int party_optionchanged(int party_id,uint32 account_id,int exp,int item,int flag)
 {
 	struct party_data *p;
-	struct map_session_data *sd=map_id2sd(account_id);
+	map_session_data *sd=map_id2sd(account_id);
 
 	if( (p = party_search(party_id)) == NULL)
 		return 0;
@@ -784,7 +784,7 @@ int party_optionchanged(int party_id,uint32 account_id,int exp,int item,int flag
 	return 0;
 }
 
-int party_changeleader(struct map_session_data *sd, struct map_session_data *tsd, struct party_data *p)
+int party_changeleader(map_session_data *sd, map_session_data *tsd, struct party_data *p)
 {
 	int mi, tmi;
 
@@ -882,7 +882,7 @@ int party_recv_movemap(int party_id,uint32 account_id,uint32 char_id, unsigned s
 	return 0;
 }
 
-void party_send_movemap(struct map_session_data *sd)
+void party_send_movemap(map_session_data *sd)
 {
 	struct party_data *p;
 
@@ -916,12 +916,12 @@ void party_send_movemap(struct map_session_data *sd)
 	return;
 }
 
-void party_send_levelup(struct map_session_data *sd)
+void party_send_levelup(map_session_data *sd)
 {
 	intif_party_changemap(sd,1);
 }
 
-int party_send_logout(struct map_session_data *sd)
+int party_send_logout(map_session_data *sd)
 {
 	struct party_data *p;
 	int i;
@@ -942,7 +942,7 @@ int party_send_logout(struct map_session_data *sd)
 	return 1;
 }
 
-int party_send_message(struct map_session_data *sd,const char *mes,int len)
+int party_send_message(map_session_data *sd,const char *mes,int len)
 {
 	if(sd->status.party_id == 0)
 		return 0;
@@ -964,10 +964,10 @@ int party_recv_message(int party_id,uint32 account_id,const char *mes,int len)
 	return 0;
 }
 
-int party_skill_check(struct map_session_data *sd, int party_id, uint16 skill_id, uint16 skill_lv)
+int party_skill_check(map_session_data *sd, int party_id, uint16 skill_id, uint16 skill_lv)
 {
 	struct party_data *p;
-	struct map_session_data *p_sd;
+	map_session_data *p_sd;
 	int i;
 
 	if(!party_id || (p = party_search(party_id)) == NULL)
@@ -1033,7 +1033,7 @@ TIMER_FUNC(party_send_xy_timer){
 
 		// for each member of this party
 		for( i = 0; i < MAX_PARTY; i++ ) {
-			struct map_session_data* sd = p->data[i].sd;
+			map_session_data* sd = p->data[i].sd;
 
 			if( !sd )
 				continue;
@@ -1082,7 +1082,7 @@ int party_send_xy_clear(struct party_data *p)
  **/
 void party_exp_share(struct party_data* p, struct block_list* src, t_exp base_exp, t_exp job_exp, int zeny)
 {
-	struct map_session_data* sd[MAX_PARTY];
+	map_session_data* sd[MAX_PARTY];
 	unsigned int i, c;
 #ifdef RENEWAL_EXP
 	TBL_MOB *md = BL_CAST(BL_MOB, src);
@@ -1140,7 +1140,7 @@ void party_exp_share(struct party_data* p, struct block_list* src, t_exp base_ex
 }
 
 //Does party loot. first_charid holds the charid of the player who has time priority to take the item.
-int party_share_loot(struct party_data* p, struct map_session_data* sd, struct item* item, int first_charid)
+int party_share_loot(struct party_data* p, map_session_data* sd, struct item* item, int first_charid)
 {
 	TBL_PC* target = NULL;
 	int i;
@@ -1207,7 +1207,7 @@ int party_share_loot(struct party_data* p, struct map_session_data* sd, struct i
 	return 0;
 }
 
-int party_send_dot_remove(struct map_session_data *sd)
+int party_send_dot_remove(map_session_data *sd)
 {
 	if (sd->status.party_id)
 		clif_party_xy_remove(sd);
@@ -1223,7 +1223,7 @@ int party_send_dot_remove(struct map_session_data *sd)
  */
 int party_sub_count(struct block_list *bl, va_list ap)
 {
-	struct map_session_data *sd = (TBL_PC *)bl;
+	map_session_data *sd = (TBL_PC *)bl;
 
 	if (sd->state.autotrade)
 		return 0;
@@ -1242,7 +1242,7 @@ int party_sub_count(struct block_list *bl, va_list ap)
  */
 int party_sub_count_class(struct block_list *bl, va_list ap)
 {
-	struct map_session_data *sd = (TBL_PC *)bl;
+	map_session_data *sd = (TBL_PC *)bl;
 	unsigned int mask = va_arg(ap, unsigned int);
 	unsigned int mapid_class = va_arg(ap, unsigned int);
 
@@ -1256,7 +1256,7 @@ int party_sub_count_class(struct block_list *bl, va_list ap)
 }
 
 /// Executes 'func' for each party member on the same map and in range (0:whole map)
-int party_foreachsamemap(int (*func)(struct block_list*,va_list),struct map_session_data *sd,int range,...)
+int party_foreachsamemap(int (*func)(struct block_list*,va_list),map_session_data *sd,int range,...)
 {
 	struct party_data *p;
 	int i;
@@ -1276,7 +1276,7 @@ int party_foreachsamemap(int (*func)(struct block_list*,va_list),struct map_sess
 	y1 = sd->bl.y+range;
 
 	for(i = 0; i < MAX_PARTY; i++) {
-		struct map_session_data *psd = p->data[i].sd;
+		map_session_data *psd = p->data[i].sd;
 
 		if(!psd)
 			continue;
@@ -1319,7 +1319,7 @@ static struct party_booking_ad_info* create_party_booking_data(void)
 	return pb_ad;
 }
 
-void party_booking_register(struct map_session_data *sd, short level, short mapid, short* job)
+void party_booking_register(map_session_data *sd, short level, short mapid, short* job)
 {
 	struct party_booking_ad_info *pb_ad;
 	int i;
@@ -1348,7 +1348,7 @@ void party_booking_register(struct map_session_data *sd, short level, short mapi
 	clif_PartyBookingInsertNotify(sd, pb_ad); // Notice
 }
 
-void party_booking_update(struct map_session_data *sd, short* job)
+void party_booking_update(map_session_data *sd, short* job)
 {
 	int i;
 	struct party_booking_ad_info *pb_ad;
@@ -1369,7 +1369,7 @@ void party_booking_update(struct map_session_data *sd, short* job)
 	clif_PartyBookingUpdateNotify(sd, pb_ad);
 }
 
-void party_booking_search(struct map_session_data *sd, short level, short mapid, short job, unsigned long lastindex, short resultcount)
+void party_booking_search(map_session_data *sd, short level, short mapid, short job, unsigned long lastindex, short resultcount)
 {
 	struct party_booking_ad_info *pb_ad;
 	int i, count=0;
@@ -1407,7 +1407,7 @@ void party_booking_search(struct map_session_data *sd, short level, short mapid,
 	clif_PartyBookingSearchAck(sd->fd, result_list, count, more_result);
 }
 
-bool party_booking_delete(struct map_session_data *sd)
+bool party_booking_delete(map_session_data *sd)
 {
 	struct party_booking_ad_info* pb_ad;
 
diff --git a/src/map/party.hpp b/src/map/party.hpp
index 61990460bb..e97024d8d7 100644
--- a/src/map/party.hpp
+++ b/src/map/party.hpp
@@ -9,7 +9,7 @@
 #include "../common/mmo.hpp" // struct party
 
 struct block_list;
-struct map_session_data;
+class map_session_data;
 struct party;
 struct item;
 
@@ -17,7 +17,7 @@ struct item;
 #define MAX_PARTY_BOOKING_RESULTS 10
 
 struct party_member_data {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	unsigned int hp; //For HP,x,y refreshing.
 	unsigned short x, y;
 };
@@ -54,49 +54,49 @@ void do_init_party(void);
 void do_final_party(void);
 struct party_data* party_search(int party_id);
 struct party_data* party_searchname(const char* str);
-int party_getmemberid(struct party_data* p, struct map_session_data* sd);
-struct map_session_data* party_getavailablesd(struct party_data *p);
+int party_getmemberid(struct party_data* p, map_session_data* sd);
+map_session_data* party_getavailablesd(struct party_data *p);
 
-int party_create(struct map_session_data *sd,char *name, int item, int item2);
+int party_create(map_session_data *sd,char *name, int item, int item2);
 void party_created(uint32 account_id,uint32 char_id,int fail,int party_id,char *name);
 int party_request_info(int party_id, uint32 char_id);
-int party_invite(struct map_session_data *sd,struct map_session_data *tsd);
-void party_member_joined(struct map_session_data *sd);
+int party_invite(map_session_data *sd,map_session_data *tsd);
+void party_member_joined(map_session_data *sd);
 int party_member_added(int party_id,uint32 account_id,uint32 char_id,int flag);
-int party_leave(struct map_session_data *sd);
-int party_removemember(struct map_session_data *sd,uint32 account_id,char *name);
-int party_removemember2(struct map_session_data *sd,uint32 char_id,int party_id);
+int party_leave(map_session_data *sd);
+int party_removemember(map_session_data *sd,uint32 account_id,char *name);
+int party_removemember2(map_session_data *sd,uint32 char_id,int party_id);
 int party_member_withdraw(int party_id, uint32 account_id, uint32 char_id, char *name, enum e_party_member_withdraw type);
-int party_reply_invite(struct map_session_data *sd,int party_id,int flag);
+int party_reply_invite(map_session_data *sd,int party_id,int flag);
 #define party_add_member(party_id,sd) party_reply_invite(sd,party_id,1)
 int party_recv_noinfo(int party_id, uint32 char_id);
 int party_recv_info(struct party* sp, uint32 char_id);
 int party_recv_movemap(int party_id,uint32 account_id,uint32 char_id, unsigned short map,int online,int lv);
 int party_broken(int party_id);
 int party_optionchanged(int party_id,uint32 account_id,int exp,int item,int flag);
-int party_changeoption(struct map_session_data *sd,int exp,int item);
+int party_changeoption(map_session_data *sd,int exp,int item);
 int party_setoption(struct party_data *party, int option, int flag);
-int party_changeleader(struct map_session_data *sd, struct map_session_data *t_sd, struct party_data *p);
-void party_send_movemap(struct map_session_data *sd);
-void party_send_levelup(struct map_session_data *sd);
-int party_send_logout(struct map_session_data *sd);
-int party_send_message(struct map_session_data *sd,const char *mes,int len);
+int party_changeleader(map_session_data *sd, map_session_data *t_sd, struct party_data *p);
+void party_send_movemap(map_session_data *sd);
+void party_send_levelup(map_session_data *sd);
+int party_send_logout(map_session_data *sd);
+int party_send_message(map_session_data *sd,const char *mes,int len);
 int party_recv_message(int party_id,uint32 account_id,const char *mes,int len);
-int party_skill_check(struct map_session_data *sd, int party_id, uint16 skill_id, uint16 skill_lv);
+int party_skill_check(map_session_data *sd, int party_id, uint16 skill_id, uint16 skill_lv);
 int party_send_xy_clear(struct party_data *p);
 void party_exp_share(struct party_data *p,struct block_list *src,t_exp base_exp,t_exp job_exp,int zeny);
-int party_share_loot(struct party_data* p, struct map_session_data* sd, struct item* item, int first_charid);
-int party_send_dot_remove(struct map_session_data *sd);
+int party_share_loot(struct party_data* p, map_session_data* sd, struct item* item, int first_charid);
+int party_send_dot_remove(map_session_data *sd);
 int party_sub_count(struct block_list *bl, va_list ap);
 int party_sub_count_class(struct block_list *bl, va_list ap);
-int party_foreachsamemap(int (*func)(struct block_list *,va_list),struct map_session_data *sd,int range,...);
+int party_foreachsamemap(int (*func)(struct block_list *,va_list),map_session_data *sd,int range,...);
 
 /*==========================================
  * Party Booking in KRO [Spiria]
  *------------------------------------------*/
-void party_booking_register(struct map_session_data *sd, short level, short mapid, short* job);
-void party_booking_update(struct map_session_data *sd, short* job);
-void party_booking_search(struct map_session_data *sd, short level, short mapid, short job, unsigned long lastindex, short resultcount);
-bool party_booking_delete(struct map_session_data *sd);
+void party_booking_register(map_session_data *sd, short level, short mapid, short* job);
+void party_booking_update(map_session_data *sd, short* job);
+void party_booking_search(map_session_data *sd, short level, short mapid, short job, unsigned long lastindex, short resultcount);
+bool party_booking_delete(map_session_data *sd);
 
 #endif /* PARTY_HPP */
diff --git a/src/map/pc.cpp b/src/map/pc.cpp
index de76637c38..211259ab5e 100755
--- a/src/map/pc.cpp
+++ b/src/map/pc.cpp
@@ -73,7 +73,7 @@ CaptchaDatabase captcha_db;
 const char *macro_allowed_answer_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
 
 int pc_split_atoui(char* str, unsigned int* val, char sep, int max);
-static inline bool pc_attendance_rewarded_today( struct map_session_data* sd );
+static inline bool pc_attendance_rewarded_today( map_session_data* sd );
 
 #define PVP_CALCRANK_INTERVAL 1000	// PVP calculation interval
 
@@ -666,7 +666,7 @@ void pc_set_reg_load( bool val ){
 
 /**
  * Item Cool Down Delay Saving
- * Struct item_cd is not a member of struct map_session_data
+ * Struct item_cd is not a member of map_session_data
  * to keep cooldowns in memory between player log-ins.
  * All cooldowns are reset when server is restarted.
  **/
@@ -694,7 +694,7 @@ int pc_class2idx(int class_) {
 * @param sd
 * @return Group ID
 */
-int pc_get_group_id(struct map_session_data *sd) {
+int pc_get_group_id(map_session_data *sd) {
 	return sd->group_id;
 }
 
@@ -702,7 +702,7 @@ int pc_get_group_id(struct map_session_data *sd) {
 * @param sd
 * @return Group Level
 */
-int pc_get_group_level(struct map_session_data *sd) {
+int pc_get_group_level(map_session_data *sd) {
 	return sd->group->level;
 }
 
@@ -755,9 +755,9 @@ void pc_delete_bg_queue_timer(map_session_data *sd) {
 }
 
 static TIMER_FUNC(pc_invincible_timer){
-	struct map_session_data *sd;
+	map_session_data *sd;
 
-	if( (sd=(struct map_session_data *)map_id2sd(id)) == NULL || sd->bl.type!=BL_PC )
+	if( (sd=(map_session_data *)map_id2sd(id)) == NULL || sd->bl.type!=BL_PC )
 		return 1;
 
 	if(sd->invincible_timer != tid){
@@ -770,7 +770,7 @@ static TIMER_FUNC(pc_invincible_timer){
 	return 0;
 }
 
-void pc_setinvincibletimer(struct map_session_data* sd, int val) {
+void pc_setinvincibletimer(map_session_data* sd, int val) {
 	nullpo_retv(sd);
 
 	if( sd->invincible_timer != INVALID_TIMER )
@@ -778,7 +778,7 @@ void pc_setinvincibletimer(struct map_session_data* sd, int val) {
 	sd->invincible_timer = add_timer(gettick()+val,pc_invincible_timer,sd->bl.id,0);
 }
 
-void pc_delinvincibletimer(struct map_session_data* sd)
+void pc_delinvincibletimer(map_session_data* sd)
 {
 	nullpo_retv(sd);
 
@@ -791,10 +791,10 @@ void pc_delinvincibletimer(struct map_session_data* sd)
 }
 
 static TIMER_FUNC(pc_spiritball_timer){
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int i;
 
-	if( (sd=(struct map_session_data *)map_id2sd(id)) == NULL || sd->bl.type!=BL_PC )
+	if( (sd=(map_session_data *)map_id2sd(id)) == NULL || sd->bl.type!=BL_PC )
 		return 1;
 
 	if( sd->spiritball <= 0 )
@@ -827,7 +827,7 @@ static TIMER_FUNC(pc_spiritball_timer){
 * @param interval
 * @param max
 */
-void pc_addspiritball(struct map_session_data *sd,int interval,int max)
+void pc_addspiritball(map_session_data *sd,int interval,int max)
 {
 	int tid;
 	uint8 i;
@@ -867,7 +867,7 @@ void pc_addspiritball(struct map_session_data *sd,int interval,int max)
 * @param count
 * @param type 1 = doesn't give client effect
 */
-void pc_delspiritball(struct map_session_data *sd,int count,int type)
+void pc_delspiritball(map_session_data *sd,int count,int type)
 {
 	uint8 i;
 
@@ -970,7 +970,7 @@ int pc_delsoulball(map_session_data *sd, int count, bool type)
 * @param sd: Player data
 * @param amount: Amount to add
 */
-void pc_addservantball( struct map_session_data& sd, int count ){
+void pc_addservantball( map_session_data& sd, int count ){
 	sd.servantball = cap_value( sd.servantball + count, 0, MAX_SERVANTBALL );
 
 	clif_servantball( sd );
@@ -981,7 +981,7 @@ void pc_addservantball( struct map_session_data& sd, int count ){
 * @param sd: Player data
 * @param count: Amount to remove
 */
-void pc_delservantball( struct map_session_data& sd, int count ){
+void pc_delservantball( map_session_data& sd, int count ){
 	sd.servantball = cap_value( sd.servantball - count, 0, MAX_SERVANTBALL );
 
 	clif_servantball( sd );
@@ -992,7 +992,7 @@ void pc_delservantball( struct map_session_data& sd, int count ){
 * @param sd: Player data
 * @param amount: Amount to add
 */
-void pc_addabyssball( struct map_session_data& sd, int count ){
+void pc_addabyssball( map_session_data& sd, int count ){
 	sd.abyssball = cap_value( sd.abyssball + count, 0, MAX_ABYSSBALL );
 
 	clif_abyssball( sd );
@@ -1003,7 +1003,7 @@ void pc_addabyssball( struct map_session_data& sd, int count ){
 * @param sd: Player data
 * @param count: Amount to remove
 */
-void pc_delabyssball( struct map_session_data& sd, int count ){
+void pc_delabyssball( map_session_data& sd, int count ){
 	sd.abyssball = cap_value( sd.abyssball - count, 0, MAX_ABYSSBALL );
 
 	clif_abyssball( sd );
@@ -1076,7 +1076,7 @@ unsigned char pc_famerank(uint32 char_id, int job)
 * @param sd
 * @param type Restart type: 1 - Normal Resurection
 */
-void pc_setrestartvalue(struct map_session_data *sd, char type) {
+void pc_setrestartvalue(map_session_data *sd, char type) {
 	struct status_data *status, *b_status;
 	nullpo_retv(sd);
 
@@ -1108,7 +1108,7 @@ void pc_setrestartvalue(struct map_session_data *sd, char type) {
  * @return false - failure, true - success
  */
 TIMER_FUNC(pc_inventory_rental_end){
-	struct map_session_data *sd = map_id2sd(id);
+	map_session_data *sd = map_id2sd(id);
 
 	if( sd == NULL )
 		return 0;
@@ -1125,7 +1125,7 @@ TIMER_FUNC(pc_inventory_rental_end){
  * Removes the rental timer from the player
  * @param sd: Player data
  */
-void pc_inventory_rental_clear(struct map_session_data *sd)
+void pc_inventory_rental_clear(map_session_data *sd)
 {
 	if( sd->rental_timer != INVALID_TIMER ) {
 		delete_timer(sd->rental_timer, pc_inventory_rental_end);
@@ -1137,7 +1137,7 @@ void pc_inventory_rental_clear(struct map_session_data *sd)
  * Check for items in the player's inventory that are rental type
  * @param sd: Player data
  */
-void pc_inventory_rentals(struct map_session_data *sd)
+void pc_inventory_rentals(map_session_data *sd)
 {
 	int i, c = 0;
 	unsigned int next_tick = UINT_MAX;
@@ -1172,7 +1172,7 @@ void pc_inventory_rentals(struct map_session_data *sd)
  * @param sd: Player data
  * @param seconds: Rental time
  */
-void pc_inventory_rental_add(struct map_session_data *sd, unsigned int seconds)
+void pc_inventory_rental_add(map_session_data *sd, unsigned int seconds)
 {
 	t_tick tick = seconds * 1000;
 
@@ -1198,7 +1198,7 @@ void pc_inventory_rental_add(struct map_session_data *sd, unsigned int seconds)
  * @param shoptype: NPC's sub type see enum npc_subtype
  * @return bool 'true' is sellable, 'false' otherwise
  */
-bool pc_can_sell_item(struct map_session_data *sd, struct item *item, enum npc_subtype shoptype) {
+bool pc_can_sell_item(map_session_data *sd, struct item *item, enum npc_subtype shoptype) {
 	if (sd == NULL || item == NULL)
 		return false;
 
@@ -1256,7 +1256,7 @@ bool pc_can_sell_item(struct map_session_data *sd, struct item *item, enum npc_s
 /**
  * Determines if player can give / drop / trade / vend items
  */
-bool pc_can_give_items(struct map_session_data *sd)
+bool pc_can_give_items(map_session_data *sd)
 {
 	return pc_has_permission(sd, PC_PERM_TRADE);
 }
@@ -1264,7 +1264,7 @@ bool pc_can_give_items(struct map_session_data *sd)
 /**
  * Determines if player can give / drop / trade / vend bounded items
  */
-bool pc_can_give_bounded_items(struct map_session_data *sd)
+bool pc_can_give_bounded_items(map_session_data *sd)
 {
 	return pc_has_permission(sd, PC_PERM_TRADE_BOUNDED);
 }
@@ -1291,7 +1291,7 @@ bool pc_can_trade_item(map_session_data *sd, int index) {
  * Prepares character for saving.
  * @param sd
  *------------------------------------------*/
-void pc_makesavestatus(struct map_session_data *sd) {
+void pc_makesavestatus(map_session_data *sd) {
 	nullpo_retv(sd);
 
 	if(!battle_config.save_clothcolor)
@@ -1346,7 +1346,7 @@ void pc_makesavestatus(struct map_session_data *sd) {
 /*==========================================
  * Off init ? Connection?
  *------------------------------------------*/
-void pc_setnewpc(struct map_session_data *sd, uint32 account_id, uint32 char_id, int login_id1, t_tick client_tick, int sex, int fd) {
+void pc_setnewpc(map_session_data *sd, uint32 account_id, uint32 char_id, int login_id1, t_tick client_tick, int sex, int fd) {
 	nullpo_retv(sd);
 
 	sd->bl.id = account_id;
@@ -1369,7 +1369,7 @@ void pc_setnewpc(struct map_session_data *sd, uint32 account_id, uint32 char_id,
 * @param sd
 * @param id
 */
-int pc_equippoint_sub(struct map_session_data *sd,struct item_data* id){
+int pc_equippoint_sub(map_session_data *sd,struct item_data* id){
 	int ep = 0;
 
 	nullpo_ret(sd);
@@ -1395,7 +1395,7 @@ int pc_equippoint_sub(struct map_session_data *sd,struct item_data* id){
 * @param sd
 * @param n Equip index in inventory
 */
-int pc_equippoint(struct map_session_data *sd,int n){
+int pc_equippoint(map_session_data *sd,int n){
 	nullpo_ret(sd);
 
 	return pc_equippoint_sub(sd,sd->inventory_data[n]);
@@ -1406,7 +1406,7 @@ int pc_equippoint(struct map_session_data *sd,int n){
  * @param sd : player session
  * @return 0 sucess, 1:invalid sd
  */
-void pc_setinventorydata(struct map_session_data *sd)
+void pc_setinventorydata(map_session_data *sd)
 {
 	uint8 i;
 	nullpo_retv(sd);
@@ -1421,7 +1421,7 @@ void pc_setinventorydata(struct map_session_data *sd)
 * 'Calculates' weapon type
 * @param sd : Player
 */
-void pc_calcweapontype(struct map_session_data *sd)
+void pc_calcweapontype(map_session_data *sd)
 {
 	nullpo_retv(sd);
 
@@ -1467,7 +1467,7 @@ void pc_calcweapontype(struct map_session_data *sd)
 * Set equip index
 * @param sd : Player
 */
-void pc_setequipindex(struct map_session_data *sd)
+void pc_setequipindex(map_session_data *sd)
 {
 	uint16 i;
 
@@ -1512,7 +1512,7 @@ void pc_setequipindex(struct map_session_data *sd)
 	pc_calcweapontype(sd);
 }
 
-//static int pc_isAllowedCardOn(struct map_session_data *sd,int s,int eqindex,int flag)
+//static int pc_isAllowedCardOn(map_session_data *sd,int s,int eqindex,int flag)
 //{
 //	int i;
 //	struct item *item = &sd->inventory.u.items_inventory[eqindex];
@@ -1538,7 +1538,7 @@ void pc_setequipindex(struct map_session_data *sd)
  * @param nameid : itemid
  * @return 1:yes, 0:no
  */
-bool pc_isequipped(struct map_session_data *sd, t_itemid nameid)
+bool pc_isequipped(map_session_data *sd, t_itemid nameid)
 {
 	uint8 i;
 
@@ -1577,7 +1577,7 @@ bool pc_isequipped(struct map_session_data *sd, t_itemid nameid)
  *         ADOPT_LEVEL_70 - Parents need to be level 70+ (client message)
  *         ADOPT_MARRIED - Cannot adopt a married person (client message)
  */
-enum adopt_responses pc_try_adopt(struct map_session_data *p1_sd, struct map_session_data *p2_sd, struct map_session_data *b_sd)
+enum adopt_responses pc_try_adopt(map_session_data *p1_sd, map_session_data *p2_sd, map_session_data *b_sd)
 {
 	if( !p1_sd || !p2_sd || !b_sd )
 		return ADOPT_CHARACTER_NOT_FOUND;
@@ -1627,7 +1627,7 @@ enum adopt_responses pc_try_adopt(struct map_session_data *p1_sd, struct map_ses
 /*==========================================
  * Adoption Process
  *------------------------------------------*/
-bool pc_adoption(struct map_session_data *p1_sd, struct map_session_data *p2_sd, struct map_session_data *b_sd)
+bool pc_adoption(map_session_data *p1_sd, map_session_data *p2_sd, map_session_data *b_sd)
 {
 	int job, joblevel;
 	t_exp jobexp;
@@ -1676,7 +1676,7 @@ bool pc_adoption(struct map_session_data *p1_sd, struct map_session_data *p2_sd,
 	return false; // Job Change Fail
 }
 
-static bool pc_job_can_use_item( struct map_session_data* sd, struct item_data* item ){
+static bool pc_job_can_use_item( map_session_data* sd, struct item_data* item ){
 	nullpo_retr( false, sd );
 	nullpo_retr( false, item );
 
@@ -1709,7 +1709,7 @@ static bool pc_job_can_use_item( struct map_session_data* sd, struct item_data*
 		[Haru] for third-classes extension
 		[Cydh] finishing :D
  *------------------------------------------*/
-static bool pc_isItemClass (struct map_session_data *sd, struct item_data* item) {
+static bool pc_isItemClass (map_session_data *sd, struct item_data* item) {
 	while (1) {
 		if (item->class_upper&ITEMJ_NORMAL && !(sd->class_&(JOBL_UPPER|JOBL_BABY|JOBL_THIRD|JOBL_FOURTH)))	//normal classes (no upper, no baby, no third, no fourth)
 			break;
@@ -1755,7 +1755,7 @@ static bool pc_isItemClass (struct map_session_data *sd, struct item_data* item)
  * @param n Item index in inventory
  * @return ITEM_EQUIP_ACK_OK(0) if can be equipped, or ITEM_EQUIP_ACK_FAIL(1)/ITEM_EQUIP_ACK_FAILLEVEL(2) if can't
  *------------------------------------------------*/
-uint8 pc_isequip(struct map_session_data *sd,int n)
+uint8 pc_isequip(map_session_data *sd,int n)
 {
 	struct item_data *item;
 
@@ -1874,7 +1874,7 @@ uint8 pc_isequip(struct map_session_data *sd,int n)
  * No problem with the session id
  * set the status that has been sent from char server
  *------------------------------------------*/
-bool pc_authok(struct map_session_data *sd, uint32 login_id2, time_t expiration_time, int group_id, struct mmo_charstatus *st, bool changing_mapservers)
+bool pc_authok(map_session_data *sd, uint32 login_id2, time_t expiration_time, int group_id, struct mmo_charstatus *st, bool changing_mapservers)
 {
 	t_tick tick = gettick();
 	uint32 ip = session[sd->fd]->client_addr;
@@ -2102,7 +2102,7 @@ bool pc_authok(struct map_session_data *sd, uint32 login_id2, time_t expiration_
 /*==========================================
  * Closes a connection because it failed to be authenticated from the char server.
  *------------------------------------------*/
-void pc_authfail(struct map_session_data *sd)
+void pc_authfail(map_session_data *sd)
 {
 	clif_authfail_fd(sd->fd, 0);
 	return;
@@ -2115,7 +2115,7 @@ void pc_authfail(struct map_session_data *sd)
  * @param bl : target bl
  * @return false:failed, true:success
  */
-bool pc_set_hate_mob(struct map_session_data *sd, int pos, struct block_list *bl)
+bool pc_set_hate_mob(map_session_data *sd, int pos, struct block_list *bl)
 {
 	int class_;
 	if (!sd || !bl || pos < 0 || pos > 2)
@@ -2145,7 +2145,7 @@ bool pc_set_hate_mob(struct map_session_data *sd, int pos, struct block_list *bl
  * We didn't receive item information at this point so DO NOT attempt to do item operations here.
  * See intif_parse_StorageReceived() for item operations [lighta]
  *------------------------------------------*/
-void pc_reg_received(struct map_session_data *sd)
+void pc_reg_received(map_session_data *sd)
 {
 	uint8 i;
 
@@ -2308,7 +2308,7 @@ void pc_reg_received(struct map_session_data *sd)
 	channel_autojoin(sd);
 }
 
-static int pc_calc_skillpoint(struct map_session_data* sd)
+static int pc_calc_skillpoint(map_session_data* sd)
 {
 	uint16 i, skill_point = 0;
 
@@ -2333,7 +2333,7 @@ static int pc_calc_skillpoint(struct map_session_data* sd)
 	return skill_point;
 }
 
-static bool pc_grant_allskills(struct map_session_data *sd, bool addlv) {
+static bool pc_grant_allskills(map_session_data *sd, bool addlv) {
 	if (!sd || !pc_has_permission(sd, PC_PERM_ALL_SKILL))
 		return false;
 
@@ -2391,7 +2391,7 @@ static bool pc_grant_allskills(struct map_session_data *sd, bool addlv) {
  * Calculation of skill level.
  * @param sd
  *------------------------------------------*/
-void pc_calc_skilltree(struct map_session_data *sd)
+void pc_calc_skilltree(map_session_data *sd)
 {
 	nullpo_retv(sd);
 
@@ -2592,7 +2592,7 @@ void pc_calc_skilltree(struct map_session_data *sd)
 }
 
 //Checks if you can learn a new skill after having leveled up a skill.
-static void pc_check_skilltree(struct map_session_data *sd)
+static void pc_check_skilltree(map_session_data *sd)
 {
 	int flag = 0;
 
@@ -2667,7 +2667,7 @@ static void pc_check_skilltree(struct map_session_data *sd)
 
 // Make sure all the skills are in the correct condition
 // before persisting to the backend.. [MouseJstr]
-void pc_clean_skilltree(struct map_session_data *sd)
+void pc_clean_skilltree(map_session_data *sd)
 {
 	uint16 i;
 	for (i = 0; i < MAX_SKILL; i++){
@@ -2683,7 +2683,7 @@ void pc_clean_skilltree(struct map_session_data *sd)
 	}
 }
 
-uint64 pc_calc_skilltree_normalize_job_sub( struct map_session_data *sd ){
+uint64 pc_calc_skilltree_normalize_job_sub( map_session_data *sd ){
 	int skill_point = pc_calc_skillpoint( sd );
 
 	if( sd->class_ & MAPID_SUMMONER ){
@@ -2779,7 +2779,7 @@ uint64 pc_calc_skilltree_normalize_job_sub( struct map_session_data *sd ){
 	return sd->class_;
 }
 
-uint64 pc_calc_skilltree_normalize_job( struct map_session_data *sd ){
+uint64 pc_calc_skilltree_normalize_job( map_session_data *sd ){
 	if( !battle_config.skillup_limit || pc_has_permission( sd, PC_PERM_ALL_SKILL ) ){
 		return sd->class_;
 	}
@@ -2809,7 +2809,7 @@ uint64 pc_calc_skilltree_normalize_job( struct map_session_data *sd ){
  * 2: overweight 90%
  * It's assumed that SC_WEIGHT50 and SC_WEIGHT90 are only started/stopped here.
  */
-void pc_updateweightstatus(struct map_session_data *sd)
+void pc_updateweightstatus(map_session_data *sd)
 {
 	int old_overweight;
 	int new_overweight;
@@ -2842,7 +2842,7 @@ void pc_updateweightstatus(struct map_session_data *sd)
 	sd->regen.state.overweight = new_overweight;
 }
 
-int pc_disguise(struct map_session_data *sd, int class_)
+int pc_disguise(map_session_data *sd, int class_)
 {
 	if (!class_ && !sd->disguise)
 		return 0;
@@ -3225,7 +3225,7 @@ bool pc_addautobonus(std::vector<std::shared_ptr<s_autobonus>> &bonus, const cha
  * @param bonus: Autobonus array
  * @param restore: Run script on clearing or not
  */
-void pc_delautobonus(struct map_session_data &sd, std::vector<std::shared_ptr<s_autobonus>> &bonus, bool restore){
+void pc_delautobonus(map_session_data &sd, std::vector<std::shared_ptr<s_autobonus>> &bonus, bool restore){
 	std::vector<std::shared_ptr<s_autobonus>>::iterator it = bonus.begin();
 
 	while( it != bonus.end() ){
@@ -3262,7 +3262,7 @@ void pc_delautobonus(struct map_session_data &sd, std::vector<std::shared_ptr<s_
  * @param sd: Player data
  * @param autobonus: Autobonus to run
  */
-void pc_exeautobonus(struct map_session_data &sd, std::vector<std::shared_ptr<s_autobonus>> *bonus, std::shared_ptr<s_autobonus> autobonus)
+void pc_exeautobonus(map_session_data &sd, std::vector<std::shared_ptr<s_autobonus>> *bonus, std::shared_ptr<s_autobonus> autobonus)
 {
 	if (autobonus->active != INVALID_TIMER)
 		delete_timer(autobonus->active, pc_endautobonus);
@@ -3288,7 +3288,7 @@ void pc_exeautobonus(struct map_session_data &sd, std::vector<std::shared_ptr<s_
  * Remove autobonus timer from player
  */
 TIMER_FUNC(pc_endautobonus){
-	struct map_session_data *sd = map_id2sd(id);
+	map_session_data *sd = map_id2sd(id);
 	std::vector<std::shared_ptr<s_autobonus>> *bonus = (std::vector<std::shared_ptr<s_autobonus>> *)data;
 
 	nullpo_ret(sd);
@@ -3312,7 +3312,7 @@ TIMER_FUNC(pc_endautobonus){
  * @param rate: Success chance
  * @param flag: Battle flag
  */
-static void pc_bonus_addele(struct map_session_data* sd, unsigned char ele, short rate, short flag)
+static void pc_bonus_addele(map_session_data* sd, unsigned char ele, short rate, short flag)
 {
 	nullpo_retv(sd);
 
@@ -3360,7 +3360,7 @@ static void pc_bonus_addele(struct map_session_data* sd, unsigned char ele, shor
  * @param rate: Success chance
  * @param flag: Battle flag
  */
-static void pc_bonus_subele(struct map_session_data* sd, unsigned char ele, short rate, short flag)
+static void pc_bonus_subele(map_session_data* sd, unsigned char ele, short rate, short flag)
 {
 	nullpo_retv(sd);
 
@@ -3406,7 +3406,7 @@ static void pc_bonus_subele(struct map_session_data* sd, unsigned char ele, shor
  * @param rate: Success chance
  * @param flag: Battle flag
 */
-static void pc_bonus_subrace(struct map_session_data* sd, unsigned char race, short rate, short flag)
+static void pc_bonus_subrace(map_session_data* sd, unsigned char race, short rate, short flag)
 {
 	if (sd->subrace3.size() == MAX_PC_BONUS) {
 		ShowWarning("pc_bonus_subrace: Reached max (%d) number of resist race damage bonuses per character!\n", MAX_PC_BONUS);
@@ -3525,7 +3525,7 @@ static void pc_bonus_addvanish(std::vector<s_vanish_bonus> &bonus, int16 rate, i
  * @param type Bonus type used by bBonusName
  * @param val Value that usually for rate or fixed value
  *------------------------------------------*/
-void pc_bonus(struct map_session_data *sd,int type,int val)
+void pc_bonus(map_session_data *sd,int type,int val)
 {
 	struct status_data *status;
 	int bonus;
@@ -4282,7 +4282,7 @@ void pc_bonus(struct map_session_data *sd,int type,int val)
  * @param type2
  * @param val Value that usually for rate or fixed value
  *------------------------------------------*/
-void pc_bonus2(struct map_session_data *sd,int type,int type2,int val)
+void pc_bonus2(map_session_data *sd,int type,int type2,int val)
 {
 	nullpo_retv(sd);
 
@@ -4914,7 +4914,7 @@ void pc_bonus2(struct map_session_data *sd,int type,int type2,int val)
  * @param type3
  * @param val Value that usually for rate or fixed value
  */
-void pc_bonus3(struct map_session_data *sd,int type,int type2,int type3,int val)
+void pc_bonus3(map_session_data *sd,int type,int type2,int type3,int val)
 {
 	nullpo_retv(sd);
 
@@ -5055,7 +5055,7 @@ void pc_bonus3(struct map_session_data *sd,int type,int type2,int type3,int val)
  * @param type4
  * @param val Value that usually for rate or fixed value
  */
-void pc_bonus4(struct map_session_data *sd,int type,int type2,int type3,int type4,int val)
+void pc_bonus4(map_session_data *sd,int type,int type2,int type3,int type4,int val)
 {
 	nullpo_retv(sd);
 
@@ -5138,7 +5138,7 @@ void pc_bonus4(struct map_session_data *sd,int type,int type2,int type3,int type
 * @param type4
 * @param val Value that usually for rate or fixed value
 */
-void pc_bonus5(struct map_session_data *sd,int type,int type2,int type3,int type4,int type5,int val)
+void pc_bonus5(map_session_data *sd,int type,int type2,int type3,int type4,int type5,int val)
 {
 	nullpo_retv(sd);
 
@@ -5185,7 +5185,7 @@ void pc_bonus5(struct map_session_data *sd,int type,int type2,int type3,int type
  *	2 - Like 1, except the level granted can stack with previously learned level.
  *	4 - Like 0, except the skill will ignore skill tree (saves through job changes and resets).
  *------------------------------------------*/
-bool pc_skill(struct map_session_data* sd, uint16 skill_id, int level, enum e_addskill_type type) {
+bool pc_skill(map_session_data* sd, uint16 skill_id, int level, enum e_addskill_type type) {
 	uint16 idx = 0;
 	nullpo_ret(sd);
 
@@ -5346,7 +5346,7 @@ bool pc_skill_plagiarism_reset(map_session_data &sd, uint8 type)
 /*==========================================
  * Append a card to an item ?
  *------------------------------------------*/
-int pc_insert_card(struct map_session_data* sd, int idx_card, int idx_equip)
+int pc_insert_card(map_session_data* sd, int idx_card, int idx_equip)
 {
 	nullpo_ret(sd);
 
@@ -5415,7 +5415,7 @@ int pc_insert_card(struct map_session_data* sd, int idx_card, int idx_equip)
  * @param identify_item: Whether or not to identify any unidentified items
  * @return Unidentified items count
  */
-int pc_identifyall(struct map_session_data *sd, bool identify_item)
+int pc_identifyall(map_session_data *sd, bool identify_item)
 {
 	int unidentified_count = 0;
 
@@ -5439,7 +5439,7 @@ int pc_identifyall(struct map_session_data *sd, bool identify_item)
 /*==========================================
  * Update buying value by skills
  *------------------------------------------*/
-int pc_modifybuyvalue(struct map_session_data *sd,int orig_value)
+int pc_modifybuyvalue(map_session_data *sd,int orig_value)
 {
 	int skill,val = orig_value,rate1 = 0,rate2 = 0;
 	if((skill=pc_checkskill(sd,MC_DISCOUNT))>0)	// merchant discount
@@ -5458,7 +5458,7 @@ int pc_modifybuyvalue(struct map_session_data *sd,int orig_value)
 /*==========================================
  * Update selling value by skills
  *------------------------------------------*/
-int pc_modifysellvalue(struct map_session_data *sd,int orig_value)
+int pc_modifysellvalue(map_session_data *sd,int orig_value)
 {
 	int skill,val = orig_value,rate = 0;
 	if((skill=pc_checkskill(sd,MC_OVERCHARGE))>0)	//OverCharge
@@ -5479,7 +5479,7 @@ int pc_modifysellvalue(struct map_session_data *sd,int orig_value)
  * @param amount
  * @return e_chkitem_result
  *------------------------------------------*/
-char pc_checkadditem(struct map_session_data *sd, t_itemid nameid, int amount)
+char pc_checkadditem(map_session_data *sd, t_itemid nameid, int amount)
 {
 	int i;
 	struct item_data* data;
@@ -5522,7 +5522,7 @@ char pc_checkadditem(struct map_session_data *sd, t_itemid nameid, int amount)
  * @param sd
  * @return Number of empty slots
  *------------------------------------------*/
-uint8 pc_inventoryblank(struct map_session_data *sd)
+uint8 pc_inventoryblank(map_session_data *sd)
 {
 	uint16 i;
 	uint8 b;
@@ -5545,7 +5545,7 @@ uint8 pc_inventoryblank(struct map_session_data *sd)
  * @param tsd: (optional) From who to log (if null take sd)
  * @return 0: Success, 1: Failed (Removing negative Zeny or not enough Zeny), 2: Player not found
  */
-char pc_payzeny(struct map_session_data *sd, int zeny, enum e_log_pick_type type, struct map_session_data *tsd)
+char pc_payzeny(map_session_data *sd, int zeny, enum e_log_pick_type type, map_session_data *tsd)
 {
 	nullpo_retr(2,sd);
 
@@ -5580,7 +5580,7 @@ char pc_payzeny(struct map_session_data *sd, int zeny, enum e_log_pick_type type
  * @param tsd: (optional) From who to log (if null take sd)
  * @return -1: Player not found, 0: Success, 1: Giving negative Zeny
  */
-char pc_getzeny(struct map_session_data *sd, int zeny, enum e_log_pick_type type, struct map_session_data *tsd)
+char pc_getzeny(map_session_data *sd, int zeny, enum e_log_pick_type type, map_session_data *tsd)
 {
 	nullpo_retr(-1,sd);
 
@@ -5618,7 +5618,7 @@ char pc_getzeny(struct map_session_data *sd, int zeny, enum e_log_pick_type type
  * @param type: Log type
  * @return -1: Not enough points, otherwise success (cash+points)
  */
-int pc_paycash(struct map_session_data *sd, int price, int points, e_log_pick_type type)
+int pc_paycash(map_session_data *sd, int price, int points, e_log_pick_type type)
 {
 	int cash;
 	nullpo_retr(-1,sd);
@@ -5663,7 +5663,7 @@ int pc_paycash(struct map_session_data *sd, int price, int points, e_log_pick_ty
  * @param type: Log type
  * @return -1: Error, otherwise success (cash or points)
  */
-int pc_getcash(struct map_session_data *sd, int cash, int points, e_log_pick_type type)
+int pc_getcash(map_session_data *sd, int cash, int points, e_log_pick_type type)
 {
 	char output[CHAT_SIZE_MAX];
 
@@ -5720,7 +5720,7 @@ int pc_getcash(struct map_session_data *sd, int cash, int points, e_log_pick_typ
  * @param nameid Find this Item!
  * @return Stored index in inventory, or -1 if not found.
  **/
-short pc_search_inventory(struct map_session_data *sd, t_itemid nameid) {
+short pc_search_inventory(map_session_data *sd, t_itemid nameid) {
 	short i;
 	nullpo_retr(-1, sd);
 
@@ -5743,7 +5743,7 @@ short pc_search_inventory(struct map_session_data *sd, t_itemid nameid) {
  *   6 = ?
  *   7 = stack limitation
  */
-enum e_additem_result pc_additem(struct map_session_data *sd,struct item *item,int amount,e_log_pick_type log_type) {
+enum e_additem_result pc_additem(map_session_data *sd,struct item *item,int amount,e_log_pick_type log_type) {
 	struct item_data *id;
 	int16 i;
 	unsigned int w;
@@ -5856,7 +5856,7 @@ enum e_additem_result pc_additem(struct map_session_data *sd,struct item *item,i
  * @param log_type e_log_pick_type
  * @return 1 - invalid itemid or negative amount; 0 - Success
  *------------------------------------------*/
-char pc_delitem(struct map_session_data *sd,int n,int amount,int type, short reason, e_log_pick_type log_type)
+char pc_delitem(map_session_data *sd,int n,int amount,int type, short reason, e_log_pick_type log_type)
 {
 	nullpo_retr(1, sd);
 
@@ -5890,7 +5890,7 @@ char pc_delitem(struct map_session_data *sd,int n,int amount,int type, short rea
  * @param amount Amount of item
  * @return False = fail; True = success
  *------------------------------------------*/
-bool pc_dropitem(struct map_session_data *sd,int n,int amount)
+bool pc_dropitem(map_session_data *sd,int n,int amount)
 {
 	nullpo_retr(1, sd);
 
@@ -5937,7 +5937,7 @@ bool pc_dropitem(struct map_session_data *sd,int n,int amount)
  * @param fitem Item that will be picked
  * @return False = fail; True = success
  *------------------------------------------*/
-bool pc_takeitem(struct map_session_data *sd,struct flooritem_data *fitem)
+bool pc_takeitem(map_session_data *sd,struct flooritem_data *fitem)
 {
 	int flag = 0;
 	t_tick tick = gettick();
@@ -5956,7 +5956,7 @@ bool pc_takeitem(struct map_session_data *sd,struct flooritem_data *fitem)
 		p = party_search(sd->status.party_id);
 
 	if (fitem->first_get_charid > 0 && fitem->first_get_charid != sd->status.char_id) {
-		struct map_session_data *first_sd = map_charid2sd(fitem->first_get_charid);
+		map_session_data *first_sd = map_charid2sd(fitem->first_get_charid);
 		if (DIFF_TICK(tick,fitem->first_get_tick) < 0) {
 			if (!(p && p->party.item&1 &&
 				first_sd && first_sd->status.party_id == sd->status.party_id
@@ -5964,7 +5964,7 @@ bool pc_takeitem(struct map_session_data *sd,struct flooritem_data *fitem)
 				return false;
 		}
 		else if (fitem->second_get_charid > 0 && fitem->second_get_charid != sd->status.char_id) {
-			struct map_session_data *second_sd = map_charid2sd(fitem->second_get_charid);
+			map_session_data *second_sd = map_charid2sd(fitem->second_get_charid);
 			if (DIFF_TICK(tick, fitem->second_get_tick) < 0) {
 				if (!(p && p->party.item&1 &&
 					((first_sd && first_sd->status.party_id == sd->status.party_id) ||
@@ -5973,7 +5973,7 @@ bool pc_takeitem(struct map_session_data *sd,struct flooritem_data *fitem)
 					return false;
 			}
 			else if (fitem->third_get_charid > 0 && fitem->third_get_charid != sd->status.char_id){
-				struct map_session_data *third_sd = map_charid2sd(fitem->third_get_charid);
+				map_session_data *third_sd = map_charid2sd(fitem->third_get_charid);
 				if (DIFF_TICK(tick,fitem->third_get_tick) < 0) {
 					if(!(p && p->party.item&1 &&
 						((first_sd && first_sd->status.party_id == sd->status.party_id) ||
@@ -6012,7 +6012,7 @@ bool pc_takeitem(struct map_session_data *sd,struct flooritem_data *fitem)
  *	false = no
  *	true = yes
  *------------------------------------------*/
-bool pc_isUseitem(struct map_session_data *sd,int n)
+bool pc_isUseitem(map_session_data *sd,int n)
 {
 	struct item_data *item;
 	t_itemid nameid;
@@ -6168,7 +6168,7 @@ bool pc_isUseitem(struct map_session_data *sd,int n)
  *	0 = fail
  *	1 = success
  *------------------------------------------*/
-int pc_useitem(struct map_session_data *sd,int n)
+int pc_useitem(map_session_data *sd,int n)
 {
 	t_tick tick = gettick();
 	int amount;
@@ -6283,7 +6283,7 @@ int pc_useitem(struct map_session_data *sd,int n)
  * @param log_type
  * @return See pc.hpp::e_additem_result
  */
-enum e_additem_result pc_cart_additem(struct map_session_data *sd,struct item *item,int amount,e_log_pick_type log_type)
+enum e_additem_result pc_cart_additem(map_session_data *sd,struct item *item,int amount,e_log_pick_type log_type)
 {
 	struct item_data *data;
 	int i,w;
@@ -6359,7 +6359,7 @@ enum e_additem_result pc_cart_additem(struct map_session_data *sd,struct item *i
 /*==========================================
  * Delete item on cart for given index.
  *------------------------------------------*/
-void pc_cart_delitem(struct map_session_data *sd,int n,int amount,int type,e_log_pick_type log_type)
+void pc_cart_delitem(map_session_data *sd,int n,int amount,int type,e_log_pick_type log_type)
 {
 	nullpo_retv(sd);
 
@@ -6384,7 +6384,7 @@ void pc_cart_delitem(struct map_session_data *sd,int n,int amount,int type,e_log
 /*==========================================
  * Transfer item from inventory to cart.
  *------------------------------------------*/
-void pc_putitemtocart(struct map_session_data *sd,int idx,int amount)
+void pc_putitemtocart(map_session_data *sd,int idx,int amount)
 {
 	nullpo_retv(sd);
 
@@ -6418,7 +6418,7 @@ void pc_putitemtocart(struct map_session_data *sd,int idx,int amount)
         -1 = itemid not found or no amount found
         x = remaining itemid on cart after get
  *------------------------------------------*/
-int pc_cartitem_amount(struct map_session_data* sd, int idx, int amount)
+int pc_cartitem_amount(map_session_data* sd, int idx, int amount)
 {
 	struct item* item_data;
 
@@ -6434,7 +6434,7 @@ int pc_cartitem_amount(struct map_session_data* sd, int idx, int amount)
 /*==========================================
  * Retrieve an item at index idx from cart.
  *------------------------------------------*/
-void pc_getitemfromcart(struct map_session_data *sd,int idx,int amount)
+void pc_getitemfromcart(map_session_data *sd,int idx,int amount)
 {
 	nullpo_retv(sd);
 
@@ -6482,11 +6482,11 @@ int pc_bound_chk(TBL_PC *sd,enum bound_type type,int *idxlist)
  *------------------------------------------*/
 int pc_show_steal(struct block_list *bl,va_list ap)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	t_itemid itemid;
 	char output[100];
 
-	sd=va_arg(ap,struct map_session_data *);
+	sd=va_arg(ap,map_session_data *);
 	itemid=va_arg(ap,int);
 
 	std::shared_ptr<item_data> id = item_db.find(itemid);
@@ -6495,7 +6495,7 @@ int pc_show_steal(struct block_list *bl,va_list ap)
 		sprintf(output,"%s stole an Unknown Item (id: %u).",sd->status.name, itemid);
 	else
 		sprintf(output,"%s stole %s.",sd->status.name,id->ename.c_str());
-	clif_displaymessage( ((struct map_session_data *)bl)->fd, output);
+	clif_displaymessage( ((map_session_data *)bl)->fd, output);
 
 	return 0;
 }
@@ -6507,7 +6507,7 @@ int pc_show_steal(struct block_list *bl,va_list ap)
  * @param skill_lv: Level of skill used
  * @return True on success or false otherwise
  */
-bool pc_steal_item(struct map_session_data *sd,struct block_list *bl, uint16 skill_lv)
+bool pc_steal_item(map_session_data *sd,struct block_list *bl, uint16 skill_lv)
 {
 	int i;
 	t_itemid itemid;
@@ -6601,7 +6601,7 @@ bool pc_steal_item(struct map_session_data *sd,struct block_list *bl, uint16 ski
  *	0 = fail
  *	1 = success
  *------------------------------------------*/
-int pc_steal_coin(struct map_session_data *sd,struct block_list *target)
+int pc_steal_coin(map_session_data *sd,struct block_list *target)
 {
 	int rate, target_lv;
 	struct mob_data *md;
@@ -6642,7 +6642,7 @@ int pc_steal_coin(struct map_session_data *sd,struct block_list *target)
  *			SETPOS_NO_MAPSERVER	Map not in this map-server, and failed to locate alternate map-server.
  *			SETPOS_AUTOTRADE	Player is in autotrade state
  *------------------------------------------*/
-enum e_setpos pc_setpos(struct map_session_data* sd, unsigned short mapindex, int x, int y, clr_type clrtype)
+enum e_setpos pc_setpos(map_session_data* sd, unsigned short mapindex, int x, int y, clr_type clrtype)
 {
 	nullpo_retr(SETPOS_OK,sd);
 
@@ -6896,7 +6896,7 @@ enum e_setpos pc_setpos(struct map_session_data* sd, unsigned short mapindex, in
  *	0 = Success
  *	1,2,3 = Fail
  *------------------------------------------*/
-char pc_randomwarp(struct map_session_data *sd, clr_type type, bool ignore_mapflag)
+char pc_randomwarp(map_session_data *sd, clr_type type, bool ignore_mapflag)
 {
 	int x,y,i=0;
 
@@ -6922,7 +6922,7 @@ char pc_randomwarp(struct map_session_data *sd, clr_type type, bool ignore_mapfl
  * Records a memo point at sd's current position
  * pos - entry to replace, (-1: shift oldest entry out)
  *------------------------------------------*/
-bool pc_memo(struct map_session_data* sd, int pos)
+bool pc_memo(map_session_data* sd, int pos)
 {
 	int skill;
 
@@ -6984,9 +6984,9 @@ bool pc_memo(struct map_session_data* sd, int pos)
  * @param lv : skill lv
  * @return player skill cooldown
  */
-int pc_get_skillcooldown(struct map_session_data *sd, uint16 skill_id, uint16 skill_lv) {
+int pc_get_skillcooldown(map_session_data *sd, uint16 skill_id, uint16 skill_lv) {
 	if (skill_id == SJ_NOVAEXPLOSING) {
-		struct status_change *sc = status_get_sc(&sd->bl);
+		status_change *sc = status_get_sc(&sd->bl);
 
 		if (sc && sc->getSCE(SC_DIMENSION))
 			return 0;
@@ -7010,7 +7010,7 @@ int pc_get_skillcooldown(struct map_session_data *sd, uint16 skill_id, uint16 sk
 /*==========================================
  * Return player sd skill_lv learned for given skill
  *------------------------------------------*/
-uint8 pc_checkskill(struct map_session_data *sd, uint16 skill_id)
+uint8 pc_checkskill(map_session_data *sd, uint16 skill_id)
 {
 	uint16 idx = 0;
 	if (sd == NULL)
@@ -7100,7 +7100,7 @@ uint8 pc_checkskill_summoner(map_session_data *sd, e_summoner_power_type type) {
  *		Flag&1 = IG_SHIELD_MASTERY
  *		Flag&2 = IG_SPEAR_SWORD_M
  */
-uint8 pc_checkskill_imperial_guard(struct map_session_data *sd, short flag)
+uint8 pc_checkskill_imperial_guard(map_session_data *sd, short flag)
 {
 	nullpo_retr(0, sd);
 
@@ -7121,7 +7121,7 @@ uint8 pc_checkskill_imperial_guard(struct map_session_data *sd, short flag)
  * @param sd
  * @return 0:error, 1:check done
  */
-static void pc_checkallowskill(struct map_session_data *sd)
+static void pc_checkallowskill(map_session_data *sd)
 {
 	nullpo_retv(sd);
 
@@ -7152,7 +7152,7 @@ static void pc_checkallowskill(struct map_session_data *sd)
  * -1 : Nothing equipped
  * idx : (this index could be used in inventory to found item_data)
  *------------------------------------------*/
-short pc_checkequip(struct map_session_data *sd,int pos, bool checkall)
+short pc_checkequip(map_session_data *sd,int pos, bool checkall)
 {
 	uint8 i;
 
@@ -7180,7 +7180,7 @@ short pc_checkequip(struct map_session_data *sd,int pos, bool checkall)
  * @max : see pc.hpp enum equip_index for @min to ?
  * -return true,false
  *------------------------------------------*/
-bool pc_checkequip2(struct map_session_data *sd, t_itemid nameid, int min, int max)
+bool pc_checkequip2(map_session_data *sd, t_itemid nameid, int min, int max)
 {
 	int i;
 
@@ -7858,7 +7858,7 @@ const char* job_name(int class_)
  * used by pc_follow
  *----------------------------------------------------*/
 TIMER_FUNC(pc_follow_timer){
-	struct map_session_data *sd;
+	map_session_data *sd;
 	struct block_list *tbl;
 
 	sd = map_id2sd(id);
@@ -7896,7 +7896,7 @@ TIMER_FUNC(pc_follow_timer){
 	return 0;
 }
 
-int pc_stop_following (struct map_session_data *sd)
+int pc_stop_following (map_session_data *sd)
 {
 	nullpo_ret(sd);
 
@@ -7912,7 +7912,7 @@ int pc_stop_following (struct map_session_data *sd)
 	return 0;
 }
 
-int pc_follow(struct map_session_data *sd,int target_id)
+int pc_follow(map_session_data *sd,int target_id)
 {
 	struct block_list *bl = map_id2bl(target_id);
 	if (bl == NULL /*|| bl->type != BL_PC*/)
@@ -7926,7 +7926,7 @@ int pc_follow(struct map_session_data *sd,int target_id)
 	return 0;
 }
 
-int pc_checkbaselevelup(struct map_session_data *sd) {
+int pc_checkbaselevelup(map_session_data *sd) {
 	t_exp next = pc_nextbaseexp(sd);
 
 	if (!next || sd->status.base_exp < next || pc_is_maxbaselv(sd))
@@ -7988,7 +7988,7 @@ int pc_checkbaselevelup(struct map_session_data *sd) {
 	return 1;
 }
 
-void pc_baselevelchanged(struct map_session_data *sd) {
+void pc_baselevelchanged(map_session_data *sd) {
 	uint8 i;
 	for( i = 0; i < EQI_MAX; i++ ) {
 		if( sd->equip_index[i] >= 0 && sd->inventory_data[sd->equip_index[i]] ) {
@@ -7999,7 +7999,7 @@ void pc_baselevelchanged(struct map_session_data *sd) {
 	pc_show_questinfo(sd);
 }
 
-int pc_checkjoblevelup(struct map_session_data *sd)
+int pc_checkjoblevelup(map_session_data *sd)
 {
 	t_exp next = pc_nextjobexp(sd);
 
@@ -8047,7 +8047,7 @@ int pc_checkjoblevelup(struct map_session_data *sd)
 * @param job_exp Job EXP before peronal bonuses
 * @param src Block list that affecting the exp calculation
 */
-static void pc_calcexp(struct map_session_data *sd, t_exp *base_exp, t_exp *job_exp, struct block_list *src)
+static void pc_calcexp(map_session_data *sd, t_exp *base_exp, t_exp *job_exp, struct block_list *src)
 {
 	int bonus = 0, vip_bonus_base = 0, vip_bonus_job = 0;
 
@@ -8106,7 +8106,7 @@ static void pc_calcexp(struct map_session_data *sd, t_exp *base_exp, t_exp *job_
  * @param next_job_exp Job EXP needed for next job level
  * @param lost True:EXP penalty, lose EXP
  **/
-void pc_gainexp_disp(struct map_session_data *sd, t_exp base_exp, t_exp next_base_exp, t_exp job_exp, t_exp next_job_exp, bool lost) {
+void pc_gainexp_disp(map_session_data *sd, t_exp base_exp, t_exp next_base_exp, t_exp job_exp, t_exp next_job_exp, bool lost) {
 	char output[CHAT_SIZE_MAX];
 
 	nullpo_retv(sd);
@@ -8127,7 +8127,7 @@ void pc_gainexp_disp(struct map_session_data *sd, t_exp base_exp, t_exp next_bas
  * @param exp_flag 1: Quest EXP; 2: Param Exp (Ignore Guild EXP tax, EXP adjustments)
  * @return
  **/
-void pc_gainexp(struct map_session_data *sd, struct block_list *src, t_exp base_exp, t_exp job_exp, uint8 exp_flag)
+void pc_gainexp(map_session_data *sd, struct block_list *src, t_exp base_exp, t_exp job_exp, uint8 exp_flag)
 {
 	t_exp nextb = 0, nextj = 0;
 	uint8 flag = 0; ///< 1: Base EXP given, 2: Job EXP given, 4: Max Base level, 8: Max Job Level
@@ -8216,7 +8216,7 @@ void pc_gainexp(struct map_session_data *sd, struct block_list *src, t_exp base_
  * @param base_exp Base EXP lost
  * @param job_exp Job EXP lost
  **/
-void pc_lostexp(struct map_session_data *sd, t_exp base_exp, t_exp job_exp) {
+void pc_lostexp(map_session_data *sd, t_exp base_exp, t_exp job_exp) {
 
 	nullpo_retv(sd);
 
@@ -8254,7 +8254,7 @@ uint32 JobDatabase::get_maxBaseLv(uint16 job_id) {
  * @param sd Player
  * @return Max Base Level
  **/
-unsigned int pc_maxbaselv(struct map_session_data *sd){
+unsigned int pc_maxbaselv(map_session_data *sd){
 	return job_db.get_maxBaseLv(sd->status.class_);
 }
 
@@ -8274,7 +8274,7 @@ uint32 JobDatabase::get_maxJobLv(uint16 job_id) {
  * @param sd Player
  * @return Max Job Level
  **/
-unsigned int pc_maxjoblv(struct map_session_data *sd){
+unsigned int pc_maxjoblv(map_session_data *sd){
 	return job_db.get_maxJobLv(sd->status.class_);
 }
 
@@ -8283,7 +8283,7 @@ unsigned int pc_maxjoblv(struct map_session_data *sd){
  * @param sd
  * @return True if reached max level
  **/
-bool pc_is_maxbaselv(struct map_session_data *sd) {
+bool pc_is_maxbaselv(map_session_data *sd) {
 	nullpo_retr(false, sd);
 	return (sd->status.base_level >= pc_maxbaselv(sd));
 }
@@ -8293,7 +8293,7 @@ bool pc_is_maxbaselv(struct map_session_data *sd) {
  * @param sd
  * @return True if reached max level
  **/
-bool pc_is_maxjoblv(struct map_session_data *sd) {
+bool pc_is_maxjoblv(map_session_data *sd) {
 	nullpo_retr(false, sd);
 	return (sd->status.job_level >= pc_maxjoblv(sd));
 }
@@ -8315,7 +8315,7 @@ t_exp JobDatabase::get_baseExp(uint16 job_id, uint32 level) {
  * @param sd
  * @return Base EXP needed for next base level
  **/
-t_exp pc_nextbaseexp(struct map_session_data *sd){
+t_exp pc_nextbaseexp(map_session_data *sd){
 	nullpo_ret(sd);
 	if (sd->status.base_level == 0) // Is this something that possible?
 		return 0;
@@ -8341,7 +8341,7 @@ t_exp JobDatabase::get_jobExp(uint16 job_id, uint32 level) {
  * @param sd
  * @return Job EXP needed for next job level
  **/
-t_exp pc_nextjobexp(struct map_session_data *sd){
+t_exp pc_nextjobexp(map_session_data *sd){
 	nullpo_ret(sd);
 	if (sd->status.job_level == 0) // Is this something that possible?
 		return 0;
@@ -8386,7 +8386,7 @@ int pc_getstat(map_session_data *sd, int type)
 
 /// Sets the specified stat to the specified value.
 /// Returns the new value.
-int pc_setstat(struct map_session_data* sd, int type, int val)
+int pc_setstat(map_session_data* sd, int type, int val)
 {
 	nullpo_retr(-1, sd);
 
@@ -8484,7 +8484,7 @@ uint32 PlayerStatPointDatabase::pc_gets_trait_point(uint16 level) {
 /// Returns the number of stat points needed to change the specified stat by val.
 /// If val is negative, returns the number of stat points that would be needed to
 /// raise the specified stat from (current value - val) to current value.
-int pc_need_status_point(struct map_session_data* sd, int type, int val)
+int pc_need_status_point(map_session_data* sd, int type, int val)
 {
 	int low, high, sp = 0, max = 0;
 
@@ -8516,7 +8516,7 @@ int pc_need_status_point(struct map_session_data* sd, int type, int val)
  * @param type Stat to verify.
  * @return Maximum value the stat could grow by.
  */
-int pc_maxparameterincrease(struct map_session_data* sd, int type)
+int pc_maxparameterincrease(map_session_data* sd, int type)
 {
 	int base, final_val, status_points, max_param;
 
@@ -8547,7 +8547,7 @@ int pc_maxparameterincrease(struct map_session_data* sd, int type)
  * @retval true  if the stat was increased by any amount.
  * @retval false if there were no changes.
  */
-bool pc_statusup(struct map_session_data* sd, int type, int increase)
+bool pc_statusup(map_session_data* sd, int type, int increase)
 {
 	int max_increase = 0, current = 0, needed_points = 0, final_value = 0;
 
@@ -8609,7 +8609,7 @@ bool pc_statusup(struct map_session_data* sd, int type, int increase)
  * @return the stat increase amount.
  * @retval 0 if no changes were made.
  */
-int pc_statusup2(struct map_session_data* sd, int type, int val)
+int pc_statusup2(map_session_data* sd, int type, int val)
 {
 	int max, need;
 	nullpo_ret(sd);
@@ -8642,7 +8642,7 @@ int pc_statusup2(struct map_session_data* sd, int type, int val)
 /// Returns the number of trait stat points needed to change the specified trait stat by val.
 /// If val is negative, returns the number of trait stat points that would be needed to
 /// raise the specified trait stat from (current value - val) to current value.
-int pc_need_trait_point(struct map_session_data* sd, int type, int val)
+int pc_need_trait_point(map_session_data* sd, int type, int val)
 {
 	nullpo_retr(0, sd);
 
@@ -8674,7 +8674,7 @@ int pc_need_trait_point(struct map_session_data* sd, int type, int val)
 * @param type Trait stat to verify.
 * @return Maximum value the stat could grow by.
 */
-int pc_maxtraitparameterincrease(struct map_session_data* sd, int type)
+int pc_maxtraitparameterincrease(map_session_data* sd, int type)
 {
 	nullpo_ret(sd);
 
@@ -8709,7 +8709,7 @@ int pc_maxtraitparameterincrease(struct map_session_data* sd, int type)
 * @retval true  if the trait stat was increased by any amount.
 * @retval false if there were no changes.
 */
-bool pc_traitstatusup(struct map_session_data* sd, int type, int increase)
+bool pc_traitstatusup(map_session_data* sd, int type, int increase)
 {
 	nullpo_ret(sd);
 
@@ -8772,7 +8772,7 @@ bool pc_traitstatusup(struct map_session_data* sd, int type, int increase)
 * @return the stat increase amount.
 * @retval 0 if no changes were made.
 */
-int pc_traitstatusup2(struct map_session_data* sd, int type, int val)
+int pc_traitstatusup2(map_session_data* sd, int type, int val)
 {
 	nullpo_ret(sd);
 
@@ -8804,7 +8804,7 @@ int pc_traitstatusup2(struct map_session_data* sd, int type, int val)
  * Update skill_lv for player sd
  * Skill point allocation
  *------------------------------------------*/
-void pc_skillup(struct map_session_data *sd,uint16 skill_id)
+void pc_skillup(map_session_data *sd,uint16 skill_id)
 {
 	uint16 idx = skill_get_index(skill_id);
 
@@ -8862,7 +8862,7 @@ void pc_skillup(struct map_session_data *sd,uint16 skill_id)
 /*==========================================
  * /allskill
  *------------------------------------------*/
-int pc_allskillup(struct map_session_data *sd)
+int pc_allskillup(map_session_data *sd)
 {
 	int i;
 
@@ -8913,7 +8913,7 @@ int pc_allskillup(struct map_session_data *sd)
 /*==========================================
  * /resetlvl
  *------------------------------------------*/
-int pc_resetlvl(struct map_session_data* sd,int type)
+int pc_resetlvl(map_session_data* sd,int type)
 {
 	int  i;
 
@@ -9022,7 +9022,7 @@ int pc_resetlvl(struct map_session_data* sd,int type)
 /*==========================================
  * /resetstate
  *------------------------------------------*/
-int pc_resetstate(struct map_session_data* sd)
+int pc_resetstate(map_session_data* sd)
 {
 	nullpo_ret(sd);
 
@@ -9103,7 +9103,7 @@ int pc_resetstate(struct map_session_data* sd)
  * if flag&2, just count total amount of skill points used by player, do not really reset.
  * if flag&4, just reset the skills if the player class is a bard/dancer type (for changesex.)
  *------------------------------------------*/
-int pc_resetskill(struct map_session_data* sd, int flag)
+int pc_resetskill(map_session_data* sd, int flag)
 {
 	int i, skill_point=0;
 	nullpo_ret(sd);
@@ -9218,7 +9218,7 @@ int pc_resetskill(struct map_session_data* sd, int flag)
 /*==========================================
  * /resetfeel [Komurka]
  *------------------------------------------*/
-int pc_resetfeel(struct map_session_data* sd)
+int pc_resetfeel(map_session_data* sd)
 {
 	int i;
 	nullpo_ret(sd);
@@ -9233,7 +9233,7 @@ int pc_resetfeel(struct map_session_data* sd)
 	return 0;
 }
 
-int pc_resethate(struct map_session_data* sd)
+int pc_resethate(map_session_data* sd)
 {
 	int i;
 	nullpo_ret(sd);
@@ -9246,7 +9246,7 @@ int pc_resethate(struct map_session_data* sd)
 	return 0;
 }
 
-int pc_skillatk_bonus(struct map_session_data *sd, uint16 skill_id)
+int pc_skillatk_bonus(map_session_data *sd, uint16 skill_id)
 {
 	int bonus = 0;
 
@@ -9264,7 +9264,7 @@ int pc_skillatk_bonus(struct map_session_data *sd, uint16 skill_id)
 	return bonus;
 }
 
-int pc_sub_skillatk_bonus(struct map_session_data *sd, uint16 skill_id)
+int pc_sub_skillatk_bonus(map_session_data *sd, uint16 skill_id)
 {
 	int bonus = 0;
 
@@ -9282,7 +9282,7 @@ int pc_sub_skillatk_bonus(struct map_session_data *sd, uint16 skill_id)
 	return bonus;
 }
 
-int pc_skillheal_bonus(struct map_session_data *sd, uint16 skill_id) {
+int pc_skillheal_bonus(map_session_data *sd, uint16 skill_id) {
 	int bonus = sd->bonus.add_heal_rate;
 
 	nullpo_ret(sd);
@@ -9313,7 +9313,7 @@ int pc_skillheal_bonus(struct map_session_data *sd, uint16 skill_id) {
 	return bonus;
 }
 
-int pc_skillheal2_bonus(struct map_session_data *sd, uint16 skill_id) {
+int pc_skillheal2_bonus(map_session_data *sd, uint16 skill_id) {
 	int bonus = sd->bonus.add_heal2_rate;
 
 	skill_id = skill_dummy2skill_id(skill_id);
@@ -9328,7 +9328,7 @@ int pc_skillheal2_bonus(struct map_session_data *sd, uint16 skill_id) {
 	return bonus;
 }
 
-void pc_respawn(struct map_session_data* sd, clr_type clrtype)
+void pc_respawn(map_session_data* sd, clr_type clrtype)
 {
 	if( !pc_isdead(sd) )
 		return; // not applicable
@@ -9342,7 +9342,7 @@ void pc_respawn(struct map_session_data* sd, clr_type clrtype)
 }
 
 static TIMER_FUNC(pc_respawn_timer){
-	struct map_session_data *sd = map_id2sd(id);
+	map_session_data *sd = map_id2sd(id);
 	if( sd != NULL )
 	{
 		sd->pvp_point=0;
@@ -9356,7 +9356,7 @@ static TIMER_FUNC(pc_respawn_timer){
 /*==========================================
  * Invoked when a player has received damage
  *------------------------------------------*/
-void pc_damage(struct map_session_data *sd,struct block_list *src,unsigned int hp, unsigned int sp, unsigned int ap)
+void pc_damage(map_session_data *sd,struct block_list *src,unsigned int hp, unsigned int sp, unsigned int ap)
 {
 	if (ap) clif_updatestatus(sd,SP_AP);
 	if (sp) clif_updatestatus(sd,SP_SP);
@@ -9396,7 +9396,7 @@ TIMER_FUNC(pc_close_npc_timer){
  *   1: Produce a close button and end the NPC
  *   2: End the NPC (best for no dialog windows)
  */
-void pc_close_npc(struct map_session_data *sd,int flag)
+void pc_close_npc(map_session_data *sd,int flag)
 {
 	nullpo_retv(sd);
 
@@ -9441,7 +9441,7 @@ void pc_close_npc(struct map_session_data *sd,int flag)
 /*==========================================
  * Invoked when a player has negative current hp
  *------------------------------------------*/
-int pc_dead(struct map_session_data *sd,struct block_list *src)
+int pc_dead(map_session_data *sd,struct block_list *src)
 {
 	int i=0,k=0;
 	t_tick tick = gettick();
@@ -9468,7 +9468,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src)
 
 	for(k = 0; k < MAX_DEVOTION; k++) {
 		if (sd->devotion[k]){
-			struct map_session_data *devsd = map_id2sd(sd->devotion[k]);
+			map_session_data *devsd = map_id2sd(sd->devotion[k]);
 			if (devsd)
 				status_change_end(&devsd->bl, SC_DEVOTION);
 			sd->devotion[k] = 0;
@@ -9477,7 +9477,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src)
 
 	for (k = 0; k < MAX_STELLAR_MARKS; k++) {
 		if (sd->stellar_mark[k]) {
-			struct map_session_data *smarksd = map_id2sd(sd->stellar_mark[k]);
+			map_session_data *smarksd = map_id2sd(sd->stellar_mark[k]);
 
 			if (smarksd)
 				status_change_end(&smarksd->bl, SC_FLASHKICK);
@@ -9487,7 +9487,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src)
 
 	for (k = 0; k < MAX_UNITED_SOULS; k++) {
 		if (sd->united_soul[k]) {
-			struct map_session_data *usoulsd = map_id2sd(sd->united_soul[k]);
+			map_session_data *usoulsd = map_id2sd(sd->united_soul[k]);
 
 			if (usoulsd)
 				status_change_end(&usoulsd->bl, SC_SOULUNITY);
@@ -9497,7 +9497,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src)
 
 	for (k = 0; k < MAX_SERVANT_SIGN; k++) {
 		if (sd->servant_sign[k]) {
-			struct map_session_data *ssignsd = map_id2sd(sd->servant_sign[k]);
+			map_session_data *ssignsd = map_id2sd(sd->servant_sign[k]);
 
 			if (ssignsd)
 				status_change_end(&ssignsd->bl, SC_SERVANT_SIGN);
@@ -9613,7 +9613,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src)
 	}
 
 	if (src && src->type == BL_PC) {
-		struct map_session_data *ssd = (struct map_session_data *)src;
+		map_session_data *ssd = (map_session_data *)src;
 		pc_setparam(ssd, SP_KILLEDRID, sd->bl.id);
 		npc_script_event(ssd, NPCE_KILLPC);
 
@@ -9779,7 +9779,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src)
 		sd->pvp_point -= 5;
 		sd->pvp_lost++;
 		if( src && src->type == BL_PC ) {
-			struct map_session_data *ssd = (struct map_session_data *)src;
+			map_session_data *ssd = (map_session_data *)src;
 			ssd->pvp_point++;
 			ssd->pvp_won++;
 		}
@@ -9810,7 +9810,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src)
 	return 1;
 }
 
-void pc_revive(struct map_session_data *sd,unsigned int hp, unsigned int sp, unsigned int ap) {
+void pc_revive(map_session_data *sd,unsigned int hp, unsigned int sp, unsigned int ap) {
 	if(hp) clif_updatestatus(sd,SP_HP);
 	if(sp) clif_updatestatus(sd,SP_SP);
 	if(ap) clif_updatestatus(sd,SP_AP);
@@ -9827,7 +9827,7 @@ void pc_revive(struct map_session_data *sd,unsigned int hp, unsigned int sp, uns
 	}
 }
 
-bool pc_revive_item(struct map_session_data *sd) {
+bool pc_revive_item(map_session_data *sd) {
 	nullpo_retr(false, sd);
 
 	if (!pc_isdead(sd) || sd->respawn_tid != INVALID_TIMER)
@@ -9866,7 +9866,7 @@ bool pc_revive_item(struct map_session_data *sd) {
 /*==========================================
  * script reading pc status registry
  *------------------------------------------*/
-int64 pc_readparam(struct map_session_data* sd,int64 type)
+int64 pc_readparam(map_session_data* sd,int64 type)
 {
 	int64 val = 0;
 
@@ -10064,7 +10064,7 @@ int64 pc_readparam(struct map_session_data* sd,int64 type)
 /*==========================================
  * script set pc status registry
  *------------------------------------------*/
-bool pc_setparam(struct map_session_data *sd,int64 type,int64 val_tmp)
+bool pc_setparam(map_session_data *sd,int64 type,int64 val_tmp)
 {
 	nullpo_retr(false,sd);
 
@@ -10316,7 +10316,7 @@ bool pc_setparam(struct map_session_data *sd,int64 type,int64 val_tmp)
 /*==========================================
  * HP/SP/AP Healing. If flag is passed, the heal type is through clif_heal, otherwise update status.
  *------------------------------------------*/
-void pc_heal(struct map_session_data *sd,unsigned int hp,unsigned int sp, unsigned int ap, int type)
+void pc_heal(map_session_data *sd,unsigned int hp,unsigned int sp, unsigned int ap, int type)
 {// Is there going to be a effect for gaining AP soon??? [Rytech]
 	nullpo_retv(sd);
 
@@ -10348,7 +10348,7 @@ void pc_heal(struct map_session_data *sd,unsigned int hp,unsigned int sp, unsign
  * @param sp: SP to heal
  * @return Amount healed to an object
  */
-int pc_itemheal(struct map_session_data *sd, t_itemid itemid, int hp, int sp)
+int pc_itemheal(map_session_data *sd, t_itemid itemid, int hp, int sp)
 {
 	int bonus, tmp, penalty = 0;
 
@@ -10454,7 +10454,7 @@ int pc_itemheal(struct map_session_data *sd, t_itemid itemid, int hp, int sp)
  * HP/SP Recovery
  * Heal player hp nad/or sp by rate
  *------------------------------------------*/
-int pc_percentheal(struct map_session_data *sd,int hp,int sp)
+int pc_percentheal(map_session_data *sd,int hp,int sp)
 {
 	nullpo_ret(sd);
 
@@ -10508,7 +10508,7 @@ static int jobchange_killclone(struct block_list *bl, va_list ap)
  * @param upper 1 - JOBL_UPPER; 2 - JOBL_BABY
  * @return True if success, false if failed
  **/
-bool pc_jobchange(struct map_session_data *sd,int job, char upper)
+bool pc_jobchange(map_session_data *sd,int job, char upper)
 {
 	int i, fame_flag = 0;
 
@@ -10754,7 +10754,7 @@ bool pc_jobchange(struct map_session_data *sd,int job, char upper)
 /*==========================================
  * Tell client player sd has change equipement
  *------------------------------------------*/
-void pc_equiplookall(struct map_session_data *sd)
+void pc_equiplookall(map_session_data *sd)
 {
 	nullpo_retv(sd);
 
@@ -10769,7 +10769,7 @@ void pc_equiplookall(struct map_session_data *sd)
 /*==========================================
  * Tell client player sd has change look (hair,equip...)
  *------------------------------------------*/
-void pc_changelook(struct map_session_data *sd,int type,int val) {
+void pc_changelook(map_session_data *sd,int type,int val) {
 	nullpo_retv(sd);
 
 	switch(type) {
@@ -10834,7 +10834,7 @@ void pc_changelook(struct map_session_data *sd,int type,int val) {
 /*==========================================
  * Give an option (type) to player (sd) and display it to client
  *------------------------------------------*/
-void pc_setoption(struct map_session_data *sd,int type, int subtype)
+void pc_setoption(map_session_data *sd,int type, int subtype)
 {
 	int p_type, new_look=0;
 	nullpo_retv(sd);
@@ -10914,7 +10914,7 @@ void pc_setoption(struct map_session_data *sd,int type, int subtype)
  * @param sd Player
  * @param type 0:Remove cart, 1 ~ MAX_CARTS: Cart type
  **/
-bool pc_setcart(struct map_session_data *sd,int type) {
+bool pc_setcart(map_session_data *sd,int type) {
 #ifndef NEW_CARTS
 	int cart[6] = {0x0000,OPTION_CART1,OPTION_CART2,OPTION_CART3,OPTION_CART4,OPTION_CART5};
 	int option;
@@ -10962,7 +10962,7 @@ bool pc_setcart(struct map_session_data *sd,int type) {
 /*==========================================
  * Give player a falcon
  *------------------------------------------*/
-void pc_setfalcon(struct map_session_data* sd, int flag)
+void pc_setfalcon(map_session_data* sd, int flag)
 {
 	if( flag ){
 		if( pc_checkskill(sd,HT_FALCON)>0 )	// add falcon if he have the skill
@@ -10975,7 +10975,7 @@ void pc_setfalcon(struct map_session_data* sd, int flag)
 /*==========================================
  *  Set player riding
  *------------------------------------------*/
-void pc_setriding(struct map_session_data* sd, int flag)
+void pc_setriding(map_session_data* sd, int flag)
 {
 	if( sd->sc.getSCE(SC_ALL_RIDING) )
 		return;
@@ -10994,7 +10994,7 @@ void pc_setriding(struct map_session_data* sd, int flag)
  * @param flag: Enable or disable mado
  * @param type: See pc.hpp::e_mado_type (Default is MADO_ROBOT)
  */
-void pc_setmadogear(struct map_session_data *sd, bool flag, e_mado_type type)
+void pc_setmadogear(map_session_data *sd, bool flag, e_mado_type type)
 {
 	if ((sd->class_ & MAPID_THIRDMASK) != MAPID_MECHANIC)
 		return;
@@ -11010,7 +11010,7 @@ void pc_setmadogear(struct map_session_data *sd, bool flag, e_mado_type type)
 /*==========================================
  * Check if player can drop an item
  *------------------------------------------*/
-bool pc_candrop(struct map_session_data *sd, struct item *item)
+bool pc_candrop(map_session_data *sd, struct item *item)
 {
 	if( item && ((item->expire_time || (item->bound && !pc_can_give_bounded_items(sd))) || (itemdb_ishatched_egg(item))) )
 		return false;
@@ -11022,7 +11022,7 @@ bool pc_candrop(struct map_session_data *sd, struct item *item)
 /*==========================================
  * Read '@type' variables (temporary numeric char reg)
  *------------------------------------------*/
-int64 pc_readreg(struct map_session_data* sd, int64 reg)
+int64 pc_readreg(map_session_data* sd, int64 reg)
 {
 	return i64db_i64get(sd->regs.vars, reg);
 }
@@ -11030,7 +11030,7 @@ int64 pc_readreg(struct map_session_data* sd, int64 reg)
 /*==========================================
  * Set '@type' variables (temporary numeric char reg)
  *------------------------------------------*/
-bool pc_setreg(struct map_session_data* sd, int64 reg, int64 val)
+bool pc_setreg(map_session_data* sd, int64 reg, int64 val)
 {
 	uint32 index = script_getvaridx(reg);
 
@@ -11052,7 +11052,7 @@ bool pc_setreg(struct map_session_data* sd, int64 reg, int64 val)
 /*==========================================
  * Read '@type$' variables (temporary string char reg)
  *------------------------------------------*/
-char* pc_readregstr(struct map_session_data* sd, int64 reg)
+char* pc_readregstr(map_session_data* sd, int64 reg)
 {
 	struct script_reg_str *p = NULL;
 
@@ -11064,7 +11064,7 @@ char* pc_readregstr(struct map_session_data* sd, int64 reg)
 /*==========================================
  * Set '@type$' variables (temporary string char reg)
  *------------------------------------------*/
-bool pc_setregstr(struct map_session_data* sd, int64 reg, const char* str)
+bool pc_setregstr(map_session_data* sd, int64 reg, const char* str)
 {
 	struct script_reg_str *p = NULL;
 	unsigned int index = script_getvaridx(reg);
@@ -11107,7 +11107,7 @@ bool pc_setregstr(struct map_session_data* sd, int64 reg, const char* str)
  * - '#type' (permanent numeric account reg)
  * - '##type' (permanent numeric account reg2)
  **/
-int64 pc_readregistry(struct map_session_data *sd, int64 reg)
+int64 pc_readregistry(map_session_data *sd, int64 reg)
 {
 	struct script_reg_num *p = NULL;
 
@@ -11130,7 +11130,7 @@ int64 pc_readregistry(struct map_session_data *sd, int64 reg)
  * - '#type$' (permanent str account reg)
  * - '##type$' (permanent str account reg2)
  **/
-char* pc_readregistry_str(struct map_session_data *sd, int64 reg)
+char* pc_readregistry_str(map_session_data *sd, int64 reg)
 {
 	struct script_reg_str *p = NULL;
 
@@ -11153,7 +11153,7 @@ char* pc_readregistry_str(struct map_session_data *sd, int64 reg)
  * - '#type' (permanent numeric account reg)
  * - '##type' (permanent numeric account reg2)
  **/
-bool pc_setregistry(struct map_session_data *sd, int64 reg, int64 val)
+bool pc_setregistry(map_session_data *sd, int64 reg, int64 val)
 {
 	struct script_reg_num *p = NULL;
 	const char *regname = get_str(script_getvarid(reg));
@@ -11206,7 +11206,7 @@ bool pc_setregistry(struct map_session_data *sd, int64 reg, int64 val)
  * - '#type$' (permanent str account reg)
  * - '##type$' (permanent str account reg2)
  **/
-bool pc_setregistry_str(struct map_session_data *sd, int64 reg, const char *val)
+bool pc_setregistry_str(map_session_data *sd, int64 reg, const char *val)
 {
 	struct script_reg_str *p = NULL;
 	const char *regname = get_str(script_getvarid(reg));
@@ -11274,7 +11274,7 @@ bool pc_setregistry_str(struct map_session_data *sd, int64 reg, const char *val)
  * @param value
  * @return True if success, false if failed.
  **/
-bool pc_setreg2(struct map_session_data *sd, const char *reg, int64 val) {
+bool pc_setreg2(map_session_data *sd, const char *reg, int64 val) {
 	char prefix = reg[0];
 
 	nullpo_retr(false, sd);
@@ -11309,7 +11309,7 @@ bool pc_setreg2(struct map_session_data *sd, const char *reg, int64 val) {
  * @param reg Variable name
  * @return Variable value or 0 if failed.
  **/
-int64 pc_readreg2(struct map_session_data *sd, const char *reg) {
+int64 pc_readreg2(map_session_data *sd, const char *reg) {
 	char prefix = reg[0];
 
 	nullpo_ret(sd);
@@ -11340,7 +11340,7 @@ int64 pc_readreg2(struct map_session_data *sd, const char *reg) {
  * Exec eventtimer for player sd (retrieved from map_session (id))
  *------------------------------------------*/
 static TIMER_FUNC(pc_eventtimer){
-	struct map_session_data *sd=map_id2sd(id);
+	map_session_data *sd=map_id2sd(id);
 	char *p = (char *)data;
 	int i;
 	if(sd==NULL)
@@ -11363,7 +11363,7 @@ static TIMER_FUNC(pc_eventtimer){
 /*==========================================
  * Add eventtimer for player sd ?
  *------------------------------------------*/
-bool pc_addeventtimer(struct map_session_data *sd,int tick,const char *name)
+bool pc_addeventtimer(map_session_data *sd,int tick,const char *name)
 {
 	int i;
 	nullpo_retr(false,sd);
@@ -11381,7 +11381,7 @@ bool pc_addeventtimer(struct map_session_data *sd,int tick,const char *name)
 /*==========================================
  * Del eventtimer for player sd ?
  *------------------------------------------*/
-bool pc_deleventtimer(struct map_session_data *sd,const char *name)
+bool pc_deleventtimer(map_session_data *sd,const char *name)
 {
 	char* p = NULL;
 	int i;
@@ -11411,7 +11411,7 @@ bool pc_deleventtimer(struct map_session_data *sd,const char *name)
 /*==========================================
  * Update eventtimer count for player sd
  *------------------------------------------*/
-void pc_addeventtimercount(struct map_session_data *sd,const char *name,int tick)
+void pc_addeventtimercount(map_session_data *sd,const char *name,int tick)
 {
 	int i;
 
@@ -11428,7 +11428,7 @@ void pc_addeventtimercount(struct map_session_data *sd,const char *name,int tick
 /*==========================================
  * Remove all eventtimer for player sd
  *------------------------------------------*/
-void pc_cleareventtimer(struct map_session_data *sd)
+void pc_cleareventtimer(map_session_data *sd)
 {
 	int i;
 
@@ -11455,7 +11455,7 @@ void pc_cleareventtimer(struct map_session_data *sd)
  * @param data: Item data
  * @return Number of succeeded combo(s)
  */
-static int pc_checkcombo(struct map_session_data *sd, item_data *data) {
+static int pc_checkcombo(map_session_data *sd, item_data *data) {
 	int success = 0;
 
 	for (const auto &item_combo : data->combos) {
@@ -11588,7 +11588,7 @@ static int pc_checkcombo(struct map_session_data *sd, item_data *data) {
  * @param data: Item data
  * @return Number of removed combo(s)
  */
-static int pc_removecombo(struct map_session_data *sd, item_data *data ) {
+static int pc_removecombo(map_session_data *sd, item_data *data ) {
 
 	if (sd->combos.empty())
 		return 0; // Nothing to do here, player has no combos
@@ -11632,7 +11632,7 @@ static int pc_removecombo(struct map_session_data *sd, item_data *data ) {
  * @param sd: Player data
  * @return ret numbers of succeed combo
  */
-int pc_load_combo(struct map_session_data *sd) {
+int pc_load_combo(map_session_data *sd) {
 	int ret = 0;
 
 	for (int16 i = 0; i < EQI_MAX; i++) {
@@ -11667,7 +11667,7 @@ int pc_load_combo(struct map_session_data *sd) {
  * Equip item on player sd at req_pos from inventory index n
  * return: false - fail; true - success
  *------------------------------------------*/
-bool pc_equipitem(struct map_session_data *sd,short n,int req_pos,bool equipswitch)
+bool pc_equipitem(map_session_data *sd,short n,int req_pos,bool equipswitch)
 {
 	int i, pos, flag = 0, iflag;
 	struct item_data *id;
@@ -11957,7 +11957,7 @@ static void pc_deleteautobonus( std::vector<std::shared_ptr<s_autobonus>>& bonus
  * @param flag: Whether to recalculate a player's status or not
  * @return True on success or false on failure
  */
-static void pc_unequipitem_sub(struct map_session_data *sd, int n, int flag) {
+static void pc_unequipitem_sub(map_session_data *sd, int n, int flag) {
 	int i, iflag;
 	bool status_calc = false;
 
@@ -12040,7 +12040,7 @@ static void pc_unequipitem_sub(struct map_session_data *sd, int n, int flag) {
  *  4 - unequip by switching equipment
  * @return True on success or false on failure
  */
-bool pc_unequipitem(struct map_session_data *sd, int n, int flag) {
+bool pc_unequipitem(map_session_data *sd, int n, int flag) {
 	int i, pos;
 
 	nullpo_retr(false,sd);
@@ -12148,7 +12148,7 @@ bool pc_unequipitem(struct map_session_data *sd, int n, int flag) {
 	return true;
 }
 
-int pc_equipswitch( struct map_session_data* sd, int index ){
+int pc_equipswitch( map_session_data* sd, int index ){
 	// Get the target equip mask
 	int position = sd->inventory.u.items_inventory[index].equipSwitch;
 
@@ -12228,7 +12228,7 @@ int pc_equipswitch( struct map_session_data* sd, int index ){
 	}
 }
 
-void pc_equipswitch_remove( struct map_session_data* sd, int index ){
+void pc_equipswitch_remove( map_session_data* sd, int index ){
 	struct item* item = &sd->inventory.u.items_inventory[index];
 
 	if( !item->equipSwitch ){
@@ -12253,7 +12253,7 @@ void pc_equipswitch_remove( struct map_session_data* sd, int index ){
  * Checking if player (sd) has an invalid item
  * and is unequiped on map load (item_noequip)
  *------------------------------------------*/
-void pc_checkitem(struct map_session_data *sd) {
+void pc_checkitem(map_session_data *sd) {
 	int i, calc_flag = 0;
 	struct item* it;
 
@@ -12320,7 +12320,7 @@ void pc_checkitem(struct map_session_data *sd) {
  *   2 - Cart
  *   4 - Storage
  *------------------------------------------*/
-void pc_check_available_item(struct map_session_data *sd, uint8 type)
+void pc_check_available_item(map_session_data *sd, uint8 type)
 {
 	int i;
 	t_itemid nameid;
@@ -12388,10 +12388,10 @@ void pc_check_available_item(struct map_session_data *sd, uint8 type)
  *------------------------------------------*/
 static int pc_calc_pvprank_sub(struct block_list *bl,va_list ap)
 {
-	struct map_session_data *sd1,*sd2;
+	map_session_data *sd1,*sd2;
 
-	sd1=(struct map_session_data *)bl;
-	sd2=va_arg(ap,struct map_session_data *);
+	sd1=(map_session_data *)bl;
+	sd2=va_arg(ap,map_session_data *);
 
 	if( pc_isinvisible(sd1) || pc_isinvisible(sd2) )
 	{// cannot register pvp rank for hidden GMs
@@ -12406,7 +12406,7 @@ static int pc_calc_pvprank_sub(struct block_list *bl,va_list ap)
  * Calculate new rank beetween all present players (map_foreachinallarea)
  * and display result
  *------------------------------------------*/
-int pc_calc_pvprank(struct map_session_data *sd)
+int pc_calc_pvprank(map_session_data *sd)
 {
 	int old = sd->pvp_rank;
 	struct map_data *mapdata = map_getmapdata(sd->bl.m);
@@ -12421,7 +12421,7 @@ int pc_calc_pvprank(struct map_session_data *sd)
  * Calculate next sd ranking calculation from config
  *------------------------------------------*/
 TIMER_FUNC(pc_calc_pvprank_timer){
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	sd=map_id2sd(id);
 	if(sd==NULL)
@@ -12444,7 +12444,7 @@ TIMER_FUNC(pc_calc_pvprank_timer){
  *	partner_id = yes
  *	0 = no
  *------------------------------------------*/
-int pc_ismarried(struct map_session_data *sd)
+int pc_ismarried(map_session_data *sd)
 {
 	if(sd == NULL)
 		return -1;
@@ -12459,7 +12459,7 @@ int pc_ismarried(struct map_session_data *sd)
  *	false = fail
  *	true = success
  *------------------------------------------*/
-bool pc_marriage(struct map_session_data *sd,struct map_session_data *dstsd)
+bool pc_marriage(map_session_data *sd,map_session_data *dstsd)
 {
 	if(sd == NULL || dstsd == NULL ||
 		sd->status.partner_id > 0 || dstsd->status.partner_id > 0 ||
@@ -12480,9 +12480,9 @@ bool pc_marriage(struct map_session_data *sd,struct map_session_data *dstsd)
  *	false = fail
  *	true  = success
  *------------------------------------------*/
-bool pc_divorce(struct map_session_data *sd)
+bool pc_divorce(map_session_data *sd)
 {
-	struct map_session_data *p_sd;
+	map_session_data *p_sd;
 	int i;
 
 	if( sd == NULL || !pc_ismarried(sd) )
@@ -12521,7 +12521,7 @@ bool pc_divorce(struct map_session_data *sd)
  * @param sd : the husband|wife session
  * @return partner session or NULL
  */
-struct map_session_data *pc_get_partner(struct map_session_data *sd){
+map_session_data *pc_get_partner(map_session_data *sd){
 	if (!sd || !pc_ismarried(sd))
 		return NULL;
 	return map_charid2sd(sd->status.partner_id);
@@ -12532,7 +12532,7 @@ struct map_session_data *pc_get_partner(struct map_session_data *sd){
  * @param sd : the baby session
  * @return father session or NULL
  */
-struct map_session_data *pc_get_father (struct map_session_data *sd){
+map_session_data *pc_get_father (map_session_data *sd){
 	if (!sd || !(sd->class_&JOBL_BABY) || !sd->status.father)
 		return NULL;
 	return map_charid2sd(sd->status.father);
@@ -12543,7 +12543,7 @@ struct map_session_data *pc_get_father (struct map_session_data *sd){
  * @param sd : the baby session
  * @return mother session or NULL
  */
-struct map_session_data *pc_get_mother (struct map_session_data *sd){
+map_session_data *pc_get_mother (map_session_data *sd){
 	if (!sd || !(sd->class_&JOBL_BABY) || !sd->status.mother)
 		return NULL;
 	return map_charid2sd(sd->status.mother);
@@ -12552,7 +12552,7 @@ struct map_session_data *pc_get_mother (struct map_session_data *sd){
 /*==========================================
  * Get sd children charid. (Need to be married)
  *------------------------------------------*/
-struct map_session_data *pc_get_child (struct map_session_data *sd)
+map_session_data *pc_get_child (map_session_data *sd)
 {
 	if (!sd || !pc_ismarried(sd) || !sd->status.child)
 		// charid2sd returns NULL if not found
@@ -12563,7 +12563,7 @@ struct map_session_data *pc_get_child (struct map_session_data *sd)
 /*==========================================
  * Set player sd to bleed. (losing hp and/or sp each diff_tick)
  *------------------------------------------*/
-void pc_bleeding (struct map_session_data *sd, t_tick diff_tick)
+void pc_bleeding (map_session_data *sd, t_tick diff_tick)
 {
 	int hp = 0, sp = 0;
 
@@ -12595,7 +12595,7 @@ void pc_bleeding (struct map_session_data *sd, t_tick diff_tick)
 //Character regen. Flag is used to know which types of regen can take place.
 //&1: HP regen
 //&2: SP regen
-void pc_regen (struct map_session_data *sd, t_tick diff_tick)
+void pc_regen (map_session_data *sd, t_tick diff_tick)
 {
 	int hp = 0, sp = 0;
 
@@ -12638,7 +12638,7 @@ void pc_regen (struct map_session_data *sd, t_tick diff_tick)
 /*==========================================
  * Memo player sd savepoint. (map,x,y)
  *------------------------------------------*/
-void pc_setsavepoint(struct map_session_data *sd, short mapindex,int x,int y)
+void pc_setsavepoint(map_session_data *sd, short mapindex,int x,int y)
 {
 	nullpo_retv(sd);
 
@@ -12653,7 +12653,7 @@ void pc_setsavepoint(struct map_session_data *sd, short mapindex,int x,int y)
 static TIMER_FUNC(pc_autosave){
 	int interval;
 	struct s_mapiterator* iter;
-	struct map_session_data* sd;
+	map_session_data* sd;
 	static int last_save_id = 0, save_flag = 0;
 
 	if(save_flag == 2) //Someone was saved on last call, normal cycle
@@ -12692,7 +12692,7 @@ static TIMER_FUNC(pc_autosave){
 	return 0;
 }
 
-static int pc_daynight_timer_sub(struct map_session_data *sd,va_list ap)
+static int pc_daynight_timer_sub(map_session_data *sd,va_list ap)
 {
 	if (sd->state.night != night_flag && map_getmapflag(sd->bl.m, MF_NIGHTENABLED))
 	{	//Night/day state does not match.
@@ -12748,7 +12748,7 @@ TIMER_FUNC(map_night_timer){
 * @param force Ignore the check, ask player to stand up. Used in some cases like pc_damage(), pc_revive(), etc
 * @return True if success, Fals if failed
 */
-bool pc_setstand(struct map_session_data *sd, bool force){
+bool pc_setstand(map_session_data *sd, bool force){
 	nullpo_ret(sd);
 
 	// Cannot stand yet
@@ -12793,7 +12793,7 @@ void pc_overheat(map_session_data &sd, int16 heat) {
 /**
  * Check if player is autolooting given itemID.
  */
-bool pc_isautolooting(struct map_session_data *sd, t_itemid nameid)
+bool pc_isautolooting(map_session_data *sd, t_itemid nameid)
 {
 	uint8 i = 0;
 
@@ -12815,11 +12815,11 @@ bool pc_isautolooting(struct map_session_data *sd, t_itemid nameid)
  * @param command Command name without @/# and params
  * @param type is it atcommand or charcommand
  */
-bool pc_can_use_command( struct map_session_data *sd, const char *command, AtCommandType type ){
+bool pc_can_use_command( map_session_data *sd, const char *command, AtCommandType type ){
 	return sd->group->can_use_command( command, type );
 }
 
-bool pc_has_permission( struct map_session_data* sd, e_pc_permission permission ){
+bool pc_has_permission( map_session_data* sd, e_pc_permission permission ){
 	return sd->permissions.test( permission );
 }
 
@@ -12828,7 +12828,7 @@ bool pc_has_permission( struct map_session_data* sd, e_pc_permission permission
  * according to their group setting.
  * @param sd Player map session data
  */
-bool pc_should_log_commands( struct map_session_data *sd ){
+bool pc_should_log_commands( map_session_data *sd ){
 	return sd->group->log_commands;
 }
 
@@ -12837,10 +12837,10 @@ bool pc_should_log_commands( struct map_session_data *sd ){
  * @see TimerFunc
  */
 static TIMER_FUNC(pc_spiritcharm_timer){
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int i;
 
-	if ((sd = (struct map_session_data *)map_id2sd(id)) == NULL || sd->bl.type != BL_PC)
+	if ((sd = (map_session_data *)map_id2sd(id)) == NULL || sd->bl.type != BL_PC)
 		return 1;
 
 	if (sd->spiritcharm <= 0) {
@@ -12879,7 +12879,7 @@ static TIMER_FUNC(pc_spiritcharm_timer){
  * @param max: Maximum amount of charms to add
  * @param type: Charm type (@see spirit_charm_types)
  */
-void pc_addspiritcharm(struct map_session_data *sd, int interval, int max, int type)
+void pc_addspiritcharm(map_session_data *sd, int interval, int max, int type)
 {
 	int tid, i;
 
@@ -12922,7 +12922,7 @@ void pc_addspiritcharm(struct map_session_data *sd, int interval, int max, int t
  * @param count: Amount of charms to remove
  * @param type: Type of charm to remove
  */
-void pc_delspiritcharm(struct map_session_data *sd, int count, int type)
+void pc_delspiritcharm(map_session_data *sd, int count, int type)
 {
 	int i;
 
@@ -12974,7 +12974,7 @@ void pc_delspiritcharm(struct map_session_data *sd, int count, int type)
  * @param type: 1 - EXP, 2 - Item Drop
  * @return Penalty rate
  */
-uint16 pc_level_penalty_mod( struct map_session_data* sd, e_penalty_type type, std::shared_ptr<s_mob_db> mob, mob_data* md ){
+uint16 pc_level_penalty_mod( map_session_data* sd, e_penalty_type type, std::shared_ptr<s_mob_db> mob, mob_data* md ){
 	// No player was attached, we don't use any modifier (100 = rates are not touched)
 	if( sd == nullptr ){
 		return 100;
@@ -14170,7 +14170,7 @@ int pc_read_motd(void)
 	return 0;
 }
 
-void pc_itemcd_do(struct map_session_data *sd, bool load) {
+void pc_itemcd_do(map_session_data *sd, bool load) {
 	int i,cursor = 0;
 	struct item_cd* cd = NULL;
 
@@ -14213,7 +14213,7 @@ void pc_itemcd_do(struct map_session_data *sd, bool load) {
  * @return 0: No delay, can consume item.
  *         1: Has delay, cancel consumption.
  **/
-uint8 pc_itemcd_add(struct map_session_data *sd, struct item_data *id, t_tick tick, unsigned short n) {
+uint8 pc_itemcd_add(map_session_data *sd, struct item_data *id, t_tick tick, unsigned short n) {
 	int i;
 	ARR_FIND(0, MAX_ITEMDELAYS, i, sd->item_delay[i].nameid == id->nameid );
 	if( i == MAX_ITEMDELAYS ) /* item not found. try first empty now */
@@ -14259,8 +14259,8 @@ uint8 pc_itemcd_add(struct map_session_data *sd, struct item_data *id, t_tick ti
  * @return 0: No delay, can consume item.
  *         1: Has delay, cancel consumption.
  **/
-uint8 pc_itemcd_check(struct map_session_data *sd, struct item_data *id, t_tick tick, unsigned short n) {
-	struct status_change *sc = NULL;
+uint8 pc_itemcd_check(map_session_data *sd, struct item_data *id, t_tick tick, unsigned short n) {
+	status_change *sc = NULL;
 
 	nullpo_retr(0, sd);
 	nullpo_retr(0, id);
@@ -14301,7 +14301,7 @@ static void pc_clear_log_damage_sub(uint32 char_id, struct mob_data *md)
 * @param sd
 * @param id Monster's GID
 **/
-void pc_damage_log_add(struct map_session_data *sd, int id)
+void pc_damage_log_add(map_session_data *sd, int id)
 {
 	uint8 i = 0;
 
@@ -14326,7 +14326,7 @@ void pc_damage_log_add(struct map_session_data *sd, int id)
 * @param sd
 * @param id Monster's id
 **/
-void pc_damage_log_clear(struct map_session_data *sd, int id)
+void pc_damage_log_clear(map_session_data *sd, int id)
 {
 	uint8 i;
 	struct mob_data *md = NULL;
@@ -14358,7 +14358,7 @@ void pc_damage_log_clear(struct map_session_data *sd, int id)
  * Status change data arrived from char-server
  * @param sd: Player data
  */
-void pc_scdata_received(struct map_session_data *sd) {
+void pc_scdata_received(map_session_data *sd) {
 	pc_inventory_rentals(sd); // Needed here to remove rentals that have Status Changes after chrif_load_scdata has finished
 
 	clif_weight_limit( sd );
@@ -14387,7 +14387,7 @@ void pc_scdata_received(struct map_session_data *sd) {
  * Check player account expiration time and rental item expirations
  * @param sd: Player data
  */
-void pc_check_expiration(struct map_session_data *sd) {
+void pc_check_expiration(map_session_data *sd) {
 #ifndef ENABLE_SC_SAVING
 	pc_inventory_rentals(sd); // Check here if Status Change saving is disabled
 #endif
@@ -14404,7 +14404,7 @@ void pc_check_expiration(struct map_session_data *sd) {
 }
 
 TIMER_FUNC(pc_expiration_timer){
-	struct map_session_data *sd = map_id2sd(id);
+	map_session_data *sd = map_id2sd(id);
 
 	if( !sd ) return 0;
 
@@ -14419,7 +14419,7 @@ TIMER_FUNC(pc_expiration_timer){
 }
 
 TIMER_FUNC(pc_autotrade_timer){
-	struct map_session_data *sd = map_id2sd(id);
+	map_session_data *sd = map_id2sd(id);
 
 	if (!sd)
 		return 0;
@@ -14443,7 +14443,7 @@ TIMER_FUNC(pc_autotrade_timer){
 /* it loops thru online players once an hour to check whether a new < 24h is available */
 TIMER_FUNC(pc_global_expiration_timer){
 	struct s_mapiterator* iter;
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	iter = mapit_getallusers();
 
@@ -14456,7 +14456,7 @@ TIMER_FUNC(pc_global_expiration_timer){
   return 0;
 }
 
-void pc_expire_check(struct map_session_data *sd) {  
+void pc_expire_check(map_session_data *sd) {  
 	/* ongoing timer */
 	if( sd->expiration_tid != INVALID_TIMER )
 		return;
@@ -14479,7 +14479,7 @@ void pc_expire_check(struct map_session_data *sd) {
 * @param sd
 * @param money Amount of money to deposit
 **/
-enum e_BANKING_DEPOSIT_ACK pc_bank_deposit(struct map_session_data *sd, int money) {
+enum e_BANKING_DEPOSIT_ACK pc_bank_deposit(map_session_data *sd, int money) {
 	unsigned int limit_check = money + sd->bank_vault;
 
 	if( money <= 0 || limit_check > MAX_BANK_ZENY ) {
@@ -14503,7 +14503,7 @@ enum e_BANKING_DEPOSIT_ACK pc_bank_deposit(struct map_session_data *sd, int mone
 * @param sd
 * @param money Amount of money that will be withdrawn
 **/
-enum e_BANKING_WITHDRAW_ACK pc_bank_withdraw(struct map_session_data *sd, int money) {
+enum e_BANKING_WITHDRAW_ACK pc_bank_withdraw(map_session_data *sd, int money) {
 	unsigned int limit_check = money + sd->status.zeny;
 	
 	if( money <= 0 ) {
@@ -14530,7 +14530,7 @@ enum e_BANKING_WITHDRAW_ACK pc_bank_withdraw(struct map_session_data *sd, int mo
 * Clear Crimson Marker data from caster
 * @param sd: Player
 **/
-void pc_crimson_marker_clear(struct map_session_data *sd) {
+void pc_crimson_marker_clear(map_session_data *sd) {
 	uint8 i;
 
 	if (!sd)
@@ -14548,7 +14548,7 @@ void pc_crimson_marker_clear(struct map_session_data *sd) {
 * Show version to player
 * @param sd: Player
 **/
-void pc_show_version(struct map_session_data *sd) {
+void pc_show_version(map_session_data *sd) {
 	const char* svn = get_svn_revision();
 	char buf[CHAT_SIZE_MAX];
 
@@ -14569,7 +14569,7 @@ void pc_show_version(struct map_session_data *sd) {
  * @param sd
  * @author [Cydh]
  **/
-void pc_bonus_script(struct map_session_data *sd) {
+void pc_bonus_script(map_session_data *sd) {
 	t_tick now = gettick();
 	struct linkdb_node *node = NULL, *next = NULL;
 
@@ -14611,7 +14611,7 @@ void pc_bonus_script(struct map_session_data *sd) {
  * @return New created entry pointer or NULL if failed or NULL if duplicate fail
  * @author [Cydh]
  **/
-struct s_bonus_script_entry *pc_bonus_script_add(struct map_session_data *sd, const char *script_str, t_tick dur, enum efst_type icon, uint16 flag, uint8 type) {
+struct s_bonus_script_entry *pc_bonus_script_add(map_session_data *sd, const char *script_str, t_tick dur, enum efst_type icon, uint16 flag, uint8 type) {
 	struct script_code *script = NULL;
 	struct linkdb_node *node = NULL;
 	struct s_bonus_script_entry *entry = NULL;
@@ -14666,7 +14666,7 @@ struct s_bonus_script_entry *pc_bonus_script_add(struct map_session_data *sd, co
 * @param list: Bonus script entry from player
 * @author [Cydh]
 **/
-void pc_bonus_script_free_entry(struct map_session_data *sd, struct s_bonus_script_entry *entry) {
+void pc_bonus_script_free_entry(map_session_data *sd, struct s_bonus_script_entry *entry) {
 	if (entry->tid != INVALID_TIMER)
 		delete_timer(entry->tid, pc_bonus_script_timer);
 
@@ -14689,7 +14689,7 @@ void pc_bonus_script_free_entry(struct map_session_data *sd, struct s_bonus_scri
  * Do final process if no entry left
  * @param sd
  **/
-static void inline pc_bonus_script_check_final(struct map_session_data *sd) {
+static void inline pc_bonus_script_check_final(map_session_data *sd) {
 	if (sd->bonus_script.count == 0) {
 		if (sd->bonus_script.head && sd->bonus_script.head->data)
 			pc_bonus_script_free_entry(sd, (struct s_bonus_script_entry *)sd->bonus_script.head->data);
@@ -14706,7 +14706,7 @@ static void inline pc_bonus_script_check_final(struct map_session_data *sd) {
 * @author [Cydh]
 **/
 TIMER_FUNC(pc_bonus_script_timer){
-	struct map_session_data *sd;
+	map_session_data *sd;
 	struct s_bonus_script_entry *entry = (struct s_bonus_script_entry *)data;
 
 	sd = map_id2sd(id);
@@ -14736,7 +14736,7 @@ TIMER_FUNC(pc_bonus_script_timer){
 * @param flag: Reason to remove the bonus_script. e_bonus_script_flags or e_bonus_script_types
 * @author [Cydh]
 **/
-void pc_bonus_script_clear(struct map_session_data *sd, uint32 flag) {
+void pc_bonus_script_clear(map_session_data *sd, uint32 flag) {
 	struct linkdb_node *node = NULL;
 	uint16 count = 0;
 
@@ -14774,7 +14774,7 @@ void pc_bonus_script_clear(struct map_session_data *sd, uint32 flag) {
  * Gives/removes SC_BASILICA when player steps in/out the cell with 'cell_basilica'
  * @param sd: Target player
  */
-void pc_cell_basilica(struct map_session_data *sd) {
+void pc_cell_basilica(map_session_data *sd) {
 	nullpo_retv(sd);
 
 #ifdef RENEWAL
@@ -14797,7 +14797,7 @@ void pc_cell_basilica(struct map_session_data *sd) {
  * @param param: Max parameter to check
  * @return max_param
  */
-uint16 pc_maxparameter(struct map_session_data *sd, e_params param) {
+uint16 pc_maxparameter(map_session_data *sd, e_params param) {
 	nullpo_retr(0, sd);
 
 	std::shared_ptr<s_job_info> job = job_db.find(pc_mapid2jobid(sd->class_,sd->status.sex));
@@ -14814,7 +14814,7 @@ uint16 pc_maxparameter(struct map_session_data *sd, e_params param) {
 * @param sd Player
 * @return ASPD
 */
-short pc_maxaspd(struct map_session_data *sd) {
+short pc_maxaspd(map_session_data *sd) {
 	nullpo_ret(sd);
 
 	return (( sd->class_&JOBL_THIRD) ? battle_config.max_third_aspd : (
@@ -14829,7 +14829,7 @@ short pc_maxaspd(struct map_session_data *sd) {
 * @param nameid Item ID
 * @return Heal rate
 **/
-short pc_get_itemgroup_bonus(struct map_session_data* sd, t_itemid nameid, std::vector<s_item_bonus>& bonuses) {
+short pc_get_itemgroup_bonus(map_session_data* sd, t_itemid nameid, std::vector<s_item_bonus>& bonuses) {
 	if (bonuses.empty())
 		return 0;
 
@@ -14852,7 +14852,7 @@ short pc_get_itemgroup_bonus(struct map_session_data* sd, t_itemid nameid, std::
 * @param group_id Item Group ID
 * @return Heal rate
 **/
-short pc_get_itemgroup_bonus_group(struct map_session_data* sd, uint16 group_id, std::vector<s_item_bonus>& bonuses) {
+short pc_get_itemgroup_bonus_group(map_session_data* sd, uint16 group_id, std::vector<s_item_bonus>& bonuses) {
 	if (bonuses.empty())
 		return 0;
 
@@ -14897,7 +14897,7 @@ bool pc_is_same_equip_index(enum equip_index eqi, short *equip_index, short inde
  * @param sd : Player
  * @return A generated Unique item ID
  */
-uint64 pc_generate_unique_id(struct map_session_data *sd) {
+uint64 pc_generate_unique_id(map_session_data *sd) {
 	nullpo_ret(sd);
 	return ((uint64)sd->status.char_id << 32) | sd->status.uniqueitem_counter++;
 }
@@ -14906,7 +14906,7 @@ uint64 pc_generate_unique_id(struct map_session_data *sd) {
  * Validating skill from player after logged on
  * @param sd
  **/
-void pc_validate_skill(struct map_session_data *sd) {
+void pc_validate_skill(map_session_data *sd) {
 	if (sd) {
 		uint16 i = 0, count = 0;
 		struct s_skill tmp_skills[MAX_SKILL] = {{ 0 }};
@@ -14932,7 +14932,7 @@ void pc_validate_skill(struct map_session_data *sd) {
  * Show available NPC Quest / Event Icon Check [Kisuka]
  * @param sd Player
  **/
-void pc_show_questinfo(struct map_session_data *sd) {
+void pc_show_questinfo(map_session_data *sd) {
 #if PACKETVER >= 20090218
 	nullpo_retv(sd);
 
@@ -14989,7 +14989,7 @@ void pc_show_questinfo(struct map_session_data *sd) {
  * Reinit the questinfo for player when changing map
  * @param sd Player
  **/
-void pc_show_questinfo_reinit(struct map_session_data *sd) {
+void pc_show_questinfo_reinit(map_session_data *sd) {
 #if PACKETVER >= 20090218
 	nullpo_retv(sd);
 
@@ -15053,7 +15053,7 @@ bool pc_job_can_entermap(enum e_job jobid, int m, int group_lv) {
  * Tells client about player's costume view on mapchange for checking 'nocostume' mapflag.
  * @param sd
  **/
-void pc_set_costume_view(struct map_session_data *sd) {
+void pc_set_costume_view(map_session_data *sd) {
 	int i = -1, head_low = 0, head_mid = 0, head_top = 0, robe = 0;
 	struct item_data *id = NULL;
 
@@ -15149,11 +15149,11 @@ bool pc_attendance_enabled(){
 	return pc_attendance_period() != nullptr;
 }
 
-static inline bool pc_attendance_rewarded_today( struct map_session_data* sd ){
+static inline bool pc_attendance_rewarded_today( map_session_data* sd ){
 	return pc_readreg2( sd, ATTENDANCE_DATE_VAR ) >= date_get(DT_YYYYMMDD);
 }
 
-int32 pc_attendance_counter( struct map_session_data* sd ){
+int32 pc_attendance_counter( map_session_data* sd ){
 	std::shared_ptr<s_attendance_period> period = pc_attendance_period();
 
 	// No running attendance period
@@ -15175,7 +15175,7 @@ int32 pc_attendance_counter( struct map_session_data* sd ){
 	return 10 * counter + ( ( pc_attendance_rewarded_today(sd) ) ? 1 : 0 );
 }
 
-void pc_attendance_claim_reward( struct map_session_data* sd ){
+void pc_attendance_claim_reward( map_session_data* sd ){
 	// If the user's group does not have the permission
 	if( !pc_has_permission( sd, PC_PERM_ATTENDANCE ) ){
 		return;
diff --git a/src/map/pc.hpp b/src/map/pc.hpp
index c42ff1f6ff..801105c087 100644
--- a/src/map/pc.hpp
+++ b/src/map/pc.hpp
@@ -378,7 +378,7 @@ public:
 	struct unit_data ud;
 	struct view_data vd;
 	struct status_data base_status, battle_status;
-	struct status_change sc;
+	status_change sc;
 	struct regen_data regen;
 	struct regen_data_sub sregen, ssregen;
 	//NOTE: When deciding to add a flag to state or special_state, take into consideration that state is preserved in
@@ -1127,7 +1127,7 @@ extern JobDatabase job_db;
 #define pc_isidle_hom(sd)     ( (sd)->hd && ( (sd)->chatID || (sd)->state.vending || (sd)->state.buyingstore || DIFF_TICK(last_tick, (sd)->idletime_hom) >= battle_config.hom_idle_no_share ) )
 #define pc_isidle_mer(sd)     ( (sd)->md && ( (sd)->chatID || (sd)->state.vending || (sd)->state.buyingstore || DIFF_TICK(last_tick, (sd)->idletime_mer) >= battle_config.mer_idle_no_share ) )
 #define pc_istrading(sd)      ( (sd)->npc_id || (sd)->state.vending || (sd)->state.buyingstore || (sd)->state.trading )
-static bool pc_cant_act2( struct map_session_data* sd ){
+static bool pc_cant_act2( map_session_data* sd ){
 	return sd->state.vending || sd->state.buyingstore || (sd->sc.opt1 && sd->sc.opt1 != OPT1_BURNING)
 		|| sd->state.trading || sd->state.storage_flag || sd->state.prevend || sd->state.refineui_open
 		|| sd->state.stylist_open || sd->state.inventory_expansion_confirmation || sd->npc_shopid
@@ -1137,7 +1137,7 @@ static bool pc_cant_act2( struct map_session_data* sd ){
 		|| sd->state.item_reform || sd->state.item_enchant_index;
 }
 // equals pc_cant_act2 and additionally checks for chat rooms and npcs
-static bool pc_cant_act( struct map_session_data* sd ){
+static bool pc_cant_act( map_session_data* sd ){
 	return sd->npc_id || sd->chatID || pc_cant_act2( sd );
 }
 
@@ -1164,12 +1164,12 @@ static bool pc_cant_act( struct map_session_data* sd ){
 #define pc_is70overweight(sd) ( (sd)->weight * 100 >= (sd)->max_weight * battle_config.natural_heal_weight_rate_renewal )
 #define pc_is90overweight(sd) ( (sd)->weight * 10 >= (sd)->max_weight * 9 )
 
-static inline bool pc_hasprogress(struct map_session_data *sd, enum e_wip_block progress) {
+static inline bool pc_hasprogress(map_session_data *sd, enum e_wip_block progress) {
 	return sd == NULL || (sd->state.workinprogress&progress) == progress;
 }
 
-uint16 pc_maxparameter(struct map_session_data *sd, e_params param);
-short pc_maxaspd(struct map_session_data *sd);
+uint16 pc_maxparameter(map_session_data *sd, e_params param);
+short pc_maxaspd(map_session_data *sd);
 
 /**
  * Ranger
@@ -1348,50 +1348,50 @@ enum e_summoner_power_type {
 
 void pc_set_reg_load(bool val);
 int pc_class2idx(int class_);
-int pc_get_group_level(struct map_session_data *sd);
-int pc_get_group_id(struct map_session_data *sd);
-bool pc_can_sell_item(struct map_session_data* sd, struct item * item, enum npc_subtype shoptype);
-bool pc_can_give_items(struct map_session_data *sd);
-bool pc_can_give_bounded_items(struct map_session_data *sd);
+int pc_get_group_level(map_session_data *sd);
+int pc_get_group_id(map_session_data *sd);
+bool pc_can_sell_item(map_session_data* sd, struct item * item, enum npc_subtype shoptype);
+bool pc_can_give_items(map_session_data *sd);
+bool pc_can_give_bounded_items(map_session_data *sd);
 bool pc_can_trade_item(map_session_data *sd, int index);
 
-bool pc_can_use_command(struct map_session_data *sd, const char *command, AtCommandType type);
-bool pc_has_permission( struct map_session_data* sd, e_pc_permission permission );
-bool pc_should_log_commands(struct map_session_data *sd);
+bool pc_can_use_command(map_session_data *sd, const char *command, AtCommandType type);
+bool pc_has_permission( map_session_data* sd, e_pc_permission permission );
+bool pc_should_log_commands(map_session_data *sd);
 
-void pc_setrestartvalue(struct map_session_data *sd, char type);
-void pc_makesavestatus(struct map_session_data *sd);
-void pc_respawn(struct map_session_data* sd, clr_type clrtype);
-void pc_setnewpc(struct map_session_data *sd, uint32 account_id, uint32 char_id, int login_id1, t_tick client_tick, int sex, int fd);
-bool pc_authok(struct map_session_data *sd, uint32 login_id2, time_t expiration_time, int group_id, struct mmo_charstatus *st, bool changing_mapservers);
-void pc_authfail(struct map_session_data *sd);
-void pc_reg_received(struct map_session_data *sd);
-void pc_close_npc(struct map_session_data *sd,int flag);
+void pc_setrestartvalue(map_session_data *sd, char type);
+void pc_makesavestatus(map_session_data *sd);
+void pc_respawn(map_session_data* sd, clr_type clrtype);
+void pc_setnewpc(map_session_data *sd, uint32 account_id, uint32 char_id, int login_id1, t_tick client_tick, int sex, int fd);
+bool pc_authok(map_session_data *sd, uint32 login_id2, time_t expiration_time, int group_id, struct mmo_charstatus *st, bool changing_mapservers);
+void pc_authfail(map_session_data *sd);
+void pc_reg_received(map_session_data *sd);
+void pc_close_npc(map_session_data *sd,int flag);
 TIMER_FUNC(pc_close_npc_timer);
 
-void pc_setequipindex(struct map_session_data *sd);
-uint8 pc_isequip(struct map_session_data *sd,int n);
-int pc_equippoint(struct map_session_data *sd,int n);
-int pc_equippoint_sub(struct map_session_data *sd, struct item_data* id);
-void pc_setinventorydata(struct map_session_data *sd);
+void pc_setequipindex(map_session_data *sd);
+uint8 pc_isequip(map_session_data *sd,int n);
+int pc_equippoint(map_session_data *sd,int n);
+int pc_equippoint_sub(map_session_data *sd, struct item_data* id);
+void pc_setinventorydata(map_session_data *sd);
 
-int pc_get_skillcooldown(struct map_session_data *sd, uint16 skill_id, uint16 skill_lv);
-uint8 pc_checkskill(struct map_session_data *sd,uint16 skill_id);
+int pc_get_skillcooldown(map_session_data *sd, uint16 skill_id, uint16 skill_lv);
+uint8 pc_checkskill(map_session_data *sd,uint16 skill_id);
 e_skill_flag pc_checkskill_flag(map_session_data &sd, uint16 skill_id);
 uint8 pc_checkskill_summoner(map_session_data *sd, e_summoner_power_type type);
-uint8 pc_checkskill_imperial_guard(struct map_session_data *sd, short flag);
-short pc_checkequip(struct map_session_data *sd,int pos,bool checkall=false);
-bool pc_checkequip2(struct map_session_data *sd, t_itemid nameid, int min, int max);
+uint8 pc_checkskill_imperial_guard(map_session_data *sd, short flag);
+short pc_checkequip(map_session_data *sd,int pos,bool checkall=false);
+bool pc_checkequip2(map_session_data *sd, t_itemid nameid, int min, int max);
 
-void pc_scdata_received(struct map_session_data *sd);
-void pc_check_expiration(struct map_session_data *sd);
+void pc_scdata_received(map_session_data *sd);
+void pc_check_expiration(map_session_data *sd);
 TIMER_FUNC(pc_expiration_timer);
 TIMER_FUNC(pc_global_expiration_timer);
-void pc_expire_check(struct map_session_data *sd);
+void pc_expire_check(map_session_data *sd);
 
-void pc_calc_skilltree(struct map_session_data *sd);
-uint64 pc_calc_skilltree_normalize_job(struct map_session_data *sd);
-void pc_clean_skilltree(struct map_session_data *sd);
+void pc_calc_skilltree(map_session_data *sd);
+uint64 pc_calc_skilltree_normalize_job(map_session_data *sd);
+void pc_clean_skilltree(map_session_data *sd);
 
 #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)
@@ -1403,53 +1403,53 @@ enum e_setpos{
 	SETPOS_AUTOTRADE = 3
 };
 
-enum e_setpos pc_setpos(struct map_session_data* sd, unsigned short mapindex, int x, int y, clr_type clrtype);
-void pc_setsavepoint(struct map_session_data *sd, short mapindex,int x,int y);
-char pc_randomwarp(struct map_session_data *sd,clr_type type,bool ignore_mapflag = false);
-bool pc_memo(struct map_session_data* sd, int pos);
+enum e_setpos pc_setpos(map_session_data* sd, unsigned short mapindex, int x, int y, clr_type clrtype);
+void pc_setsavepoint(map_session_data *sd, short mapindex,int x,int y);
+char pc_randomwarp(map_session_data *sd,clr_type type,bool ignore_mapflag = false);
+bool pc_memo(map_session_data* sd, int pos);
 
-char pc_checkadditem(struct map_session_data *sd, t_itemid nameid, int amount);
-uint8 pc_inventoryblank(struct map_session_data *sd);
-short pc_search_inventory(struct map_session_data *sd, t_itemid nameid);
-char pc_payzeny(struct map_session_data *sd, int zeny, enum e_log_pick_type type, struct map_session_data *tsd);
-enum e_additem_result pc_additem(struct map_session_data *sd, struct item *item, int amount, e_log_pick_type log_type);
-char pc_getzeny(struct map_session_data *sd, int zeny, enum e_log_pick_type type, struct map_session_data *tsd);
-char pc_delitem(struct map_session_data *sd, int n, int amount, int type, short reason, e_log_pick_type log_type);
+char pc_checkadditem(map_session_data *sd, t_itemid nameid, int amount);
+uint8 pc_inventoryblank(map_session_data *sd);
+short pc_search_inventory(map_session_data *sd, t_itemid nameid);
+char pc_payzeny(map_session_data *sd, int zeny, enum e_log_pick_type type, map_session_data *tsd);
+enum e_additem_result pc_additem(map_session_data *sd, struct item *item, int amount, e_log_pick_type log_type);
+char pc_getzeny(map_session_data *sd, int zeny, enum e_log_pick_type type, map_session_data *tsd);
+char pc_delitem(map_session_data *sd, int n, int amount, int type, short reason, e_log_pick_type log_type);
 
-uint64 pc_generate_unique_id(struct map_session_data *sd);
+uint64 pc_generate_unique_id(map_session_data *sd);
 
 //Bound items
 int pc_bound_chk(TBL_PC *sd,enum bound_type type,int *idxlist);
 
 // Special Shop System
-int pc_paycash( struct map_session_data *sd, int price, int points, e_log_pick_type type );
-int pc_getcash( struct map_session_data *sd, int cash, int points, e_log_pick_type type );
+int pc_paycash( map_session_data *sd, int price, int points, e_log_pick_type type );
+int pc_getcash( map_session_data *sd, int cash, int points, e_log_pick_type type );
 
-enum e_additem_result pc_cart_additem(struct map_session_data *sd,struct item *item_data,int amount,e_log_pick_type log_type);
-void pc_cart_delitem(struct map_session_data *sd,int n,int amount,int type,e_log_pick_type log_type);
-void pc_putitemtocart(struct map_session_data *sd,int idx,int amount);
-void pc_getitemfromcart(struct map_session_data *sd,int idx,int amount);
-int pc_cartitem_amount(struct map_session_data *sd,int idx,int amount);
+enum e_additem_result pc_cart_additem(map_session_data *sd,struct item *item_data,int amount,e_log_pick_type log_type);
+void pc_cart_delitem(map_session_data *sd,int n,int amount,int type,e_log_pick_type log_type);
+void pc_putitemtocart(map_session_data *sd,int idx,int amount);
+void pc_getitemfromcart(map_session_data *sd,int idx,int amount);
+int pc_cartitem_amount(map_session_data *sd,int idx,int amount);
 
-bool pc_takeitem(struct map_session_data *sd,struct flooritem_data *fitem);
-bool pc_dropitem(struct map_session_data *sd,int n,int amount);
+bool pc_takeitem(map_session_data *sd,struct flooritem_data *fitem);
+bool pc_dropitem(map_session_data *sd,int n,int amount);
 
-bool pc_isequipped(struct map_session_data *sd, t_itemid nameid);
-enum adopt_responses pc_try_adopt(struct map_session_data *p1_sd, struct map_session_data *p2_sd, struct map_session_data *b_sd);
-bool pc_adoption(struct map_session_data *p1_sd, struct map_session_data *p2_sd, struct map_session_data *b_sd);
+bool pc_isequipped(map_session_data *sd, t_itemid nameid);
+enum adopt_responses pc_try_adopt(map_session_data *p1_sd, map_session_data *p2_sd, map_session_data *b_sd);
+bool pc_adoption(map_session_data *p1_sd, map_session_data *p2_sd, map_session_data *b_sd);
 
-void pc_updateweightstatus(struct map_session_data *sd);
+void pc_updateweightstatus(map_session_data *sd);
 
 bool pc_addautobonus(std::vector<std::shared_ptr<s_autobonus>> &bonus, const char *script, short rate, unsigned int dur, uint16 atk_type, const char *o_script, unsigned int pos, bool onskill);
-void pc_exeautobonus(struct map_session_data &sd, std::vector<std::shared_ptr<s_autobonus>> *bonus, std::shared_ptr<s_autobonus> autobonus);
+void pc_exeautobonus(map_session_data &sd, std::vector<std::shared_ptr<s_autobonus>> *bonus, std::shared_ptr<s_autobonus> autobonus);
 TIMER_FUNC(pc_endautobonus);
-void pc_delautobonus(struct map_session_data &sd, std::vector<std::shared_ptr<s_autobonus>> &bonus, bool restore);
+void pc_delautobonus(map_session_data &sd, std::vector<std::shared_ptr<s_autobonus>> &bonus, bool restore);
 
-void pc_bonus(struct map_session_data *sd, int type, int val);
-void pc_bonus2(struct map_session_data *sd, int type, int type2, int val);
-void pc_bonus3(struct map_session_data *sd, int type, int type2, int type3, int val);
-void pc_bonus4(struct map_session_data *sd, int type, int type2, int type3, int type4, int val);
-void pc_bonus5(struct map_session_data *sd, int type, int type2, int type3, int type4, int type5, int val);
+void pc_bonus(map_session_data *sd, int type, int val);
+void pc_bonus2(map_session_data *sd, int type, int type2, int val);
+void pc_bonus3(map_session_data *sd, int type, int type2, int type3, int val);
+void pc_bonus4(map_session_data *sd, int type, int type2, int type3, int type4, int val);
+void pc_bonus5(map_session_data *sd, int type, int type2, int type3, int type4, int type5, int val);
 
 enum e_addskill_type {
 	ADDSKILL_PERMANENT			= 0,	///< Permanent skill. Remove the skill if level is 0
@@ -1458,91 +1458,91 @@ enum e_addskill_type {
 	ADDSKILL_PERMANENT_GRANTED	= 3,	///< Grant permanent skill, ignore skill tree and learned level
 };
 
-bool pc_skill(struct map_session_data *sd, uint16 skill_id, int level, enum e_addskill_type type);
+bool pc_skill(map_session_data *sd, uint16 skill_id, int level, enum e_addskill_type type);
 bool pc_skill_plagiarism(map_session_data &sd, uint16 skill_id, uint16 skill_lv);
 bool pc_skill_plagiarism_reset(map_session_data &sd, uint8 type);
 
-int pc_insert_card(struct map_session_data *sd,int idx_card,int idx_equip);
+int pc_insert_card(map_session_data *sd,int idx_card,int idx_equip);
 
-int pc_identifyall(struct map_session_data *sd, bool identify_item);
+int pc_identifyall(map_session_data *sd, bool identify_item);
 
-bool pc_steal_item(struct map_session_data *sd,struct block_list *bl, uint16 skill_lv);
-int pc_steal_coin(struct map_session_data *sd,struct block_list *bl);
+bool pc_steal_item(map_session_data *sd,struct block_list *bl, uint16 skill_lv);
+int pc_steal_coin(map_session_data *sd,struct block_list *bl);
 
-int pc_modifybuyvalue(struct map_session_data*,int);
-int pc_modifysellvalue(struct map_session_data*,int);
+int pc_modifybuyvalue(map_session_data*,int);
+int pc_modifysellvalue(map_session_data*,int);
 
-int pc_follow(struct map_session_data*, int); // [MouseJstr]
-int pc_stop_following(struct map_session_data*);
+int pc_follow(map_session_data*, int); // [MouseJstr]
+int pc_stop_following(map_session_data*);
 
-unsigned int pc_maxbaselv(struct map_session_data *sd);
-unsigned int pc_maxjoblv(struct map_session_data *sd);
-bool pc_is_maxbaselv(struct map_session_data *sd);
-bool pc_is_maxjoblv(struct map_session_data *sd);
-int pc_checkbaselevelup(struct map_session_data *sd);
-int pc_checkjoblevelup(struct map_session_data *sd);
-void pc_gainexp(struct map_session_data *sd, struct block_list *src, t_exp base_exp, t_exp job_exp, uint8 exp_flag);
-void pc_gainexp_disp(struct map_session_data *sd, t_exp base_exp, t_exp next_base_exp, t_exp job_exp, t_exp next_job_exp, bool lost);
-void pc_lostexp(struct map_session_data *sd, t_exp base_exp, t_exp job_exp);
-t_exp pc_nextbaseexp(struct map_session_data *sd);
-t_exp pc_nextjobexp(struct map_session_data *sd);
-int pc_need_status_point(struct map_session_data *,int,int);
-int pc_maxparameterincrease(struct map_session_data*,int);
-bool pc_statusup(struct map_session_data*,int,int);
-int pc_statusup2(struct map_session_data*,int,int);
+unsigned int pc_maxbaselv(map_session_data *sd);
+unsigned int pc_maxjoblv(map_session_data *sd);
+bool pc_is_maxbaselv(map_session_data *sd);
+bool pc_is_maxjoblv(map_session_data *sd);
+int pc_checkbaselevelup(map_session_data *sd);
+int pc_checkjoblevelup(map_session_data *sd);
+void pc_gainexp(map_session_data *sd, struct block_list *src, t_exp base_exp, t_exp job_exp, uint8 exp_flag);
+void pc_gainexp_disp(map_session_data *sd, t_exp base_exp, t_exp next_base_exp, t_exp job_exp, t_exp next_job_exp, bool lost);
+void pc_lostexp(map_session_data *sd, t_exp base_exp, t_exp job_exp);
+t_exp pc_nextbaseexp(map_session_data *sd);
+t_exp pc_nextjobexp(map_session_data *sd);
+int pc_need_status_point(map_session_data *,int,int);
+int pc_maxparameterincrease(map_session_data*,int);
+bool pc_statusup(map_session_data*,int,int);
+int pc_statusup2(map_session_data*,int,int);
 int pc_getstat(map_session_data *sd, int type);
-int pc_setstat(struct map_session_data* sd, int type, int val);
-int pc_need_trait_point(struct map_session_data *, int, int);
-int pc_maxtraitparameterincrease(struct map_session_data*, int);
-bool pc_traitstatusup(struct map_session_data*, int, int);
-int pc_traitstatusup2(struct map_session_data*, int, int);
-void pc_skillup(struct map_session_data*,uint16 skill_id);
-int pc_allskillup(struct map_session_data*);
-int pc_resetlvl(struct map_session_data*,int type);
-int pc_resetstate(struct map_session_data*);
-int pc_resetskill(struct map_session_data*, int);
-int pc_resetfeel(struct map_session_data*);
-int pc_resethate(struct map_session_data*);
-bool pc_equipitem(struct map_session_data *sd, short n, int req_pos, bool equipswitch=false);
-bool pc_unequipitem(struct map_session_data*,int,int);
-int pc_equipswitch( struct map_session_data* sd, int index );
-void pc_equipswitch_remove( struct map_session_data* sd, int index );
-void pc_checkitem(struct map_session_data*);
-void pc_check_available_item(struct map_session_data *sd, uint8 type);
-int pc_useitem(struct map_session_data*,int);
+int pc_setstat(map_session_data* sd, int type, int val);
+int pc_need_trait_point(map_session_data *, int, int);
+int pc_maxtraitparameterincrease(map_session_data*, int);
+bool pc_traitstatusup(map_session_data*, int, int);
+int pc_traitstatusup2(map_session_data*, int, int);
+void pc_skillup(map_session_data*,uint16 skill_id);
+int pc_allskillup(map_session_data*);
+int pc_resetlvl(map_session_data*,int type);
+int pc_resetstate(map_session_data*);
+int pc_resetskill(map_session_data*, int);
+int pc_resetfeel(map_session_data*);
+int pc_resethate(map_session_data*);
+bool pc_equipitem(map_session_data *sd, short n, int req_pos, bool equipswitch=false);
+bool pc_unequipitem(map_session_data*,int,int);
+int pc_equipswitch( map_session_data* sd, int index );
+void pc_equipswitch_remove( map_session_data* sd, int index );
+void pc_checkitem(map_session_data*);
+void pc_check_available_item(map_session_data *sd, uint8 type);
+int pc_useitem(map_session_data*,int);
 
-int pc_skillatk_bonus(struct map_session_data *sd, uint16 skill_id);
-int pc_sub_skillatk_bonus(struct map_session_data *sd, uint16 skill_id);
-int pc_skillheal_bonus(struct map_session_data *sd, uint16 skill_id);
-int pc_skillheal2_bonus(struct map_session_data *sd, uint16 skill_id);
+int pc_skillatk_bonus(map_session_data *sd, uint16 skill_id);
+int pc_sub_skillatk_bonus(map_session_data *sd, uint16 skill_id);
+int pc_skillheal_bonus(map_session_data *sd, uint16 skill_id);
+int pc_skillheal2_bonus(map_session_data *sd, uint16 skill_id);
 
-void pc_damage(struct map_session_data *sd,struct block_list *src,unsigned int hp, unsigned int sp, unsigned int ap);
-int pc_dead(struct map_session_data *sd,struct block_list *src);
-void pc_revive(struct map_session_data *sd,unsigned int hp, unsigned int sp, unsigned int ap = 0);
-bool pc_revive_item(struct map_session_data *sd);
-void pc_heal(struct map_session_data *sd,unsigned int hp,unsigned int sp, unsigned int ap, int type);
-int pc_itemheal(struct map_session_data *sd, t_itemid itemid, int hp,int sp);
-int pc_percentheal(struct map_session_data *sd,int,int);
-bool pc_jobchange(struct map_session_data *sd, int job, char upper);
-void pc_setoption(struct map_session_data *,int type, int subtype = 0);
-bool pc_setcart(struct map_session_data* sd, int type);
-void pc_setfalcon(struct map_session_data* sd, int flag);
-void pc_setriding(struct map_session_data* sd, int flag);
-void pc_setmadogear(struct map_session_data* sd, bool flag, e_mado_type type = MADO_ROBOT);
-void pc_changelook(struct map_session_data *,int,int);
-void pc_equiplookall(struct map_session_data *sd);
-void pc_set_costume_view(struct map_session_data *sd);
+void pc_damage(map_session_data *sd,struct block_list *src,unsigned int hp, unsigned int sp, unsigned int ap);
+int pc_dead(map_session_data *sd,struct block_list *src);
+void pc_revive(map_session_data *sd,unsigned int hp, unsigned int sp, unsigned int ap = 0);
+bool pc_revive_item(map_session_data *sd);
+void pc_heal(map_session_data *sd,unsigned int hp,unsigned int sp, unsigned int ap, int type);
+int pc_itemheal(map_session_data *sd, t_itemid itemid, int hp,int sp);
+int pc_percentheal(map_session_data *sd,int,int);
+bool pc_jobchange(map_session_data *sd, int job, char upper);
+void pc_setoption(map_session_data *,int type, int subtype = 0);
+bool pc_setcart(map_session_data* sd, int type);
+void pc_setfalcon(map_session_data* sd, int flag);
+void pc_setriding(map_session_data* sd, int flag);
+void pc_setmadogear(map_session_data* sd, bool flag, e_mado_type type = MADO_ROBOT);
+void pc_changelook(map_session_data *,int,int);
+void pc_equiplookall(map_session_data *sd);
+void pc_set_costume_view(map_session_data *sd);
 
-int64 pc_readparam(struct map_session_data *sd, int64 type);
-bool pc_setparam(struct map_session_data *sd, int64 type, int64 val);
-int64 pc_readreg(struct map_session_data *sd, int64 reg);
-bool pc_setreg(struct map_session_data *sd, int64 reg, int64 val);
-char *pc_readregstr(struct map_session_data *sd, int64 reg);
-bool pc_setregstr(struct map_session_data *sd, int64 reg, const char *str);
-int64 pc_readregistry(struct map_session_data *sd, int64 reg);
-bool pc_setregistry(struct map_session_data *sd, int64 reg, int64 val);
-char *pc_readregistry_str(struct map_session_data *sd, int64 reg);
-bool pc_setregistry_str(struct map_session_data *sd, int64 reg, const char *val);
+int64 pc_readparam(map_session_data *sd, int64 type);
+bool pc_setparam(map_session_data *sd, int64 type, int64 val);
+int64 pc_readreg(map_session_data *sd, int64 reg);
+bool pc_setreg(map_session_data *sd, int64 reg, int64 val);
+char *pc_readregstr(map_session_data *sd, int64 reg);
+bool pc_setregstr(map_session_data *sd, int64 reg, const char *str);
+int64 pc_readregistry(map_session_data *sd, int64 reg);
+bool pc_setregistry(map_session_data *sd, int64 reg, int64 val);
+char *pc_readregistry_str(map_session_data *sd, int64 reg);
+bool pc_setregistry_str(map_session_data *sd, int64 reg, const char *val);
 
 #define pc_readglobalreg(sd,reg) pc_readregistry(sd,reg)
 #define pc_setglobalreg(sd,reg,val) pc_setregistry(sd,reg,val)
@@ -1557,30 +1557,30 @@ bool pc_setregistry_str(struct map_session_data *sd, int64 reg, const char *val)
 #define pc_readaccountreg2str(sd,reg) pc_readregistry_str(sd,reg)
 #define pc_setaccountreg2str(sd,reg,val) pc_setregistry_str(sd,reg,val)
 
-bool pc_setreg2(struct map_session_data *sd, const char *reg, int64 val);
-int64 pc_readreg2(struct map_session_data *sd, const char *reg);
+bool pc_setreg2(map_session_data *sd, const char *reg, int64 val);
+int64 pc_readreg2(map_session_data *sd, const char *reg);
 
-bool pc_addeventtimer(struct map_session_data *sd,int tick,const char *name);
-bool pc_deleventtimer(struct map_session_data *sd,const char *name);
-void pc_cleareventtimer(struct map_session_data *sd);
-void pc_addeventtimercount(struct map_session_data *sd,const char *name,int tick);
+bool pc_addeventtimer(map_session_data *sd,int tick,const char *name);
+bool pc_deleventtimer(map_session_data *sd,const char *name);
+void pc_cleareventtimer(map_session_data *sd);
+void pc_addeventtimercount(map_session_data *sd,const char *name,int tick);
 
-int pc_calc_pvprank(struct map_session_data *sd);
+int pc_calc_pvprank(map_session_data *sd);
 TIMER_FUNC(pc_calc_pvprank_timer);
 
-int pc_ismarried(struct map_session_data *sd);
-bool pc_marriage(struct map_session_data *sd,struct map_session_data *dstsd);
-bool pc_divorce(struct map_session_data *sd);
-struct map_session_data *pc_get_partner(struct map_session_data *sd);
-struct map_session_data *pc_get_father(struct map_session_data *sd);
-struct map_session_data *pc_get_mother(struct map_session_data *sd);
-struct map_session_data *pc_get_child(struct map_session_data *sd);
+int pc_ismarried(map_session_data *sd);
+bool pc_marriage(map_session_data *sd,map_session_data *dstsd);
+bool pc_divorce(map_session_data *sd);
+map_session_data *pc_get_partner(map_session_data *sd);
+map_session_data *pc_get_father(map_session_data *sd);
+map_session_data *pc_get_mother(map_session_data *sd);
+map_session_data *pc_get_child(map_session_data *sd);
 
-void pc_bleeding (struct map_session_data *sd, t_tick diff_tick);
-void pc_regen (struct map_session_data *sd, t_tick diff_tick);
+void pc_bleeding (map_session_data *sd, t_tick diff_tick);
+void pc_regen (map_session_data *sd, t_tick diff_tick);
 
-bool pc_setstand(struct map_session_data *sd, bool force);
-bool pc_candrop(struct map_session_data *sd,struct item *item);
+bool pc_setstand(map_session_data *sd, bool force);
+bool pc_candrop(map_session_data *sd,struct item *item);
 
 uint64 pc_jobid2mapid(unsigned short b_class);	// Skotlex
 int pc_mapid2jobid(uint64 class_, int sex);	// Skotlex
@@ -1628,21 +1628,21 @@ extern const struct sg_data sg_info[MAX_PC_FEELHATE];
 void pc_set_bg_queue_timer(map_session_data *sd);
 void pc_delete_bg_queue_timer(map_session_data *sd);
 
-void pc_setinvincibletimer(struct map_session_data* sd, int val);
-void pc_delinvincibletimer(struct map_session_data* sd);
+void pc_setinvincibletimer(map_session_data* sd, int val);
+void pc_delinvincibletimer(map_session_data* sd);
 
-void pc_addspiritball(struct map_session_data *sd,int interval,int max);
-void pc_delspiritball(struct map_session_data *sd,int count,int type);
+void pc_addspiritball(map_session_data *sd,int interval,int max);
+void pc_delspiritball(map_session_data *sd,int count,int type);
 int pc_addsoulball(map_session_data *sd, int max);
 int pc_delsoulball(map_session_data *sd, int count, bool type);
-void pc_addservantball( struct map_session_data& sd, int count = 1 );
-void pc_delservantball( struct map_session_data& sd, int count = 1 );
-void pc_addabyssball( struct map_session_data& sd, int count = 1 );
-void pc_delabyssball( struct map_session_data& sd, int count = 1 );
+void pc_addservantball( map_session_data& sd, int count = 1 );
+void pc_delservantball( map_session_data& sd, int count = 1 );
+void pc_addabyssball( map_session_data& sd, int count = 1 );
+void pc_delabyssball( map_session_data& sd, int count = 1 );
 
 bool pc_addfame(map_session_data &sd, int count);
 unsigned char pc_famerank(uint32 char_id, int job);
-bool pc_set_hate_mob(struct map_session_data *sd, int pos, struct block_list *bl);
+bool pc_set_hate_mob(map_session_data *sd, int pos, struct block_list *bl);
 
 extern struct fame_list smith_fame_list[MAX_FAME_LIST];
 extern struct fame_list chemist_fame_list[MAX_FAME_LIST];
@@ -1659,48 +1659,48 @@ TIMER_FUNC(map_day_timer); // by [yor]
 TIMER_FUNC(map_night_timer); // by [yor]
 
 // Rental System
-void pc_inventory_rentals(struct map_session_data *sd);
-void pc_inventory_rental_clear(struct map_session_data *sd);
-void pc_inventory_rental_add(struct map_session_data *sd, unsigned int seconds);
+void pc_inventory_rentals(map_session_data *sd);
+void pc_inventory_rental_clear(map_session_data *sd);
+void pc_inventory_rental_add(map_session_data *sd, unsigned int seconds);
 
 int pc_read_motd(void); // [Valaris]
-int pc_disguise(struct map_session_data *sd, int class_);
-bool pc_isautolooting(struct map_session_data *sd, t_itemid nameid);
+int pc_disguise(map_session_data *sd, int class_);
+bool pc_isautolooting(map_session_data *sd, t_itemid nameid);
 
 void pc_overheat(map_session_data &sd, int16 heat);
 
-void pc_itemcd_do(struct map_session_data *sd, bool load);
-uint8 pc_itemcd_add(struct map_session_data *sd, struct item_data *id, t_tick tick, unsigned short n);
-uint8 pc_itemcd_check(struct map_session_data *sd, struct item_data *id, t_tick tick, unsigned short n);
+void pc_itemcd_do(map_session_data *sd, bool load);
+uint8 pc_itemcd_add(map_session_data *sd, struct item_data *id, t_tick tick, unsigned short n);
+uint8 pc_itemcd_check(map_session_data *sd, struct item_data *id, t_tick tick, unsigned short n);
 
-int pc_load_combo(struct map_session_data *sd);
+int pc_load_combo(map_session_data *sd);
 
-void pc_addspiritcharm(struct map_session_data *sd, int interval, int max, int type);
-void pc_delspiritcharm(struct map_session_data *sd, int count, int type);
+void pc_addspiritcharm(map_session_data *sd, int interval, int max, int type);
+void pc_delspiritcharm(map_session_data *sd, int count, int type);
 
-void pc_baselevelchanged(struct map_session_data *sd);
+void pc_baselevelchanged(map_session_data *sd);
 
-void pc_damage_log_add(struct map_session_data *sd, int id);
-void pc_damage_log_clear(struct map_session_data *sd, int id);
+void pc_damage_log_add(map_session_data *sd, int id);
+void pc_damage_log_clear(map_session_data *sd, int id);
 
 enum e_BANKING_DEPOSIT_ACK : uint8;
 enum e_BANKING_WITHDRAW_ACK : uint8;
-enum e_BANKING_DEPOSIT_ACK pc_bank_deposit(struct map_session_data *sd, int money);
-enum e_BANKING_WITHDRAW_ACK pc_bank_withdraw(struct map_session_data *sd, int money);
+enum e_BANKING_DEPOSIT_ACK pc_bank_deposit(map_session_data *sd, int money);
+enum e_BANKING_WITHDRAW_ACK pc_bank_withdraw(map_session_data *sd, int money);
 
-void pc_crimson_marker_clear(struct map_session_data *sd);
+void pc_crimson_marker_clear(map_session_data *sd);
 
-void pc_show_version(struct map_session_data *sd);
+void pc_show_version(map_session_data *sd);
 
 TIMER_FUNC(pc_bonus_script_timer);
-void pc_bonus_script(struct map_session_data *sd);
-struct s_bonus_script_entry *pc_bonus_script_add(struct map_session_data *sd, const char *script_str, t_tick dur, enum efst_type icon, uint16 flag, uint8 type);
-void pc_bonus_script_clear(struct map_session_data *sd, uint32 flag);
+void pc_bonus_script(map_session_data *sd);
+struct s_bonus_script_entry *pc_bonus_script_add(map_session_data *sd, const char *script_str, t_tick dur, enum efst_type icon, uint16 flag, uint8 type);
+void pc_bonus_script_clear(map_session_data *sd, uint32 flag);
 
-void pc_cell_basilica(struct map_session_data *sd);
+void pc_cell_basilica(map_session_data *sd);
 
-short pc_get_itemgroup_bonus(struct map_session_data* sd, t_itemid nameid, std::vector<s_item_bonus>& bonuses);
-short pc_get_itemgroup_bonus_group(struct map_session_data* sd, uint16 group_id, std::vector<s_item_bonus>& bonuses);
+short pc_get_itemgroup_bonus(map_session_data* sd, t_itemid nameid, std::vector<s_item_bonus>& bonuses);
+short pc_get_itemgroup_bonus_group(map_session_data* sd, uint16 group_id, std::vector<s_item_bonus>& bonuses);
 
 bool pc_is_same_equip_index(enum equip_index eqi, short *equip_index, short index);
 /// Check if player is Taekwon Ranker and the level is >= 90 (battle_config.taekwon_ranker_min_lv)
@@ -1708,20 +1708,20 @@ bool pc_is_same_equip_index(enum equip_index eqi, short *equip_index, short inde
 
 TIMER_FUNC(pc_autotrade_timer);
 
-void pc_validate_skill(struct map_session_data *sd);
+void pc_validate_skill(map_session_data *sd);
 
-void pc_show_questinfo(struct map_session_data *sd);
-void pc_show_questinfo_reinit(struct map_session_data *sd);
+void pc_show_questinfo(map_session_data *sd);
+void pc_show_questinfo_reinit(map_session_data *sd);
 
 bool pc_job_can_entermap(enum e_job jobid, int m, int group_lv);
 
 #if defined(RENEWAL_DROP) || defined(RENEWAL_EXP)
-uint16 pc_level_penalty_mod( struct map_session_data* sd, e_penalty_type type, std::shared_ptr<s_mob_db> mob, mob_data* md = nullptr );
+uint16 pc_level_penalty_mod( map_session_data* sd, e_penalty_type type, std::shared_ptr<s_mob_db> mob, mob_data* md = nullptr );
 #endif
 
 bool pc_attendance_enabled();
-int32 pc_attendance_counter( struct map_session_data* sd );
-void pc_attendance_claim_reward( struct map_session_data* sd );
+int32 pc_attendance_counter( map_session_data* sd );
+void pc_attendance_claim_reward( map_session_data* sd );
 
 void pc_jail(map_session_data &sd, int32 duration = INT_MAX);
 
diff --git a/src/map/pc_groups.cpp b/src/map/pc_groups.cpp
index f78088b16f..7deba235bb 100644
--- a/src/map/pc_groups.cpp
+++ b/src/map/pc_groups.cpp
@@ -9,7 +9,7 @@
 #include "../common/utilities.hpp"
 
 #include "atcommand.hpp" // AtCommandType
-#include "pc.hpp" // struct map_session_data
+#include "pc.hpp" // map_session_data
 
 using namespace rathena;
 
@@ -338,7 +338,7 @@ bool s_player_group::can_use_command( const std::string& command, AtCommandType
  * Load permission for player based on group id
  * @param sd Player
  */
-void pc_group_pc_load(struct map_session_data * sd) {
+void pc_group_pc_load(map_session_data * sd) {
 	std::shared_ptr<s_player_group> group = player_group_db.find( sd->group_id );
 
 	if( group == nullptr ){
@@ -392,7 +392,7 @@ void pc_groups_reload( void ){
 	
 	/* refresh online users permissions */
 	struct s_mapiterator* iter = mapit_getallusers();
-	for( struct map_session_data* sd = (struct map_session_data*)mapit_first(iter); mapit_exists(iter); sd = (struct map_session_data*)mapit_next(iter) ){
+	for( map_session_data* sd = (map_session_data*)mapit_first(iter); mapit_exists(iter); sd = (map_session_data*)mapit_next(iter) ){
 		pc_group_pc_load(sd);
 	}
 	mapit_free(iter);
diff --git a/src/map/pc_groups.hpp b/src/map/pc_groups.hpp
index e299144e7a..a61b149b6d 100644
--- a/src/map/pc_groups.hpp
+++ b/src/map/pc_groups.hpp
@@ -14,7 +14,7 @@
 // Forward declaration from atcommands.hpp
 enum AtCommandType : uint8;
 
-void pc_group_pc_load(struct map_session_data *sd);
+void pc_group_pc_load(class map_session_data *sd);
 void do_init_pc_groups(void);
 void do_final_pc_groups(void);
 void pc_groups_reload(void);
diff --git a/src/map/pet.cpp b/src/map/pet.cpp
index befdf0a304..5861481185 100644
--- a/src/map/pet.cpp
+++ b/src/map/pet.cpp
@@ -480,7 +480,7 @@ uint64 PetDatabase::parseBodyNode( const ryml::NodeRef& node ){
  * Clear pet support bonuses from memory
  * @param sd: Pet owner
  */
-void pet_clear_support_bonuses(struct map_session_data *sd) {
+void pet_clear_support_bonuses(map_session_data *sd) {
 	nullpo_retv(sd);
 
 	if (!sd->pd)
@@ -538,7 +538,7 @@ void pet_clear_support_bonuses(struct map_session_data *sd) {
  * @param args: va_list of arguments
  * @return 0
  */
-static int pet_reload_sub( struct map_session_data *sd, va_list args ){
+static int pet_reload_sub( map_session_data *sd, va_list args ){
 	if( sd->pd == nullptr ){
 		return 0;
 	}
@@ -637,7 +637,7 @@ void pet_set_intimate(struct pet_data *pd, int value)
 
 	pd->pet.intimate = min(value, PET_INTIMATE_MAX);
 
-	struct map_session_data *sd = pd->master;
+	map_session_data *sd = pd->master;
 
 	int index = pet_egg_search( sd, pd->pet.pet_id );
 
@@ -660,7 +660,7 @@ void pet_set_intimate(struct pet_data *pd, int value)
  * @param item_id : item ID of tamer
  * @return true:success, false:failure
  */
-bool pet_create_egg(struct map_session_data *sd, t_itemid item_id)
+bool pet_create_egg(map_session_data *sd, t_itemid item_id)
 {
 	std::shared_ptr<s_pet_db> pet = pet_db_search(item_id, PET_EGG);
 
@@ -796,7 +796,7 @@ int pet_target_check(struct pet_data *pd,struct block_list *bl,int type)
  * @param type : recovery type
  * @author [Skotlex]
  */
-int pet_sc_check(struct map_session_data *sd, int type)
+int pet_sc_check(map_session_data *sd, int type)
 {
 	struct pet_data *pd;
 
@@ -824,7 +824,7 @@ int pet_sc_check(struct map_session_data *sd, int type)
  * @return 0
  */
 static TIMER_FUNC(pet_hungry){
-	struct map_session_data *sd;
+	map_session_data *sd;
 	struct pet_data *pd;
 	int interval;
 
@@ -931,7 +931,7 @@ int pet_hungry_timer_delete(struct pet_data *pd)
  * @param pd : pet requesting
  * @return 1
  */
-static int pet_performance(struct map_session_data *sd, struct pet_data *pd)
+static int pet_performance(map_session_data *sd, struct pet_data *pd)
 {
 	int val;
 
@@ -955,7 +955,7 @@ static int pet_performance(struct map_session_data *sd, struct pet_data *pd)
  * @param pd : pet requesting
  * @return true if everything went well, false if the egg is not found in the inventory.
  */
-bool pet_return_egg( struct map_session_data *sd, struct pet_data *pd ){
+bool pet_return_egg( map_session_data *sd, struct pet_data *pd ){
 	pet_lootitem_drop(pd,sd);
 
 	int i = pet_egg_search( sd, pd->pet.pet_id );
@@ -985,7 +985,7 @@ bool pet_return_egg( struct map_session_data *sd, struct pet_data *pd ){
  * @param pet : pet requesting
  * @return True on success or false otherwise
  */
-bool pet_data_init(struct map_session_data *sd, struct s_pet *pet)
+bool pet_data_init(map_session_data *sd, struct s_pet *pet)
 {
 	struct pet_data *pd;
 	int interval = 0;
@@ -1078,7 +1078,7 @@ bool pet_data_init(struct map_session_data *sd, struct s_pet *pet)
  * @param sd : player requesting
  * @param pet : pet requesting
  */
-int pet_birth_process(struct map_session_data *sd, struct s_pet *pet)
+int pet_birth_process(map_session_data *sd, struct s_pet *pet)
 {
 	nullpo_retr(1, sd);
 
@@ -1133,7 +1133,7 @@ int pet_birth_process(struct map_session_data *sd, struct s_pet *pet)
  */
 int pet_recv_petdata(uint32 account_id,struct s_pet *p,int flag)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	sd = map_id2sd(account_id);
 
@@ -1186,7 +1186,7 @@ int pet_recv_petdata(uint32 account_id,struct s_pet *p,int flag)
  * @param egg_index : egg index value in inventory
  * @return 0
  */
-int pet_select_egg(struct map_session_data *sd,short egg_index)
+int pet_select_egg(map_session_data *sd,short egg_index)
 {
 	nullpo_ret(sd);
 
@@ -1216,7 +1216,7 @@ int pet_select_egg(struct map_session_data *sd,short egg_index)
  * @param target_class : monster ID of pet to catch
  * @return 0
  */
-int pet_catch_process1(struct map_session_data *sd,int target_class)
+int pet_catch_process1(map_session_data *sd,int target_class)
 {
 	nullpo_ret(sd);
 
@@ -1237,7 +1237,7 @@ int pet_catch_process1(struct map_session_data *sd,int target_class)
  * @param target_id : monster ID of pet to catch
  * @return 0:success, 1:failure
  */
-int pet_catch_process2(struct map_session_data* sd, int target_id)
+int pet_catch_process2(map_session_data* sd, int target_id)
 {
 	struct mob_data* md;
 	int pet_catch_rate = 0;
@@ -1293,7 +1293,7 @@ int pet_catch_process2(struct map_session_data* sd, int target_id)
 		return 1;
 	}
 
-	struct status_change* tsc = status_get_sc( &md->bl );
+	status_change* tsc = status_get_sc( &md->bl );
 
 	if( battle_config.pet_hide_check && tsc && ( tsc->getSCE(SC_HIDING) || tsc->getSCE(SC_CLOAKING) || tsc->getSCE(SC_CAMOUFLAGE) || tsc->getSCE(SC_NEWMOON) || tsc->getSCE(SC_CLOAKINGEXCEED) ) ){
 		clif_pet_roulette( sd, 0 );
@@ -1341,7 +1341,7 @@ int pet_catch_process2(struct map_session_data* sd, int target_id)
  * @return true : success, false : failure
  **/
 bool pet_get_egg(uint32 account_id, short pet_class, int pet_id ) {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	struct item tmp_item;
 	int ret = 0;
 
@@ -1384,7 +1384,7 @@ bool pet_get_egg(uint32 account_id, short pet_class, int pet_id ) {
 	return true;
 }
 
-static int pet_unequipitem(struct map_session_data *sd, struct pet_data *pd);
+static int pet_unequipitem(map_session_data *sd, struct pet_data *pd);
 static int pet_ai_sub_hard_lootsearch(struct block_list *bl,va_list ap);
 
 /**
@@ -1393,7 +1393,7 @@ static int pet_ai_sub_hard_lootsearch(struct block_list *bl,va_list ap);
  * @param menunum : menu option chosen
  * @return 0:success, 1:failure
  */
-int pet_menu(struct map_session_data *sd,int menunum)
+int pet_menu(map_session_data *sd,int menunum)
 {
 	nullpo_ret(sd);
 
@@ -1431,7 +1431,7 @@ int pet_menu(struct map_session_data *sd,int menunum)
  * @param name : new pet name
  * @return 0:success, 1:failure
  */
-int pet_change_name(struct map_session_data *sd,char *name)
+int pet_change_name(map_session_data *sd,char *name)
 {
 	int i;
 	struct pet_data *pd;
@@ -1458,7 +1458,7 @@ int pet_change_name(struct map_session_data *sd,char *name)
  * @param flag : 1:cannot use this name
  * @return 1:success, 0:failure
  */
-int pet_change_name_ack(struct map_session_data *sd, char* name, int flag)
+int pet_change_name_ack(map_session_data *sd, char* name, int flag)
 {
 	struct pet_data *pd = sd->pd;
 
@@ -1494,7 +1494,7 @@ int pet_change_name_ack(struct map_session_data *sd, char* name, int flag)
  * @param index : index value of item
  * @return 0:success, 1:failure
  */
-int pet_equipitem(struct map_session_data *sd,int index)
+int pet_equipitem(map_session_data *sd,int index)
 {
 	struct pet_data *pd;
 
@@ -1546,7 +1546,7 @@ int pet_equipitem(struct map_session_data *sd,int index)
  * @param pd : pet requesting
  * @return 0:success, 1:failure
  */
-static int pet_unequipitem(struct map_session_data *sd, struct pet_data *pd)
+static int pet_unequipitem(map_session_data *sd, struct pet_data *pd)
 {
 	struct item tmp_item;
 	unsigned char flag = 0;
@@ -1596,7 +1596,7 @@ static int pet_unequipitem(struct map_session_data *sd, struct pet_data *pd)
  * @param pd : pet requesting
  * @return 0:success, 1:failure
  */
-int pet_food(struct map_session_data *sd, struct pet_data *pd)
+int pet_food(map_session_data *sd, struct pet_data *pd)
 {
 	nullpo_retr(1, sd);
 	nullpo_retr(1, pd);
@@ -1717,7 +1717,7 @@ static int pet_randomwalk(struct pet_data *pd,t_tick tick)
  * @param tick : last support time
  * @return 0
  */
-static int pet_ai_sub_hard(struct pet_data *pd, struct map_session_data *sd, t_tick tick)
+static int pet_ai_sub_hard(struct pet_data *pd, map_session_data *sd, t_tick tick)
 {
 	struct block_list *target = NULL;
 
@@ -1847,7 +1847,7 @@ static int pet_ai_sub_hard(struct pet_data *pd, struct map_session_data *sd, t_t
  *   tick : last search time
  * @return 0
  */
-static int pet_ai_sub_foreachclient(struct map_session_data *sd,va_list ap)
+static int pet_ai_sub_foreachclient(map_session_data *sd,va_list ap)
 {
 	t_tick tick = va_arg(ap,t_tick);
 
@@ -1942,7 +1942,7 @@ static TIMER_FUNC(pet_delay_item_drop){
  * @param sd : player requesting
  * @return 1:success, 0:failure
  */
-int pet_lootitem_drop(struct pet_data *pd,struct map_session_data *sd)
+int pet_lootitem_drop(struct pet_data *pd,map_session_data *sd)
 {
 	int i;
 	struct item_drop_list *dlist;
@@ -2005,7 +2005,7 @@ int pet_lootitem_drop(struct pet_data *pd,struct map_session_data *sd)
  * @author [Valaris], rewritten by [Skotlex]
  */
 TIMER_FUNC(pet_skill_bonus_timer){
-	struct map_session_data *sd = map_id2sd(id);
+	map_session_data *sd = map_id2sd(id);
 	struct pet_data *pd;
 	int bonus;
 	int timer = 0;
@@ -2053,7 +2053,7 @@ TIMER_FUNC(pet_skill_bonus_timer){
  * @author [Valaris], rewritten by [Skotlex]
  */
 TIMER_FUNC(pet_recovery_timer){
-	struct map_session_data *sd = map_id2sd(id);
+	map_session_data *sd = map_id2sd(id);
 	struct pet_data *pd;
 
 	if(sd == NULL || sd->pd == NULL || sd->pd->recovery == NULL)
@@ -2085,7 +2085,7 @@ TIMER_FUNC(pet_recovery_timer){
  * @param id : ID of pet owner
  */
 TIMER_FUNC(pet_heal_timer){
-	struct map_session_data *sd = map_id2sd(id);
+	map_session_data *sd = map_id2sd(id);
 	struct status_data *status;
 	struct pet_data *pd;
 	unsigned int rate = 100;
@@ -2128,7 +2128,7 @@ TIMER_FUNC(pet_heal_timer){
  * @author [Skotlex]
  */
 TIMER_FUNC(pet_skill_support_timer){
-	struct map_session_data *sd = map_id2sd(id);
+	map_session_data *sd = map_id2sd(id);
 	struct pet_data *pd;
 	struct status_data *status;
 	short rate = 100;
@@ -2177,7 +2177,7 @@ TIMER_FUNC(pet_skill_support_timer){
  * @param pet_id : pet ID of the pet
  * @return index of egg in player's inventory or -1 if the egg is not found.
  */
-int pet_egg_search(struct map_session_data* sd, int pet_id) {
+int pet_egg_search(map_session_data* sd, int pet_id) {
 	for (int i = 0; i < MAX_INVENTORY; i++) {
 		if (sd->inventory.u.items_inventory[i].card[0] == CARD0_PET &&
 			pet_id == MakeDWord(sd->inventory.u.items_inventory[i].card[1], sd->inventory.u.items_inventory[i].card[2]))
@@ -2192,7 +2192,7 @@ int pet_egg_search(struct map_session_data* sd, int pet_id) {
  * @param pet_id: Pet's database ID
  * @return True on success or false otherwise
  */
-bool pet_evolution_requirements_check(struct map_session_data *sd, short pet_id) {
+bool pet_evolution_requirements_check(map_session_data *sd, short pet_id) {
 	nullpo_retr(false, sd);
 
 	if (sd->pd == nullptr)
@@ -2224,7 +2224,7 @@ bool pet_evolution_requirements_check(struct map_session_data *sd, short pet_id)
  * @param sd: Player requesting the evolution
  * @param pet_id: Pet's database ID
  */
-void pet_evolution(struct map_session_data *sd, int16 pet_id) {
+void pet_evolution(map_session_data *sd, int16 pet_id) {
 	nullpo_retv(sd);
 
 	if (sd->pd == nullptr) {
diff --git a/src/map/pet.hpp b/src/map/pet.hpp
index aaf9fdc82f..27c29fe327 100644
--- a/src/map/pet.hpp
+++ b/src/map/pet.hpp
@@ -204,7 +204,7 @@ struct pet_data {
 	std::vector<std::shared_ptr<s_petautobonus>> autobonus, autobonus2, autobonus3;
 
 	int masterteleport_timer;
-	struct map_session_data *master;
+	map_session_data *master;
 
 	std::shared_ptr<s_pet_db> get_pet_db() {
 		return pet_db.find(this->pet.class_);
@@ -223,36 +223,36 @@ struct pet_data {
 	}
 };
 
-bool pet_create_egg(struct map_session_data *sd, t_itemid item_id);
+bool pet_create_egg(map_session_data *sd, t_itemid item_id);
 int pet_hungry_val(struct pet_data *pd);
 void pet_set_intimate(struct pet_data *pd, int value);
 int pet_target_check(struct pet_data *pd,struct block_list *bl,int type);
 void pet_unlocktarget(struct pet_data *pd);
-int pet_sc_check(struct map_session_data *sd, int type); //Skotlex
+int pet_sc_check(map_session_data *sd, int type); //Skotlex
 std::shared_ptr<s_pet_db> pet_db_search(int key, enum e_pet_itemtype type);
 int pet_hungry_timer_delete(struct pet_data *pd);
-bool pet_data_init(struct map_session_data *sd, struct s_pet *pet);
-bool pet_return_egg( struct map_session_data *sd, struct pet_data *pd );
-int pet_birth_process(struct map_session_data *sd, struct s_pet *pet);
+bool pet_data_init(map_session_data *sd, struct s_pet *pet);
+bool pet_return_egg( map_session_data *sd, struct pet_data *pd );
+int pet_birth_process(map_session_data *sd, struct s_pet *pet);
 int pet_recv_petdata(uint32 account_id,struct s_pet *p,int flag);
-int pet_select_egg(struct map_session_data *sd,short egg_index);
-int pet_catch_process1(struct map_session_data *sd,int target_class);
-int pet_catch_process2(struct map_session_data *sd,int target_id);
+int pet_select_egg(map_session_data *sd,short egg_index);
+int pet_catch_process1(map_session_data *sd,int target_class);
+int pet_catch_process2(map_session_data *sd,int target_id);
 bool pet_get_egg(uint32 account_id, short pet_class, int pet_id);
-int pet_menu(struct map_session_data *sd,int menunum);
-int pet_change_name(struct map_session_data *sd,char *name);
-int pet_change_name_ack(struct map_session_data *sd, char* name, int flag);
-int pet_equipitem(struct map_session_data *sd,int index);
-int pet_lootitem_drop(struct pet_data *pd,struct map_session_data *sd);
+int pet_menu(map_session_data *sd,int menunum);
+int pet_change_name(map_session_data *sd,char *name);
+int pet_change_name_ack(map_session_data *sd, char* name, int flag);
+int pet_equipitem(map_session_data *sd,int index);
+int pet_lootitem_drop(struct pet_data *pd,map_session_data *sd);
 int pet_attackskill(struct pet_data *pd, int target_id);
 TIMER_FUNC(pet_skill_support_timer); // [Skotlex]
 TIMER_FUNC(pet_skill_bonus_timer); // [Valaris]
 TIMER_FUNC(pet_recovery_timer); // [Valaris]
 TIMER_FUNC(pet_heal_timer); // [Valaris]
-int pet_egg_search(struct map_session_data *sd, int pet_id);
-void pet_evolution(struct map_session_data *sd, int16 pet_id);
-int pet_food(struct map_session_data *sd, struct pet_data *pd);
-void pet_clear_support_bonuses(struct map_session_data *sd);
+int pet_egg_search(map_session_data *sd, int pet_id);
+void pet_evolution(map_session_data *sd, int16 pet_id);
+int pet_food(map_session_data *sd, struct pet_data *pd);
+void pet_clear_support_bonuses(map_session_data *sd);
 
 #define pet_stop_walking(pd, type) unit_stop_walking(&(pd)->bl, type)
 #define pet_stop_attack(pd) unit_stop_attack(&(pd)->bl)
diff --git a/src/map/quest.cpp b/src/map/quest.cpp
index e7d3a45992..71afc1ac44 100644
--- a/src/map/quest.cpp
+++ b/src/map/quest.cpp
@@ -501,7 +501,7 @@ std::shared_ptr<s_quest_db> quest_search(int quest_id)
  * @param sd : Player's data
  * @return 0 in case of success, nonzero otherwise (i.e. the player has no quests)
  */
-int quest_pc_login(struct map_session_data *sd)
+int quest_pc_login(map_session_data *sd)
 {
 	if (!sd->avail_quests)
 		return 1;
@@ -552,7 +552,7 @@ static time_t quest_time(std::shared_ptr<s_quest_db> qi)
  * @param quest_id : ID of the quest to add.
  * @return 0 in case of success, nonzero otherwise
  */
-int quest_add(struct map_session_data *sd, int quest_id)
+int quest_add(map_session_data *sd, int quest_id)
 {
 	std::shared_ptr<s_quest_db> qi = quest_search(quest_id);
 
@@ -598,7 +598,7 @@ int quest_add(struct map_session_data *sd, int quest_id)
  * @param qid2 : New quest to add
  * @return 0 in case of success, nonzero otherwise
  */
-int quest_change(struct map_session_data *sd, int qid1, int qid2)
+int quest_change(map_session_data *sd, int qid1, int qid2)
 {
 	std::shared_ptr<s_quest_db> qi = quest_search(qid2);
 
@@ -647,7 +647,7 @@ int quest_change(struct map_session_data *sd, int qid1, int qid2)
  * @param quest_id : ID of the quest to remove
  * @return 0 in case of success, nonzero otherwise
  */
-int quest_delete(struct map_session_data *sd, int quest_id)
+int quest_delete(map_session_data *sd, int quest_id)
 {
 	int i;
 
@@ -695,7 +695,7 @@ int quest_update_objective_sub(struct block_list *bl, va_list ap)
 {
 	nullpo_ret(bl);
 
-	struct map_session_data *sd = BL_CAST(BL_PC, bl);
+	map_session_data *sd = BL_CAST(BL_PC, bl);
 
 	nullpo_ret(sd);
 
@@ -719,7 +719,7 @@ int quest_update_objective_sub(struct block_list *bl, va_list ap)
  * @param mob_size: Monster Size
  * @param mob_element: Monster Element
  */
-void quest_update_objective(struct map_session_data *sd, struct mob_data* md)
+void quest_update_objective(map_session_data *sd, struct mob_data* md)
 {
 	nullpo_retv(sd);
 
@@ -811,7 +811,7 @@ void quest_update_objective(struct map_session_data *sd, struct mob_data* md)
  * @return 0 in case of success, nonzero otherwise
  * @author [Inkfish]
  */
-int quest_update_status(struct map_session_data *sd, int quest_id, e_quest_state status)
+int quest_update_status(map_session_data *sd, int quest_id, e_quest_state status)
 {
 	int i;
 
@@ -860,7 +860,7 @@ int quest_update_status(struct map_session_data *sd, int quest_id, e_quest_state
  *              1 if the quest's timeout has expired
  *              0 otherwise
  */
-int quest_check(struct map_session_data *sd, int quest_id, e_quest_check_type type)
+int quest_check(map_session_data *sd, int quest_id, e_quest_check_type type)
 {
 	int i;
 
@@ -902,7 +902,7 @@ int quest_check(struct map_session_data *sd, int quest_id, e_quest_check_type ty
  * @param sd : Character's data
  * @param ap : Ignored
  */
-static int quest_reload_check_sub(struct map_session_data *sd, va_list ap)
+static int quest_reload_check_sub(map_session_data *sd, va_list ap)
 {
 	nullpo_ret(sd);
 
diff --git a/src/map/quest.hpp b/src/map/quest.hpp
index 0668cac760..9195e78bae 100644
--- a/src/map/quest.hpp
+++ b/src/map/quest.hpp
@@ -12,7 +12,7 @@
 
 #include "map.hpp"
 
-struct map_session_data;
+class map_session_data;
 enum e_size : uint8;
 
 struct s_quest_dropitem {
@@ -69,15 +69,15 @@ public:
 
 extern QuestDatabase quest_db;
 
-int quest_pc_login(struct map_session_data *sd);
+int quest_pc_login(map_session_data *sd);
 
-int quest_add(struct map_session_data *sd, int quest_id);
-int quest_delete(struct map_session_data *sd, int quest_id);
-int quest_change(struct map_session_data *sd, int qid1, int qid2);
+int quest_add(map_session_data *sd, int quest_id);
+int quest_delete(map_session_data *sd, int quest_id);
+int quest_change(map_session_data *sd, int qid1, int qid2);
 int quest_update_objective_sub(struct block_list *bl, va_list ap);
-void quest_update_objective(struct map_session_data *sd, struct mob_data* md);
-int quest_update_status(struct map_session_data *sd, int quest_id, e_quest_state status);
-int quest_check(struct map_session_data *sd, int quest_id, e_quest_check_type type);
+void quest_update_objective(map_session_data *sd, struct mob_data* md);
+int quest_update_status(map_session_data *sd, int quest_id, e_quest_state status);
+int quest_check(map_session_data *sd, int quest_id, e_quest_check_type type);
 
 std::shared_ptr<s_quest_db> quest_search(int quest_id);
 
diff --git a/src/map/script.cpp b/src/map/script.cpp
index 4889510347..2101b069d7 100644
--- a/src/map/script.cpp
+++ b/src/map/script.cpp
@@ -74,7 +74,7 @@ unsigned int next_id;
 struct eri *st_ers;
 struct eri *stack_ers;
 
-static bool script_rid2sd_( struct script_state *st, struct map_session_data** sd, const char *func );
+static bool script_rid2sd_( struct script_state *st, map_session_data** sd, const char *func );
 
 /**
  * Get `sd` from a account id in `loc` param instead of attached rid
@@ -83,7 +83,7 @@ static bool script_rid2sd_( struct script_state *st, struct map_session_data** s
  * @param sd Variable that will be assigned
  * @return True if `sd` is assigned, false otherwise
  **/
-static bool script_accid2sd_(struct script_state *st, uint8 loc, struct map_session_data **sd, const char *func) {
+static bool script_accid2sd_(struct script_state *st, uint8 loc, map_session_data **sd, const char *func) {
 	if (script_hasdata(st, loc)) {
 		int id_ = script_getnum(st, loc);
 		if (!(*sd = map_id2sd(id_))){
@@ -104,7 +104,7 @@ static bool script_accid2sd_(struct script_state *st, uint8 loc, struct map_sess
  * @param sd Variable that will be assigned
  * @return True if `sd` is assigned, false otherwise
  **/
-static bool script_charid2sd_(struct script_state *st, uint8 loc, struct map_session_data **sd, const char *func) {
+static bool script_charid2sd_(struct script_state *st, uint8 loc, map_session_data **sd, const char *func) {
 	if (script_hasdata(st, loc)) {
 		int id_ = script_getnum(st, loc);
 		if (!(*sd = map_charid2sd(id_))){
@@ -125,7 +125,7 @@ static bool script_charid2sd_(struct script_state *st, uint8 loc, struct map_ses
  * @param sd Variable that will be assigned
  * @return True if `sd` is assigned, false otherwise
  **/
-static bool script_nick2sd_(struct script_state *st, uint8 loc, struct map_session_data **sd, const char *func) {
+static bool script_nick2sd_(struct script_state *st, uint8 loc, map_session_data **sd, const char *func) {
 	if (script_hasdata(st, loc)) {
 		const char *name_ = script_getstr(st, loc);
 		if (!(*sd = map_nick2sd(name_,false))){
@@ -146,7 +146,7 @@ static bool script_nick2sd_(struct script_state *st, uint8 loc, struct map_sessi
  * @param sd Variable that will be assigned
  * @return True if `sd` is assigned, false otherwise
  **/
-static bool script_mapid2sd_(struct script_state *st, uint8 loc, struct map_session_data **sd, const char *func) {
+static bool script_mapid2sd_(struct script_state *st, uint8 loc, map_session_data **sd, const char *func) {
 	if (script_hasdata(st, loc)) {
 		int id_ = script_getnum(st, loc);
 		if (!(*sd = map_id2sd(id_))){
@@ -2662,7 +2662,7 @@ struct script_code* parse_script(const char *src,const char *file,int line,int o
 
 /// Returns the player attached to this script, identified by the rid.
 /// If there is no player attached, the script is terminated.
-static bool script_rid2sd_( struct script_state *st, struct map_session_data** sd, const char *func ){
+static bool script_rid2sd_( struct script_state *st, map_session_data** sd, const char *func ){
 	*sd = map_id2sd( st->rid );
 
 	if( *sd ){
@@ -2682,7 +2682,7 @@ static bool script_rid2sd_( struct script_state *st, struct map_session_data** s
  * @param data Variable/constant
  * @param sd If NULL, will try to use sd from st->rid (for player's variables)
  */
-struct script_data *get_val_(struct script_state* st, struct script_data* data, struct map_session_data *sd)
+struct script_data *get_val_(struct script_state* st, struct script_data* data, map_session_data *sd)
 {
 	const char* name;
 	char prefix;
@@ -2886,7 +2886,7 @@ int64 get_val2_num( struct script_state* st, int64 uid, struct reg_db* ref ){
  * Because, currently, array members with key 0 are indifferenciable from normal variables, we should ensure its actually in
  * Will be gone as soon as undefined var feature is implemented
  **/
-void script_array_ensure_zero(struct script_state *st, struct map_session_data *sd, int64 uid, struct reg_db *ref)
+void script_array_ensure_zero(struct script_state *st, map_session_data *sd, int64 uid, struct reg_db *ref)
 {
 	const char *name = get_str(script_getvarid(uid));
 	// is here st can be null pointer and st->rid is wrong?
@@ -2932,7 +2932,7 @@ void script_array_ensure_zero(struct script_state *st, struct map_session_data *
 /**
  * Returns array size by ID
  **/
-unsigned int script_array_size(struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref)
+unsigned int script_array_size(struct script_state *st, map_session_data *sd, const char *name, struct reg_db *ref)
 {
 	struct script_array *sa = NULL;
 	struct reg_db *src = script_array_src(st, sd, name, ref);
@@ -2946,7 +2946,7 @@ unsigned int script_array_size(struct script_state *st, struct map_session_data
 /**
  * Returns array's highest key (for that awful getarraysize implementation that doesn't really gets the array size)
  **/
-unsigned int script_array_highest_key(struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref)
+unsigned int script_array_highest_key(struct script_state *st, map_session_data *sd, const char *name, struct reg_db *ref)
 {
 	struct script_array *sa = NULL;
 	struct reg_db *src = script_array_src(st, sd, name, ref);
@@ -3033,7 +3033,7 @@ void script_array_add_member(struct script_array *sa, unsigned int idx)
  * Obtains the source of the array database for this type and scenario
  * Initializes such database when not yet initialized.
  **/
-struct reg_db *script_array_src(struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref)
+struct reg_db *script_array_src(struct script_state *st, map_session_data *sd, const char *name, struct reg_db *ref)
 {
 	struct reg_db *src = NULL;
 
@@ -3137,7 +3137,7 @@ void script_array_update(struct reg_db *src, int64 num, bool empty)
  *
  * TODO: return values are screwed up, have been for some time (reaad: years), e.g. some functions return 1 failure and success.
  *------------------------------------------*/
-bool set_reg_str( struct script_state* st, struct map_session_data* sd, int64 num, const char* name, const char* value, struct reg_db *ref ){
+bool set_reg_str( struct script_state* st, map_session_data* sd, int64 num, const char* name, const char* value, struct reg_db *ref ){
 	char prefix = name[0];
 	size_t vlen = 0;
 
@@ -3217,7 +3217,7 @@ bool set_reg_str( struct script_state* st, struct map_session_data* sd, int64 nu
 	}
 }
 
-bool set_reg_num( struct script_state* st, struct map_session_data* sd, int64 num, const char* name, int64 value, struct reg_db *ref ){
+bool set_reg_num( struct script_state* st, map_session_data* sd, int64 num, const char* name, int64 value, struct reg_db *ref ){
 	char prefix = name[0];
 	size_t vlen = 0;
 
@@ -3311,11 +3311,11 @@ bool set_reg_num( struct script_state* st, struct map_session_data* sd, int64 nu
 	}
 }
 
-bool set_var_str( struct map_session_data* sd, const char* name, const char* val ){
+bool set_var_str( map_session_data* sd, const char* name, const char* val ){
 	return set_reg_str( NULL, sd, reference_uid( add_str( name ), 0 ), name, val, NULL );
 }
 
-bool clear_reg( struct script_state* st, struct map_session_data* sd, int64 num, const char* name, struct reg_db *ref ){
+bool clear_reg( struct script_state* st, map_session_data* sd, int64 num, const char* name, struct reg_db *ref ){
 	if( is_string_variable( name ) ){
 		return set_reg_str( st, sd, num, name, "", ref );
 	}else{
@@ -3323,11 +3323,11 @@ bool clear_reg( struct script_state* st, struct map_session_data* sd, int64 num,
 	}
 }
 
-void setd_sub_num( struct script_state* st, struct map_session_data* sd, const char* varname, int elem, int64 value, struct reg_db* ref ){
+void setd_sub_num( struct script_state* st, map_session_data* sd, const char* varname, int elem, int64 value, struct reg_db* ref ){
 	set_reg_num( st, sd, reference_uid( add_str( varname ), elem ), varname, value, ref );
 }
 
-void setd_sub_str( struct script_state* st, struct map_session_data* sd, const char* varname, int elem, const char* value, struct reg_db* ref ){
+void setd_sub_str( struct script_state* st, map_session_data* sd, const char* varname, int elem, const char* value, struct reg_db* ref ){
 	set_reg_str( st, sd, reference_uid( add_str( varname ), elem ), varname, value, ref );
 }
 
@@ -3337,7 +3337,7 @@ void setd_sub_str( struct script_state* st, struct map_session_data* sd, const c
  * @param data
  * @param sd
  */
-const char* conv_str_(struct script_state* st, struct script_data* data, struct map_session_data *sd)
+const char* conv_str_(struct script_state* st, struct script_data* data, map_session_data *sd)
 {
 	char* p;
 
@@ -3381,7 +3381,7 @@ const char* conv_str(struct script_state* st, struct script_data* data)
  * @param data
  * @param sd
  */
-int64 conv_num_(struct script_state* st, struct script_data* data, struct map_session_data *sd)
+int64 conv_num_(struct script_state* st, struct script_data* data, map_session_data *sd)
 {
 	get_val_(st, data, sd);
 	if( data_isint(data) )
@@ -3667,7 +3667,7 @@ struct script_state* script_alloc_state(struct script_code* rootscript, int pos,
 void script_free_state(struct script_state* st)
 {
 	if (idb_exists(st_db, st->id)) {
-		struct map_session_data *sd = st->rid ? map_id2sd(st->rid) : NULL;
+		map_session_data *sd = st->rid ? map_id2sd(st->rid) : NULL;
 
 		if (st->bk_st) // backup was not restored
 			ShowDebug("script_free_state: Previous script state lost (rid=%d, oid=%d, state=%d, bk_npcid=%d).\n", st->bk_st->rid, st->bk_st->oid, st->bk_st->state, st->bk_npcid);
@@ -4224,7 +4224,7 @@ TIMER_FUNC(run_script_timer){
 
 	// If it was a player before going to sleep and there is still a unit attached to the script
 	if( id != 0 && st->rid ){
-		struct map_session_data *sd = map_id2sd(st->rid);
+		map_session_data *sd = map_id2sd(st->rid);
 
 		// Attached player is offline(logout) or another unit type(should not happen)
 		if( !sd ){
@@ -4299,7 +4299,7 @@ struct linkdb_node *script_erase_sleepdb(struct linkdb_node *n) {
 /// @param dequeue_event Whether to schedule any queued events, when there was no previous script.
 static void script_detach_state(struct script_state* st, bool dequeue_event)
 {
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if(st->rid && (sd = map_id2sd(st->rid))!=NULL) {
 		if( sd->state.using_fake_npc ){
@@ -4342,7 +4342,7 @@ static void script_detach_state(struct script_state* st, bool dequeue_event)
 ///
 /// @param st Script state to attach.
 void script_attach_state(struct script_state* st){
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if(st->rid && (sd = map_id2sd(st->rid))!=NULL)
 	{
@@ -4581,7 +4581,7 @@ static int db_script_free_code_sub(DBKey key, DBData *data, va_list ap)
 	return 0;
 }
 
-void script_run_autobonus(const char *autobonus, struct map_session_data *sd, unsigned int pos)
+void script_run_autobonus(const char *autobonus, map_session_data *sd, unsigned int pos)
 {
 	struct script_code *script = (struct script_code *)strdb_get(autobonus_db, autobonus);
 
@@ -4636,7 +4636,7 @@ void script_add_petautobonus(const std::string &autobonus) {
 }
 
 /// resets a temporary character array variable to given value
-void script_cleararray_pc( struct map_session_data* sd, const char* varname ){
+void script_cleararray_pc( map_session_data* sd, const char* varname ){
 	struct script_array *sa = NULL;
 	struct reg_db *src = NULL;
 	unsigned int i, *list = NULL, size = 0;
@@ -4661,7 +4661,7 @@ void script_cleararray_pc( struct map_session_data* sd, const char* varname ){
 
 /// sets a temporary character array variable element idx to given value
 /// @param refcache Pointer to an int variable, which keeps a copy of the reference to varname and must be initialized to 0. Can be NULL if only one element is set.
-void script_setarray_pc(struct map_session_data* sd, const char* varname, uint32 idx, int64 value, int* refcache)
+void script_setarray_pc(map_session_data* sd, const char* varname, uint32 idx, int64 value, int* refcache)
 {
 	int key;
 
@@ -4709,7 +4709,7 @@ int script_reg_destroy(DBKey key, DBData *data, va_list ap)
 /**
  * Clears a single persistent variable
  **/
-void script_reg_destroy_single(struct map_session_data *sd, int64 reg, struct script_reg_state *data)
+void script_reg_destroy_single(map_session_data *sd, int64 reg, struct script_reg_state *data)
 {
 	i64db_remove(sd->regs.vars, reg);
 
@@ -4906,7 +4906,7 @@ void script_reload(void) {
 /// mes "<message>";
 BUILDIN_FUNC(mes)
 {
-	struct map_session_data* sd;
+	map_session_data* sd;
 	if( !script_rid2sd(sd) )
 		return SCRIPT_CMD_SUCCESS;
 
@@ -4935,7 +4935,7 @@ BUILDIN_FUNC(mes)
 /// next;
 BUILDIN_FUNC(next)
 {
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if (!st->mes_active) {
 		ShowWarning("buildin_next: There is no mes active.\n");
@@ -4977,7 +4977,7 @@ BUILDIN_FUNC(clear)
 /// close;
 BUILDIN_FUNC(close)
 {
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if( !script_rid2sd(sd) )
 		return SCRIPT_CMD_SUCCESS;
@@ -5593,7 +5593,7 @@ BUILDIN_FUNC(warp)
 	int ret;
 	int x,y;
 	const char* str;
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if(!script_charid2sd(5, sd))
 		return SCRIPT_CMD_SUCCESS;
@@ -6449,7 +6449,7 @@ BUILDIN_FUNC(getarraysize)
 {
 	struct script_data* data;
 	const char* name;
-	struct map_session_data* sd = NULL;
+	map_session_data* sd = NULL;
 
 	data = script_getdata(st, 2);
 	if( !data_isreference(data) )
@@ -6641,7 +6641,7 @@ BUILDIN_FUNC(inarray)
 	struct script_data *data;
 	const char* name;
 	int id, i, array_size;
-	struct map_session_data* sd = NULL;
+	map_session_data* sd = NULL;
 	struct reg_db *ref = NULL;
 	data = script_getdata(st, 2);
 
@@ -6720,7 +6720,7 @@ BUILDIN_FUNC(countinarray)
 	const char* name1;
 	const char* name2;
 	int id1, id2, i, j, array_size1, array_size2, case_count = 0;
-	struct map_session_data* sd = NULL;
+	map_session_data* sd = NULL;
 	struct reg_db *ref1 = NULL, *ref2 = NULL;
 	data1 = script_getdata(st, 2);
 	data2 = script_getdata(st, 3);
@@ -6943,7 +6943,7 @@ BUILDIN_FUNC(viewpointmap) {
  * @param funcname Function name
  * @param x First position of random option id array from the script
  **/
-static bool script_getitem_randomoption(struct script_state *st, struct map_session_data* sd, struct item *it, const char *funcname, int x) {
+static bool script_getitem_randomoption(struct script_state *st, map_session_data* sd, struct item *it, const char *funcname, int x) {
 	int i, opt_id_n;
 	struct script_data *opt_id = script_getdata(st,x);
 	struct script_data *opt_val = script_getdata(st,x+1);
@@ -7047,7 +7047,7 @@ static bool script_getitem_randomoption(struct script_state *st, struct map_sess
  * @param rental: Whether or not to count rental items
  * @return Total count of item being searched
  */
-static int script_countitem_sub(struct item *items, std::shared_ptr<item_data> id, int size, int expanded, struct script_state *st, struct map_session_data *sd = nullptr, bool rental = false) {
+static int script_countitem_sub(struct item *items, std::shared_ptr<item_data> id, int size, int expanded, struct script_state *st, map_session_data *sd = nullptr, bool rental = false) {
 
 	nullpo_retr(-1, items);
 	nullpo_retr(-1, st);
@@ -7396,7 +7396,7 @@ BUILDIN_FUNC(checkweight)
 	unsigned short amount2 = 0;
 	unsigned int weight = 0, i, nbargs;
 	std::shared_ptr<item_data> id;
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if( !script_rid2sd(sd) )
 		return SCRIPT_CMD_SUCCESS;
@@ -7586,7 +7586,7 @@ BUILDIN_FUNC(getitem)
 	t_itemid nameid;
 	unsigned short amount;
 	struct item it;
-	struct map_session_data *sd;
+	map_session_data *sd;
 	unsigned char flag = 0;
 	const char* command = script_getfuncname(st);
 	std::shared_ptr<item_data> id;
@@ -7833,7 +7833,7 @@ BUILDIN_FUNC(getitem2)
  * rentitem "<item name>",<seconds>{,<account_id>}
  */
 BUILDIN_FUNC(rentitem) {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	t_itemid nameid = 0;
 	unsigned char flag = 0;
 
@@ -7889,7 +7889,7 @@ BUILDIN_FUNC(rentitem) {
  * rentitem4 "<item name>",<time>,<identify>,<refine>,<attribute>,<card1>,<card2>,<card3>,<card4>,<grade>,<RandomIDArray>,<RandomValueArray>,<RandomParamArray>{,<account_id>};
  */
 BUILDIN_FUNC(rentitem2) {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	const char *funcname = script_getfuncname(st);
 
 	if (funcname[strlen(funcname)-1] == '3') {
@@ -8259,7 +8259,7 @@ BUILDIN_FUNC(makeitem2) {
 /// Counts / deletes the current item given by idx.
 /// Used by buildin_delitem_search
 /// Relies on all input data being already fully valid.
-static void buildin_delitem_delete(struct map_session_data* sd, int idx, int* amount, uint8 loc, bool delete_items)
+static void buildin_delitem_delete(map_session_data* sd, int idx, int* amount, uint8 loc, bool delete_items)
 {
 	int delamount;
 	struct item *itm = NULL;
@@ -8325,7 +8325,7 @@ static void buildin_delitem_delete(struct map_session_data* sd, int idx, int* am
 ///   0x1: identify, attributes, cards
 ///   0x2: random option
 /// @return true when all items could be deleted, false when there were not enough items to delete
-static bool buildin_delitem_search(struct map_session_data* sd, struct item* it, uint8 exact_match, uint8 loc)
+static bool buildin_delitem_search(map_session_data* sd, struct item* it, uint8 exact_match, uint8 loc)
 {
 	bool delete_items = false;
 	int i, amount, size;
@@ -8691,7 +8691,7 @@ BUILDIN_FUNC(delitem2)
 /// Deletes items from the target/attached player at given index.
 /// delitemidx <index>{,<amount>{,<char id>}};
 BUILDIN_FUNC(delitemidx) {
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if (!script_charid2sd(4, sd)) {
 		script_pushint(st, false);
@@ -8907,7 +8907,7 @@ BUILDIN_FUNC(getpartymember)
 				return SCRIPT_CMD_FAILURE;
 			}
 			if (not_server_variable(*varname)) {
-				struct map_session_data *sd;
+				map_session_data *sd;
 
 				if (!script_rid2sd(sd)) {
 					ShowError("buildin_getpartymember: Cannot use a player variable '%s' if no player is attached.\n", varname);
@@ -9449,7 +9449,7 @@ BUILDIN_FUNC(getequipweaponlv)
 		num = EQI_COMPOUND_ON;
 	}
 
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if (!script_charid2sd(3, sd)) {
 		script_pushint(st, 0);
@@ -9485,7 +9485,7 @@ BUILDIN_FUNC(getequiparmorlv){
 		num = EQI_COMPOUND_ON;
 	}
 
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if( !script_charid2sd( 3, sd ) ){
 		script_pushint( st, 0 );
@@ -9824,7 +9824,7 @@ BUILDIN_FUNC(statusup2)
 **/
 BUILDIN_FUNC(traitstatusup)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	if (!script_charid2sd(3, sd))
 		return SCRIPT_CMD_FAILURE;
@@ -9846,7 +9846,7 @@ BUILDIN_FUNC(traitstatusup)
 **/
 BUILDIN_FUNC(traitstatusup2)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	if (!script_charid2sd(4, sd))
 		return SCRIPT_CMD_FAILURE;
@@ -10823,7 +10823,7 @@ BUILDIN_FUNC(guildopenstorage_log){
 	ShowError( "buildin_guildopenstorage_log: This command requires PACKETVER 2014-02-05 or newer.\n" );
 	return SCRIPT_CMD_FAILURE;
 #else
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if( !script_charid2sd( 2, sd ) ){
 		return SCRIPT_CMD_FAILURE;
@@ -10836,7 +10836,7 @@ BUILDIN_FUNC(guildopenstorage_log){
 }
 
 BUILDIN_FUNC(guild_has_permission){
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if( !script_charid2sd( 3, sd ) ){
 		return SCRIPT_CMD_FAILURE;
@@ -10952,7 +10952,7 @@ BUILDIN_FUNC(cooking)
  *------------------------------------------*/
 BUILDIN_FUNC(makepet)
 {
-	struct map_session_data* sd;
+	map_session_data* sd;
 	uint16 mob_id;
 
 	if( !script_rid2sd(sd) )
@@ -10980,7 +10980,7 @@ BUILDIN_FUNC(makepet)
  * getexp <base xp>,<job xp>{,<char_id>};
  **/
 BUILDIN_FUNC(getexp){
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if( !script_charid2sd( 4, sd ) ){
 		return SCRIPT_CMD_FAILURE;
@@ -11026,7 +11026,7 @@ BUILDIN_FUNC(getexp){
  * Gain guild exp [Celest]
  *------------------------------------------*/
 BUILDIN_FUNC(guildgetexp){
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if( !script_rid2sd( sd ) ){
 		return SCRIPT_CMD_FAILURE;
@@ -11087,7 +11087,7 @@ BUILDIN_FUNC(monster)
 	unsigned int size	= SZ_SMALL;
 	enum mob_ai ai		= AI_NONE;
 
-	struct map_session_data* sd;
+	map_session_data* sd;
 	int16 m;
 	int i;
 
@@ -11204,7 +11204,7 @@ BUILDIN_FUNC(areamonster)
 	unsigned int size	= SZ_SMALL;
 	enum mob_ai ai		= AI_NONE;
 
-	struct map_session_data* sd;
+	map_session_data* sd;
 	int16 m;
 	int i;
 
@@ -11427,7 +11427,7 @@ BUILDIN_FUNC(clone)
 BUILDIN_FUNC(doevent)
 {
 	const char* event;
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if( !script_rid2sd(sd) )
 		return SCRIPT_CMD_SUCCESS;
@@ -11802,7 +11802,7 @@ BUILDIN_FUNC(announce)
 		if(flag&BC_NPC){
 			bl = map_id2bl(st->oid);
 		}else{
-			struct map_session_data* sd;
+			map_session_data* sd;
 
 			if(script_charid2sd(9, sd))
 				bl = &sd->bl;
@@ -11905,7 +11905,7 @@ BUILDIN_FUNC(areaannounce)
 BUILDIN_FUNC(getusers)
 {
 	int flag, val = 0;
-	struct map_session_data* sd;
+	map_session_data* sd;
 	struct block_list* bl = NULL;
 
 	flag = script_getnum(st,2);
@@ -12022,7 +12022,7 @@ BUILDIN_FUNC(getareausers)
 BUILDIN_FUNC(getunits)
 {
 	struct block_list *bl = NULL;
-	struct map_session_data *sd = NULL;
+	map_session_data *sd = NULL;
 	struct script_data *data = NULL;
 	char *command = (char *)script_getfuncname(st);
 	const char *str;
@@ -12316,7 +12316,7 @@ BUILDIN_FUNC(sc_end)
 		return SCRIPT_CMD_SUCCESS;
 
 	if (type > SC_NONE && type < SC_MAX) {
-		struct status_change *sc = status_get_sc(bl);
+		status_change *sc = status_get_sc(bl);
 
 		if (sc == nullptr)
 			return SCRIPT_CMD_SUCCESS;
@@ -12354,7 +12354,7 @@ BUILDIN_FUNC(sc_end)
  */
 BUILDIN_FUNC(sc_end_class)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int class_;
 
 	if (!script_charid2sd(2, sd))
@@ -12404,7 +12404,7 @@ BUILDIN_FUNC(getscrate)
 BUILDIN_FUNC(getstatus)
 {
 	int id, type;
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if (!script_charid2sd(4,sd))
 		return SCRIPT_CMD_FAILURE;
@@ -13159,7 +13159,7 @@ void script_detach_rid(struct script_state* st)
 static int buildin_addrid_sub(struct block_list *bl,va_list ap)
 {
 	int forceflag;
-	struct map_session_data *sd = (TBL_PC *)bl;
+	map_session_data *sd = (TBL_PC *)bl;
 	struct script_state* st;
 
 	st = va_arg(ap,struct script_state*);
@@ -13272,7 +13272,7 @@ BUILDIN_FUNC(attachrid)
 		force = true;
 	}
 
-	struct map_session_data* sd = map_id2sd(rid);
+	map_session_data* sd = map_id2sd(rid);
 
 	if( sd != NULL && ( !sd->npc_id || force ) ){
 		script_detach_rid(st);
@@ -13594,7 +13594,7 @@ BUILDIN_FUNC(emotion)
 }
 
 
-static int buildin_maprespawnguildid_sub_pc(struct map_session_data* sd, va_list ap)
+static int buildin_maprespawnguildid_sub_pc(map_session_data* sd, va_list ap)
 {
 	int16 m=va_arg(ap,int);
 	int g_id=va_arg(ap,int);
@@ -14138,7 +14138,7 @@ BUILDIN_FUNC(mobcount)	// Added by RoVeRT
 		check_event(st, event);
 
 	if( strcmp(mapname, "this") == 0 ) {
-		struct map_session_data *sd;
+		map_session_data *sd;
 		if( script_rid2sd(sd) )
 			m = sd->bl.m;
 		else {
@@ -14975,7 +14975,7 @@ BUILDIN_FUNC(misceffect)
  *------------------------------------------*/
 BUILDIN_FUNC(playBGM)
 {
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if( script_rid2sd(sd) ) {
 		clif_playBGM( *sd, script_getstr( st, 2 ) );
@@ -14990,7 +14990,7 @@ static int playBGM_sub(struct block_list* bl,va_list ap)
 	return 0;
 }
 
-static int playBGM_foreachpc_sub(struct map_session_data* sd, va_list args)
+static int playBGM_foreachpc_sub(map_session_data* sd, va_list args)
 {
 	const char* name = va_arg(args, const char*);
 	clif_playBGM( *sd, name );
@@ -15030,7 +15030,7 @@ BUILDIN_FUNC(playBGMall)
  *------------------------------------------*/
 BUILDIN_FUNC(soundeffect)
 {
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if(script_rid2sd(sd)){
 		const char* name = script_getstr(st,2);
@@ -15058,7 +15058,7 @@ int soundeffect_sub(struct block_list* bl,va_list ap)
 BUILDIN_FUNC(soundeffectall)
 {
 	struct block_list* bl;
-	struct map_session_data* sd;
+	map_session_data* sd;
 	const char* name;
 	int type;
 
@@ -15403,7 +15403,7 @@ BUILDIN_FUNC(removespecialeffect)
 
 	struct block_list *bl_src;
 	struct block_list *bl_target;
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	if( strcmp(command, "removespecialeffect") == 0 ) {
 		if (!script_hasdata(st, 4)) {
@@ -15542,7 +15542,7 @@ BUILDIN_FUNC(dispbottom)
 /*===================================
  * Heal portion of recovery command
  *-----------------------------------*/
-int recovery_sub(struct map_session_data* sd, int revive)
+int recovery_sub(map_session_data* sd, int revive)
 {
 	if(revive&(1|4) && pc_isdead(sd)) {
 		status_revive(&sd->bl, 100, 100);
@@ -15607,7 +15607,7 @@ BUILDIN_FUNC(recovery)
 			if(p == NULL)
 				return SCRIPT_CMD_SUCCESS;
 			for (i = 0; i < MAX_PARTY; i++) {
-				struct map_session_data* pl_sd;
+				map_session_data* pl_sd;
 				if((!(pl_sd = p->data[i].sd) || pl_sd->status.party_id != p_id)
 					|| (map_idx && pl_sd->bl.m != map_idx))
 					continue;
@@ -15635,7 +15635,7 @@ BUILDIN_FUNC(recovery)
 			if(g == NULL)
 				return SCRIPT_CMD_SUCCESS;
 			for (i = 0; i < MAX_GUILD; i++) {
-				struct map_session_data* pl_sd;
+				map_session_data* pl_sd;
 				if((!(pl_sd = g->member[i].sd) || pl_sd->status.guild_id != g_id)
 					|| (map_idx && pl_sd->bl.m != map_idx))
 					continue;
@@ -15774,7 +15774,7 @@ BUILDIN_FUNC(addhomintimacy)
 BUILDIN_FUNC(getmercinfo)
 {
 	int type;
-	struct map_session_data* sd;
+	map_session_data* sd;
 	s_mercenary_data* md;
 
 	if( !script_charid2sd(3,sd) ){
@@ -16269,7 +16269,7 @@ BUILDIN_FUNC(mapid2name)
 BUILDIN_FUNC(logmes)
 {
 	const char *str;
-	struct map_session_data* sd = map_id2sd(st->rid);
+	map_session_data* sd = map_id2sd(st->rid);
 
 	str = script_getstr(st,2);
 	if( sd ){
@@ -17185,7 +17185,7 @@ BUILDIN_FUNC(sprintf)
 BUILDIN_FUNC(sscanf){
 	unsigned int argc, arg = 0, len;
 	struct script_data* data;
-	struct map_session_data* sd = NULL;
+	map_session_data* sd = NULL;
 	const char* str;
 	const char* format;
 	const char* p;
@@ -19762,7 +19762,7 @@ BUILDIN_FUNC(unitattack)
 
 	switch(unit_bl->type) {
 		case BL_PC: {
-			struct map_session_data* sd = (struct map_session_data*)unit_bl;
+			map_session_data* sd = (map_session_data*)unit_bl;
 
 			clif_parse_ActionRequest_sub(sd, actiontype > 0 ? 0x07 : 0x00, target_bl->id, gettick());
 			script_pushint(st, sd->ud.target == target_bl->id);
@@ -20193,7 +20193,7 @@ BUILDIN_FUNC(warpportal)
  **/
 BUILDIN_FUNC(openmail)
 {
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if (!script_charid2sd(2,sd))
 		return SCRIPT_CMD_FAILURE;
@@ -20284,7 +20284,7 @@ BUILDIN_FUNC(getfreecell)
 		*data_x = script_getdata(st, 3),
 		*data_y = script_getdata(st, 4);
 	struct block_list* bl = map_id2bl(st->rid);
-	struct map_session_data *sd = nullptr;
+	map_session_data *sd = nullptr;
 	int16 m, x = 0, y = 0;
 	int rx = -1, ry = -1, flag = 1;
 
@@ -20351,7 +20351,7 @@ BUILDIN_FUNC(getfreecell)
  *------------------------------------------*/
 BUILDIN_FUNC(mercenary_create)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int class_, contract_time;
 
 	if( !script_rid2sd(sd) || sd->md || sd->status.mer_id != 0 )
@@ -20370,7 +20370,7 @@ BUILDIN_FUNC(mercenary_create)
 
 BUILDIN_FUNC(mercenary_delete)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int type = 0;
 
 	if( !script_charid2sd(2, sd) )
@@ -20396,7 +20396,7 @@ BUILDIN_FUNC(mercenary_delete)
 
 BUILDIN_FUNC(mercenary_heal)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int hp, sp;
 
 	if( !script_rid2sd(sd) || sd->md == NULL )
@@ -20410,7 +20410,7 @@ BUILDIN_FUNC(mercenary_heal)
 
 BUILDIN_FUNC(mercenary_sc_start)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	enum sc_type type;
 	int tick, val1;
 
@@ -20427,7 +20427,7 @@ BUILDIN_FUNC(mercenary_sc_start)
 
 BUILDIN_FUNC(mercenary_get_calls)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int guild;
 
 	if( !script_rid2sd(sd) )
@@ -20454,7 +20454,7 @@ BUILDIN_FUNC(mercenary_get_calls)
 
 BUILDIN_FUNC(mercenary_set_calls)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int guild, value, *calls;
 
 	if( !script_rid2sd(sd) )
@@ -20486,7 +20486,7 @@ BUILDIN_FUNC(mercenary_set_calls)
 
 BUILDIN_FUNC(mercenary_get_faith)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int guild;
 
 	if( !script_rid2sd(sd) )
@@ -20513,7 +20513,7 @@ BUILDIN_FUNC(mercenary_get_faith)
 
 BUILDIN_FUNC(mercenary_set_faith)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int guild, value, *calls;
 
 	if( !script_rid2sd(sd) )
@@ -20551,7 +20551,7 @@ BUILDIN_FUNC(mercenary_set_faith)
  *------------------------------------------*/
 BUILDIN_FUNC(readbook)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int book_id, page;
 
 	if( !script_rid2sd(sd) )
@@ -20665,7 +20665,7 @@ BUILDIN_FUNC(questinfo)
  **/
 BUILDIN_FUNC(questinfo_refresh)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	if (!script_charid2sd(2, sd))
 		return SCRIPT_CMD_FAILURE;
@@ -20679,7 +20679,7 @@ BUILDIN_FUNC(questinfo_refresh)
  **/
 BUILDIN_FUNC(setquest)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int quest_id;
 
 	quest_id = script_getnum(st, 2);
@@ -20702,7 +20702,7 @@ BUILDIN_FUNC(setquest)
  **/
 BUILDIN_FUNC(erasequest)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	if (!script_charid2sd(3,sd))
 		return SCRIPT_CMD_FAILURE;
@@ -20720,7 +20720,7 @@ BUILDIN_FUNC(erasequest)
  **/
 BUILDIN_FUNC(completequest)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	if (!script_charid2sd(3,sd))
 		return SCRIPT_CMD_FAILURE;
@@ -20736,7 +20736,7 @@ BUILDIN_FUNC(completequest)
  **/
 BUILDIN_FUNC(changequest)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	
 	if (!script_charid2sd(4,sd))
 		return SCRIPT_CMD_FAILURE;
@@ -20756,7 +20756,7 @@ BUILDIN_FUNC(changequest)
  **/
 BUILDIN_FUNC(checkquest)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	e_quest_check_type type = HAVEQUEST;
 
 	if( script_hasdata(st, 3) )
@@ -20775,7 +20775,7 @@ BUILDIN_FUNC(checkquest)
  **/
 BUILDIN_FUNC(isbegin_quest)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	if (!script_charid2sd(3,sd))
 		return SCRIPT_CMD_FAILURE;
@@ -20877,7 +20877,7 @@ BUILDIN_FUNC(waitingroom2bg)
 	}
 
 	for (i = 0; i < cd->users; i++) { // Only add those who are in the chat room
-		struct map_session_data *sd;
+		map_session_data *sd;
 		if( (sd = cd->usersd[i]) != NULL && bg_team_join(bg_id, sd, false) ){
 			mapreg_setreg(reference_uid(add_str("$@arenamembers"), c), sd->bl.id);
 			++c;
@@ -20894,7 +20894,7 @@ BUILDIN_FUNC(waitingroom2bg_single)
 	const char* map_name;
 	struct npc_data *nd;
 	struct chat_data *cd;
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int x, y, mapindex, bg_id = script_getnum(st,2);
 	std::shared_ptr<s_battleground_data> bg = util::umap_find(bg_team_db, bg_id);
 
@@ -20980,7 +20980,7 @@ BUILDIN_FUNC(bg_create) {
 /// @author [secretdataz]
 BUILDIN_FUNC(bg_join) {
 	const char* map_name;
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int x, y, mapindex, bg_id = script_getnum(st, 2);
 	std::shared_ptr<s_battleground_data> bg = util::umap_find(bg_team_db, bg_id);
 
@@ -21089,7 +21089,7 @@ BUILDIN_FUNC(bg_monster_set_team)
 
 BUILDIN_FUNC(bg_leave)
 {
-	struct map_session_data *sd = NULL;
+	map_session_data *sd = NULL;
 	bool deserter = false;
 
 	if( !script_charid2sd(2,sd) || !sd->bg_id )
@@ -21277,7 +21277,7 @@ int script_instancegetid(struct script_state* st, e_instance_mode mode)
 		if (nd->instance_id > 0)
 			instance_id = nd->instance_id;
 	} else {
-		struct map_session_data *sd = map_id2sd(st->rid);
+		map_session_data *sd = map_id2sd(st->rid);
 
 		if (sd) {
 			switch (mode) {
@@ -21336,7 +21336,7 @@ BUILDIN_FUNC(instance_create)
 		owner_id = script_getnum(st, 4);
 	else {
 		// If sd is NULL, instance_create will return -2.
-		struct map_session_data *sd = NULL;
+		map_session_data *sd = NULL;
 
 		switch(mode) {
 			case IM_NONE:
@@ -21402,7 +21402,7 @@ BUILDIN_FUNC(instance_destroy)
  *------------------------------------------*/
 BUILDIN_FUNC(instance_enter)
 {
-	struct map_session_data *sd = NULL;
+	map_session_data *sd = NULL;
 	int x = script_hasdata(st,3) ? script_getnum(st, 3) : -1;
 	int y = script_hasdata(st,4) ? script_getnum(st, 4) : -1;
 	int instance_id;
@@ -21510,7 +21510,7 @@ static int buildin_instance_warpall_sub(struct block_list *bl, va_list ap)
 	int x = va_arg(ap,int);
 	int y = va_arg(ap,int);
 	int instance_id = va_arg(ap, int);
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	nullpo_retr(0, bl);
 
@@ -21650,7 +21650,7 @@ BUILDIN_FUNC(instance_check_party)
 	}
 
 	for( i = 0; i < MAX_PARTY; i++ ) {
-		struct map_session_data *pl_sd;
+		map_session_data *pl_sd;
 		if( (pl_sd = p->data[i].sd) )
 			if(map_id2bl(pl_sd->bl.id) && !pl_sd->state.autotrade) {
 				if(pl_sd->status.base_level < min) {
@@ -21710,7 +21710,7 @@ BUILDIN_FUNC(instance_check_guild)
 	}
 
 	for(i = 0; i < MAX_GUILD; i++) {
-		struct map_session_data *pl_sd;
+		map_session_data *pl_sd;
 
 		if ((pl_sd = g->member[i].sd)) {
 			if (map_id2bl(pl_sd->bl.id) && !pl_sd->state.autotrade) {
@@ -21772,7 +21772,7 @@ BUILDIN_FUNC(instance_check_clan)
 	}
 
 	for(i = 0; i < MAX_CLAN; i++) {
-		struct map_session_data *pl_sd;
+		map_session_data *pl_sd;
 
 		if ((pl_sd = cd->members[i])) {
 			if (map_id2bl(pl_sd->bl.id) && !pl_sd->state.autotrade) {
@@ -21966,7 +21966,7 @@ BUILDIN_FUNC(instance_list)
  *------------------------------------------*/
 BUILDIN_FUNC(setfont)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int font;
 
 	if( !script_rid2sd(sd) )
@@ -22100,7 +22100,7 @@ BUILDIN_FUNC(areamobuseskill)
  */
 BUILDIN_FUNC(progressbar)
 {
-	struct map_session_data * sd;
+	map_session_data * sd;
 	const char * color;
 	unsigned int second;
 
@@ -22186,7 +22186,7 @@ BUILDIN_FUNC(pushpc)
 {
 	uint8 dir;
 	int cells, dx, dy;
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if(!script_rid2sd(sd))
 	{
@@ -22226,7 +22226,7 @@ BUILDIN_FUNC(pushpc)
 /// buyingstore <slots>;
 BUILDIN_FUNC(buyingstore)
 {
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if( !script_rid2sd(sd) )
 	{
@@ -22251,7 +22251,7 @@ BUILDIN_FUNC(searchstores)
 {
 	unsigned short effect;
 	unsigned int uses;
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if( !script_rid2sd(sd) )
 	{
@@ -22282,7 +22282,7 @@ BUILDIN_FUNC(showdigit)
 {
 	unsigned int type = 0;
 	int value;
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if( !script_rid2sd(sd) )
 	{
@@ -22450,7 +22450,7 @@ BUILDIN_FUNC(getargcount) {
  **/
 BUILDIN_FUNC(getcharip)
 {
-	struct map_session_data* sd = NULL;
+	map_session_data* sd = NULL;
 
 	/* check if a character name is specified */
 	if( script_hasdata(st, 2) )
@@ -22811,7 +22811,7 @@ BUILDIN_FUNC(npcskill)
 	unsigned int stat_point;
 	unsigned int npc_level;
 	struct npc_data *nd;
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	if( !script_rid2sd(sd) )
 		return SCRIPT_CMD_SUCCESS;
@@ -22871,7 +22871,7 @@ BUILDIN_FUNC(npcskill)
  */
 BUILDIN_FUNC(consumeitem)
 {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	std::shared_ptr<item_data> item_data;
 
 	if (!script_charid2sd(3, sd))
@@ -23468,7 +23468,7 @@ BUILDIN_FUNC(getguildmember)
 				return SCRIPT_CMD_FAILURE;
 			}
 			if (not_server_variable(*varname)) {
-				struct map_session_data *sd;
+				map_session_data *sd;
 
 				if (!script_rid2sd(sd)) {
 					ShowError("buildin_getguildmember: Cannot use a player variable '%s' if no player is attached.\n", varname);
@@ -23518,7 +23518,7 @@ BUILDIN_FUNC(getguildmember)
 BUILDIN_FUNC(addspiritball) {
 	uint8 i, count;
 	uint16 duration;
-	struct map_session_data *sd = NULL;
+	map_session_data *sd = NULL;
 
 	if (script_hasdata(st,4)) {
 		if (!script_isstring(st,4))
@@ -23551,7 +23551,7 @@ BUILDIN_FUNC(addspiritball) {
 */
 BUILDIN_FUNC(delspiritball) {
 	uint8 count;
-	struct map_session_data *sd = NULL;
+	map_session_data *sd = NULL;
 	
 	if (script_hasdata(st,3)) {
 		if (!script_isstring(st,3))
@@ -23579,7 +23579,7 @@ BUILDIN_FUNC(delspiritball) {
 * @author [Cydh]
 */
 BUILDIN_FUNC(countspiritball) {
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	if (script_hasdata(st,2)) {
 		if (!script_isstring(st,2))
@@ -23601,7 +23601,7 @@ BUILDIN_FUNC(countspiritball) {
 * @author [Cydh]
 */
 BUILDIN_FUNC(mergeitem) {
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	if (!script_charid2sd(2, sd))
 		return SCRIPT_CMD_FAILURE;
@@ -23617,7 +23617,7 @@ BUILDIN_FUNC(mergeitem) {
 * @author [Cydh]
 */
 BUILDIN_FUNC(mergeitem2) {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	struct item *items = NULL;
 	uint16 i, count = 0;
 	t_itemid nameid = 0;
@@ -23745,7 +23745,7 @@ BUILDIN_FUNC(npcshopupdate) {
 
 // Clan System
 BUILDIN_FUNC(clan_join){
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int clan_id = script_getnum(st,2);
 
 	if( !script_charid2sd( 3, sd ) ){
@@ -23762,7 +23762,7 @@ BUILDIN_FUNC(clan_join){
 }
 
 BUILDIN_FUNC(clan_leave){
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	if( !script_charid2sd( 2, sd ) ){
 		script_pushint(st, false);
@@ -23792,7 +23792,7 @@ BUILDIN_FUNC(getattachedrid) {
  */
 BUILDIN_FUNC(getvar) {
 	int char_id = script_getnum(st, 3);
-	struct map_session_data *sd = map_charid2sd(char_id);
+	map_session_data *sd = map_charid2sd(char_id);
 	struct script_data *data = NULL;
 	const char *name = NULL;
 
@@ -23885,7 +23885,7 @@ BUILDIN_FUNC(showscript) {
 BUILDIN_FUNC(ignoretimeout)
 {
 #ifdef SECURE_NPCTIMEOUT
-	struct map_session_data *sd = NULL;
+	map_session_data *sd = NULL;
 
 	if (script_hasdata(st,3)) {
 		if (!script_isstring(st,3))
@@ -24105,7 +24105,7 @@ BUILDIN_FUNC(minmax){
 		// Is the current parameter an array variable?
 		}else if( data_isreference( data ) ){
 			const char *name;
-			struct map_session_data* sd;
+			map_session_data* sd;
 			unsigned int start, end;
 
 			// Get the name of the variable
@@ -24224,7 +24224,7 @@ BUILDIN_FUNC(recalculatestat) {
 
 BUILDIN_FUNC(hateffect){
 #if PACKETVER_MAIN_NUM >= 20150507 || PACKETVER_RE_NUM >= 20150429 || defined(PACKETVER_ZERO)
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if( !script_rid2sd(sd) )
 		return SCRIPT_CMD_FAILURE;
@@ -24267,7 +24267,7 @@ BUILDIN_FUNC(hateffect){
 * @author [secretdataz]
 **/
 BUILDIN_FUNC(getrandomoptinfo) {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int val;
 	if (script_rid2sd(sd) && current_equip_item_index != -1 && current_equip_opt_index != -1 && sd->inventory.u.items_inventory[current_equip_item_index].option[current_equip_opt_index].id) {
 		int param = script_getnum(st, 2);
@@ -24301,7 +24301,7 @@ BUILDIN_FUNC(getrandomoptinfo) {
 * @author [secretdataz]
 */
 BUILDIN_FUNC(getequiprandomoption) {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int val;
 	short i = -1;
 	int pos = script_getnum(st, 2);
@@ -24350,7 +24350,7 @@ BUILDIN_FUNC(getequiprandomoption) {
 * @author [secretdataz]
 */
 BUILDIN_FUNC(setrandomoption) {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int pos, index, id, value, param, ep;
 	int i = -1;
 	if (!script_charid2sd(7, sd))
@@ -24401,7 +24401,7 @@ BUILDIN_FUNC(setrandomoption) {
 /// *needed_status_point(<type>,<val>{,<char id>});
 /// @author [secretdataz]
 BUILDIN_FUNC(needed_status_point) {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int type, val;
 	if (!script_charid2sd(4, sd))
 		return SCRIPT_CMD_FAILURE;
@@ -24417,7 +24417,7 @@ BUILDIN_FUNC(needed_status_point) {
 /// raise the specified trait stat from (current value - val) to current value.
 /// *needed_trait_point(<type>,<val>{,<char id>});
 BUILDIN_FUNC(needed_trait_point) {
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	if (!script_charid2sd(4, sd))
 		return SCRIPT_CMD_FAILURE;
@@ -24763,7 +24763,7 @@ BUILDIN_FUNC(channel_setgroup) {
 		}
 
 		if (not_server_variable(*varname)) {
-			struct map_session_data *sd;
+			map_session_data *sd;
 
 			if (!script_rid2sd(sd)) {
 				ShowError("buildin_%s: Cannot use a player variable '%s' if no player is attached.\n", funcname, varname);
@@ -25192,7 +25192,7 @@ BUILDIN_FUNC(duplicate_dynamic){
 		return SCRIPT_CMD_FAILURE;
 	}
 
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if( !script_charid2sd( 3, sd ) ){
 		script_pushstrcopy( st, "" );
@@ -25215,7 +25215,7 @@ BUILDIN_FUNC(duplicate_dynamic){
  * achievementadd(<achievement ID>{,<char ID>});
  */
 BUILDIN_FUNC(achievementadd) {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int achievement_id = script_getnum(st, 2);
 
 	if (!script_charid2sd(3, sd)) {
@@ -25247,7 +25247,7 @@ BUILDIN_FUNC(achievementadd) {
  * Just for Atemo. ;)
  */
 BUILDIN_FUNC(achievementremove) {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int achievement_id = script_getnum(st, 2);
 
 	if (!script_charid2sd(3, sd)) {
@@ -25278,7 +25278,7 @@ BUILDIN_FUNC(achievementremove) {
  * achievementinfo(<achievement ID>,<type>{,<char ID>});
  */
 BUILDIN_FUNC(achievementinfo) {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int achievement_id = script_getnum(st, 2);
 
 	if (!script_charid2sd(4, sd)) {
@@ -25307,7 +25307,7 @@ BUILDIN_FUNC(achievementinfo) {
  * achievementcomplete(<achievement ID>{,<char ID>});
  */
 BUILDIN_FUNC(achievementcomplete) {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int i, achievement_id = script_getnum(st, 2);
 
 	if (!script_charid2sd(3, sd)) {
@@ -25339,7 +25339,7 @@ BUILDIN_FUNC(achievementcomplete) {
  * achievementexists(<achievement ID>{,<char ID>});
  */
 BUILDIN_FUNC(achievementexists) {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int i, achievement_id = script_getnum(st, 2);
 
 	if (!script_charid2sd(3, sd)) {
@@ -25369,7 +25369,7 @@ BUILDIN_FUNC(achievementexists) {
  * achievementupdate(<achievement ID>,<type>,<value>{,<char ID>});
  */
 BUILDIN_FUNC(achievementupdate) {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int i, achievement_id, type, value;
 
 	achievement_id = script_getnum(st, 2);
@@ -25538,7 +25538,7 @@ BUILDIN_FUNC(getequiptradability) {
 	return SCRIPT_CMD_SUCCESS;
 }
 
-static inline bool mail_sub( struct script_state *st, struct script_data *data, struct map_session_data *sd, int i, const char **out_name, unsigned int *start, unsigned int *end, int32 *id ){
+static inline bool mail_sub( struct script_state *st, struct script_data *data, map_session_data *sd, int i, const char **out_name, unsigned int *start, unsigned int *end, int32 *id ){
 	const char *name;
 
 	// Check if it is a variable
@@ -25587,7 +25587,7 @@ BUILDIN_FUNC(mail){
 	const char *sender, *title, *body, *name;
 	struct mail_message msg;
 	struct script_data *data;
-	struct map_session_data *sd = NULL;
+	map_session_data *sd = NULL;
 	unsigned int i, j, k, num_items, start, end;
 	int32 id;
 
@@ -25832,7 +25832,7 @@ BUILDIN_FUNC(open_roulette){
 	ShowError( "buildin_open_roulette: This command requires PACKETVER 2014-10-22 or newer.\n" );
 	return SCRIPT_CMD_FAILURE;
 #else
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if( !battle_config.feature_roulette ){
 		ShowError( "buildin_open_roulette: Roulette system is disabled.\n" );
@@ -25878,7 +25878,7 @@ BUILDIN_FUNC(identifyall) {
 
 BUILDIN_FUNC(is_guild_leader)
 {
-	struct map_session_data* sd;
+	map_session_data* sd;
 	struct guild* guild_data;
 	int guild_id;
 
@@ -25902,7 +25902,7 @@ BUILDIN_FUNC(is_guild_leader)
 
 BUILDIN_FUNC(is_party_leader)
 {
-	struct map_session_data* sd;
+	map_session_data* sd;
 	struct party_data* p_data;
 	int p_id, i = 0;
 
@@ -25933,7 +25933,7 @@ BUILDIN_FUNC( camerainfo ){
 	ShowError("buildin_camerainfo: This command requires PACKETVER 2016-05-25 or newer.\n");
 	return SCRIPT_CMD_FAILURE;
 #else
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if( !script_charid2sd( 5, sd ) ){
 		return SCRIPT_CMD_FAILURE;
@@ -26053,7 +26053,7 @@ BUILDIN_FUNC(setinstancevar)
 
 	script_pushcopy(st, 2);
 
-	struct map_session_data* sd = nullptr;
+	map_session_data* sd = nullptr;
 
 	if( is_string_variable(name) )
 		set_reg_str( st, sd, reference_getuid(data), name, script_getstr( st, 3 ), &im->regs );
@@ -26147,7 +26147,7 @@ BUILDIN_FUNC(refineui){
 	ShowError( "buildin_refineui: This command requires packet version 2016-10-12 or newer.\n" );
 	return SCRIPT_CMD_FAILURE;
 #else
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if( !script_charid2sd(2,sd) ){
 		return SCRIPT_CMD_FAILURE;
@@ -26167,7 +26167,7 @@ BUILDIN_FUNC(refineui){
 }
 
 BUILDIN_FUNC(getenchantgrade){
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	if (!script_charid2sd(3, sd)) {
 		script_pushint(st,-1);
@@ -26259,7 +26259,7 @@ BUILDIN_FUNC(mob_setidleevent){
 
 BUILDIN_FUNC( openstylist ){
 #if PACKETVER >= 20151104
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if( !script_charid2sd( 2, sd ) ){
 		return SCRIPT_CMD_FAILURE;
@@ -26292,7 +26292,7 @@ BUILDIN_FUNC(navihide) {
 }
 
 BUILDIN_FUNC(getitempos) {
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if ( !script_rid2sd(sd) ){
 		script_pushint(st, 0);
@@ -26311,7 +26311,7 @@ BUILDIN_FUNC(getitempos) {
 }
 
 BUILDIN_FUNC( laphine_synthesis ){
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if( !script_rid2sd( sd ) ){
 		return SCRIPT_CMD_FAILURE;
@@ -26371,7 +26371,7 @@ BUILDIN_FUNC( laphine_synthesis ){
 }
 
 BUILDIN_FUNC( laphine_upgrade ){
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if( !script_rid2sd( sd ) ){
 		return SCRIPT_CMD_FAILURE;
@@ -26433,7 +26433,7 @@ BUILDIN_FUNC( open_quest_ui ){
 	ShowError( "buildin_open_quest_ui: This command requires PACKETVER 20151202 or newer.\n" );
 	return SCRIPT_CMD_FAILURE;
 #else
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if (!script_charid2sd(3, sd))
 		return SCRIPT_CMD_FAILURE;
@@ -26458,7 +26458,7 @@ BUILDIN_FUNC(openbank){
 	ShowError( "buildin_openbank: This command requires PACKETVER 20151202 or newer.\n" );
 	return SCRIPT_CMD_FAILURE;
 #else
-	struct map_session_data* sd = nullptr;
+	map_session_data* sd = nullptr;
 
 	if (!script_charid2sd(2, sd)) {
 		return SCRIPT_CMD_FAILURE;
@@ -26475,7 +26475,7 @@ BUILDIN_FUNC(openbank){
 }
 
 BUILDIN_FUNC(getbaseexp_ratio){
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	if( !script_charid2sd( 4, sd ) ){
 		return SCRIPT_CMD_FAILURE;
@@ -26522,7 +26522,7 @@ BUILDIN_FUNC(getbaseexp_ratio){
 }
 
 BUILDIN_FUNC(getjobexp_ratio){
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	if( !script_charid2sd( 4, sd ) ){
 		return SCRIPT_CMD_FAILURE;
@@ -26570,7 +26570,7 @@ BUILDIN_FUNC(getjobexp_ratio){
 
 BUILDIN_FUNC( enchantgradeui ){
 #if PACKETVER_MAIN_NUM >= 20200916 || PACKETVER_RE_NUM >= 20200724
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if( !script_charid2sd( 2, sd ) ){
 		return SCRIPT_CMD_FAILURE;
@@ -26586,7 +26586,7 @@ BUILDIN_FUNC( enchantgradeui ){
 }
 
 BUILDIN_FUNC(set_reputation_points){
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if( !script_charid2sd( 4, sd ) ){
 		return SCRIPT_CMD_FAILURE;
@@ -26614,7 +26614,7 @@ BUILDIN_FUNC(set_reputation_points){
 }
 
 BUILDIN_FUNC(get_reputation_points){
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if( !script_charid2sd( 3, sd ) ){
 		return SCRIPT_CMD_FAILURE;
@@ -26639,7 +26639,7 @@ BUILDIN_FUNC(get_reputation_points){
 
 BUILDIN_FUNC(add_reputation_points)
 {
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if( !script_charid2sd( 4, sd ) ){
 		return SCRIPT_CMD_FAILURE;
@@ -26671,7 +26671,7 @@ BUILDIN_FUNC(item_reform){
 	ShowError( "buildin_item_reform: This command requires packet version 2021-11-03 or newer.\n" );
 	return SCRIPT_CMD_FAILURE;
 #else
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if( !script_charid2sd( 3, sd ) ){
 		return SCRIPT_CMD_FAILURE;
@@ -26728,7 +26728,7 @@ BUILDIN_FUNC(item_enchant){
 	ShowError( "buildin_item_enchant: This command requires packet version 2021-11-03 or newer.\n" );
 	return SCRIPT_CMD_FAILURE;
 #else
-	struct map_session_data* sd;
+	map_session_data* sd;
 
 	if( !script_charid2sd( 3, sd ) ){
 		return SCRIPT_CMD_FAILURE;
@@ -26784,7 +26784,7 @@ BUILDIN_FUNC(itemlink)
 }
 
 BUILDIN_FUNC(addfame) {
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	if (!script_charid2sd(3, sd))
 		return SCRIPT_CMD_FAILURE;
@@ -26797,7 +26797,7 @@ BUILDIN_FUNC(addfame) {
 
 
 BUILDIN_FUNC(getfame) {
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	if (!script_charid2sd(2, sd))
 		return SCRIPT_CMD_FAILURE;
@@ -26808,7 +26808,7 @@ BUILDIN_FUNC(getfame) {
 }
 
 BUILDIN_FUNC(getfamerank) {
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	if (!script_charid2sd(2, sd))
 		return SCRIPT_CMD_FAILURE;
@@ -26819,7 +26819,7 @@ BUILDIN_FUNC(getfamerank) {
 }
 
 BUILDIN_FUNC(isdead) {
-	struct map_session_data *sd;
+	map_session_data *sd;
 
 	if (!script_mapid2sd(2, sd))
 		return SCRIPT_CMD_FAILURE;
diff --git a/src/map/script.hpp b/src/map/script.hpp
index 7bf89257e9..152c359a14 100644
--- a/src/map/script.hpp
+++ b/src/map/script.hpp
@@ -140,7 +140,7 @@ enum script_cmd_result {
 #define SCRIPT_BLOCK_SIZE 512
 enum e_labelType { LABEL_NEXTLINE = 1, LABEL_START };
 
-struct map_session_data;
+class map_session_data;
 struct eri;
 
 extern int potion_flag; //For use on Alchemist improved potions/Potion Pitcher. [Skotlex]
@@ -2147,10 +2147,10 @@ bool is_number(const char *p);
 struct script_code* parse_script(const char* src,const char* file,int line,int options);
 void run_script(struct script_code *rootscript,int pos,int rid,int oid);
 
-bool set_reg_num(struct script_state* st, struct map_session_data* sd, int64 num, const char* name, const int64 value, struct reg_db *ref);
-bool set_reg_str(struct script_state* st, struct map_session_data* sd, int64 num, const char* name, const char* value, struct reg_db* ref);
-bool set_var_str(struct map_session_data *sd, const char* name, const char* val);
-bool clear_reg( struct script_state* st, struct map_session_data* sd, int64 num, const char* name, struct reg_db *ref );
+bool set_reg_num(struct script_state* st, map_session_data* sd, int64 num, const char* name, const int64 value, struct reg_db *ref);
+bool set_reg_str(struct script_state* st, map_session_data* sd, int64 num, const char* name, const char* value, struct reg_db* ref);
+bool set_var_str(map_session_data *sd, const char* name, const char* val);
+bool clear_reg( struct script_state* st, map_session_data* sd, int64 num, const char* name, struct reg_db *ref );
 int64 conv_num64(struct script_state *st, struct script_data *data);
 int conv_num(struct script_state *st, struct script_data *data);
 const char* conv_str(struct script_state *st,struct script_data *data);
@@ -2170,7 +2170,7 @@ void script_free_state(struct script_state* st);
 
 struct DBMap* script_get_label_db(void);
 struct DBMap* script_get_userfunc_db(void);
-void script_run_autobonus(const char *autobonus, struct map_session_data *sd, unsigned int pos);
+void script_run_autobonus(const char *autobonus, map_session_data *sd, unsigned int pos);
 void script_run_petautobonus(const std::string &autobonus, map_session_data &sd);
 
 const char* script_get_constant_str(const char* prefix, int64 value);
@@ -2180,8 +2180,8 @@ void script_set_constant_(const char* name, int64 value, const char* constant_na
 #define script_set_constant(name, value, isparameter, deprecated) script_set_constant_(name, value, NULL, isparameter, deprecated)
 void script_hardcoded_constants(void);
 
-void script_cleararray_pc(struct map_session_data* sd, const char* varname);
-void script_setarray_pc(struct map_session_data* sd, const char* varname, uint32 idx, int64 value, int* refcache);
+void script_cleararray_pc(map_session_data* sd, const char* varname);
+void script_setarray_pc(map_session_data* sd, const char* varname, uint32 idx, int64 value, int* refcache);
 
 int script_config_read(const char *cfgName);
 void do_init_script(void);
@@ -2190,23 +2190,23 @@ int add_str(const char* p);
 const char* get_str(int id);
 void script_reload(void);
 
-void setd_sub_num( struct script_state* st, struct map_session_data* sd, const char* varname, int elem, int64 value, struct reg_db* ref );
-void setd_sub_str( struct script_state* st, struct map_session_data* sd, const char* varname, int elem, const char* value, struct reg_db* ref );
+void setd_sub_num( struct script_state* st, map_session_data* sd, const char* varname, int elem, int64 value, struct reg_db* ref );
+void setd_sub_str( struct script_state* st, map_session_data* sd, const char* varname, int elem, const char* value, struct reg_db* ref );
 
 /**
  * Array Handling
  **/
-struct reg_db *script_array_src(struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref);
+struct reg_db *script_array_src(struct script_state *st, map_session_data *sd, const char *name, struct reg_db *ref);
 void script_array_update(struct reg_db *src, int64 num, bool empty);
 void script_array_delete(struct reg_db *src, struct script_array *sa);
 void script_array_remove_member(struct reg_db *src, struct script_array *sa, unsigned int idx);
 void script_array_add_member(struct script_array *sa, unsigned int idx);
-unsigned int script_array_size(struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref);
-unsigned int script_array_highest_key(struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref);
-void script_array_ensure_zero(struct script_state *st, struct map_session_data *sd, int64 uid, struct reg_db *ref);
+unsigned int script_array_size(struct script_state *st, map_session_data *sd, const char *name, struct reg_db *ref);
+unsigned int script_array_highest_key(struct script_state *st, map_session_data *sd, const char *name, struct reg_db *ref);
+void script_array_ensure_zero(struct script_state *st, map_session_data *sd, int64 uid, struct reg_db *ref);
 int script_free_array_db(DBKey key, DBData *data, va_list ap);
 /* */
-void script_reg_destroy_single(struct map_session_data *sd, int64 reg, struct script_reg_state *data);
+void script_reg_destroy_single(map_session_data *sd, int64 reg, struct script_reg_state *data);
 int script_reg_destroy(DBKey key, DBData *data, va_list ap);
 /* */
 void script_generic_ui_array_expand(unsigned int plus);
diff --git a/src/map/searchstore.cpp b/src/map/searchstore.cpp
index 18586ec202..d6ebb37cab 100644
--- a/src/map/searchstore.cpp
+++ b/src/map/searchstore.cpp
@@ -10,7 +10,7 @@
 
 #include "battle.hpp"  // battle_config.*
 #include "clif.hpp"  // clif_open_search_store_info, clif_search_store_info_*
-#include "pc.hpp"  // struct map_session_data
+#include "pc.hpp"  // map_session_data
 
 /// Failure constants for clif functions
 enum e_searchstore_failure
@@ -38,8 +38,8 @@ enum e_searchstore_effecttype
 };
 
 /// Type for shop search function
-typedef bool (*searchstore_search_t)(struct map_session_data* sd, t_itemid nameid);
-typedef bool (*searchstore_searchall_t)(struct map_session_data* sd, const struct s_search_store_search* s);
+typedef bool (*searchstore_search_t)(map_session_data* sd, t_itemid nameid);
+typedef bool (*searchstore_searchall_t)(map_session_data* sd, const struct s_search_store_search* s);
 
 /**
  * Retrieves search function by type.
@@ -77,7 +77,7 @@ static searchstore_searchall_t searchstore_getsearchallfunc(unsigned char type)
  * @param type : type of search to conduct
  * @return : store type
  */
-static bool searchstore_hasstore(struct map_session_data* sd, unsigned char type)
+static bool searchstore_hasstore(map_session_data* sd, unsigned char type)
 {
 	switch( type ) {
 		case SEARCHTYPE_VENDING:      return sd->state.vending;
@@ -93,7 +93,7 @@ static bool searchstore_hasstore(struct map_session_data* sd, unsigned char type
  * @param type : type of search to conduct
  * @return : store ID
  */
-static int searchstore_getstoreid(struct map_session_data* sd, unsigned char type)
+static int searchstore_getstoreid(map_session_data* sd, unsigned char type)
 {
 	switch( type ) {
 		case SEARCHTYPE_VENDING:      return sd->vender_id;
@@ -110,7 +110,7 @@ static int searchstore_getstoreid(struct map_session_data* sd, unsigned char typ
  * @param effect : shop type
  * @return : true : opened, false : failed to open
  */
-bool searchstore_open(struct map_session_data* sd, unsigned int uses, unsigned short effect)
+bool searchstore_open(map_session_data* sd, unsigned int uses, unsigned short effect)
 {
 	if( !battle_config.feature_search_stores || sd->searchstore.open )
 		return false;
@@ -138,10 +138,10 @@ bool searchstore_open(struct map_session_data* sd, unsigned int uses, unsigned s
  * @param cardlist : list with stored cards (cards attached to items)
  * @param card_count : amount of items in cardlist
  */
-void searchstore_query(struct map_session_data* sd, unsigned char type, unsigned int min_price, unsigned int max_price, const struct PACKET_CZ_SEARCH_STORE_INFO_item* itemlist, unsigned int item_count, const struct PACKET_CZ_SEARCH_STORE_INFO_item* cardlist, unsigned int card_count)
+void searchstore_query(map_session_data* sd, unsigned char type, unsigned int min_price, unsigned int max_price, const struct PACKET_CZ_SEARCH_STORE_INFO_item* itemlist, unsigned int item_count, const struct PACKET_CZ_SEARCH_STORE_INFO_item* cardlist, unsigned int card_count)
 {
 	unsigned int i;
-	struct map_session_data* pl_sd;
+	map_session_data* pl_sd;
 	struct DBIterator *iter;
 	struct s_search_store_search s;
 	searchstore_searchall_t store_searchall;
@@ -206,7 +206,7 @@ void searchstore_query(struct map_session_data* sd, unsigned char type, unsigned
 	s.max_price  = max_price;
 	iter         = db_iterator((type == SEARCHTYPE_VENDING) ? vending_getdb() : buyingstore_getdb());
 
-	for( pl_sd = (struct map_session_data*)dbi_first(iter); dbi_exists(iter);  pl_sd = (struct map_session_data*)dbi_next(iter) ) {
+	for( pl_sd = (map_session_data*)dbi_first(iter); dbi_exists(iter);  pl_sd = (map_session_data*)dbi_next(iter) ) {
 		if( sd == pl_sd ) // skip own shop, if any
 			continue;
 
@@ -241,7 +241,7 @@ void searchstore_query(struct map_session_data* sd, unsigned char type, unsigned
  * @param sd : player requesting
  * @return : true : more items to search, false : no more items
  */
-bool searchstore_querynext(struct map_session_data* sd)
+bool searchstore_querynext(map_session_data* sd)
 {
 	if( !sd->searchstore.items.empty() && ( sd->searchstore.items.size()-1 )/SEARCHSTORE_RESULTS_PER_PAGE > sd->searchstore.pages )
 		return true;
@@ -253,7 +253,7 @@ bool searchstore_querynext(struct map_session_data* sd)
  * Get and display the results for the next page.
  * @param sd : player requesting
  */
-void searchstore_next(struct map_session_data* sd)
+void searchstore_next(map_session_data* sd)
 {
 	if( !battle_config.feature_search_stores || !sd->searchstore.open || sd->searchstore.items.size() <= sd->searchstore.pages*SEARCHSTORE_RESULTS_PER_PAGE ) // nothing (more) to display
 		return;
@@ -269,7 +269,7 @@ void searchstore_next(struct map_session_data* sd)
  * Prepare to clear information for closing of window.
  * @param sd : player requesting
  */
-void searchstore_clear(struct map_session_data* sd)
+void searchstore_clear(map_session_data* sd)
 {
 	searchstore_clearremote(sd);
 
@@ -281,7 +281,7 @@ void searchstore_clear(struct map_session_data* sd)
  * Close the Search Store window.
  * @param sd : player requesting
  */
-void searchstore_close(struct map_session_data* sd)
+void searchstore_close(map_session_data* sd)
 {
 	if( sd->searchstore.open ) {
 		searchstore_clear(sd);
@@ -298,10 +298,10 @@ void searchstore_close(struct map_session_data* sd)
  * @param store_id : store ID created by client
  * @param nameid : item being searched
  */
-void searchstore_click(struct map_session_data* sd, uint32 account_id, int store_id, t_itemid nameid)
+void searchstore_click(map_session_data* sd, uint32 account_id, int store_id, t_itemid nameid)
 {
 	unsigned int i;
-	struct map_session_data* pl_sd;
+	map_session_data* pl_sd;
 	searchstore_search_t store_search;
 
 	if( !battle_config.feature_search_stores || !sd->searchstore.open || sd->searchstore.items.empty() )
@@ -363,7 +363,7 @@ void searchstore_click(struct map_session_data* sd, uint32 account_id, int store
  * @param account_id : account ID of owner's shop
  * @return : true : shop opened, false : shop not opened
  */
-bool searchstore_queryremote(struct map_session_data* sd, uint32 account_id)
+bool searchstore_queryremote(map_session_data* sd, uint32 account_id)
 {
 	return (bool)( sd->searchstore.open && !sd->searchstore.items.empty() && sd->searchstore.remote_id == account_id );
 }
@@ -372,7 +372,7 @@ bool searchstore_queryremote(struct map_session_data* sd, uint32 account_id)
  * Removes range-check bypassing for remotely opened stores.
  * @param sd : player requesting
  */
-void searchstore_clearremote(struct map_session_data* sd)
+void searchstore_clearremote(map_session_data* sd)
 {
 	sd->searchstore.remote_id = 0;
 }
diff --git a/src/map/searchstore.hpp b/src/map/searchstore.hpp
index 499c4aaad4..b1d127a19a 100644
--- a/src/map/searchstore.hpp
+++ b/src/map/searchstore.hpp
@@ -17,7 +17,7 @@
 
 /// information about the search being performed
 struct s_search_store_search {
-	struct map_session_data* search_sd;  // sd of the searching player
+	map_session_data* search_sd;  // sd of the searching player
 	const struct PACKET_CZ_SEARCH_STORE_INFO_item* itemlist;
 	const struct PACKET_CZ_SEARCH_STORE_INFO_item* cardlist;
 	unsigned int item_count;
@@ -49,14 +49,14 @@ struct s_search_store_info {
 	bool open;
 };
 
-bool searchstore_open(struct map_session_data* sd, unsigned int uses, unsigned short effect);
-void searchstore_query(struct map_session_data* sd, unsigned char type, unsigned int min_price, unsigned int max_price, const struct PACKET_CZ_SEARCH_STORE_INFO_item* itemlist, unsigned int item_count, const struct PACKET_CZ_SEARCH_STORE_INFO_item* cardlist, unsigned int card_count);
-bool searchstore_querynext(struct map_session_data* sd);
-void searchstore_next(struct map_session_data* sd);
-void searchstore_clear(struct map_session_data* sd);
-void searchstore_close(struct map_session_data* sd);
-void searchstore_click(struct map_session_data* sd, uint32 account_id, int store_id, t_itemid nameid);
-bool searchstore_queryremote(struct map_session_data* sd, uint32 account_id);
-void searchstore_clearremote(struct map_session_data* sd);
+bool searchstore_open(map_session_data* sd, unsigned int uses, unsigned short effect);
+void searchstore_query(map_session_data* sd, unsigned char type, unsigned int min_price, unsigned int max_price, const struct PACKET_CZ_SEARCH_STORE_INFO_item* itemlist, unsigned int item_count, const struct PACKET_CZ_SEARCH_STORE_INFO_item* cardlist, unsigned int card_count);
+bool searchstore_querynext(map_session_data* sd);
+void searchstore_next(map_session_data* sd);
+void searchstore_clear(map_session_data* sd);
+void searchstore_close(map_session_data* sd);
+void searchstore_click(map_session_data* sd, uint32 account_id, int store_id, t_itemid nameid);
+bool searchstore_queryremote(map_session_data* sd, uint32 account_id);
+void searchstore_clearremote(map_session_data* sd);
 
 #endif /* SEARCHSTORE_HPP */
diff --git a/src/map/skill.cpp b/src/map/skill.cpp
index 38758e0eae..9355338777 100755
--- a/src/map/skill.cpp
+++ b/src/map/skill.cpp
@@ -102,7 +102,7 @@ static int skill_check_unit_range (struct block_list *bl, int x, int y, uint16 s
 static int skill_check_unit_range2 (struct block_list *bl, int x, int y, uint16 skill_id, uint16 skill_lv, bool isNearNPC);
 static int skill_destroy_trap( struct block_list *bl, va_list ap );
 static int skill_check_condition_mob_master_sub (struct block_list *bl, va_list ap);
-static bool skill_check_condition_sc_required(struct map_session_data *sd, unsigned short skill_id, struct s_skill_condition *require);
+static bool skill_check_condition_sc_required(map_session_data *sd, unsigned short skill_id, struct s_skill_condition *require);
 static bool skill_check_unit_movepos(uint8 check_flag, struct block_list *bl, short dst_x, short dst_y, int easy, bool checkpath);
 
 // Use this function for splash skills that can't hit icewall when cast by players
@@ -481,7 +481,7 @@ bool skill_pos_maxcount_check(struct block_list *src, int16 x, int16 y, uint16 s
 		return false;
 
 	struct unit_data *ud = unit_bl2ud(src);
-	struct map_session_data *sd = map_id2sd(src->id);
+	map_session_data *sd = map_id2sd(src->id);
 	int maxcount = 0;
 	std::shared_ptr<s_skill_db> skill = skill_db.find(skill_id);
 
@@ -523,9 +523,9 @@ int skill_calc_heal(struct block_list *src, struct block_list *target, uint16 sk
 	int hp_bonus = 0;
 	double global_bonus = 1;
 #endif
-	struct map_session_data *sd = BL_CAST(BL_PC, src);
-	struct map_session_data *tsd = BL_CAST(BL_PC, target);
-	struct status_change *sc, *tsc;
+	map_session_data *sd = BL_CAST(BL_PC, src);
+	map_session_data *tsd = BL_CAST(BL_PC, target);
+	status_change *sc, *tsc;
 
 	sc = status_get_sc(src);
 	tsc = status_get_sc(target);
@@ -799,7 +799,7 @@ int skill_calc_heal(struct block_list *src, struct block_list *target, uint16 sk
  * @return 0 - Cannot be copied; 1 - Can be copied by Plagiarism 2 - Can be copied by Reproduce
  * @author Aru - for previous check; Jobbie for class restriction idea; Cydh expands the copyable skill
  */
-int8 skill_isCopyable(struct map_session_data *sd, uint16 skill_id) {
+int8 skill_isCopyable(map_session_data *sd, uint16 skill_id) {
 	uint16 skill_idx = skill_get_index(skill_id);
 
 	if (!skill_idx)
@@ -830,7 +830,7 @@ int8 skill_isCopyable(struct map_session_data *sd, uint16 skill_id) {
  * @return true: Skill cannot be used, false: otherwise
  * @author [MouseJstr]
  */
-bool skill_isNotOk(uint16 skill_id, struct map_session_data *sd)
+bool skill_isNotOk(uint16 skill_id, map_session_data *sd)
 {
 	nullpo_retr(1,sd);
 
@@ -1002,8 +1002,8 @@ bool skill_isNotOk(uint16 skill_id, struct map_session_data *sd)
  */
 bool skill_isNotOk_hom(struct homun_data *hd, uint16 skill_id, uint16 skill_lv)
 {
-	struct map_session_data *sd = NULL;
-	struct status_change *sc;
+	map_session_data *sd = NULL;
+	status_change *sc;
 	int8 spiritball = 0;
 
 	nullpo_retr(true, hd);
@@ -1210,10 +1210,10 @@ static int skill_area_temp[8];
  *------------------------------------------*/
 int skill_additional_effect(struct block_list* src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int attack_type, enum damage_lv dmg_lv, t_tick tick)
 {
-	struct map_session_data *sd, *dstsd;
+	map_session_data *sd, *dstsd;
 	struct mob_data *md, *dstmd;
 	struct status_data *sstatus, *tstatus;
-	struct status_change *sc, *tsc;
+	status_change *sc, *tsc;
 	int skill;
 	int rate;
 
@@ -2415,7 +2415,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, t_tick tick) {
+int skill_onskillusage(map_session_data *sd, struct block_list *bl, uint16 skill_id, t_tick tick) {
 	if( sd == nullptr || !skill_id )
 		return 0;
 
@@ -2524,8 +2524,8 @@ int skill_onskillusage(struct map_session_data *sd, struct block_list *bl, uint1
 int skill_counter_additional_effect (struct block_list* src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int attack_type, t_tick tick)
 {
 	int rate;
-	struct map_session_data *sd=NULL;
-	struct map_session_data *dstsd=NULL;
+	map_session_data *sd=NULL;
+	map_session_data *dstsd=NULL;
 
 	nullpo_ret(src);
 	nullpo_ret(bl);
@@ -2636,7 +2636,7 @@ int skill_counter_additional_effect (struct block_list* src, struct block_list *
 			sp += sd->bonus.magic_sp_gain_value;
 			hp += sd->bonus.magic_hp_gain_value;
 			if( skill_id == WZ_WATERBALL ) {//(bugreport:5303)
-				struct status_change *sc = NULL;
+				status_change *sc = NULL;
 				if( ( sc = status_get_sc(src) ) ) {
 					if(sc->getSCE(SC_SPIRIT) &&
 								sc->getSCE(SC_SPIRIT)->val2 == SL_WIZARD &&
@@ -2651,7 +2651,7 @@ int skill_counter_additional_effect (struct block_list* src, struct block_list *
 	}
 
 	if (dstsd && !status_isdead(bl) && !(skill_id && skill_get_nk(skill_id, NK_NODAMAGE))) {
-		struct status_change *sc = status_get_sc(bl);
+		status_change *sc = status_get_sc(bl);
 
 		if (sc && sc->getSCE(SC_DORAM_SVSP) && attack_type&(BF_MAGIC|BF_LONG))
 			skill_castend_damage_id(bl, src, SU_SV_STEMSPEAR, (pc_checkskill(dstsd, SU_SV_STEMSPEAR) ? pc_checkskill(dstsd, SU_SV_STEMSPEAR) : 1), tick, 0);
@@ -2783,7 +2783,7 @@ int skill_break_equip(struct block_list *src, struct block_list *bl, unsigned sh
 	const int where_list[6]     = { EQP_WEAPON, EQP_ARMOR, EQP_SHIELD, EQP_HELM, EQP_ACC, EQP_SHADOW_GEAR };
 	const enum sc_type scatk[6] = { SC_STRIPWEAPON, SC_STRIPARMOR, SC_STRIPSHIELD, SC_STRIPHELM, SC__STRIPACCESSORY, SC_SHADOW_STRIP };
 	const enum sc_type scdef[6] = { SC_CP_WEAPON, SC_CP_ARMOR, SC_CP_SHIELD, SC_CP_HELM, SC_NONE, SC_PROTECTSHADOWEQUIP };
-	struct status_change *sc = status_get_sc(bl);
+	status_change *sc = status_get_sc(bl);
 	int i;
 	TBL_PC *sd;
 	sd = BL_CAST(BL_PC, bl);
@@ -2909,7 +2909,7 @@ bool skill_strip_equip(struct block_list *src, struct block_list *target, uint16
 	nullpo_retr(false, src);
 	nullpo_retr(false, target);
 
-	struct status_change *tsc = status_get_sc(target);
+	status_change *tsc = status_get_sc(target);
 
 	if (!tsc || tsc->option&OPTION_MADOGEAR) // Mado Gear cannot be divested [Ind]
 		return false;
@@ -3050,7 +3050,7 @@ short skill_blown(struct block_list* src, struct block_list* target, char count,
 {
 	int dx = 0, dy = 0;
 	uint8 checkflag = 0;
-	struct status_change *tsc = status_get_sc(target);
+	status_change *tsc = status_get_sc(target);
 	enum e_unit_blown reason = UB_KNOCKABLE;
 
 	nullpo_ret(src);
@@ -3106,8 +3106,8 @@ short skill_blown(struct block_list* src, struct block_list* target, char count,
 //		2 - SL_KAITE reflection
 static int skill_magic_reflect(struct block_list* src, struct block_list* bl, int type)
 {
-	struct status_change *sc = status_get_sc(bl);
-	struct map_session_data* sd = BL_CAST(BL_PC, bl);
+	status_change *sc = status_get_sc(bl);
+	map_session_data* sd = BL_CAST(BL_PC, bl);
 
 	// Deadly Projection null's all magic reflection.
 	if (sc && sc->getSCE(SC_DEADLY_DEFEASANCE))
@@ -3226,7 +3226,7 @@ void skill_combo(struct block_list* src,struct block_list *dsrc, struct block_li
 	struct status_change_entry *sce;
 	TBL_PC *sd = BL_CAST(BL_PC,src);
 	TBL_HOM *hd = BL_CAST(BL_HOM,src);
-	struct status_change *sc = status_get_sc(src);
+	status_change *sc = status_get_sc(src);
 
 	if(sc == NULL) return;
 
@@ -3377,7 +3377,7 @@ static void skill_do_copy(struct block_list* src,struct block_list *bl, uint16 s
 				break;
 			case 2: //Copied by Reproduce
 				{
-					struct status_change *tsc = status_get_sc(bl);
+					status_change *tsc = status_get_sc(bl);
 					//Already did SC check
 					//Skill level copied depends on Reproduce skill that used
 					lv = (tsc) ? tsc->getSCE(SC__REPRODUCE)->val1 : 1;
@@ -3505,8 +3505,8 @@ int64 skill_attack (int attack_type, struct block_list* src, struct block_list *
 {
 	struct Damage dmg;
 	struct status_data *sstatus, *tstatus;
-	struct status_change *sc, *tsc;
-	struct map_session_data *sd, *tsd;
+	status_change *sc, *tsc;
+	map_session_data *sd, *tsd;
 	int64 damage;
 	bool rmdamage = false;//magic reflected
 	int type;
@@ -3733,7 +3733,7 @@ int64 skill_attack (int attack_type, struct block_list* src, struct block_list *
 		case SL_STIN:
 		case SL_STUN:
 			if (skill_lv >= 7) {
-				struct status_change *sc_cur = status_get_sc(src);
+				status_change *sc_cur = status_get_sc(src);
 				if (sc_cur && !sc_cur->getSCE(SC_SMA))
 					sc_start(src,src,SC_SMA,100,skill_lv,skill_get_time(SL_SMA, skill_lv));
 			}
@@ -3999,7 +3999,7 @@ int64 skill_attack (int attack_type, struct block_list* src, struct block_list *
 				int64 devotion_damage = damage;
 
 				// Needed to check the devotion master for Rebound Shield status.
-				struct status_change *d_sc = status_get_sc(d_bl);
+				status_change *d_sc = status_get_sc(d_bl);
 
 				if (d_sc && d_sc->getSCE(SC_REBOUND_S))
 					devotion_damage -= devotion_damage * d_sc->getSCE(SC_REBOUND_S)->val2 / 100;
@@ -4072,7 +4072,7 @@ int64 skill_attack (int attack_type, struct block_list* src, struct block_list *
 	if( damage > 0 ) { // Post-damage effects
 		switch( skill_id ) {
 			case GC_VENOMPRESSURE: {
-					struct status_change *ssc = status_get_sc(src);
+					status_change *ssc = status_get_sc(src);
 					if( ssc && ssc->getSCE(SC_POISONINGWEAPON) && rnd()%100 < 70 + 5*skill_lv ) {
 						sc_start4(src, bl, (sc_type)ssc->getSCE(SC_POISONINGWEAPON)->val2, 100, ssc->getSCE(SC_POISONINGWEAPON)->val1, 0, 1, 0, skill_get_time2(GC_POISONINGWEAPON, 1));
 						status_change_end(src,SC_POISONINGWEAPON);
@@ -4341,7 +4341,7 @@ static int skill_check_unit_range2 (struct block_list *bl, int x, int y, uint16
 static int skill_check_condition_mercenary(struct block_list *bl, uint16 skill_id, uint16 skill_lv, int type)
 {
 	struct status_data *status;
-	struct map_session_data *sd = NULL;
+	map_session_data *sd = NULL;
 	int i, hp, sp, hp_rate, sp_rate, state, mhp;
 	t_itemid itemid[MAX_SKILL_ITEM_REQUIRE];
 	int amount[ARRAYLENGTH(itemid)], index[ARRAYLENGTH(itemid)];
@@ -4581,7 +4581,7 @@ static TIMER_FUNC(skill_timerskill){
 						unit_set_walkdelay(src, tick, TIMERSKILL_INTERVAL, 1);
 						skill_addtimerskill(src,tick+TIMERSKILL_INTERVAL,target->id,skl->x,skl->y,skl->skill_id,skl->skill_lv,skl->type+1,skl->flag);
 					} else {
-						struct status_change *sc = status_get_sc(src);
+						status_change *sc = status_get_sc(src);
 						if(sc) {
 							if(sc->getSCE(SC_SPIRIT) &&
 								sc->getSCE(SC_SPIRIT)->val2 == SL_WIZARD &&
@@ -4650,7 +4650,7 @@ static TIMER_FUNC(skill_timerskill){
 					break;
 				case SR_WINDMILL:
 					if( target->type == BL_PC ) {
-						struct map_session_data *tsd = NULL;
+						map_session_data *tsd = NULL;
 						if( (tsd = ((TBL_PC*)target)) && !pc_issit(tsd) ) {
 							pc_setsit(tsd);
 							skill_sit(tsd, true);
@@ -4663,8 +4663,8 @@ static TIMER_FUNC(skill_timerskill){
 					break;
 				case CH_PALMSTRIKE:
 					{
-						struct status_change* tsc = status_get_sc(target);
-						struct status_change* sc = status_get_sc(src);
+						status_change* tsc = status_get_sc(target);
+						status_change* sc = status_get_sc(src);
 						if( ( tsc && tsc->option&OPTION_HIDE ) ||
 							( sc && sc->option&OPTION_HIDE ) ){
 							skill_blown(src,target,skill_get_blewcount(skl->skill_id, skl->skill_lv), -1, BLOWN_NONE);
@@ -4685,7 +4685,7 @@ static TIMER_FUNC(skill_timerskill){
 					break;
 
 				case SU_SV_ROOTTWIST_ATK: {
-						struct status_change *tsc = status_get_sc(target);
+						status_change *tsc = status_get_sc(target);
 
 						if (tsc && tsc->getSCE(SC_SV_ROOTTWIST)) {
 							if (check_distance_bl(src, target, 32)) // Only damage if caster is within 32x32 area
@@ -5003,9 +5003,9 @@ static int skill_tarotcard(struct block_list* src, struct block_list *target, ui
  *------------------------------------------*/
 int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, t_tick tick, int flag)
 {
-	struct map_session_data *sd = NULL;
+	map_session_data *sd = NULL;
 	struct status_data *tstatus;
-	struct status_change *sc, *tsc;
+	status_change *sc, *tsc;
 
 	if (skill_id > 0 && !skill_lv) return 0;
 
@@ -6699,7 +6699,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
 	case EL_TIDAL_WEAPON:
 		if( src->type == BL_ELEM ) {
 			s_elemental_data *ele = BL_CAST(BL_ELEM,src);
-			struct status_change *tsc_ele = status_get_sc(&ele->bl);
+			status_change *tsc_ele = status_get_sc(&ele->bl);
 			sc_type type = SC_TIDAL_WEAPON_OPTION, type2 = SC_TIDAL_WEAPON;
 
 			clif_skill_nodamage(src,battle_get_master(src),skill_id,skill_lv,1);
@@ -6860,7 +6860,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
 		}
 		break;
 	case SJ_FLASHKICK: {
-			struct map_session_data *tsd = BL_CAST(BL_PC, bl);
+			map_session_data *tsd = BL_CAST(BL_PC, bl);
 			struct mob_data *md = BL_CAST(BL_MOB, src), *tmd = BL_CAST(BL_MOB, bl);
 
 			// Only players and monsters can be tagged....I think??? [Rytech]
@@ -7006,7 +7006,7 @@ static int skill_castend_song(struct block_list* src, uint16 skill_id, uint16 sk
 		return 0;
 	}
 
-	struct map_session_data* sd = BL_CAST(BL_PC, src);
+	map_session_data* sd = BL_CAST(BL_PC, src);
 	int flag = BCT_PARTY;
 
 	switch (skill_id) {
@@ -7046,12 +7046,12 @@ static int skill_castend_song(struct block_list* src, uint16 skill_id, uint16 sk
  **/
 int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, t_tick tick, int flag)
 {
-	struct map_session_data *sd, *dstsd;
+	map_session_data *sd, *dstsd;
 	struct mob_data *md, *dstmd;
 	struct homun_data *hd;
 	s_mercenary_data *mer;
 	struct status_data *sstatus, *tstatus;
-	struct status_change *tsc;
+	status_change *tsc;
 	struct status_change_entry *tsce;
 
 	int i = 0;
@@ -8340,7 +8340,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
 	case MT_AXE_STOMP:
 	case ABC_ABYSS_DAGGER:
 	{
-		struct status_change *sc = status_get_sc(src);
+		status_change *sc = status_get_sc(src);
 		int starget = BL_CHAR|BL_SKILL;
 
 		if (skill_id == SR_HOWLINGOFLION)
@@ -9718,8 +9718,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
 	// parent-baby skills
 	case WE_BABY:
 		if(sd){
-			struct map_session_data *f_sd = pc_get_father(sd);
-			struct map_session_data *m_sd = pc_get_mother(sd);
+			map_session_data *f_sd = pc_get_father(sd);
+			map_session_data *m_sd = pc_get_mother(sd);
 
 			if( (!f_sd && !m_sd) // if neither was found
 				|| (sd->status.party_id != 0 && //not in same party
@@ -9741,8 +9741,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
 
 	case WE_CALLALLFAMILY:
 		if (sd) {
-			struct map_session_data *p_sd = pc_get_partner(sd);
-			struct map_session_data *c_sd = pc_get_child(sd);
+			map_session_data *p_sd = pc_get_partner(sd);
+			map_session_data *c_sd = pc_get_child(sd);
 
 			if (!p_sd && !c_sd) { // Fail if no family members are found
 				clif_skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0);
@@ -9761,8 +9761,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
 
 	case WE_ONEFOREVER:
 		if (sd) {
-			struct map_session_data *p_sd = pc_get_partner(sd);
-			struct map_session_data *c_sd = pc_get_child(sd);
+			map_session_data *p_sd = pc_get_partner(sd);
+			map_session_data *c_sd = pc_get_child(sd);
 
 			if (!p_sd && !c_sd && !dstsd) { // Fail if no family members are found
 				clif_skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0);
@@ -9792,8 +9792,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
 
 	case WE_CHEERUP:
 		if (sd) {
-			struct map_session_data *f_sd = pc_get_father(sd);
-			struct map_session_data *m_sd = pc_get_mother(sd);
+			map_session_data *f_sd = pc_get_father(sd);
+			map_session_data *m_sd = pc_get_mother(sd);
 
 			if (!f_sd && !m_sd && !dstsd) { // Fail if no family members are found
 				clif_skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0);
@@ -11424,7 +11424,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
 	case WM_LERADS_DEW:
 	case WM_UNLIMITED_HUMMING_VOICE:
 		if( flag&1 ) {	// These affect to to all party members near the caster.
-			struct status_change *sc = status_get_sc(src);
+			status_change *sc = status_get_sc(src);
 			if( sc && sc->getSCE(type) ) {
 				sc_start2(src,bl,type,100,skill_lv,pc_checkskill(sd, WM_LESSON),skill_get_time(skill_id,skill_lv));
 			}
@@ -11813,7 +11813,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
 			s_elemental_data *ele = BL_CAST(BL_ELEM, src);
 			if( ele ) {
 				sc_type type2 = (sc_type)(type-1);
-				struct status_change *sc = status_get_sc(&ele->bl);
+				status_change *sc = status_get_sc(&ele->bl);
 
 				if( (sc && sc->getSCE(type2)) || (tsc && tsc->getSCE(type)) ) {
 					status_change_end(src,type);
@@ -11840,7 +11840,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
 	case EL_WATER_SCREEN: {
 			s_elemental_data *ele = BL_CAST(BL_ELEM, src);
 			if( ele ) {
-				struct status_change *sc = status_get_sc(&ele->bl);
+				status_change *sc = status_get_sc(&ele->bl);
 				sc_type type2 = (sc_type)(type-1);
 
 				clif_skill_nodamage(src,src,skill_id,skill_lv,1);
@@ -12552,7 +12552,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
 	}
 
 	if (skill_id != SR_CURSEDCIRCLE && skill_id != NPC_SR_CURSEDCIRCLE) {
-		struct status_change *sc = status_get_sc(src);
+		status_change *sc = status_get_sc(src);
 
 		if (sc && sc->getSCE(SC_CURSEDCIRCLE_ATKER)) // Should only remove after the skill had been casted.
 			status_change_end(src,SC_CURSEDCIRCLE_ATKER);
@@ -12591,7 +12591,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
 static int8 skill_castend_id_check(struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv) {
 	std::shared_ptr<s_skill_db> skill = skill_db.find(skill_id);
 	int inf = skill->inf;
-	struct status_change *tsc = status_get_sc(target);
+	status_change *tsc = status_get_sc(target);
 
 	if (src != target && (status_bl_has_mode(target,MD_SKILLIMMUNE) || (status_get_class(target) == MOBID_EMPERIUM && !skill->inf2[INF2_TARGETEMPERIUM])) && skill_get_casttype(skill_id) == CAST_NODAMAGE)
 		return USESKILL_FAIL_MAX; // Don't show a skill fail message (NoDamage type doesn't consume requirements)
@@ -12720,7 +12720,7 @@ static int8 skill_castend_id_check(struct block_list *src, struct block_list *ta
 }
 
 TIMER_FUNC( skill_keep_using ){
-	struct map_session_data* sd = map_id2sd( id );
+	map_session_data* sd = map_id2sd( id );
 
 	if( sd && sd->skill_keep_using.skill_id ){
 		clif_parse_skill_toid( sd, sd->skill_keep_using.skill_id, sd->skill_keep_using.level, sd->skill_keep_using.target );
@@ -12738,10 +12738,10 @@ TIMER_FUNC( skill_keep_using ){
  **/
 TIMER_FUNC(skill_castend_id){
 	struct block_list *target, *src;
-	struct map_session_data *sd;
+	map_session_data *sd;
 	struct mob_data *md;
 	struct unit_data *ud;
-	struct status_change *sc = NULL;
+	status_change *sc = NULL;
 	int flag = 0;
 
 	src = map_id2bl(id);
@@ -13094,7 +13094,7 @@ TIMER_FUNC(skill_castend_id){
  *------------------------------------------*/
 TIMER_FUNC(skill_castend_pos){
 	struct block_list* src = map_id2bl(id);
-	struct map_session_data *sd;
+	map_session_data *sd;
 	struct unit_data *ud = unit_bl2ud(src);
 	struct mob_data *md;
 
@@ -13244,8 +13244,8 @@ static int skill_count_wos(struct block_list *bl,va_list ap) {
  *------------------------------------------*/
 int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, uint16 skill_lv, t_tick tick, int flag)
 {
-	struct map_session_data* sd;
-	struct status_change* sc;
+	map_session_data* sd;
+	status_change* sc;
 	struct status_change_entry *sce;
 	std::shared_ptr<s_skill_unit_group> sg;
 	enum sc_type type;
@@ -14178,7 +14178,7 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui
 /*==========================================
  *
  *------------------------------------------*/
-int skill_castend_map (struct map_session_data *sd, uint16 skill_id, const char *mapname)
+int skill_castend_map (map_session_data *sd, uint16 skill_id, const char *mapname)
 {
 	nullpo_ret(sd);
 
@@ -14421,9 +14421,9 @@ std::shared_ptr<s_skill_unit_group> skill_unitsetting(struct block_list *src, ui
 	int target, interval, range;
 	t_itemid req_item = 0;
 	struct s_skill_unit_layout *layout;
-	struct map_session_data *sd;
+	map_session_data *sd;
 	struct status_data *status;
-	struct status_change *sc;
+	status_change *sc;
 	int active_flag = 1;
 	int subunt = 0;
 	bool hidden = false;
@@ -15006,7 +15006,7 @@ static int skill_unit_onplace(struct skill_unit *unit, struct block_list *bl, t_
 {
 	
 	struct block_list *ss; // Actual source that cast the skill unit
-	struct status_change *sc;
+	status_change *sc;
 	struct status_change_entry *sce;
 	struct status_data *tstatus;
 	enum sc_type type;
@@ -15126,7 +15126,7 @@ static int skill_unit_onplace(struct skill_unit *unit, struct block_list *bl, t_
 			int working = sg->val1&0xffff;
 
 			if(bl->type==BL_PC && !working){
-				struct map_session_data *sd = (struct map_session_data *)bl;
+				map_session_data *sd = (map_session_data *)bl;
 				if((!sd->chatID || battle_config.chat_warpportal)
 					&& sd->ud.to_x == unit->bl.x && sd->ud.to_y == unit->bl.y)
 				{
@@ -15353,7 +15353,7 @@ int skill_unit_onplace_timer(struct skill_unit *unit, struct block_list *bl, t_t
 	struct block_list *ss;
 	TBL_PC* tsd;
 	struct status_data *tstatus;
-	struct status_change *sc, *tsc;
+	status_change *sc, *tsc;
 	struct skill_unit_group_tickset *ts;
 	enum sc_type type;
 	uint16 skill_id;
@@ -16137,7 +16137,7 @@ int skill_unit_onplace_timer(struct skill_unit *unit, struct block_list *bl, t_t
  */
 int skill_unit_onout(struct skill_unit *src, struct block_list *bl, t_tick tick)
 {
-	struct status_change *sc;
+	status_change *sc;
 	struct status_change_entry *sce;
 	enum sc_type type;
 
@@ -16210,7 +16210,7 @@ int skill_unit_onout(struct skill_unit *src, struct block_list *bl, t_tick tick)
  */
 int skill_unit_onleft(uint16 skill_id, struct block_list *bl, t_tick tick)
 {
-	struct status_change *sc;
+	status_change *sc;
 	struct status_change_entry *sce;
 	enum sc_type type;
 
@@ -16444,14 +16444,14 @@ int skill_check_condition_char_sub (struct block_list *bl, va_list ap)
 {
 	int *c, skill_id;
 	struct block_list *src;
-	struct map_session_data *sd;
-	struct map_session_data *tsd;
+	map_session_data *sd;
+	map_session_data *tsd;
 	int *p_sd;	//Contains the list of characters found.
 
 	nullpo_ret(bl);
-	nullpo_ret(tsd=(struct map_session_data*)bl);
+	nullpo_ret(tsd=(map_session_data*)bl);
 	nullpo_ret(src=va_arg(ap,struct block_list *));
-	nullpo_ret(sd=(struct map_session_data*)src);
+	nullpo_ret(sd=(map_session_data*)src);
 
 	c=va_arg(ap,int *);
 	p_sd = va_arg(ap, int *);
@@ -16545,7 +16545,7 @@ int skill_check_condition_char_sub (struct block_list *bl, va_list ap)
  * @param range Area range to check
  * @param cast_flag Special handle
  */
-int skill_check_pc_partner(struct map_session_data *sd, uint16 skill_id, uint16 *skill_lv, int range, int cast_flag)
+int skill_check_pc_partner(map_session_data *sd, uint16 skill_id, uint16 *skill_lv, int range, int cast_flag)
 {
 	static int c=0;
 	static int p_sd[MAX_PARTY];
@@ -16559,7 +16559,7 @@ int skill_check_pc_partner(struct map_session_data *sd, uint16 skill_id, uint16
 		return is_chorus ? MAX_PARTY : 99; //As if there were infinite partners.
 
 	if (cast_flag) {	//Execute the skill on the partners.
-		struct map_session_data* tsd;
+		map_session_data* tsd;
 		switch (skill_id) {
 			case PR_BENEDICTIO:
 			case WM_GREAT_ECHO:
@@ -16675,7 +16675,7 @@ static int skill_check_condition_mob_master_sub(struct block_list *bl, va_list a
  * @param skill_id Skill ID
  * @return True if skill is need ammo; False otherwise.
  */
-int skill_isammotype(struct map_session_data *sd, unsigned short skill_id)
+int skill_isammotype(map_session_data *sd, unsigned short skill_id)
 {
 	std::shared_ptr<s_skill_db> skill = skill_db.find(skill_id);
 
@@ -16695,7 +16695,7 @@ int skill_isammotype(struct map_session_data *sd, unsigned short skill_id)
 * @param skill_id
 * @return True if condition is met, False otherwise
 **/
-static bool skill_check_condition_sc_required(struct map_session_data *sd, unsigned short skill_id, struct s_skill_condition *require) {
+static bool skill_check_condition_sc_required(map_session_data *sd, unsigned short skill_id, struct s_skill_condition *require) {
 	if (require == nullptr || require->status.empty())
 		return true;
 
@@ -16749,10 +16749,10 @@ static bool skill_check_condition_sc_required(struct map_session_data *sd, unsig
  * @param skill_lv Level of used skill
  * @return true: All condition passed, false: Failed
  */
-bool skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_id, uint16 skill_lv)
+bool skill_check_condition_castbegin(map_session_data* sd, uint16 skill_id, uint16 skill_lv)
 {
 	struct status_data *status;
-	struct status_change *sc;
+	status_change *sc;
 	struct s_skill_condition require;
 	int i;
 
@@ -17791,7 +17791,7 @@ bool skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_i
  * @param skill_lv Level of used skill
  * @return true: All condition passed, false: Failed
  */
-bool skill_check_condition_castend(struct map_session_data* sd, uint16 skill_id, uint16 skill_lv)
+bool skill_check_condition_castend(map_session_data* sd, uint16 skill_id, uint16 skill_lv)
 {
 	struct s_skill_condition require;
 	struct status_data *status;
@@ -18031,7 +18031,7 @@ bool skill_check_condition_castend(struct map_session_data* sd, uint16 skill_id,
  *  type&1: consume the others (before skill was used);
  *  type&2: consume items (after skill was used)
  */
-void skill_consume_requirement(struct map_session_data *sd, uint16 skill_id, uint16 skill_lv, short type)
+void skill_consume_requirement(map_session_data *sd, uint16 skill_id, uint16 skill_lv, short type)
 {
 	struct s_skill_condition require;
 
@@ -18106,7 +18106,7 @@ void skill_consume_requirement(struct map_session_data *sd, uint16 skill_id, uin
 	}
 
 	if( type&2 ) {
-		struct status_change *sc = &sd->sc;
+		status_change *sc = &sd->sc;
 		int n,i;
 
 		if( !sc->count )
@@ -18155,11 +18155,11 @@ void skill_consume_requirement(struct map_session_data *sd, uint16 skill_id, uin
  * @param skill_lv Skill level of used skill
  * @return s_skill_condition Struct 's_skill_condition' that store the modified skill requirements
  */
-struct s_skill_condition skill_get_requirement(struct map_session_data* sd, uint16 skill_id, uint16 skill_lv)
+struct s_skill_condition skill_get_requirement(map_session_data* sd, uint16 skill_id, uint16 skill_lv)
 {
 	struct s_skill_condition req;
 	struct status_data *status;
-	struct status_change *sc;
+	status_change *sc;
 	int i,hp_rate,sp_rate, ap_rate, sp_skill_rate_bonus = 100;
 
 	memset(&req,0,sizeof(req));
@@ -18544,8 +18544,8 @@ int skill_castfix(struct block_list *bl, uint16 skill_id, uint16 skill_lv) {
 
 #ifndef RENEWAL_CAST
 	{
-		struct map_session_data *sd = BL_CAST(BL_PC, bl);
-		struct status_change *sc = status_get_sc(bl);
+		map_session_data *sd = BL_CAST(BL_PC, bl);
+		status_change *sc = status_get_sc(bl);
 		int reduce_cast_rate = 0;
 		uint8 flag = skill_get_castnodex(skill_id);
 
@@ -18921,7 +18921,7 @@ int skill_delayfix(struct block_list *bl, uint16 skill_id, uint16 skill_lv)
 /*==========================================
  * Weapon Repair [Celest/DracoRPG]
  *------------------------------------------*/
-void skill_repairweapon(struct map_session_data *sd, int idx) {
+void skill_repairweapon(map_session_data *sd, int idx) {
 	static const t_itemid weapon_materials[MAX_WEAPON_LEVEL] = {
 		ITEMID_IRON_ORE,
 		ITEMID_IRON,
@@ -18939,7 +18939,7 @@ void skill_repairweapon(struct map_session_data *sd, int idx) {
 	};
 	t_itemid material = 0;
 	struct item *item;
-	struct map_session_data *target_sd;
+	map_session_data *target_sd;
 
 	nullpo_retv(sd);
 
@@ -18991,7 +18991,7 @@ void skill_repairweapon(struct map_session_data *sd, int idx) {
 /*==========================================
  * Item Appraisal
  *------------------------------------------*/
-void skill_identify(struct map_session_data *sd, int idx)
+void skill_identify(map_session_data *sd, int idx)
 {
 	int flag=1;
 
@@ -19011,7 +19011,7 @@ void skill_identify(struct map_session_data *sd, int idx)
 /*==========================================
  * Weapon Refine [Celest]
  *------------------------------------------*/
-void skill_weaponrefine(struct map_session_data *sd, int idx)
+void skill_weaponrefine(map_session_data *sd, int idx)
 {
 	static const t_itemid material[MAX_WEAPON_LEVEL] = {
 		ITEMID_PHRACON,
@@ -19128,7 +19128,7 @@ void skill_weaponrefine(struct map_session_data *sd, int idx)
 /*==========================================
  *
  *------------------------------------------*/
-int skill_autospell(struct map_session_data *sd, uint16 skill_id)
+int skill_autospell(map_session_data *sd, uint16 skill_id)
 {
 	nullpo_ret(sd);
 
@@ -19183,7 +19183,7 @@ int skill_autospell(struct map_session_data *sd, uint16 skill_id)
  */
 static int skill_sit_count(struct block_list *bl, va_list ap)
 {
-	struct map_session_data *sd = (struct map_session_data*)bl;
+	map_session_data *sd = (map_session_data*)bl;
 	int flag = va_arg(ap, int);
 
 	if (!pc_issit(sd))
@@ -19206,7 +19206,7 @@ static int skill_sit_count(struct block_list *bl, va_list ap)
  */
 static int skill_sit_in(struct block_list *bl, va_list ap)
 {
-	struct map_session_data *sd = (struct map_session_data*)bl;
+	map_session_data *sd = (map_session_data*)bl;
 	int flag = va_arg(ap, int);
 
 	if (!pc_issit(sd))
@@ -19232,7 +19232,7 @@ static int skill_sit_in(struct block_list *bl, va_list ap)
  */
 static int skill_sit_out(struct block_list *bl, va_list ap)
 {
-	struct map_session_data *sd = (struct map_session_data*)bl;
+	map_session_data *sd = (map_session_data*)bl;
 	int flag = va_arg(ap, int), range = va_arg(ap, int);
 
 	if (map_foreachinallrange(skill_sit_count, &sd->bl, range, BL_PC, flag) > 1)
@@ -19255,7 +19255,7 @@ static int skill_sit_out(struct block_list *bl, va_list ap)
  * @param sitting: True when sitting or false when standing
  * @return 0
  */
-int skill_sit(struct map_session_data *sd, bool sitting)
+int skill_sit(map_session_data *sd, bool sitting)
 {
 	int flag = 0, range = 0, lv;
 
@@ -19311,7 +19311,7 @@ int skill_frostjoke_scream(struct block_list *bl, va_list ap)
 	if (src == bl || status_isdead(bl))
 		return 0;
 	if (bl->type == BL_PC) {
-		struct map_session_data *sd = (struct map_session_data *)bl;
+		map_session_data *sd = (map_session_data *)bl;
 		if ( sd && sd->sc.option&(OPTION_INVISIBLE|OPTION_MADOGEAR) )
 			return 0;//Frost Joke / Scream cannot target invisible or MADO Gear characters [Ind]
 	}
@@ -19515,13 +19515,13 @@ int skill_graffitiremover(struct block_list *bl, va_list ap)
 int skill_greed(struct block_list *bl, va_list ap)
 {
 	struct block_list *src;
-	struct map_session_data *sd = NULL;
+	map_session_data *sd = NULL;
 	struct flooritem_data *fitem = NULL;
 
 	nullpo_ret(bl);
 	nullpo_ret(src = va_arg(ap, struct block_list *));
 
-	if(src->type == BL_PC && (sd = (struct map_session_data *)src) && bl->type == BL_ITEM && (fitem = (struct flooritem_data *)bl))
+	if(src->type == BL_PC && (sd = (map_session_data *)src) && bl->type == BL_ITEM && (fitem = (struct flooritem_data *)bl))
 		pc_takeitem(sd, fitem);
 
 	return 0;
@@ -19587,7 +19587,7 @@ int skill_detonator(struct block_list *bl, va_list ap)
  * @param sd: Player data
  * @return Number of Royal Guard
  */
-int skill_banding_count(struct map_session_data *sd)
+int skill_banding_count(map_session_data *sd)
 {
  	nullpo_ret(sd);
 
@@ -19965,7 +19965,7 @@ bool skill_check_cloaking(struct block_list *bl, struct status_change_entry *sce
  */
 bool skill_check_shadowform(struct block_list *bl, int64 damage, int hit)
 {
-	struct status_change *sc;
+	status_change *sc;
 
 	nullpo_retr(false,bl);
 
@@ -20232,7 +20232,7 @@ int skill_delunit(struct skill_unit* unit)
 			break;
 		case SC_MANHOLE: // Note : Removing the unit don't remove the status (official info)
 			if( group->val2 ) { // Someone Traped
-				struct status_change *tsc = status_get_sc( map_id2bl(group->val2));
+				status_change *tsc = status_get_sc( map_id2bl(group->val2));
 				if( tsc && tsc->getSCE(SC__MANHOLE) )
 					tsc->getSCE(SC__MANHOLE)->val4 = 0; // Remove the Unit ID
 			}
@@ -20383,7 +20383,7 @@ int skill_delunitgroup_(std::shared_ptr<s_skill_unit_group> group, const char* f
 	}
 
 	if (skill_get_unit_flag_(group->skill_id, { UF_DANCE, UF_SONG, UF_ENSEMBLE })) {
-		struct status_change* sc = status_get_sc(src);
+		status_change* sc = status_get_sc(src);
 		if (sc && sc->getSCE(SC_DANCING)) {
 			sc->getSCE(SC_DANCING)->val2 = 0 ; //This prevents status_change_end attempting to redelete the group. [Skotlex]
 			status_change_end(src, SC_DANCING);
@@ -20399,7 +20399,7 @@ int skill_delunitgroup_(std::shared_ptr<s_skill_unit_group> group, const char* f
 #endif
 	}
 	if (i != SC_NONE) {
-		struct status_change *sc = status_get_sc(src);
+		status_change *sc = status_get_sc(src);
 		if (sc && sc->getSCE(i)) {
 			sc->getSCE(i)->val3 = 0; //Remove reference to this group. [Skotlex]
 			status_change_end(src, (sc_type)i);
@@ -20410,7 +20410,7 @@ int skill_delunitgroup_(std::shared_ptr<s_skill_unit_group> group, const char* f
 		case PF_SPIDERWEB:
 		{
 			struct block_list* target = map_id2bl(group->val2);
-			struct status_change *sc;
+			status_change *sc;
 			bool removed = true;
 			//Clear group id from status change
 			if (target && (sc = status_get_sc(target)) != NULL && sc->getSCE(SC_SPIDERWEB)) {
@@ -20451,7 +20451,7 @@ int skill_delunitgroup_(std::shared_ptr<s_skill_unit_group> group, const char* f
 			break;
 		case NC_NEUTRALBARRIER:
 			{
-				struct status_change *sc = NULL;
+				status_change *sc = NULL;
 				if( (sc = status_get_sc(src)) != NULL ) {
 					if ( sc->getSCE(SC_NEUTRALBARRIER_MASTER) )
 					{
@@ -20464,7 +20464,7 @@ int skill_delunitgroup_(std::shared_ptr<s_skill_unit_group> group, const char* f
 			break;
 		case NC_STEALTHFIELD:
 			{
-				struct status_change *sc = NULL;
+				status_change *sc = NULL;
 				if( (sc = status_get_sc(src)) != NULL && sc->getSCE(SC_STEALTHFIELD_MASTER) ) {
 					sc->getSCE(SC_STEALTHFIELD_MASTER)->val2 = 0;
 					status_change_end(src,SC_STEALTHFIELD_MASTER);
@@ -20698,7 +20698,7 @@ static int skill_unit_timer_sub(DBKey key, DBData *data, va_list ap)
 
 			case UNT_CALLFAMILY:
 			{
-				struct map_session_data *sd = NULL;
+				map_session_data *sd = NULL;
 				if(group->val1) {
 					sd = map_charid2sd(group->val1);
 					group->val1 = 0;
@@ -20741,7 +20741,7 @@ static int skill_unit_timer_sub(DBKey key, DBData *data, va_list ap)
 			case UNT_BANDING:
 			{
 				struct block_list *src = map_id2bl(group->src_id);
-				struct status_change *sc;
+				status_change *sc;
 				if( !src || (sc = status_get_sc(src)) == NULL || !sc->getSCE(SC_BANDING) ) {
 					skill_delunit(unit);
 					break;
@@ -21168,7 +21168,7 @@ void skill_unit_move_unit_group(std::shared_ptr<s_skill_unit_group> group, int16
  * @param qty Amount of item will be created
  * @return 0 If failed or Index+1 of item found on skill_produce_db[]
  */
-short skill_can_produce_mix(struct map_session_data *sd, t_itemid nameid, int trigger, int qty)
+short skill_can_produce_mix(map_session_data *sd, t_itemid nameid, int trigger, int qty)
 {
 	nullpo_ret(sd);
 
@@ -21248,7 +21248,7 @@ short skill_can_produce_mix(struct map_session_data *sd, t_itemid nameid, int tr
  * @param produce_idx Index of produce entry in skill_produce_db[]. (Optional. Assumed the requirements are complete, checked somewhere)
  * @return True is success, False if failed
  */
-bool skill_produce_mix(struct map_session_data *sd, uint16 skill_id, t_itemid nameid, int slot1, int slot2, int slot3, int qty, short produce_idx)
+bool skill_produce_mix(map_session_data *sd, uint16 skill_id, t_itemid nameid, int slot1, int slot2, int slot3, int qty, short produce_idx)
 {
 	int slot[3];
 	int i, sc, ele, idx, equip, wlv, make_per = 0, flag = 0, skill_lv = 0;
@@ -21914,7 +21914,7 @@ bool skill_produce_mix(struct map_session_data *sd, uint16 skill_id, t_itemid na
  * @param nameid Item ID of material
  * @return True if created, False is failed
  */
-bool skill_arrow_create(struct map_session_data *sd, t_itemid nameid)
+bool skill_arrow_create(map_session_data *sd, t_itemid nameid)
 {
 	nullpo_ret(sd);
 
@@ -21965,7 +21965,7 @@ bool skill_arrow_create(struct map_session_data *sd, t_itemid nameid)
  * @param sd Player
  * @nameid Item ID of poison type
  */
-int skill_poisoningweapon(struct map_session_data *sd, t_itemid nameid)
+int skill_poisoningweapon(map_session_data *sd, t_itemid nameid)
 {
 	nullpo_ret(sd);
 
@@ -22016,7 +22016,7 @@ int skill_poisoningweapon(struct map_session_data *sd, t_itemid nameid)
  */
 void skill_toggle_magicpower(struct block_list *bl, uint16 skill_id)
 {
-	struct status_change *sc = status_get_sc(bl);
+	status_change *sc = status_get_sc(bl);
 
 	// non-offensive and non-magic skills do not affect the status
 	if (skill_get_nk(skill_id, NK_NODAMAGE) || !(skill_get_type(skill_id)&BF_MAGIC))
@@ -22036,7 +22036,7 @@ void skill_toggle_magicpower(struct block_list *bl, uint16 skill_id)
 	}
 }
 
-int skill_magicdecoy(struct map_session_data *sd, t_itemid nameid) {
+int skill_magicdecoy(map_session_data *sd, t_itemid nameid) {
 	int x, y, i, class_, skill;
 	struct mob_data *md;
 	nullpo_ret(sd);
@@ -22141,7 +22141,7 @@ void skill_spellbook(map_session_data &sd, t_itemid nameid) {
 	status_zap(&sd.bl, 0, skill_get_sp(skill_id, skill_lv));
 }
 
-int skill_select_menu(struct map_session_data *sd,uint16 skill_id) {
+int skill_select_menu(map_session_data *sd,uint16 skill_id) {
 	int lv, prob, aslvl = 0;
 	uint16 id, sk_idx = 0;
 	nullpo_ret(sd);
@@ -22166,7 +22166,7 @@ int skill_select_menu(struct map_session_data *sd,uint16 skill_id) {
 	return 0;
 }
 
-int skill_elementalanalysis(struct map_session_data* sd, int n, uint16 skill_lv, unsigned short* item_list) {
+int skill_elementalanalysis(map_session_data* sd, int n, uint16 skill_lv, unsigned short* item_list) {
 	int i;
 
 	nullpo_ret(sd);
@@ -22241,7 +22241,7 @@ int skill_elementalanalysis(struct map_session_data* sd, int n, uint16 skill_lv,
 	return 0;
 }
 
-int skill_changematerial(struct map_session_data *sd, int n, unsigned short *item_list) {
+int skill_changematerial(map_session_data *sd, int n, unsigned short *item_list) {
 	int i, j, k, c, p = 0, amount;
 	t_itemid nameid;
 
@@ -22336,7 +22336,7 @@ static int skill_destroy_trap(struct block_list *bl, va_list ap)
 /*==========================================
  *
  *------------------------------------------*/
-int skill_blockpc_get(struct map_session_data *sd, int skillid) {
+int skill_blockpc_get(map_session_data *sd, int skillid) {
 	int i;
 
 	nullpo_retr(-1, sd);
@@ -22346,7 +22346,7 @@ int skill_blockpc_get(struct map_session_data *sd, int skillid) {
 }
 
 TIMER_FUNC(skill_blockpc_end){
-	struct map_session_data *sd = map_id2sd(id);
+	map_session_data *sd = map_id2sd(id);
 	int i = (int)data;
 
 	if (!sd || data < 0 || data >= MAX_SKILLCOOLDOWN)
@@ -22370,7 +22370,7 @@ TIMER_FUNC(skill_blockpc_end){
  * @param   load      whether this assignment is being loaded upon player login
  * @return  0 if successful, -1 otherwise
  */
-int skill_blockpc_start(struct map_session_data *sd, int skill_id, t_tick tick) {
+int skill_blockpc_start(map_session_data *sd, int skill_id, t_tick tick) {
 	int i;
 
 	nullpo_retr(-1, sd);
@@ -22401,7 +22401,7 @@ int skill_blockpc_start(struct map_session_data *sd, int skill_id, t_tick tick)
 	}
 }
 
-int skill_blockpc_clear(struct map_session_data *sd) {
+int skill_blockpc_clear(map_session_data *sd) {
 	int i;
 
 	nullpo_ret(sd);
@@ -22485,7 +22485,7 @@ int skill_blockmerc_start(s_mercenary_data *md, uint16 skill_id, int tick)
  * @param skill_id: Skill ID to save
  * @param skill_lv: Skill level to save
  */
-void skill_usave_add(struct map_session_data *sd, uint16 skill_id, uint16 skill_lv)
+void skill_usave_add(map_session_data *sd, uint16 skill_id, uint16 skill_lv)
 {
 	struct skill_usave *sus = NULL;
 
@@ -22503,7 +22503,7 @@ void skill_usave_add(struct map_session_data *sd, uint16 skill_id, uint16 skill_
  * Loads saved skill unit entries for this player after map load
  * @param sd: Player
  */
-void skill_usave_trigger(struct map_session_data *sd)
+void skill_usave_trigger(map_session_data *sd)
 {
 	skill_usave *sus;
 	std::shared_ptr<s_skill_unit_group> group;
@@ -23014,7 +23014,7 @@ void skill_init_nounit_layout (void) {
 }
 
 int skill_block_check(struct block_list *bl, sc_type type , uint16 skill_id) {
-	struct status_change *sc = status_get_sc(bl);
+	status_change *sc = status_get_sc(bl);
 
 	if( !sc || !bl || !skill_id )
 		return 0; // Can do it
@@ -23086,7 +23086,7 @@ int skill_get_elemental_type( uint16 skill_id , uint16 skill_lv ) {
  * @return True:If unit can be moved, False:If check on flags are met or unit cannot be moved.
  **/
 static bool skill_check_unit_movepos(uint8 check_flag, struct block_list *bl, short dst_x, short dst_y, int easy, bool checkpath) {
-	struct status_change *sc;
+	status_change *sc;
 
 	nullpo_retr(false, bl);
 
diff --git a/src/map/skill.hpp b/src/map/skill.hpp
index 6400e57503..9198a1b3a2 100644
--- a/src/map/skill.hpp
+++ b/src/map/skill.hpp
@@ -21,12 +21,12 @@ enum send_target : uint8;
 enum e_damage_type : uint8;
 enum e_battle_flag : uint16;
 enum e_battle_check_target : uint32;
-struct map_session_data;
+class map_session_data;
 struct homun_data;
 struct skill_unit;
 struct s_skill_unit_group;
 struct status_change_entry;
-struct status_change;
+class status_change;
 
 #define MAX_SKILL_PRODUCE_DB	300 /// Max Produce DB
 #define MAX_PRODUCE_RESOURCE	12 /// Max Produce requirements
@@ -548,11 +548,11 @@ unsigned short skill_dummy2skill_id(unsigned short skill_id);
 
 uint16 skill_name2id(const char* name);
 
-int skill_isammotype(struct map_session_data *sd, unsigned short skill_id);
+int skill_isammotype(map_session_data *sd, unsigned short skill_id);
 TIMER_FUNC(skill_castend_id);
 TIMER_FUNC(skill_castend_pos);
 TIMER_FUNC( skill_keep_using );
-int skill_castend_map( struct map_session_data *sd,uint16 skill_id, const char *map);
+int skill_castend_map( map_session_data *sd,uint16 skill_id, const char *map);
 
 int skill_cleartimerskill(struct block_list *src);
 int skill_addtimerskill(struct block_list *src,t_tick tick,int target,int x,int y,uint16 skill_id,uint16 skill_lv,int type,int flag);
@@ -589,51 +589,51 @@ int skill_delayfix(struct block_list *bl, uint16 skill_id, uint16 skill_lv);
 void skill_toggle_magicpower(struct block_list *bl, uint16 skill_id);
 
 // Skill conditions check and remove [Inkfish]
-bool skill_check_condition_castbegin(struct map_session_data *sd, uint16 skill_id, uint16 skill_lv);
-bool skill_check_condition_castend(struct map_session_data *sd, uint16 skill_id, uint16 skill_lv);
+bool skill_check_condition_castbegin(map_session_data *sd, uint16 skill_id, uint16 skill_lv);
+bool skill_check_condition_castend(map_session_data *sd, uint16 skill_id, uint16 skill_lv);
 int skill_check_condition_char_sub (struct block_list *bl, va_list ap);
-void skill_consume_requirement(struct map_session_data *sd, uint16 skill_id, uint16 skill_lv, short type);
-struct s_skill_condition skill_get_requirement(struct map_session_data *sd, uint16 skill_id, uint16 skill_lv);
+void skill_consume_requirement(map_session_data *sd, uint16 skill_id, uint16 skill_lv, short type);
+struct s_skill_condition skill_get_requirement(map_session_data *sd, uint16 skill_id, uint16 skill_lv);
 bool skill_disable_check(status_change &sc, uint16 skill_id);
 bool skill_pos_maxcount_check(struct block_list *src, int16 x, int16 y, uint16 skill_id, uint16 skill_lv, enum bl_type type, bool display_failure);
 
-int skill_check_pc_partner(struct map_session_data *sd, uint16 skill_id, uint16 *skill_lv, int range, int cast_flag);
+int skill_check_pc_partner(map_session_data *sd, uint16 skill_id, uint16 *skill_lv, int range, int cast_flag);
 int skill_unit_move(struct block_list *bl,t_tick tick,int flag);
 void skill_unit_move_unit_group( std::shared_ptr<s_skill_unit_group> group, int16 m,int16 dx,int16 dy);
 void skill_unit_move_unit(struct block_list *bl, int dx, int dy);
 
-int skill_sit(struct map_session_data *sd, bool sitting);
-void skill_repairweapon(struct map_session_data *sd, int idx);
-void skill_identify(struct map_session_data *sd,int idx);
-void skill_weaponrefine(struct map_session_data *sd,int idx); // [Celest]
-int skill_autospell(struct map_session_data *md,uint16 skill_id);
+int skill_sit(map_session_data *sd, bool sitting);
+void skill_repairweapon(map_session_data *sd, int idx);
+void skill_identify(map_session_data *sd,int idx);
+void skill_weaponrefine(map_session_data *sd,int idx); // [Celest]
+int skill_autospell(map_session_data *md,uint16 skill_id);
 
 int skill_calc_heal(struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, bool heal);
 
 bool skill_check_cloaking(struct block_list *bl, struct status_change_entry *sce);
-int8 skill_isCopyable(struct map_session_data *sd, uint16 skill_id);
+int8 skill_isCopyable(map_session_data *sd, uint16 skill_id);
 
 // Abnormal status
-bool skill_isNotOk(uint16 skill_id, struct map_session_data *sd);
+bool skill_isNotOk(uint16 skill_id, map_session_data *sd);
 bool skill_isNotOk_hom(struct homun_data *hd, uint16 skill_id, uint16 skill_lv);
 bool skill_isNotOk_mercenary(uint16 skill_id, s_mercenary_data *md);
 
 bool skill_isNotOk_npcRange(struct block_list *src, uint16 skill_id, uint16 skill_lv, int pos_x, int pos_y);
 
 // Item creation
-short skill_can_produce_mix( struct map_session_data *sd, t_itemid nameid, int trigger, int qty);
-bool skill_produce_mix( struct map_session_data *sd, uint16 skill_id, t_itemid nameid, int slot1, int slot2, int slot3, int qty, short produce_idx );
+short skill_can_produce_mix( map_session_data *sd, t_itemid nameid, int trigger, int qty);
+bool skill_produce_mix( map_session_data *sd, uint16 skill_id, t_itemid nameid, int slot1, int slot2, int slot3, int qty, short produce_idx );
 
-bool skill_arrow_create( struct map_session_data *sd, t_itemid nameid);
+bool skill_arrow_create( map_session_data *sd, t_itemid nameid);
 
 // skills for the mob
 int skill_castend_nodamage_id( struct block_list *src, struct block_list *bl,uint16 skill_id,uint16 skill_lv,t_tick tick,int flag );
 int skill_castend_damage_id( struct block_list* src, struct block_list *bl,uint16 skill_id,uint16 skill_lv,t_tick tick,int flag );
 int skill_castend_pos2( struct block_list *src, int x,int y,uint16 skill_id,uint16 skill_lv,t_tick tick,int flag);
 
-int skill_blockpc_start(struct map_session_data*, int, t_tick);
-int skill_blockpc_get(struct map_session_data *sd, int skillid);
-int skill_blockpc_clear(struct map_session_data *sd);
+int skill_blockpc_start(map_session_data*, int, t_tick);
+int skill_blockpc_get(map_session_data *sd, int skillid);
+int skill_blockpc_clear(map_session_data *sd);
 TIMER_FUNC(skill_blockpc_end);
 int skill_blockhomun_start (struct homun_data*,uint16 skill_id,int);
 int skill_blockmerc_start (s_mercenary_data*,uint16 skill_id,int);
@@ -2649,8 +2649,8 @@ enum e_skill_unit_id : uint16 {
 /**
  * Skill Unit Save
  **/
-void skill_usave_add(struct map_session_data * sd, uint16 skill_id, uint16 skill_lv);
-void skill_usave_trigger(struct map_session_data *sd);
+void skill_usave_add(map_session_data * sd, uint16 skill_id, uint16 skill_lv);
+void skill_usave_trigger(map_session_data *sd);
 
 /**
  * Warlock
@@ -2714,23 +2714,23 @@ bool skill_check_camouflage(struct block_list *bl, struct status_change_entry *s
 /**
  * Mechanic
  **/
-int skill_magicdecoy(struct map_session_data *sd, t_itemid nameid);
+int skill_magicdecoy(map_session_data *sd, t_itemid nameid);
 
 /**
  * Guiltoine Cross
  **/
-int skill_poisoningweapon( struct map_session_data *sd, t_itemid nameid);
+int skill_poisoningweapon( map_session_data *sd, t_itemid nameid);
 
 /**
  * Auto Shadow Spell (Shadow Chaser)
  **/
-int skill_select_menu(struct map_session_data *sd,uint16 skill_id);
+int skill_select_menu(map_session_data *sd,uint16 skill_id);
 
-int skill_elementalanalysis(struct map_session_data *sd, int n, uint16 skill_lv, unsigned short *item_list); // Sorcerer Four Elemental Analisys.
-int skill_changematerial(struct map_session_data *sd, int n, unsigned short *item_list);	// Genetic Change Material.
+int skill_elementalanalysis(map_session_data *sd, int n, uint16 skill_lv, unsigned short *item_list); // Sorcerer Four Elemental Analisys.
+int skill_changematerial(map_session_data *sd, int n, unsigned short *item_list);	// Genetic Change Material.
 int skill_get_elemental_type(uint16 skill_id, uint16 skill_lv);
 
-int skill_banding_count(struct map_session_data *sd);
+int skill_banding_count(map_session_data *sd);
 
 int skill_is_combo(uint16 skill_id);
 void skill_combo_toggle_inf(struct block_list* bl, uint16 skill_id, int inf);
diff --git a/src/map/status.cpp b/src/map/status.cpp
index 2216613458..53c5a466b1 100644
--- a/src/map/status.cpp
+++ b/src/map/status.cpp
@@ -58,56 +58,56 @@ short current_equip_opt_index; /// Contains random option index of an equipped i
 
 uint16 SCDisabled[SC_MAX]; ///< List of disabled SC on map zones. [Cydh]
 
-static unsigned short status_calc_str(struct block_list *,struct status_change *,int);
-static unsigned short status_calc_agi(struct block_list *,struct status_change *,int);
-static unsigned short status_calc_vit(struct block_list *,struct status_change *,int);
-static unsigned short status_calc_int(struct block_list *,struct status_change *,int);
-static unsigned short status_calc_dex(struct block_list *,struct status_change *,int);
-static unsigned short status_calc_luk(struct block_list *,struct status_change *,int);
-static unsigned short status_calc_pow(struct block_list *, struct status_change *, int);
-static unsigned short status_calc_sta(struct block_list *, struct status_change *, int);
-static unsigned short status_calc_wis(struct block_list *, struct status_change *, int);
-static unsigned short status_calc_spl(struct block_list *, struct status_change *, int);
-static unsigned short status_calc_con(struct block_list *, struct status_change *, int);
-static unsigned short status_calc_crt(struct block_list *, struct status_change *, int);
-static unsigned short status_calc_batk(struct block_list *,struct status_change *,int);
-static unsigned short status_calc_watk(struct block_list *,struct status_change *,int);
-static unsigned short status_calc_matk(struct block_list *,struct status_change *,int);
-static signed short status_calc_hit(struct block_list *,struct status_change *,int);
-static signed short status_calc_critical(struct block_list *,struct status_change *,int);
-static signed short status_calc_flee(struct block_list *,struct status_change *,int);
-static signed short status_calc_flee2(struct block_list *,struct status_change *,int);
-static defType status_calc_def(struct block_list *bl, struct status_change *sc, int);
-static signed short status_calc_def2(struct block_list *,struct status_change *,int);
-static defType status_calc_mdef(struct block_list *bl, struct status_change *sc, int);
-static signed short status_calc_mdef2(struct block_list *,struct status_change *,int);
-static unsigned short status_calc_speed(struct block_list *,struct status_change *,int);
-static short status_calc_aspd_rate(struct block_list *,struct status_change *,int);
-static unsigned short status_calc_dmotion(struct block_list *bl, struct status_change *sc, int dmotion);
+static unsigned short status_calc_str(struct block_list *,status_change *,int);
+static unsigned short status_calc_agi(struct block_list *,status_change *,int);
+static unsigned short status_calc_vit(struct block_list *,status_change *,int);
+static unsigned short status_calc_int(struct block_list *,status_change *,int);
+static unsigned short status_calc_dex(struct block_list *,status_change *,int);
+static unsigned short status_calc_luk(struct block_list *,status_change *,int);
+static unsigned short status_calc_pow(struct block_list *, status_change *, int);
+static unsigned short status_calc_sta(struct block_list *, status_change *, int);
+static unsigned short status_calc_wis(struct block_list *, status_change *, int);
+static unsigned short status_calc_spl(struct block_list *, status_change *, int);
+static unsigned short status_calc_con(struct block_list *, status_change *, int);
+static unsigned short status_calc_crt(struct block_list *, status_change *, int);
+static unsigned short status_calc_batk(struct block_list *,status_change *,int);
+static unsigned short status_calc_watk(struct block_list *,status_change *,int);
+static unsigned short status_calc_matk(struct block_list *,status_change *,int);
+static signed short status_calc_hit(struct block_list *,status_change *,int);
+static signed short status_calc_critical(struct block_list *,status_change *,int);
+static signed short status_calc_flee(struct block_list *,status_change *,int);
+static signed short status_calc_flee2(struct block_list *,status_change *,int);
+static defType status_calc_def(struct block_list *bl, status_change *sc, int);
+static signed short status_calc_def2(struct block_list *,status_change *,int);
+static defType status_calc_mdef(struct block_list *bl, status_change *sc, int);
+static signed short status_calc_mdef2(struct block_list *,status_change *,int);
+static unsigned short status_calc_speed(struct block_list *,status_change *,int);
+static short status_calc_aspd_rate(struct block_list *,status_change *,int);
+static unsigned short status_calc_dmotion(struct block_list *bl, status_change *sc, int dmotion);
 #ifdef RENEWAL_ASPD
-static short status_calc_aspd(struct block_list *bl, struct status_change *sc, bool fixed);
+static short status_calc_aspd(struct block_list *bl, status_change *sc, bool fixed);
 #endif
-static short status_calc_fix_aspd(struct block_list *bl, struct status_change *sc, int);
-static signed short status_calc_patk(struct block_list *, struct status_change *, int);
-static signed short status_calc_smatk(struct block_list *, struct status_change *, int);
-static signed short status_calc_res(struct block_list *, struct status_change *, int);
-static signed short status_calc_mres(struct block_list *, struct status_change *, int);
-static signed short status_calc_hplus(struct block_list *, struct status_change *, int);
-static signed short status_calc_crate(struct block_list *, struct status_change *, int);
+static short status_calc_fix_aspd(struct block_list *bl, status_change *sc, int);
+static signed short status_calc_patk(struct block_list *, status_change *, int);
+static signed short status_calc_smatk(struct block_list *, status_change *, int);
+static signed short status_calc_res(struct block_list *, status_change *, int);
+static signed short status_calc_mres(struct block_list *, status_change *, int);
+static signed short status_calc_hplus(struct block_list *, status_change *, int);
+static signed short status_calc_crate(struct block_list *, status_change *, int);
 static unsigned int status_calc_maxhp(struct block_list *bl, uint64 maxhp);
 static unsigned int status_calc_maxsp(struct block_list *bl, uint64 maxsp);
 static unsigned int status_calc_maxap(struct block_list *bl, uint64 maxap);
-static unsigned char status_calc_element(struct block_list *bl, struct status_change *sc, int element);
-static unsigned char status_calc_element_lv(struct block_list *bl, struct status_change *sc, int lv);
-static int status_calc_mode(struct block_list *bl, struct status_change *sc, int mode);
+static unsigned char status_calc_element(struct block_list *bl, status_change *sc, int element);
+static unsigned char status_calc_element_lv(struct block_list *bl, status_change *sc, int lv);
+static int status_calc_mode(struct block_list *bl, status_change *sc, int mode);
 #ifdef RENEWAL
-static unsigned short status_calc_ematk(struct block_list *,struct status_change *,int);
+static unsigned short status_calc_ematk(struct block_list *,status_change *,int);
 #endif
 static int status_get_hpbonus(struct block_list *bl, enum e_status_bonus type);
 static int status_get_spbonus(struct block_list *bl, enum e_status_bonus type);
 static int status_get_apbonus(struct block_list *bl, enum e_status_bonus type);
-static unsigned int status_calc_maxhpsp_pc(struct map_session_data* sd, unsigned int stat, bool isHP);
-static unsigned int status_calc_maxap_pc(struct map_session_data* sd);
+static unsigned int status_calc_maxhpsp_pc(map_session_data* sd, unsigned int stat, bool isHP);
+static unsigned int status_calc_maxap_pc(map_session_data* sd);
 static int status_get_sc_interval(enum sc_type type);
 
 static bool status_change_isDisabledOnMap_(sc_type type, bool mapIsVS, bool mapIsPVP, bool mapIsGVG, bool mapIsBG, unsigned int mapZone, bool mapIsTE);
@@ -1414,7 +1414,7 @@ int64 status_charge(struct block_list* bl, int64 hp, int64 sp)
 int status_damage(struct block_list *src,struct block_list *target,int64 dhp, int64 dsp, int64 dap, t_tick walkdelay, int flag, uint16 skill_id)
 {
 	struct status_data *status;
-	struct status_change *sc;
+	status_change *sc;
 	int hp = (int)cap_value(dhp,INT_MIN,INT_MAX);
 	int sp = (int)cap_value(dsp,INT_MIN,INT_MAX);
 	int ap = (int)cap_value(dap,INT_MIN,INT_MAX);
@@ -1683,7 +1683,7 @@ int status_damage(struct block_list *src,struct block_list *target,int64 dhp, in
 int status_heal(struct block_list *bl,int64 hhp,int64 hsp, int64 hap, int flag)
 {
 	struct status_data *status;
-	struct status_change *sc;
+	status_change *sc;
 	int hp = (int)cap_value(hhp,INT_MIN,INT_MAX);
 	int sp = (int)cap_value(hsp,INT_MIN,INT_MAX);
 	int ap = (int)cap_value(hap,INT_MIN,INT_MAX);
@@ -1921,7 +1921,7 @@ int status_revive(struct block_list *bl, unsigned char per_hp, unsigned char per
  */
 bool status_check_skilluse(struct block_list *src, struct block_list *target, uint16 skill_id, int flag) {
 	struct status_data *status;
-	struct status_change *sc = NULL, *tsc;
+	status_change *sc = NULL, *tsc;
 	int hide_flag;
 
 	status = src ? status_get_status_data(src) : &dummy_status;
@@ -2125,7 +2125,7 @@ bool status_check_skilluse(struct block_list *src, struct block_list *target, ui
 
 	switch( target->type ) {
 		case BL_PC: {
-				struct map_session_data *tsd = (TBL_PC*)target;
+				map_session_data *tsd = (TBL_PC*)target;
 				bool is_boss = (src && status_get_class_(src) == CLASS_BOSS);
 				bool is_detect = status_has_mode(status,MD_DETECTOR);
 
@@ -2180,7 +2180,7 @@ int status_check_visibility(struct block_list *src, struct block_list *target)
 {
 	int view_range;
 	struct status_data* status = status_get_status_data(src);
-	struct status_change* tsc = status_get_sc(target);
+	status_change* tsc = status_get_sc(target);
 	switch (src->type) {
 		case BL_MOB:
 			view_range = ((TBL_MOB*)src)->min_chase;
@@ -2204,7 +2204,7 @@ int status_check_visibility(struct block_list *src, struct block_list *target)
 
 		switch (target->type) {	// Check for chase-walk/hiding/cloaking opponents.
 			case BL_PC: {
-					struct map_session_data *tsd = (TBL_PC*)target;
+					map_session_data *tsd = (TBL_PC*)target;
 
 					if (((tsc->option&(OPTION_HIDE|OPTION_CLOAK|OPTION_CHASEWALK)) || tsc->getSCE(SC_CAMOUFLAGE) || tsc->getSCE(SC_STEALTHFIELD) || tsc->getSCE(SC_SUHIDE)) && !is_boss && (tsd->special_state.perfect_hiding || !is_detector))
 						return 0;
@@ -2234,7 +2234,7 @@ int status_check_visibility(struct block_list *src, struct block_list *target)
  * @return base amotion after single/dual weapon and shield adjustments [RENEWAL]
  *	  base amotion after single/dual weapon and stats adjustments [PRE-RENEWAL]
  */
-int status_base_amotion_pc(struct map_session_data* sd, struct status_data* status)
+int status_base_amotion_pc(map_session_data* sd, struct status_data* status)
 {
 	std::shared_ptr<s_job_info> job = job_db.find(sd->status.class_);
 
@@ -2954,7 +2954,7 @@ void status_calc_pet_(struct pet_data *pd, uint8 opt)
 	}
 
 	if (battle_config.pet_lv_rate && pd->master) {
-		struct map_session_data *sd = pd->master;
+		map_session_data *sd = pd->master;
 		int lv;
 
 		lv =sd->status.base_level*battle_config.pet_lv_rate/100;
@@ -3011,11 +3011,11 @@ static int status_get_hpbonus(struct block_list *bl, enum e_status_bonus type) {
 	int bonus = 0;
 
 	if (type == STATUS_BONUS_FIX) {
-		struct status_change *sc = status_get_sc(bl);
+		status_change *sc = status_get_sc(bl);
 
 		//Only for BL_PC
 		if (bl->type == BL_PC) {
-			struct map_session_data *sd = map_id2sd(bl->id);
+			map_session_data *sd = map_id2sd(bl->id);
 			uint16 skill_lv;
 
 			bonus += sd->bonus.hp;
@@ -3068,7 +3068,7 @@ static int status_get_hpbonus(struct block_list *bl, enum e_status_bonus type) {
 #endif
 		}
 	} else if (type == STATUS_BONUS_RATE) {
-		struct status_change *sc = status_get_sc(bl);
+		status_change *sc = status_get_sc(bl);
 
 		//Bonus by SC
 		if (sc) {
@@ -3166,7 +3166,7 @@ static int status_get_hpbonus_equip(TBL_PC *sd) {
 static int status_get_hpbonus_item(block_list *bl) {
 	int bonus = 0;
 
-	struct status_change *sc = status_get_sc(bl);
+	status_change *sc = status_get_sc(bl);
 
 	//Bonus by SC
 	if (sc) {
@@ -3194,11 +3194,11 @@ static int status_get_spbonus(struct block_list *bl, enum e_status_bonus type) {
 	int bonus = 0;
 
 	if (type == STATUS_BONUS_FIX) {
-		struct status_change *sc = status_get_sc(bl);
+		status_change *sc = status_get_sc(bl);
 
 		//Only for BL_PC
 		if (bl->type == BL_PC) {
-			struct map_session_data *sd = map_id2sd(bl->id);
+			map_session_data *sd = map_id2sd(bl->id);
 			uint16 skill_lv;
 
 			bonus += sd->bonus.sp;
@@ -3239,11 +3239,11 @@ static int status_get_spbonus(struct block_list *bl, enum e_status_bonus type) {
 				bonus += sc->getSCE(SC_GLASTHEIM_HPSP)->val2;
 		}
 	} else if (type == STATUS_BONUS_RATE) {
-		struct status_change *sc = status_get_sc(bl);
+		status_change *sc = status_get_sc(bl);
 
 		//Only for BL_PC
 		if (bl->type == BL_PC) {
-			struct map_session_data *sd = map_id2sd(bl->id);
+			map_session_data *sd = map_id2sd(bl->id);
 			uint8 i;
 
 			if((i = pc_checkskill(sd,HP_MEDITATIO)) > 0)
@@ -3314,7 +3314,7 @@ static int status_get_spbonus_equip(TBL_PC *sd) {
 static int status_get_spbonus_item(block_list *bl) {
 	int bonus = 0;
 
-	struct status_change *sc = status_get_sc(bl);
+	status_change *sc = status_get_sc(bl);
 
 	//Bonus by SC
 	if (sc) {
@@ -3342,11 +3342,11 @@ static int status_get_apbonus(struct block_list *bl, enum e_status_bonus type) {
 	int bonus = 0;
 
 	if (type == STATUS_BONUS_FIX) {
-		struct status_change *sc = status_get_sc(bl);
+		status_change *sc = status_get_sc(bl);
 
 		//Only for BL_PC
 		if (bl->type == BL_PC) {
-			struct map_session_data *sd = map_id2sd(bl->id);
+			map_session_data *sd = map_id2sd(bl->id);
 			//uint16 skill_lv;
 
 			bonus += sd->bonus.ap;
@@ -3360,11 +3360,11 @@ static int status_get_apbonus(struct block_list *bl, enum e_status_bonus type) {
 			//	bonus += sc->getSCE(SC_NONE)->val1;
 		}
 	} else if (type == STATUS_BONUS_RATE) {
-		struct status_change *sc = status_get_sc(bl);
+		status_change *sc = status_get_sc(bl);
 
 		//Only for BL_PC
 		if (bl->type == BL_PC) {
-			struct map_session_data *sd = map_id2sd(bl->id);
+			map_session_data *sd = map_id2sd(bl->id);
 			//uint8 i;
 
 			//if ((i = pc_checkskill(sd, NV_BASIC)) > 0)
@@ -3404,7 +3404,7 @@ static int status_get_apbonus_equip(TBL_PC *sd) {
 static int status_get_apbonus_item(block_list *bl) {
 	int bonus = 0;
 
-	struct status_change *sc = status_get_sc(bl);
+	status_change *sc = status_get_sc(bl);
 
 	//Bonus by SC
 	if (sc) {
@@ -3424,7 +3424,7 @@ static int status_get_apbonus_item(block_list *bl) {
  * @param isHP true - calculates Max HP, false - calculated Max SP
  * @return max The max value of HP or SP
  */
-static unsigned int status_calc_maxhpsp_pc(struct map_session_data* sd, unsigned int stat, bool isHP) {
+static unsigned int status_calc_maxhpsp_pc(map_session_data* sd, unsigned int stat, bool isHP) {
 	nullpo_ret(sd);
 
 	double dmax = 0;
@@ -3466,7 +3466,7 @@ static unsigned int status_calc_maxhpsp_pc(struct map_session_data* sd, unsigned
  * @param sd: Player data
  * @return AP amount
  */
-static unsigned int status_calc_maxap_pc(struct map_session_data* sd) {
+static unsigned int status_calc_maxap_pc(map_session_data* sd) {
 	double dmax = 0, equip_bonus = 0, item_bonus = 0;
 
 	nullpo_ret(sd);
@@ -3492,10 +3492,10 @@ static unsigned int status_calc_maxap_pc(struct map_session_data* sd) {
  *   CALCWT_MAXBONUS - Skill/Status/Configuration max weight bonus
  * @return false - failed, true - success
  */
-bool status_calc_weight(struct map_session_data *sd, enum e_status_calc_weight_opt flag)
+bool status_calc_weight(map_session_data *sd, enum e_status_calc_weight_opt flag)
 {
 	int b_weight, b_max_weight, skill, i;
-	struct status_change *sc;
+	status_change *sc;
 
 	nullpo_retr(false, sd);
 
@@ -3551,7 +3551,7 @@ bool status_calc_weight(struct map_session_data *sd, enum e_status_calc_weight_o
  *   CALCWT_CARTSTATE - Whether to check for cart state
  * @return false - failed, true - success
  */
-bool status_calc_cart_weight(struct map_session_data *sd, enum e_status_calc_weight_opt flag)
+bool status_calc_cart_weight(map_session_data *sd, enum e_status_calc_weight_opt flag)
 {
 	int b_cart_weight_max, i;
 
@@ -3593,11 +3593,11 @@ bool status_calc_cart_weight(struct map_session_data *sd, enum e_status_calc_wei
  * @param opt: Whether it is first calc (login) or not
  * @return (-1) for too many recursive calls, (1) recursive call, (0) success
  */
-int status_calc_pc_sub(struct map_session_data* sd, uint8 opt)
+int status_calc_pc_sub(map_session_data* sd, uint8 opt)
 {
 	static int calculating = 0; ///< Check for recursive call preemption. [Skotlex]
 	struct status_data *base_status; ///< Pointer to the player's base status
-	struct status_change *sc = &sd->sc;
+	status_change *sc = &sd->sc;
 	struct s_skill b_skill[MAX_SKILL]; ///< Previous skill tree
 	int i, skill, refinedef = 0;
 	short index = -1;
@@ -4843,7 +4843,7 @@ int status_calc_pc_sub(struct map_session_data* sd, uint8 opt)
 }
 
 /// Intermediate function since C++ does not have a try-finally syntax
-int status_calc_pc_( struct map_session_data* sd, uint8 opt ){
+int status_calc_pc_( map_session_data* sd, uint8 opt ){
 	// Save the old script the player was attached to
 	struct script_state* previous_st = sd->st;
 
@@ -4994,7 +4994,7 @@ int status_calc_elemental_(s_elemental_data *ed, uint8 opt)
 {
 	struct status_data *status = &ed->base_status;
 	s_elemental *ele = &ed->elemental;
-	struct map_session_data *sd = ed->master;
+	map_session_data *sd = ed->master;
 
 	if( !sd )
 		return 0;
@@ -5084,8 +5084,8 @@ int status_calc_npc_(struct npc_data *nd, uint8 opt)
  */
 void status_calc_regen(struct block_list *bl, struct status_data *status, struct regen_data *regen)
 {
-	struct map_session_data *sd;
-	struct status_change *sc;
+	map_session_data *sd;
+	status_change *sc;
 	int val, skill, reg_flag;
 
 	if( !(bl->type&BL_REGEN) || !regen )
@@ -5202,7 +5202,7 @@ void status_calc_regen(struct block_list *bl, struct status_data *status, struct
  * @param regen: Object's base regeneration data
  * @param sc: Object's status change data
  */
-void status_calc_regen_rate(struct block_list *bl, struct regen_data *regen, struct status_change *sc)
+void status_calc_regen_rate(struct block_list *bl, struct regen_data *regen, status_change *sc)
 {
 	if (!(bl->type&BL_REGEN) || !regen)
 		return;
@@ -5347,7 +5347,7 @@ void status_calc_regen_rate(struct block_list *bl, struct regen_data *regen, str
  * @param flag: Which state to apply to bl
  * @param start: (1) start state, (0) remove state
  */
-void status_calc_state( struct block_list *bl, struct status_change *sc, std::bitset<SCS_MAX> flag, bool start )
+void status_calc_state( struct block_list *bl, status_change *sc, std::bitset<SCS_MAX> flag, bool start )
 {
 
 	/// No sc at all, we can zero without any extra weight over our conciousness
@@ -5488,7 +5488,7 @@ void status_calc_bl_main(struct block_list *bl, std::bitset<SCB_MAX> flag)
 {
 	const struct status_data *b_status = status_get_base_status(bl); // Base Status
 	struct status_data *status = status_get_status_data(bl); // Battle Status
-	struct status_change *sc = status_get_sc(bl);
+	status_change *sc = status_get_sc(bl);
 	TBL_PC *sd = BL_CAST(BL_PC,bl);
 	int temp;
 
@@ -6092,7 +6092,7 @@ void status_calc_bl_(struct block_list* bl, std::bitset<SCB_MAX> flag, uint8 opt
 	struct status_data* status; // Pointer to current battle status
 
 	if (bl->type == BL_PC) {
-		struct map_session_data *sd = BL_CAST(BL_PC, bl);
+		map_session_data *sd = BL_CAST(BL_PC, bl);
 
 		if (sd->delayed_damage != 0) {
 			if (opt&SCO_FORCE)
@@ -6311,7 +6311,7 @@ void status_calc_bl_(struct block_list* bl, std::bitset<SCB_MAX> flag, uint8 opt
  * @param str: Initial str
  * @return modified str with cap_value(str,0,USHRT_MAX)
  */
-static unsigned short status_calc_str(struct block_list *bl, struct status_change *sc, int str)
+static unsigned short status_calc_str(struct block_list *bl, status_change *sc, int str)
 {
 	if(!sc || !sc->count)
 		return cap_value(str,0,USHRT_MAX);
@@ -6397,7 +6397,7 @@ static unsigned short status_calc_str(struct block_list *bl, struct status_chang
  * @param agi: Initial agi
  * @return modified agi with cap_value(agi,0,USHRT_MAX)
  */
-static unsigned short status_calc_agi(struct block_list *bl, struct status_change *sc, int agi)
+static unsigned short status_calc_agi(struct block_list *bl, status_change *sc, int agi)
 {
 	if(!sc || !sc->count)
 		return cap_value(agi,0,USHRT_MAX);
@@ -6481,7 +6481,7 @@ static unsigned short status_calc_agi(struct block_list *bl, struct status_chang
  * @param vit: Initial vit
  * @return modified vit with cap_value(vit,0,USHRT_MAX)
  */
-static unsigned short status_calc_vit(struct block_list *bl, struct status_change *sc, int vit)
+static unsigned short status_calc_vit(struct block_list *bl, status_change *sc, int vit)
 {
 	if(!sc || !sc->count)
 		return cap_value(vit,0,USHRT_MAX);
@@ -6557,7 +6557,7 @@ static unsigned short status_calc_vit(struct block_list *bl, struct status_chang
  * @param int_: Initial int
  * @return modified int with cap_value(int_,0,USHRT_MAX)
  */
-static unsigned short status_calc_int(struct block_list *bl, struct status_change *sc, int int_)
+static unsigned short status_calc_int(struct block_list *bl, status_change *sc, int int_)
 {
 	if(!sc || !sc->count)
 		return cap_value(int_,0,USHRT_MAX);
@@ -6646,7 +6646,7 @@ static unsigned short status_calc_int(struct block_list *bl, struct status_chang
  * @param dex: Initial dex
  * @return modified dex with cap_value(dex,0,USHRT_MAX)
  */
-static unsigned short status_calc_dex(struct block_list *bl, struct status_change *sc, int dex)
+static unsigned short status_calc_dex(struct block_list *bl, status_change *sc, int dex)
 {
 	if(!sc || !sc->count)
 		return cap_value(dex,0,USHRT_MAX);
@@ -6732,7 +6732,7 @@ static unsigned short status_calc_dex(struct block_list *bl, struct status_chang
  * @param luk: Initial luk
  * @return modified luk with cap_value(luk,0,USHRT_MAX)
  */
-static unsigned short status_calc_luk(struct block_list *bl, struct status_change *sc, int luk)
+static unsigned short status_calc_luk(struct block_list *bl, status_change *sc, int luk)
 {
 	if(!sc || !sc->count)
 		return cap_value(luk,0,USHRT_MAX);
@@ -6806,7 +6806,7 @@ static unsigned short status_calc_luk(struct block_list *bl, struct status_chang
 * @param pow: Initial pow
 * @return modified pow with cap_value(pow,0,USHRT_MAX)
 */
-static unsigned short status_calc_pow(struct block_list *bl, struct status_change *sc, int pow)
+static unsigned short status_calc_pow(struct block_list *bl, status_change *sc, int pow)
 {
 	if (!sc || !sc->count)
 		return cap_value(pow, 0, USHRT_MAX);
@@ -6824,7 +6824,7 @@ static unsigned short status_calc_pow(struct block_list *bl, struct status_chang
 * @param sta: Initial sta
 * @return modified sta with cap_value(sta,0,USHRT_MAX)
 */
-static unsigned short status_calc_sta(struct block_list *bl, struct status_change *sc, int sta)
+static unsigned short status_calc_sta(struct block_list *bl, status_change *sc, int sta)
 {
 	if (!sc || !sc->count)
 		return cap_value(sta, 0, USHRT_MAX);
@@ -6842,7 +6842,7 @@ static unsigned short status_calc_sta(struct block_list *bl, struct status_chang
 * @param wis: Initial wis
 * @return modified wis with cap_value(wis,0,USHRT_MAX)
 */
-static unsigned short status_calc_wis(struct block_list *bl, struct status_change *sc, int wis)
+static unsigned short status_calc_wis(struct block_list *bl, status_change *sc, int wis)
 {
 	if (!sc || !sc->count)
 		return cap_value(wis, 0, USHRT_MAX);
@@ -6860,7 +6860,7 @@ static unsigned short status_calc_wis(struct block_list *bl, struct status_chang
 * @param spl: Initial spl
 * @return modified spl with cap_value(spl,0,USHRT_MAX)
 */
-static unsigned short status_calc_spl(struct block_list *bl, struct status_change *sc, int spl)
+static unsigned short status_calc_spl(struct block_list *bl, status_change *sc, int spl)
 {
 	if (!sc || !sc->count)
 		return cap_value(spl, 0, USHRT_MAX);
@@ -6878,7 +6878,7 @@ static unsigned short status_calc_spl(struct block_list *bl, struct status_chang
 * @param con: Initial con
 * @return modified con with cap_value(con,0,USHRT_MAX)
 */
-static unsigned short status_calc_con(struct block_list *bl, struct status_change *sc, int con)
+static unsigned short status_calc_con(struct block_list *bl, status_change *sc, int con)
 {
 	if (!sc || !sc->count)
 		return cap_value(con, 0, USHRT_MAX);
@@ -6896,7 +6896,7 @@ static unsigned short status_calc_con(struct block_list *bl, struct status_chang
 * @param crt: Initial crt
 * @return modified crt with cap_value(crt,0,USHRT_MAX)
 */
-static unsigned short status_calc_crt(struct block_list *bl, struct status_change *sc, int crt)
+static unsigned short status_calc_crt(struct block_list *bl, status_change *sc, int crt)
 {
 	if (!sc || !sc->count)
 		return cap_value(crt, 0, USHRT_MAX);
@@ -6914,7 +6914,7 @@ static unsigned short status_calc_crt(struct block_list *bl, struct status_chang
  * @param batk: Initial batk
  * @return modified batk with cap_value(batk,0,USHRT_MAX)
  */
-static unsigned short status_calc_batk(struct block_list *bl, struct status_change *sc, int batk)
+static unsigned short status_calc_batk(struct block_list *bl, status_change *sc, int batk)
 {
 	if(!sc || !sc->count)
 		return cap_value(batk,0,USHRT_MAX);
@@ -7001,7 +7001,7 @@ static unsigned short status_calc_batk(struct block_list *bl, struct status_chan
  * @param watk: Initial watk
  * @return modified watk with cap_value(watk,0,USHRT_MAX)
  */
-static unsigned short status_calc_watk(struct block_list *bl, struct status_change *sc, int watk)
+static unsigned short status_calc_watk(struct block_list *bl, status_change *sc, int watk)
 {
 	if(!sc || !sc->count)
 		return cap_value(watk,0,USHRT_MAX);
@@ -7112,7 +7112,7 @@ static unsigned short status_calc_watk(struct block_list *bl, struct status_chan
  * @param matk: Initial matk
  * @return modified matk with cap_value(matk,0,USHRT_MAX)
  */
-static unsigned short status_calc_ematk(struct block_list *bl, struct status_change *sc, int matk)
+static unsigned short status_calc_ematk(struct block_list *bl, status_change *sc, int matk)
 {
 	if (!sc || !sc->count)
 		return cap_value(matk,0,USHRT_MAX);
@@ -7187,7 +7187,7 @@ static unsigned short status_calc_ematk(struct block_list *bl, struct status_cha
  * @param matk: Initial matk
  * @return modified matk with cap_value(matk,0,USHRT_MAX)
  */
-static unsigned short status_calc_matk(struct block_list *bl, struct status_change *sc, int matk)
+static unsigned short status_calc_matk(struct block_list *bl, status_change *sc, int matk)
 {
 	if(!sc || !sc->count)
 		return cap_value(matk,0,USHRT_MAX);
@@ -7271,7 +7271,7 @@ static unsigned short status_calc_matk(struct block_list *bl, struct status_chan
  * @param critical: Initial critical
  * @return modified critical with cap_value(critical,10,USHRT_MAX)
  */
-static signed short status_calc_critical(struct block_list *bl, struct status_change *sc, int critical)
+static signed short status_calc_critical(struct block_list *bl, status_change *sc, int critical)
 {
 	if(!sc || !sc->count)
 		return cap_value(critical,10,SHRT_MAX);
@@ -7319,7 +7319,7 @@ static signed short status_calc_critical(struct block_list *bl, struct status_ch
  * @param hit: Initial hit
  * @return modified hit with cap_value(hit,1,USHRT_MAX)
  */
-static signed short status_calc_hit(struct block_list *bl, struct status_change *sc, int hit)
+static signed short status_calc_hit(struct block_list *bl, status_change *sc, int hit)
 {
 	if(!sc || !sc->count)
 		return cap_value(hit,1,SHRT_MAX);
@@ -7395,7 +7395,7 @@ static signed short status_calc_hit(struct block_list *bl, struct status_change
  * @param flee: Initial flee
  * @return modified flee with cap_value(flee,1,USHRT_MAX)
  */
-static signed short status_calc_flee(struct block_list *bl, struct status_change *sc, int flee)
+static signed short status_calc_flee(struct block_list *bl, status_change *sc, int flee)
 {
 	if( bl->type == BL_PC ) {
 		struct map_data *mapdata = map_getmapdata(bl->m);
@@ -7513,7 +7513,7 @@ static signed short status_calc_flee(struct block_list *bl, struct status_change
  * @param flee2: Initial flee2
  * @return modified flee2 with cap_value(flee2,10,USHRT_MAX)
  */
-static signed short status_calc_flee2(struct block_list *bl, struct status_change *sc, int flee2)
+static signed short status_calc_flee2(struct block_list *bl, status_change *sc, int flee2)
 {
 	if(!sc || !sc->count)
 		return cap_value(flee2,10,SHRT_MAX);
@@ -7539,7 +7539,7 @@ static signed short status_calc_flee2(struct block_list *bl, struct status_chang
  * @param def: Initial def
  * @return modified def with cap_value(def,DEFTYPE_MIN,DEFTYPE_MAX)
  */
-static defType status_calc_def(struct block_list *bl, struct status_change *sc, int def)
+static defType status_calc_def(struct block_list *bl, status_change *sc, int def)
 {
 	if(!sc || !sc->count)
 		return (defType)cap_value(def,DEFTYPE_MIN,DEFTYPE_MAX);
@@ -7651,7 +7651,7 @@ static defType status_calc_def(struct block_list *bl, struct status_change *sc,
  * @param def2: Initial def2
  * @return modified def2 with cap_value(def2,SHRT_MIN,SHRT_MAX)
  */
-static signed short status_calc_def2(struct block_list *bl, struct status_change *sc, int def2)
+static signed short status_calc_def2(struct block_list *bl, status_change *sc, int def2)
 {
 	if(!sc || !sc->count)
 #ifdef RENEWAL
@@ -7719,7 +7719,7 @@ static signed short status_calc_def2(struct block_list *bl, struct status_change
  * @param mdef: Initial mdef
  * @return modified mdef with cap_value(mdef,DEFTYPE_MIN,DEFTYPE_MAX)
  */
-static defType status_calc_mdef(struct block_list *bl, struct status_change *sc, int mdef)
+static defType status_calc_mdef(struct block_list *bl, status_change *sc, int mdef)
 {
 	if(!sc || !sc->count)
 		return (defType)cap_value(mdef,DEFTYPE_MIN,DEFTYPE_MAX);
@@ -7785,7 +7785,7 @@ static defType status_calc_mdef(struct block_list *bl, struct status_change *sc,
  * @param mdef2: Initial mdef2
  * @return modified mdef2 with cap_value(mdef2,SHRT_MIN,SHRT_MAX)
  */
-static signed short status_calc_mdef2(struct block_list *bl, struct status_change *sc, int mdef2)
+static signed short status_calc_mdef2(struct block_list *bl, status_change *sc, int mdef2)
 {
 	if(!sc || !sc->count)
 #ifdef RENEWAL
@@ -7822,7 +7822,7 @@ static signed short status_calc_mdef2(struct block_list *bl, struct status_chang
  * @param speed: Initial speed
  * @return modified speed with cap_value(speed,10,USHRT_MAX)
  */
-static unsigned short status_calc_speed(struct block_list *bl, struct status_change *sc, int speed)
+static unsigned short status_calc_speed(struct block_list *bl, status_change *sc, int speed)
 {
 	TBL_PC* sd = BL_CAST(BL_PC, bl);
 	int speed_rate = 100;
@@ -8034,7 +8034,7 @@ static unsigned short status_calc_speed(struct block_list *bl, struct status_cha
  *               False - percentage value
  * @return modified aspd
  */
-static short status_calc_aspd(struct block_list *bl, struct status_change *sc, bool fixed)
+static short status_calc_aspd(struct block_list *bl, status_change *sc, bool fixed)
 {
 	int bonus = 0;
 
@@ -8167,7 +8167,7 @@ static short status_calc_aspd(struct block_list *bl, struct status_change *sc, b
 		if( sc->getSCE(SC_PORK_RIB_STEW) )
 			bonus += 5;
 
-		struct map_session_data* sd = BL_CAST(BL_PC, bl);
+		map_session_data* sd = BL_CAST(BL_PC, bl);
 		uint8 skill_lv;
 
 		if (sd && (skill_lv = pc_checkskill(sd, BA_MUSICALLESSON)) > 0)
@@ -8187,7 +8187,7 @@ static short status_calc_aspd(struct block_list *bl, struct status_change *sc, b
  * @param aspd: Object's current ASPD
  * @return modified aspd
  */
-static short status_calc_fix_aspd(struct block_list *bl, struct status_change *sc, int aspd)
+static short status_calc_fix_aspd(struct block_list *bl, status_change *sc, int aspd)
 {
 	if (!sc || !sc->count)
 		return cap_value(aspd, 0, 2000);
@@ -8227,7 +8227,7 @@ static short status_calc_fix_aspd(struct block_list *bl, struct status_change *s
  * @param aspd_rate: Object's current ASPD
  * @return modified aspd_rate
  */
-static short status_calc_aspd_rate(struct block_list *bl, struct status_change *sc, int aspd_rate)
+static short status_calc_aspd_rate(struct block_list *bl, status_change *sc, int aspd_rate)
 {
 	int i;
 
@@ -8387,7 +8387,7 @@ static short status_calc_aspd_rate(struct block_list *bl, struct status_change *
  * @param dmotion: Object's current damage delay
  * @return modified delay rate
  */
-static unsigned short status_calc_dmotion(struct block_list *bl, struct status_change *sc, int dmotion)
+static unsigned short status_calc_dmotion(struct block_list *bl, status_change *sc, int dmotion)
 {
 	/// It has been confirmed on official servers that MvP mobs have no dmotion even without endure
 	if( bl->type == BL_MOB && status_get_class_(bl) == CLASS_BOSS )
@@ -8414,7 +8414,7 @@ static unsigned short status_calc_dmotion(struct block_list *bl, struct status_c
 * @param patk: Initial patk
 * @return modified patk with cap_value(patk,0,USHRT_MAX)
 */
-static signed short status_calc_patk(struct block_list *bl, struct status_change *sc, int patk)
+static signed short status_calc_patk(struct block_list *bl, status_change *sc, int patk)
 {
 	if (!sc || !sc->count)
 		return cap_value(patk, 0, SHRT_MAX);
@@ -8438,7 +8438,7 @@ static signed short status_calc_patk(struct block_list *bl, struct status_change
 * @param smatk: Initial smatk
 * @return modified smatk with cap_value(smatk,0,USHRT_MAX)
 */
-static signed short status_calc_smatk(struct block_list *bl, struct status_change *sc, int smatk)
+static signed short status_calc_smatk(struct block_list *bl, status_change *sc, int smatk)
 {
 	if (!sc || !sc->count)
 		return cap_value(smatk, 0, SHRT_MAX);
@@ -8462,7 +8462,7 @@ static signed short status_calc_smatk(struct block_list *bl, struct status_chang
 * @param res: Initial res
 * @return modified res with cap_value(res,0,USHRT_MAX)
 */
-static signed short status_calc_res(struct block_list *bl, struct status_change *sc, int res)
+static signed short status_calc_res(struct block_list *bl, status_change *sc, int res)
 {
 	if (!sc || !sc->count)
 		return cap_value(res, 0, SHRT_MAX);
@@ -8488,7 +8488,7 @@ static signed short status_calc_res(struct block_list *bl, struct status_change
 * @param mres: Initial mres
 * @return modified mres with cap_value(mres,0,USHRT_MAX)
 */
-static signed short status_calc_mres(struct block_list *bl, struct status_change *sc, int mres)
+static signed short status_calc_mres(struct block_list *bl, status_change *sc, int mres)
 {
 	if (!sc || !sc->count)
 		return cap_value(mres, 0, SHRT_MAX);
@@ -8508,7 +8508,7 @@ static signed short status_calc_mres(struct block_list *bl, struct status_change
 * @param hplus: Initial hplus
 * @return modified hplus with cap_value(hplus,0,USHRT_MAX)
 */
-static signed short status_calc_hplus(struct block_list *bl, struct status_change *sc, int hplus)
+static signed short status_calc_hplus(struct block_list *bl, status_change *sc, int hplus)
 {
 	if (!sc || !sc->count)
 		return cap_value(hplus, 0, SHRT_MAX);
@@ -8523,7 +8523,7 @@ static signed short status_calc_hplus(struct block_list *bl, struct status_chang
 * @param crate: Initial crate
 * @return modified crate with cap_value(crate,0,USHRT_MAX)
 */
-static signed short status_calc_crate(struct block_list *bl, struct status_change *sc, int crate)
+static signed short status_calc_crate(struct block_list *bl, status_change *sc, int crate)
 {
 	if (!sc || !sc->count)
 		return cap_value(crate, 0, SHRT_MAX);
@@ -8598,7 +8598,7 @@ static unsigned int status_calc_maxap(struct block_list *bl, uint64 maxap)
  * @param element: Object's current element
  * @return new element
  */
-static unsigned char status_calc_element(struct block_list *bl, struct status_change *sc, int element)
+static unsigned char status_calc_element(struct block_list *bl, status_change *sc, int element)
 {
 	if(!sc || !sc->count)
 		return cap_value(element, 0, UCHAR_MAX);
@@ -8632,7 +8632,7 @@ static unsigned char status_calc_element(struct block_list *bl, struct status_ch
  * @param lv: Object's current element level
  * @return new element level
  */
-static unsigned char status_calc_element_lv(struct block_list *bl, struct status_change *sc, int lv)
+static unsigned char status_calc_element_lv(struct block_list *bl, status_change *sc, int lv)
 {
 	if(!sc || !sc->count)
 		return cap_value(lv, 1, 4);
@@ -8665,7 +8665,7 @@ static unsigned char status_calc_element_lv(struct block_list *bl, struct status
  * @param element: Object's current attack element
  * @return new attack element
  */
-unsigned char status_calc_attack_element(struct block_list *bl, struct status_change *sc, int element)
+unsigned char status_calc_attack_element(struct block_list *bl, status_change *sc, int element)
 {
 	if(!sc || !sc->count)
 		return cap_value(element, 0, UCHAR_MAX);
@@ -8703,7 +8703,7 @@ unsigned char status_calc_attack_element(struct block_list *bl, struct status_ch
  * @param mode: Original mode
  * @return mode with cap_value(mode, 0, INT_MAX)
  */
-static int status_calc_mode(struct block_list *bl, struct status_change *sc, int mode)
+static int status_calc_mode(struct block_list *bl, status_change *sc, int mode)
 {
 	if(!sc || !sc->count)
 		return cap_value(mode, MD_NONE,INT_MAX);
@@ -8914,7 +8914,7 @@ int status_get_party_id(struct block_list *bl)
 		case BL_MOB: {
 				struct mob_data *md=(TBL_MOB*)bl;
 				if( md->master_id > 0 ) {
-					struct map_session_data *msd;
+					map_session_data *msd;
 					if (md->special_state.ai && (msd = map_id2sd(md->master_id)) != NULL)
 						return msd->status.party_id;
 					return -md->master_id;
@@ -8958,7 +8958,7 @@ int status_get_guild_id(struct block_list *bl)
 			break;
 		case BL_MOB:
 			{
-				struct map_session_data *msd;
+				map_session_data *msd;
 				struct mob_data *md = (struct mob_data *)bl;
 				if (md->guardian_data)	// Guardian's guild [Skotlex]
 					return md->guardian_data->guild_id;
@@ -9007,7 +9007,7 @@ int status_get_emblem_id(struct block_list *bl)
 			break;
 		case BL_MOB:
 			{
-				struct map_session_data *msd;
+				map_session_data *msd;
 				struct mob_data *md = (struct mob_data *)bl;
 				if (md->guardian_data)	// Guardian's guild [Skotlex]
 					return md->guardian_data->emblem_id;
@@ -9072,7 +9072,7 @@ int status_isdead(struct block_list *bl)
  */
 int status_isimmune(struct block_list *bl)
 {
-	struct status_change *sc =status_get_sc(bl);
+	status_change *sc =status_get_sc(bl);
 
 	if (sc) {
 		if (sc->getSCE(SC_HERMODE))
@@ -9279,7 +9279,7 @@ void status_set_viewdata(struct block_list *bl, int class_)
  * @param bl: Object whose sc data to get [PC|MOB|HOM|MER|ELEM|NPC]
  * @return status change data structure bl->sc
  */
-struct status_change *status_get_sc(struct block_list *bl)
+status_change *status_get_sc(struct block_list *bl)
 {
 	if( bl )
 	switch (bl->type) {
@@ -9299,9 +9299,9 @@ struct status_change *status_get_sc(struct block_list *bl)
  */
 void status_change_init(struct block_list *bl)
 {
-	struct status_change *sc = status_get_sc(bl);
+	status_change *sc = status_get_sc(bl);
 	nullpo_retv(sc);
-	memset(sc, 0, sizeof (struct status_change));
+	memset(sc, 0, sizeof (status_change));
 	sc->lastEffect = SC_NONE;
 	sc->lastEffectTimer = INVALID_TIMER;
 }
@@ -9364,8 +9364,8 @@ t_tick status_get_sc_def(struct block_list *src, struct block_list *bl, enum sc_
 	int sc_def2 = 0, tick_def2 = 0;
 
 	struct status_data *status, *status_src;
-	struct status_change *sc;
-	struct map_session_data *sd;
+	status_change *sc;
+	map_session_data *sd;
 
 	nullpo_ret(bl);
 	if (src == NULL)
@@ -9732,7 +9732,7 @@ void status_display_add(struct block_list *bl, enum sc_type type, int dval1, int
 
 	switch( bl->type ){
 		case BL_PC: {
-			struct map_session_data* sd = (struct map_session_data*)bl;
+			map_session_data* sd = (map_session_data*)bl;
 
 			sc_display_ptr = &sd->sc_display;
 			sc_display_count_ptr = &sd->sc_display_count;
@@ -9794,7 +9794,7 @@ void status_display_remove(struct block_list *bl, enum sc_type type) {
 
 	switch( bl->type ){
 		case BL_PC: {
-			struct map_session_data* sd = (struct map_session_data*)bl;
+			map_session_data* sd = (map_session_data*)bl;
 
 			sc_display_ptr = &sd->sc_display;
 			sc_display_count_ptr = &sd->sc_display_count;
@@ -9859,8 +9859,8 @@ void status_display_remove(struct block_list *bl, enum sc_type type) {
  * @return adjusted duration based on flag values
  */
 int status_change_start(struct block_list* src, struct block_list* bl,enum sc_type type,int rate,int val1,int val2,int val3,int val4,t_tick duration,unsigned char flag, int32 delay) {
-	struct map_session_data *sd = NULL;
-	struct status_change* sc;
+	map_session_data *sd = NULL;
+	status_change* sc;
 	struct status_change_entry* sce;
 	struct status_data *status;
 	struct view_data *vd;
@@ -10178,7 +10178,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
 			if (src == bl)
 				return 0;
 			else {
-				struct status_change *tsc = status_get_sc(bl);
+				status_change *tsc = status_get_sc(bl);
 				// Failed if the target is already marked and the new marker that isn't same marker
 				if (tsc && tsc->getSCE(type) && tsc->getSCE(type)->val2 != src->id)
 					return 0;
@@ -10481,7 +10481,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
 		case SC_ENDURE:
 			val2 = 7; // Hit-count [Celest]
 			if( !(flag&SCSTART_NOAVOID) && (bl->type&(BL_PC|BL_MER)) && !map_flag_gvg2(bl->m) && !map_getmapflag(bl->m, MF_BATTLEGROUND) && !val4 ) {
-				struct map_session_data *tsd;
+				map_session_data *tsd;
 				if( sd ) {
 					int i;
 					for( i = 0; i < MAX_DEVOTION; i++ ) {
@@ -10579,7 +10579,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
 			val2 = 10+val1*3; // %Dmg reflected
 			// val4 used to mark if reflect shield is an inheritance bonus from Devotion
 			if( !(flag&SCSTART_NOAVOID) && (bl->type&(BL_PC|BL_MER)) ) {
-				struct map_session_data *tsd;
+				map_session_data *tsd;
 				if( sd ) {
 					int i;
 					for( i = 0; i < MAX_DEVOTION; i++ ) {
@@ -10906,7 +10906,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
 
 		case SC_AUTOGUARD:
 			if( !(flag&SCSTART_NOAVOID) ) {
-				struct map_session_data *tsd;
+				map_session_data *tsd;
 				int i;
 				for( i = val2 = 0; i < val1; i++) {
 					int t = 5-(i>>1);
@@ -10933,7 +10933,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
 				val4 = 250 - 50*val1; // Aspd adjustment
 
 				if (sd) {
-					struct map_session_data *tsd;
+					map_session_data *tsd;
 					int i;
 					for (i = 0; i < MAX_DEVOTION; i++) { // See if there are devoted characters, and pass the status to them. [Skotlex]
 						if (sd->devotion[i] && (tsd = map_id2sd(sd->devotion[i])))
@@ -11007,7 +11007,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
 			int stat,max_stat;
 			// Fetch caster information
 			struct block_list *pbl = map_id2bl(val1);
-			struct status_change *psc = pbl?status_get_sc(pbl):NULL;
+			status_change *psc = pbl?status_get_sc(pbl):NULL;
 			struct status_change_entry *psce = psc?psc->getSCE(SC_MARIONETTE):NULL;
 			// Fetch target's stats
 			struct status_data* status2 = status_get_status_data(bl); // Battle status
@@ -11073,7 +11073,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
 		case SC_DEVOTION:
 		{
 			struct block_list *d_bl;
-			struct status_change *d_sc;
+			status_change *d_sc;
 
 			if( (d_bl = map_id2bl(val1)) && (d_sc = status_get_sc(d_bl)) && d_sc->count ) { // Inherits Status From Source
 				const enum sc_type types[] = { SC_AUTOGUARD, SC_DEFENDER, SC_REFLECTSHIELD, SC_ENDURE };
@@ -11095,7 +11095,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
 		case SC_CLOSECONFINE2:
 		{
 			struct block_list *src2 = val2?map_id2bl(val2):NULL;
-			struct status_change *sc2 = src2?status_get_sc(src2):NULL;
+			status_change *sc2 = src2?status_get_sc(src2):NULL;
 			struct status_change_entry *sce2 = sc2?sc2->getSCE(SC_CLOSECONFINE):NULL;
 
 			if (src2 && sc2) {
@@ -11197,7 +11197,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
 		case SC_ADRENALINE:
 		case SC_WEAPONPERFECTION:
 			{
-				struct map_session_data * s_sd = BL_CAST(BL_PC, src);
+				map_session_data * s_sd = BL_CAST(BL_PC, src);
 				if (type == SC_OVERTHRUST) {
 					// val2 holds if it was casted on self, or is bonus received from others
 #ifdef RENEWAL
@@ -11567,7 +11567,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
 		}
 		case SC__SHADOWFORM:
 			{
-				struct map_session_data * s_sd = map_id2sd(val2);
+				map_session_data * s_sd = map_id2sd(val2);
 				if( s_sd )
 					s_sd->shadowform_id = bl->id;
 				val4 = tick / 1000;
@@ -12096,7 +12096,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
 #ifndef RENEWAL
 		case SC_APPLEIDUN:
 		{
-			struct map_session_data * s_sd = BL_CAST(BL_PC, src);
+			map_session_data * s_sd = BL_CAST(BL_PC, src);
 
 			val2 = (5 + 2 * val1) + (status_get_vit(src) / 10); //HP Rate: (5 + 2 * skill_lv) + (vit/10) + (BA_MUSICALLESSON level)
 			if (s_sd)
@@ -12878,7 +12878,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
 		case SC_C_MARKER:
 			//Send mini-map, don't wait for first timer triggered
 			if (src->type == BL_PC) {
-				clif_crimson_marker(*(struct map_session_data *)(src), *bl, false);
+				clif_crimson_marker(*(map_session_data *)(src), *bl, false);
 			}
 			break;
 		case SC_ITEMSCRIPT: // Shows Buff Icons
@@ -12918,7 +12918,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
  */
 int status_change_clear(struct block_list* bl, int type)
 {
-	struct status_change* sc;
+	status_change* sc;
 
 	sc = status_get_sc(bl);
 
@@ -12985,8 +12985,8 @@ int status_change_clear(struct block_list* bl, int type)
  */
 int status_change_end(struct block_list* bl, enum sc_type type, int tid)
 {
-	struct map_session_data *sd;
-	struct status_change *sc;
+	map_session_data *sd;
+	status_change *sc;
 	struct status_change_entry *sce;
 	struct status_data *status;
 	struct view_data *vd;
@@ -13110,7 +13110,7 @@ int status_change_end(struct block_list* bl, enum sc_type type, int tid)
 		case SC_REFLECTSHIELD:
 		case SC_AUTOGUARD:
 			{
-				struct map_session_data *tsd;
+				map_session_data *tsd;
 				if( bl->type == BL_PC ) { // Clear Status from others
 					int i;
 					for( i = 0; i < MAX_DEVOTION; i++ ) {
@@ -13162,7 +13162,7 @@ int status_change_end(struct block_list* bl, enum sc_type type, int tid)
 			if(sce->val4) {
 				int tid2 = sce->val4; //stop the status for the other guy of bladestop as well
 				struct block_list *tbl = map_id2bl(tid2);
-				struct status_change *tsc = status_get_sc(tbl);
+				status_change *tsc = status_get_sc(tbl);
 				sce->val4 = 0;
 				if(tbl && tsc && tsc->getSCE(SC_BLADESTOP)) {
 					tsc->getSCE(SC_BLADESTOP)->val4 = 0;
@@ -13217,7 +13217,7 @@ int status_change_end(struct block_list* bl, enum sc_type type, int tid)
 			break;
 		case SC_CLOSECONFINE2:{
 			struct block_list *src = sce->val2?map_id2bl(sce->val2):NULL;
-			struct status_change *sc2 = src?status_get_sc(src):NULL;
+			status_change *sc2 = src?status_get_sc(src):NULL;
 			if (src && sc2 && sc2->getSCE(SC_CLOSECONFINE)) {
 				// If status was already ended, do nothing.
 				// Decrease count
@@ -13243,7 +13243,7 @@ int status_change_end(struct block_list* bl, enum sc_type type, int tid)
 			if (sce->val1) { // Check for partner and end their marionette status as well
 				enum sc_type type2 = (type == SC_MARIONETTE) ? SC_MARIONETTE2 : SC_MARIONETTE;
 				struct block_list *pbl = map_id2bl(sce->val1);
-				struct status_change* sc2 = pbl?status_get_sc(pbl):NULL;
+				status_change* sc2 = pbl?status_get_sc(pbl):NULL;
 
 				if (sc2 && sc2->getSCE(type2)) {
 					sc2->getSCE(type2)->val1 = 0;
@@ -13376,7 +13376,7 @@ int status_change_end(struct block_list* bl, enum sc_type type, int tid)
 			break;
 		case SC__SHADOWFORM:
 			{
-				struct map_session_data *s_sd = map_id2sd(sce->val2);
+				map_session_data *s_sd = map_id2sd(sce->val2);
 
 				if (s_sd) s_sd->shadowform_id = 0;
 			}
@@ -13412,7 +13412,7 @@ int status_change_end(struct block_list* bl, enum sc_type type, int tid)
 		case SC_CURSEDCIRCLE_TARGET:
 			{
 				struct block_list *src = map_id2bl(sce->val2);
-				struct status_change *sc2 = status_get_sc(src);
+				status_change *sc2 = status_get_sc(src);
 
 				if( sc2 && sc2->getSCE(SC_CURSEDCIRCLE_ATKER) && --(sc2->getSCE(SC_CURSEDCIRCLE_ATKER)->val2) == 0 ) {
 					clif_bladestop(bl, sce->val2, 0);
@@ -13470,7 +13470,7 @@ int status_change_end(struct block_list* bl, enum sc_type type, int tid)
 		case SC_C_MARKER:
 			{
 				// Remove mark data from caster
-				struct map_session_data *caster = map_id2sd(sce->val2);
+				map_session_data *caster = map_id2sd(sce->val2);
 				uint8 i = 0;
 
 				if (!caster)
@@ -13486,7 +13486,7 @@ int status_change_end(struct block_list* bl, enum sc_type type, int tid)
 			{
 				// Drop the material from target if expired
 				struct item it;
-				struct map_session_data *caster = NULL;
+				map_session_data *caster = NULL;
 
 				if (sce->val3 || status_isdead(bl) || !(caster = map_id2sd(sce->val2)))
 					break;
@@ -13658,7 +13658,7 @@ int status_change_end(struct block_list* bl, enum sc_type type, int tid)
 TIMER_FUNC(status_change_timer){
 	enum sc_type type = (sc_type)data;
 	struct block_list *bl;
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int interval = status_get_sc_interval(type);
 	bool dounlock = false;
 
@@ -13668,7 +13668,7 @@ TIMER_FUNC(status_change_timer){
 		return 0;
 	}
 
-	struct status_change * const sc = status_get_sc(bl);
+	status_change * const sc = status_get_sc(bl);
 	struct status_data * const status = status_get_status_data(bl);
 	if(!sc) {
 		ShowDebug("status_change_timer: Null pointer id: %d data: %" PRIdPTR " bl-type: %d\n", id, data, bl->type);
@@ -14176,7 +14176,7 @@ TIMER_FUNC(status_change_timer){
 
 	case SC_WARMER: {
 			int hp = 0;
-			struct status_change *ssc = status_get_sc(map_id2bl(sce->val2));
+			status_change *ssc = status_get_sc(map_id2bl(sce->val2));
 
 			if (ssc && ssc->getSCE(SC_HEATER_OPTION))
 				hp = status->max_hp * 3 * sce->val1 / 100;
@@ -14709,7 +14709,7 @@ TIMER_FUNC(status_change_timer){
  */
 int status_change_timer_sub(struct block_list* bl, va_list ap)
 {
-	struct status_change* tsc;
+	status_change* tsc;
 
 	struct block_list* src = va_arg(ap,struct block_list*);
 	struct status_change_entry* sce = va_arg(ap,struct status_change_entry*);
@@ -14799,7 +14799,7 @@ int status_change_timer_sub(struct block_list* bl, va_list ap)
  */
 void status_change_clear_buffs(struct block_list* bl, uint8 type)
 {
-	struct status_change *sc= status_get_sc(bl);
+	status_change *sc= status_get_sc(bl);
 
 	if (!sc || !sc->count)
 		return;
@@ -14914,11 +14914,11 @@ static int status_natural_heal(struct block_list* bl, va_list args)
 {
 	struct regen_data *regen;
 	struct status_data *status;
-	struct status_change *sc;
+	status_change *sc;
 	struct unit_data *ud;
 	struct view_data *vd = NULL;
 	struct regen_data_sub *sregen;
-	struct map_session_data *sd;
+	map_session_data *sd;
 	int rate, multi = 1, flag;
 
 	regen = status_get_regen_data(bl);
@@ -15173,7 +15173,7 @@ static bool status_change_isDisabledOnMap_(sc_type type, bool mapIsVS, bool mapI
  * @param bl: Block list data
  * @param sc: Status Change data
  */
-void status_change_clear_onChangeMap(struct block_list *bl, struct status_change *sc)
+void status_change_clear_onChangeMap(struct block_list *bl, status_change *sc)
 {
 	nullpo_retv(bl);
 
diff --git a/src/map/status.hpp b/src/map/status.hpp
index 7eec11859e..0ab07c1934 100644
--- a/src/map/status.hpp
+++ b/src/map/status.hpp
@@ -25,7 +25,7 @@ struct homun_data;
 struct s_mercenary_data;
 struct s_elemental_data;
 struct npc_data;
-struct status_change;
+class status_change;
 
 /**
  * Max Refine available to your server
@@ -3280,7 +3280,7 @@ unsigned short status_get_speed(struct block_list *bl);
 #define status_get_crate(bl) status_get_status_data(bl)->crate
 #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
-unsigned char status_calc_attack_element(struct block_list *bl, struct status_change *sc, int element);
+unsigned char status_calc_attack_element(struct block_list *bl, status_change *sc, int element);
 #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
@@ -3306,7 +3306,7 @@ std::vector<e_race2> status_get_race2(struct block_list *bl);
 struct view_data *status_get_viewdata(struct block_list *bl);
 void status_set_viewdata(struct block_list *bl, int class_);
 void status_change_init(struct block_list *bl);
-struct status_change *status_get_sc(struct block_list *bl);
+status_change *status_get_sc(struct block_list *bl);
 
 int status_isdead(struct block_list *bl);
 int status_isimmune(struct block_list *bl);
@@ -3328,7 +3328,7 @@ TIMER_FUNC(status_change_timer);
 int status_change_timer_sub(struct block_list* bl, va_list ap);
 int status_change_clear(struct block_list* bl, int type);
 void status_change_clear_buffs(struct block_list* bl, uint8 type);
-void status_change_clear_onChangeMap(struct block_list *bl, struct status_change *sc);
+void status_change_clear_onChangeMap(struct block_list *bl, status_change *sc);
 TIMER_FUNC(status_clear_lastEffect_timer);
 
 #define status_calc_mob(md, opt) status_calc_bl_(&(md)->bl, status_db.getSCB_ALL(), opt)
@@ -3339,12 +3339,12 @@ TIMER_FUNC(status_clear_lastEffect_timer);
 #define status_calc_elemental(ed, opt) status_calc_bl_(&(ed)->bl, status_db.getSCB_ALL(), opt)
 #define status_calc_npc(nd, opt) status_calc_bl_(&(nd)->bl, status_db.getSCB_ALL(), opt)
 
-bool status_calc_weight(struct map_session_data *sd, enum e_status_calc_weight_opt flag);
-bool status_calc_cart_weight(struct map_session_data *sd, enum e_status_calc_weight_opt flag);
+bool status_calc_weight(map_session_data *sd, enum e_status_calc_weight_opt flag);
+bool status_calc_cart_weight(map_session_data *sd, enum e_status_calc_weight_opt flag);
 void status_calc_bl_(struct block_list *bl, std::bitset<SCB_MAX> flag, uint8 opt = SCO_NONE);
 int status_calc_mob_(struct mob_data* md, uint8 opt);
 void status_calc_pet_(struct pet_data* pd, uint8 opt);
-int status_calc_pc_(struct map_session_data* sd, uint8 opt);
+int status_calc_pc_(map_session_data* sd, uint8 opt);
 int status_calc_homunculus_(struct homun_data *hd, uint8 opt);
 int status_calc_mercenary_(s_mercenary_data *md, uint8 opt);
 int status_calc_elemental_(s_elemental_data *ed, uint8 opt);
@@ -3363,8 +3363,8 @@ static void status_calc_bl(block_list *bl, std::vector<e_scb_flag> flags) {
 
 void status_calc_misc(struct block_list *bl, struct status_data *status, int level);
 void status_calc_regen(struct block_list *bl, struct status_data *status, struct regen_data *regen);
-void status_calc_regen_rate(struct block_list *bl, struct regen_data *regen, struct status_change *sc);
-void status_calc_state(struct block_list *bl, struct status_change *sc, std::bitset<SCS_MAX> flag, bool start);
+void status_calc_regen_rate(struct block_list *bl, struct regen_data *regen, status_change *sc);
+void status_calc_state(struct block_list *bl, status_change *sc, std::bitset<SCS_MAX> flag, bool start);
 
 void status_calc_slave_mode(struct mob_data *md, struct mob_data *mmd);
 
@@ -3377,7 +3377,7 @@ int status_change_spread(block_list *src, block_list *bl);
 unsigned short status_base_matk_min(const struct status_data* status);
 unsigned short status_base_matk_max(const struct status_data* status);
 #else
-unsigned int status_weapon_atk(struct weapon_atk wa, struct map_session_data *sd);
+unsigned int status_weapon_atk(struct weapon_atk wa, map_session_data *sd);
 unsigned short status_base_atk_min(struct block_list *bl, const struct status_data* status, int level);
 unsigned short status_base_atk_max(struct block_list *bl, const struct status_data* status, int level);
 unsigned short status_base_matk_min(struct block_list *bl, const struct status_data* status, int level);
diff --git a/src/map/storage.cpp b/src/map/storage.cpp
index 469938d599..e52e73a123 100644
--- a/src/map/storage.cpp
+++ b/src/map/storage.cpp
@@ -20,7 +20,7 @@
 #include "intif.hpp"
 #include "itemdb.hpp"
 #include "log.hpp"
-#include "map.hpp" // struct map_session_data
+#include "map.hpp" // map_session_data
 #include "packets.hpp"
 #include "pc.hpp"
 #include "pc_groups.hpp"
@@ -131,7 +131,7 @@ void do_reconnect_storage(void){
  * @param sd : player
  * @return  0:success, 1:fail
  */
-int storage_storageopen(struct map_session_data *sd)
+int storage_storageopen(map_session_data *sd)
 {
 	nullpo_ret(sd);
 
@@ -239,7 +239,7 @@ static enum e_storage_add storage_canGetItem(struct s_storage *stor, int idx, in
  * @param amount : quantity of items
  * @return 0:success, 1:failed, 2:failed because of room or stack checks
  */
-static int storage_additem(struct map_session_data* sd, struct s_storage *stor, struct item *it, int amount)
+static int storage_additem(map_session_data* sd, struct s_storage *stor, struct item *it, int amount)
 {
 	struct item_data *data;
 	int i;
@@ -303,7 +303,7 @@ static int storage_additem(struct map_session_data* sd, struct s_storage *stor,
  * @param amount :number of item to remove
  * @return 0:sucess, 1:fail
  */
-int storage_delitem(struct map_session_data* sd, struct s_storage *stor, int index, int amount)
+int storage_delitem(map_session_data* sd, struct s_storage *stor, int index, int amount)
 {
 	if( stor->u.items_storage[index].nameid == 0 || stor->u.items_storage[index].amount < amount )
 		return 1;
@@ -332,7 +332,7 @@ int storage_delitem(struct map_session_data* sd, struct s_storage *stor, int ind
  * @param amount : number of item to take
  * @return 0:fail, 1:success
  */
-void storage_storageadd(struct map_session_data* sd, struct s_storage *stor, int index, int amount)
+void storage_storageadd(map_session_data* sd, struct s_storage *stor, int index, int amount)
 {
 	enum e_storage_add result;
 
@@ -365,7 +365,7 @@ void storage_storageadd(struct map_session_data* sd, struct s_storage *stor, int
  * @param amount : number of item to take
  * @return 0:fail, 1:success
  */
-void storage_storageget(struct map_session_data *sd, struct s_storage *stor, int index, int amount)
+void storage_storageget(map_session_data *sd, struct s_storage *stor, int index, int amount)
 {
 	unsigned char flag = 0;
 	enum e_storage_add result;
@@ -392,7 +392,7 @@ void storage_storageget(struct map_session_data *sd, struct s_storage *stor, int
  * @param amount : number of item to take
  * @return 0:fail, 1:success
  */
-void storage_storageaddfromcart(struct map_session_data *sd, struct s_storage *stor, int index, int amount)
+void storage_storageaddfromcart(map_session_data *sd, struct s_storage *stor, int index, int amount)
 {
 	enum e_storage_add result;
 	nullpo_retv(sd);
@@ -429,7 +429,7 @@ void storage_storageaddfromcart(struct map_session_data *sd, struct s_storage *s
  * @param amount : number of item to take
  * @return 0:fail, 1:success
  */
-void storage_storagegettocart(struct map_session_data* sd, struct s_storage *stor, int index, int amount)
+void storage_storagegettocart(map_session_data* sd, struct s_storage *stor, int index, int amount)
 {
 	unsigned char flag = 0;
 	enum e_storage_add result;
@@ -456,7 +456,7 @@ void storage_storagegettocart(struct map_session_data* sd, struct s_storage *sto
  * Request to save storage
  * @param sd: Player who has the storage
  */
-void storage_storagesave(struct map_session_data *sd)
+void storage_storagesave(map_session_data *sd)
 {
 	nullpo_retv(sd);
 
@@ -468,7 +468,7 @@ void storage_storagesave(struct map_session_data *sd)
  * @param sd: Player who has the storage
  * @author [massdriller] / modified by [Valaris]
  */
-void storage_storageclose(struct map_session_data *sd)
+void storage_storageclose(map_session_data *sd)
 {
 	nullpo_retv(sd);
 
@@ -493,7 +493,7 @@ void storage_storageclose(struct map_session_data *sd)
  *  1: Character is quitting
  *	2(x): Character is changing map-servers 
  */
-void storage_storage_quit(struct map_session_data* sd, int flag)
+void storage_storage_quit(map_session_data* sd, int flag)
 {
 	nullpo_retv(sd);
 
@@ -551,7 +551,7 @@ void storage_guild_delete(int guild_id)
  * @param sd : player
  * @return 0 : success, 1 : fail, 2 : no guild found
  */
-char storage_guild_storageopen(struct map_session_data* sd)
+char storage_guild_storageopen(map_session_data* sd)
 {
 	struct s_storage *gstor;
 
@@ -606,7 +606,7 @@ char storage_guild_storageopen(struct map_session_data* sd)
 	return GSTORAGE_OPEN;
 }
 
-void storage_guild_log( struct map_session_data* sd, struct item* item, int16 amount ){
+void storage_guild_log( map_session_data* sd, struct item* item, int16 amount ){
 	int i;
 	SqlStmt* stmt = SqlStmt_Malloc(mmysql_handle);
 	StringBuf buf;
@@ -636,7 +636,7 @@ void storage_guild_log( struct map_session_data* sd, struct item* item, int16 am
 	StringBuf_Destroy(&buf);
 }
 
-enum e_guild_storage_log storage_guild_log_read_sub( struct map_session_data* sd, std::vector<struct guild_log_entry>& log, uint32 max ){
+enum e_guild_storage_log storage_guild_log_read_sub( map_session_data* sd, std::vector<struct guild_log_entry>& log, uint32 max ){
 	StringBuf buf;
 	int j;
 
@@ -707,7 +707,7 @@ enum e_guild_storage_log storage_guild_log_read_sub( struct map_session_data* sd
 	return GUILDSTORAGE_LOG_FINAL_SUCCESS;
 }
 
-enum e_guild_storage_log storage_guild_log_read( struct map_session_data* sd ){
+enum e_guild_storage_log storage_guild_log_read( map_session_data* sd ){
 	std::vector<struct guild_log_entry> log;
 
 	enum e_guild_storage_log ret = storage_guild_log_read_sub( sd, log, MAX_GUILD_STORAGE_LOG_PACKET );
@@ -725,7 +725,7 @@ enum e_guild_storage_log storage_guild_log_read( struct map_session_data* sd ){
  * @param amount : number of item to add
  * @return True : success, False : fail
  */
-bool storage_guild_additem(struct map_session_data* sd, struct s_storage* stor, struct item* item_data, int amount)
+bool storage_guild_additem(map_session_data* sd, struct s_storage* stor, struct item* item_data, int amount)
 {
 	struct item_data *id;
 	int i;
@@ -841,7 +841,7 @@ bool storage_guild_additem2(struct s_storage* stor, struct item* item, int amoun
  * @param amount : number of item to delete
  * @return True : success, False : fail
  */
-bool storage_guild_delitem(struct map_session_data* sd, struct s_storage* stor, int n, int amount)
+bool storage_guild_delitem(map_session_data* sd, struct s_storage* stor, int n, int amount)
 {
 	nullpo_retr(1, sd);
 	nullpo_retr(1, stor);
@@ -870,7 +870,7 @@ bool storage_guild_delitem(struct map_session_data* sd, struct s_storage* stor,
  * @param sd : player
  * @param amount : number of item to delete
  */
-void storage_guild_storageadd(struct map_session_data* sd, int index, int amount)
+void storage_guild_storageadd(map_session_data* sd, int index, int amount)
 {
 	struct s_storage *stor;
 
@@ -912,7 +912,7 @@ void storage_guild_storageadd(struct map_session_data* sd, int index, int amount
  * @param amount : number of item to get
  * @return 1:success, 0:fail
  */
-void storage_guild_storageget(struct map_session_data* sd, int index, int amount)
+void storage_guild_storageget(map_session_data* sd, int index, int amount)
 {
 	struct s_storage *stor;
 	unsigned char flag = 0;
@@ -951,7 +951,7 @@ void storage_guild_storageget(struct map_session_data* sd, int index, int amount
  * @param index : index of item in cart
  * @param amount : number of item to transfer
  */
-void storage_guild_storageaddfromcart(struct map_session_data* sd, int index, int amount)
+void storage_guild_storageaddfromcart(map_session_data* sd, int index, int amount)
 {
 	struct s_storage *stor;
 
@@ -985,7 +985,7 @@ void storage_guild_storageaddfromcart(struct map_session_data* sd, int index, in
  * @param amount : number of item to transfer
  * @return 1:fail, 0:success
  */
-void storage_guild_storagegettocart(struct map_session_data* sd, int index, int amount)
+void storage_guild_storagegettocart(map_session_data* sd, int index, int amount)
 {
 	short flag;
 	struct s_storage *stor;
@@ -1055,7 +1055,7 @@ void storage_guild_storagesaved(int guild_id)
  * Close storage for player then save it
  * @param sd : player
  */
-void storage_guild_storageclose(struct map_session_data* sd)
+void storage_guild_storageclose(map_session_data* sd)
 {
 	struct s_storage *stor;
 
@@ -1080,7 +1080,7 @@ void storage_guild_storageclose(struct map_session_data* sd)
  * @param sd
  * @param flag
  */
-void storage_guild_storage_quit(struct map_session_data* sd, int flag)
+void storage_guild_storage_quit(map_session_data* sd, int flag)
 {
 	struct s_storage *stor;
 
@@ -1113,7 +1113,7 @@ void storage_guild_storage_quit(struct map_session_data* sd, int flag)
  * Open premium storage
  * @param sd Player
  **/
-void storage_premiumStorage_open(struct map_session_data *sd) {
+void storage_premiumStorage_open(map_session_data *sd) {
 	nullpo_retv(sd);
 
 	sd->state.storage_flag = 3;
@@ -1130,7 +1130,7 @@ void storage_premiumStorage_open(struct map_session_data *sd) {
  * @return 1:Success to request, 0:Failed
  * @author [Cydh]
  **/
-bool storage_premiumStorage_load(struct map_session_data *sd, uint8 num, uint8 mode) {
+bool storage_premiumStorage_load(map_session_data *sd, uint8 num, uint8 mode) {
 	nullpo_ret(sd);
 
 	if (sd->state.storage_flag)
@@ -1162,7 +1162,7 @@ bool storage_premiumStorage_load(struct map_session_data *sd, uint8 num, uint8 m
  * @param sd Player who has the storage
  * @author [Cydh]
  **/
-void storage_premiumStorage_save(struct map_session_data *sd) {
+void storage_premiumStorage_save(map_session_data *sd) {
 	nullpo_retv(sd);
 
 	intif_storage_save(sd, &sd->premiumStorage);
@@ -1173,7 +1173,7 @@ void storage_premiumStorage_save(struct map_session_data *sd) {
  * @param sd Player who has the storage
  * @author [Cydh]
  **/
-void storage_premiumStorage_close(struct map_session_data *sd) {
+void storage_premiumStorage_close(map_session_data *sd) {
 	nullpo_retv(sd);
 
 	if (sd->premiumStorage.dirty) {
@@ -1194,7 +1194,7 @@ void storage_premiumStorage_close(struct map_session_data *sd) {
  * @param sd Player who has the storage
  * @author [Cydh]
  **/
-void storage_premiumStorage_quit(struct map_session_data *sd) {
+void storage_premiumStorage_quit(map_session_data *sd) {
 	nullpo_retv(sd);
 
 	if (save_settings&CHARSAVE_STORAGE)
diff --git a/src/map/storage.hpp b/src/map/storage.hpp
index a24ec8b7b5..6a728827f0 100644
--- a/src/map/storage.hpp
+++ b/src/map/storage.hpp
@@ -13,7 +13,7 @@
 
 struct s_storage;
 struct item;
-struct map_session_data;
+class map_session_data;
 
 extern std::unordered_map<uint16, std::shared_ptr<struct s_storage_table>> storage_db;
 
@@ -52,43 +52,43 @@ struct guild_log_entry{
 const char *storage_getName(uint8 id);
 bool storage_exists(uint8 id);
 
-int storage_delitem(struct map_session_data* sd, struct s_storage *stor, int index, int amount);
-int storage_storageopen(struct map_session_data *sd);
-void storage_storageadd(struct map_session_data *sd, struct s_storage *stor, int index, int amount);
-void storage_storageget(struct map_session_data *sd, struct s_storage *stor, int index, int amount);
-void storage_storageaddfromcart(struct map_session_data *sd, struct s_storage *stor, int index, int amount);
-void storage_storagegettocart(struct map_session_data *sd, struct s_storage *stor, int index, int amount);
-void storage_storagesave(struct map_session_data *sd);
-void storage_storageclose(struct map_session_data *sd);
+int storage_delitem(map_session_data* sd, struct s_storage *stor, int index, int amount);
+int storage_storageopen(map_session_data *sd);
+void storage_storageadd(map_session_data *sd, struct s_storage *stor, int index, int amount);
+void storage_storageget(map_session_data *sd, struct s_storage *stor, int index, int amount);
+void storage_storageaddfromcart(map_session_data *sd, struct s_storage *stor, int index, int amount);
+void storage_storagegettocart(map_session_data *sd, struct s_storage *stor, int index, int amount);
+void storage_storagesave(map_session_data *sd);
+void storage_storageclose(map_session_data *sd);
 void storage_sortitem(struct item* items, unsigned int size);
 void do_init_storage(void);
 void do_final_storage(void);
 void do_reconnect_storage(void);
-void storage_storage_quit(struct map_session_data *sd, int flag);
+void storage_storage_quit(map_session_data *sd, int flag);
 
 struct s_storage* guild2storage(int guild_id);
 struct s_storage* guild2storage2(int guild_id);
 void storage_guild_delete(int guild_id);
-char storage_guild_storageopen(struct map_session_data *sd);
-enum e_guild_storage_log storage_guild_log_read( struct map_session_data* sd );
-bool storage_guild_additem(struct map_session_data *sd,struct s_storage *stor,struct item *item_data,int amount);
+char storage_guild_storageopen(map_session_data *sd);
+enum e_guild_storage_log storage_guild_log_read( map_session_data* sd );
+bool storage_guild_additem(map_session_data *sd,struct s_storage *stor,struct item *item_data,int amount);
 bool storage_guild_additem2(struct s_storage* stor, struct item* item, int amount);
-bool storage_guild_delitem(struct map_session_data *sd,struct s_storage *stor,int n,int amount);
-void storage_guild_storageadd(struct map_session_data *sd,int index,int amount);
-void storage_guild_storageget(struct map_session_data *sd,int index,int amount);
-void storage_guild_storageaddfromcart(struct map_session_data *sd,int index,int amount);
-void storage_guild_storagegettocart(struct map_session_data *sd,int index,int amount);
-void storage_guild_storageclose(struct map_session_data *sd);
-void storage_guild_storage_quit(struct map_session_data *sd,int flag);
+bool storage_guild_delitem(map_session_data *sd,struct s_storage *stor,int n,int amount);
+void storage_guild_storageadd(map_session_data *sd,int index,int amount);
+void storage_guild_storageget(map_session_data *sd,int index,int amount);
+void storage_guild_storageaddfromcart(map_session_data *sd,int index,int amount);
+void storage_guild_storagegettocart(map_session_data *sd,int index,int amount);
+void storage_guild_storageclose(map_session_data *sd);
+void storage_guild_storage_quit(map_session_data *sd,int flag);
 bool storage_guild_storagesave(uint32 account_id, int guild_id, int flag);
 void storage_guild_storagesaved(int guild_id); //Ack from char server that guild store was saved.
 
 // Premium Storage [Cydh]
-void storage_premiumStorage_open(struct map_session_data *sd);
-bool storage_premiumStorage_load(struct map_session_data *sd, uint8 num, uint8 mode);
-void storage_premiumStorage_save(struct map_session_data *sd);
-void storage_premiumStorage_close(struct map_session_data *sd);
-void storage_premiumStorage_quit(struct map_session_data *sd);
+void storage_premiumStorage_open(map_session_data *sd);
+bool storage_premiumStorage_load(map_session_data *sd, uint8 num, uint8 mode);
+void storage_premiumStorage_save(map_session_data *sd);
+void storage_premiumStorage_close(map_session_data *sd);
+void storage_premiumStorage_quit(map_session_data *sd);
 
 int compare_item(struct item *a, struct item *b);
 
diff --git a/src/map/trade.cpp b/src/map/trade.cpp
index c91ebc9386..4f8dc9071f 100644
--- a/src/map/trade.cpp
+++ b/src/map/trade.cpp
@@ -28,7 +28,7 @@
  * @param sd : player requesting the trade
  * @param target_sd : player requested
  */
-void trade_traderequest(struct map_session_data *sd, struct map_session_data *target_sd)
+void trade_traderequest(map_session_data *sd, map_session_data *target_sd)
 {
 	nullpo_retv(sd);
 
@@ -55,7 +55,7 @@ void trade_traderequest(struct map_session_data *sd, struct map_session_data *ta
 	}
 
 	if ( sd->trade_partner != 0 ) { // If a character tries to trade to another one then cancel the previous one
-		struct map_session_data *previous_sd = map_id2sd(sd->trade_partner);
+		map_session_data *previous_sd = map_id2sd(sd->trade_partner);
 
 		if( previous_sd ){
 			previous_sd->trade_partner = 0;
@@ -101,9 +101,9 @@ void trade_traderequest(struct map_session_data *sd, struct map_session_data *ta
  * Weird enough, the client should only send 3/4
  * and the server is the one that can reply 0~2
  */
-void trade_tradeack(struct map_session_data *sd, int type)
+void trade_tradeack(map_session_data *sd, int type)
 {
-	struct map_session_data *tsd;
+	map_session_data *tsd;
 
 	nullpo_retv(sd);
 
@@ -174,7 +174,7 @@ void trade_tradeack(struct map_session_data *sd, int type)
  * @param sd : player to check
  * @return -1:zeny hack, 0:all fine, 1:item hack
  */
-int impossible_trade_check(struct map_session_data *sd)
+int impossible_trade_check(map_session_data *sd)
 {
 	struct item inventory[MAX_INVENTORY];
 	char message_to_gm[200];
@@ -240,7 +240,7 @@ int impossible_trade_check(struct map_session_data *sd)
  * @param tsd : player 2 trading
  * @return 0:error, 1:success
  */
-int trade_check(struct map_session_data *sd, struct map_session_data *tsd)
+int trade_check(map_session_data *sd, map_session_data *tsd)
 {
 	struct item inventory[MAX_INVENTORY];
 	struct item inventory2[MAX_INVENTORY];
@@ -344,9 +344,9 @@ int trade_check(struct map_session_data *sd, struct map_session_data *tsd)
  * @param index : index of item in inventory
  * @param amount : amount of item to add from index
  */
-void trade_tradeadditem(struct map_session_data *sd, short index, short amount)
+void trade_tradeadditem(map_session_data *sd, short index, short amount)
 {
-	struct map_session_data *target_sd;
+	map_session_data *target_sd;
 	struct item *item;
 	int trade_i, trade_weight;
 	int src_lv, dst_lv;
@@ -444,9 +444,9 @@ void trade_tradeadditem(struct map_session_data *sd, short index, short amount)
  * @param sd : Player who's adding zeny
  * @param amount : zeny amount
  */
-void trade_tradeaddzeny(struct map_session_data* sd, int amount)
+void trade_tradeaddzeny(map_session_data* sd, int amount)
 {
-	struct map_session_data* target_sd;
+	map_session_data* target_sd;
 
 	nullpo_retv(sd);
 
@@ -471,9 +471,9 @@ void trade_tradeaddzeny(struct map_session_data* sd, int amount)
  * 'Ok' button on the trade window is pressed.
  * @param sd : Player that pressed the button
  */
-void trade_tradeok(struct map_session_data *sd)
+void trade_tradeok(map_session_data *sd)
 {
-	struct map_session_data *target_sd;
+	map_session_data *target_sd;
 
 	if(sd->state.deal_locked || !sd->state.trading)
 		return;
@@ -493,9 +493,9 @@ void trade_tradeok(struct map_session_data *sd)
  * 'Cancel' is pressed. (or trade was force-cancelled by the code)
  * @param sd : Player that pressed the button
  */
-void trade_tradecancel(struct map_session_data *sd)
+void trade_tradecancel(map_session_data *sd)
 {
-	struct map_session_data *target_sd;
+	map_session_data *target_sd;
 	int trade_i;
 
 	nullpo_retv(sd);
@@ -559,9 +559,9 @@ void trade_tradecancel(struct map_session_data *sd)
  * lock sd and tsd trade data, execute the trade, clear, then save players
  * @param sd : Player that has click on trade button
  */
-void trade_tradecommit(struct map_session_data *sd)
+void trade_tradecommit(map_session_data *sd)
 {
-	struct map_session_data *tsd;
+	map_session_data *tsd;
 	int trade_i;
 
 	nullpo_retv(sd);
diff --git a/src/map/trade.hpp b/src/map/trade.hpp
index deef5b680a..7567408f49 100644
--- a/src/map/trade.hpp
+++ b/src/map/trade.hpp
@@ -4,14 +4,14 @@
 #ifndef TRADE_HPP
 #define TRADE_HPP
 
-struct map_session_data;
+class map_session_data;
 
-void trade_traderequest(struct map_session_data *sd, struct map_session_data *target_sd);
-void trade_tradeack(struct map_session_data *sd,int type);
-void trade_tradeadditem(struct map_session_data *sd,short index,short amount);
-void trade_tradeaddzeny(struct map_session_data *sd,int amount);
-void trade_tradeok(struct map_session_data *sd);
-void trade_tradecancel(struct map_session_data *sd);
-void trade_tradecommit(struct map_session_data *sd);
+void trade_traderequest(map_session_data *sd, map_session_data *target_sd);
+void trade_tradeack(map_session_data *sd,int type);
+void trade_tradeadditem(map_session_data *sd,short index,short amount);
+void trade_tradeaddzeny(map_session_data *sd,int amount);
+void trade_tradeok(map_session_data *sd);
+void trade_tradecancel(map_session_data *sd);
+void trade_tradecommit(map_session_data *sd);
 
 #endif /* TRADE_HPP */
diff --git a/src/map/unit.cpp b/src/map/unit.cpp
index 45f09b86ba..873f55e196 100644
--- a/src/map/unit.cpp
+++ b/src/map/unit.cpp
@@ -67,7 +67,7 @@ struct unit_data* unit_bl2ud(struct block_list *bl)
 {
 	if( bl == NULL) return NULL;
 	switch(bl->type){
-	case BL_PC: return &((struct map_session_data*)bl)->ud;
+	case BL_PC: return &((map_session_data*)bl)->ud;
 	case BL_MOB: return &((struct mob_data*)bl)->ud;
 	case BL_PET: return &((struct pet_data*)bl)->ud;
 	case BL_NPC: return &((struct npc_data*)bl)->ud;
@@ -910,7 +910,7 @@ int unit_walktobl(struct block_list *bl, struct block_list *tbl, int range, unsi
  * Called by unit_run when an object is hit.
  * @param sd Required only when using SC_WUGDASH
  */
-void unit_run_hit(struct block_list *bl, struct status_change *sc, struct map_session_data *sd, enum sc_type type)
+void unit_run_hit(struct block_list *bl, status_change *sc, map_session_data *sd, enum sc_type type)
 {
 	int lv = sc->getSCE(type)->val1;
 
@@ -938,9 +938,9 @@ void unit_run_hit(struct block_list *bl, struct status_change *sc, struct map_se
  * @param sd: Required only when using SC_WUGDASH
  * @return true: Success (Finished running) false: Fail (Hit an object/Couldn't run)
  */
-bool unit_run(struct block_list *bl, struct map_session_data *sd, enum sc_type type)
+bool unit_run(struct block_list *bl, map_session_data *sd, enum sc_type type)
 {
-	struct status_change *sc;
+	status_change *sc;
 	short to_x, to_y, dir_x, dir_y;
 	int i;
 
@@ -1033,7 +1033,7 @@ bool unit_movepos(struct block_list *bl, short dst_x, short dst_y, int easy, boo
 {
 	short dx,dy;
 	struct unit_data        *ud = NULL;
-	struct map_session_data *sd = NULL;
+	map_session_data *sd = NULL;
 
 	nullpo_retr(false,bl);
 
@@ -1160,7 +1160,7 @@ uint8 unit_getdir(struct block_list *bl)
 int unit_blown(struct block_list* bl, int dx, int dy, int count, enum e_skill_blown flag)
 {
 	if(count) {
-		struct map_session_data* sd;
+		map_session_data* sd;
 		struct skill_unit* su = NULL;
 		int nx, ny, result;
 
@@ -1248,7 +1248,7 @@ enum e_unit_blown unit_blown_immune(struct block_list* bl, uint8 flag)
 				return UB_MD_KNOCKBACK_IMMUNE;
 			break;
 		case BL_PC: {
-				struct map_session_data *sd = BL_CAST(BL_PC, bl);
+				map_session_data *sd = BL_CAST(BL_PC, bl);
 
 #ifndef RENEWAL
 				// Basilica caster can't be knocked-back by normal monsters.
@@ -1469,9 +1469,9 @@ int unit_is_walking(struct block_list *bl)
  * @return True - can move; False - can't move
  */
 bool unit_can_move(struct block_list *bl) {
-	struct map_session_data *sd;
+	map_session_data *sd;
 	struct unit_data *ud;
-	struct status_change *sc;
+	status_change *sc;
 
 	nullpo_ret(bl);
 
@@ -1606,8 +1606,8 @@ int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill_id, ui
 {
 	struct unit_data *ud;
 	struct status_data *tstatus;
-	struct status_change *sc;
-	struct map_session_data *sd = NULL;
+	status_change *sc;
+	map_session_data *sd = NULL;
 	struct block_list * target = NULL;
 	t_tick tick = gettick();
 	int combo = 0, range;
@@ -2119,9 +2119,9 @@ int unit_skilluse_pos(struct block_list *src, short skill_x, short skill_y, uint
  */
 int unit_skilluse_pos2( struct block_list *src, short skill_x, short skill_y, uint16 skill_id, uint16 skill_lv, int casttime, int castcancel)
 {
-	struct map_session_data *sd = NULL;
+	map_session_data *sd = NULL;
 	struct unit_data        *ud = NULL;
-	struct status_change *sc;
+	status_change *sc;
 	struct block_list    bl;
 	t_tick tick = gettick();
 	int range;
@@ -2676,7 +2676,7 @@ static int unit_attack_timer_sub(struct block_list* src, int tid, t_tick tick)
 	struct block_list *target;
 	struct unit_data *ud;
 	struct status_data *sstatus;
-	struct map_session_data *sd = NULL;
+	map_session_data *sd = NULL;
 	struct mob_data *md = NULL;
 	int range;
 
@@ -2866,7 +2866,7 @@ bool unit_can_attack(struct block_list *bl, int target_id) {
 			return false;
 	}
 
-	struct status_change *sc;
+	status_change *sc;
 
 	if (!(sc = status_get_sc(bl)))
 		return true;
@@ -2887,7 +2887,7 @@ bool unit_can_attack(struct block_list *bl, int target_id) {
  */
 int unit_skillcastcancel(struct block_list *bl, char type)
 {
-	struct map_session_data *sd = NULL;
+	map_session_data *sd = NULL;
 	struct unit_data *ud = unit_bl2ud( bl);
 	t_tick tick = gettick();
 	int ret = 0, skill_id;
@@ -3039,7 +3039,7 @@ int unit_changetarget(struct block_list *bl, va_list ap) {
 int unit_remove_map_(struct block_list *bl, clr_type clrtype, const char* file, int line, const char* func)
 {
 	struct unit_data *ud = unit_bl2ud(bl);
-	struct status_change *sc = status_get_sc(bl);
+	status_change *sc = status_get_sc(bl);
 
 	nullpo_ret(ud);
 
@@ -3084,7 +3084,7 @@ int unit_remove_map_(struct block_list *bl, clr_type clrtype, const char* file,
 
 	switch( bl->type ) {
 		case BL_PC: {
-			struct map_session_data *sd = (struct map_session_data*)bl;
+			map_session_data *sd = (map_session_data*)bl;
 
 			if(sd->shadowform_id) { // If shadow target has leave the map
 			    struct block_list *d_bl = map_id2bl(sd->shadowform_id);
@@ -3323,7 +3323,7 @@ void unit_refresh(struct block_list *bl, bool walking) {
  *	0: Assume bl is being warped
  *	1: Death, appropriate cleanup performed
  */
-void unit_remove_map_pc(struct map_session_data *sd, clr_type clrtype)
+void unit_remove_map_pc(map_session_data *sd, clr_type clrtype)
 {
 	unit_remove_map(&sd->bl,clrtype);
 
@@ -3349,7 +3349,7 @@ void unit_remove_map_pc(struct map_session_data *sd, clr_type clrtype)
  * Also free his pets/homon/mercenary/elemental/etc if he have any
  * @param sd: Player
  */
-void unit_free_pc(struct map_session_data *sd)
+void unit_free_pc(map_session_data *sd)
 {
 	if (sd->pd)
 		unit_free(&sd->pd->bl,CLR_OUTSIGHT);
@@ -3387,7 +3387,7 @@ int unit_free(struct block_list *bl, clr_type clrtype)
 
 	switch( bl->type ) {
 		case BL_PC: {
-			struct map_session_data *sd = (struct map_session_data*)bl;
+			map_session_data *sd = (map_session_data*)bl;
 			int i;
 
 			if( status_isdead(bl) )
@@ -3472,7 +3472,7 @@ int unit_free(struct block_list *bl, clr_type clrtype)
 		}
 		case BL_PET: {
 			struct pet_data *pd = (struct pet_data*)bl;
-			struct map_session_data *sd = pd->master;
+			map_session_data *sd = pd->master;
 
 			pet_delautobonus(*sd, pd->autobonus, false);
 			pet_delautobonus(*sd, pd->autobonus2, false);
@@ -3564,7 +3564,7 @@ int unit_free(struct block_list *bl, clr_type clrtype)
 		case BL_HOM:
 		{
 			struct homun_data *hd = (TBL_HOM*)bl;
-			struct map_session_data *sd = hd->master;
+			map_session_data *sd = hd->master;
 
 			hom_hungry_timer_delete(hd);
 
@@ -3591,7 +3591,7 @@ int unit_free(struct block_list *bl, clr_type clrtype)
 		}
 		case BL_MER: {
 			s_mercenary_data *md = (TBL_MER*)bl;
-			struct map_session_data *sd = md->master;
+			map_session_data *sd = md->master;
 
 			if( mercenary_get_lifetime(md) > 0 )
 				mercenary_save(md);
@@ -3614,7 +3614,7 @@ int unit_free(struct block_list *bl, clr_type clrtype)
 		}
 		case BL_ELEM: {
 			s_elemental_data *ed = (TBL_ELEM*)bl;
-			struct map_session_data *sd = ed->master;
+			map_session_data *sd = ed->master;
 
 			if( elemental_get_lifetime(ed) > 0 )
 				elemental_save(ed);
diff --git a/src/map/unit.hpp b/src/map/unit.hpp
index e030d908c0..5b2c889d2e 100644
--- a/src/map/unit.hpp
+++ b/src/map/unit.hpp
@@ -13,7 +13,7 @@
 enum sc_type : int16;
 struct block_list;
 struct unit_data;
-struct map_session_data;
+class map_session_data;
 enum clr_type : uint8;
 
 extern const short dirx[DIR_MAX]; ///lookup to know where will move to x according dir
@@ -110,8 +110,8 @@ enum e_unit_stop_walking {
 // Does walk action for unit
 int unit_walktoxy(struct block_list *bl, short x, short y, unsigned char flag);
 int unit_walktobl(struct block_list *bl, struct block_list *target, int range, unsigned char flag);
-void unit_run_hit(struct block_list *bl, struct status_change *sc, struct map_session_data *sd, enum sc_type type);
-bool unit_run(struct block_list *bl, struct map_session_data *sd, enum sc_type type);
+void unit_run_hit(struct block_list *bl, status_change *sc, map_session_data *sd, enum sc_type type);
+bool unit_run(struct block_list *bl, map_session_data *sd, enum sc_type type);
 int unit_calc_pos(struct block_list *bl, int tx, int ty, uint8 dir);
 TIMER_FUNC(unit_delay_walktoxy_timer);
 TIMER_FUNC(unit_delay_walktobl_timer);
@@ -165,9 +165,9 @@ void unit_skillunit_maxcount(unit_data& ud, uint16 skill_id, int& maxcount);
 
 // Remove unit
 struct unit_data* unit_bl2ud(struct block_list *bl);
-void unit_remove_map_pc(struct map_session_data *sd, clr_type clrtype);
+void unit_remove_map_pc(map_session_data *sd, clr_type clrtype);
 void unit_refresh(struct block_list *bl, bool walking = false);
-void unit_free_pc(struct map_session_data *sd);
+void unit_free_pc(map_session_data *sd);
 #define unit_remove_map(bl,clrtype) unit_remove_map_(bl,clrtype,__FILE__,__LINE__,__func__)
 int unit_remove_map_(struct block_list *bl, clr_type clrtype, const char* file, int line, const char* func);
 int unit_free(struct block_list *bl, clr_type clrtype);
diff --git a/src/map/vending.cpp b/src/map/vending.cpp
index cd66519846..6ed1f75f12 100755
--- a/src/map/vending.cpp
+++ b/src/map/vending.cpp
@@ -55,7 +55,7 @@ static int vending_getuid(void)
  * Make a player close his shop
  * @param sd : player session
  */
-void vending_closevending(struct map_session_data* sd)
+void vending_closevending(map_session_data* sd)
 {
 	nullpo_retv(sd);
 
@@ -77,9 +77,9 @@ void vending_closevending(struct map_session_data* sd)
  * @param sd : player requestion the list
  * @param id : vender account id (gid)
  */
-void vending_vendinglistreq(struct map_session_data* sd, int id)
+void vending_vendinglistreq(map_session_data* sd, int id)
 {
-	struct map_session_data* vsd;
+	map_session_data* vsd;
 	nullpo_retv(sd);
 
 	if( (vsd = map_id2sd(id)) == NULL )
@@ -103,7 +103,7 @@ void vending_vendinglistreq(struct map_session_data* sd, int id)
  * @param zeny: Total amount to tax
  * @return Total amount after taxes
  */
-static double vending_calc_tax(struct map_session_data *sd, double zeny)
+static double vending_calc_tax(map_session_data *sd, double zeny)
 {
 	if (battle_config.vending_tax && zeny >= battle_config.vending_tax_min)
 		zeny -= zeny * (battle_config.vending_tax / 10000.);
@@ -120,12 +120,12 @@ static double vending_calc_tax(struct map_session_data *sd, double zeny)
  *	data := {<index>.w <amount>.w }[count]
  * @param count : number of different items he's trying to buy
  */
-void vending_purchasereq(struct map_session_data* sd, int aid, int uid, const uint8* data, int count)
+void vending_purchasereq(map_session_data* sd, int aid, int uid, const uint8* data, int count)
 {
 	int i, j, cursor, w, new_ = 0, blank, vend_list[MAX_VENDING];
 	double z;
 	struct s_vending vending[MAX_VENDING]; // against duplicate packets
-	struct map_session_data* vsd = map_id2sd(aid);
+	map_session_data* vsd = map_id2sd(aid);
 
 	nullpo_retv(sd);
 	if( vsd == NULL || !vsd->state.vending || vsd->bl.id == sd->bl.id )
@@ -295,7 +295,7 @@ void vending_purchasereq(struct map_session_data* sd, int aid, int uid, const ui
  * @param at Autotrader info, or NULL if requetsed not from autotrade persistance
  * @return 0 If success, 1 - Cannot open (die, not state.prevend, trading), 2 - No cart, 3 - Count issue, 4 - Cart data isn't saved yet, 5 - No valid item found
  */
-int8 vending_openvending(struct map_session_data* sd, const char* message, const uint8* data, int count, struct s_autotrader *at)
+int8 vending_openvending(map_session_data* sd, const char* message, const uint8* data, int count, struct s_autotrader *at)
 {
 	int i, j;
 	int vending_skill_lvl;
@@ -401,7 +401,7 @@ int8 vending_openvending(struct map_session_data* sd, const char* message, const
  * @param nameid : item id
  * @return 0:not selling it, 1: yes
  */
-bool vending_search(struct map_session_data* sd, t_itemid nameid)
+bool vending_search(map_session_data* sd, t_itemid nameid)
 {
 	int i;
 
@@ -423,7 +423,7 @@ bool vending_search(struct map_session_data* sd, t_itemid nameid)
  * @param s : parameter of the search (see s_search_store_search)
  * @return Whether or not the search should be continued.
  */
-bool vending_searchall(struct map_session_data* sd, const struct s_search_store_search* s)
+bool vending_searchall(map_session_data* sd, const struct s_search_store_search* s)
 {
 	int i, c, slot;
 	unsigned int idx, cidx;
@@ -494,7 +494,7 @@ bool vending_searchall(struct map_session_data* sd, const struct s_search_store_
 * Open vending for Autotrader
 * @param sd Player as autotrader
 */
-void vending_reopen( struct map_session_data* sd )
+void vending_reopen( map_session_data* sd )
 {
 	struct s_autotrader *at = NULL;
 	int8 fail = -1;
@@ -616,7 +616,7 @@ void do_init_vending_autotrade(void)
 					at->sit = battle_config.feature_autotrade_sit;
 
 				// initialize player
-				CREATE(at->sd, struct map_session_data, 1);
+				CREATE(at->sd, map_session_data, 1); // TODO: Dont use Memory Manager allocation anymore and rely on the C++ container
 				pc_setnewpc(at->sd, at->account_id, at->char_id, 0, gettick(), at->sex, 0);
 				at->sd->state.autotrade = 1|2;
 				if (battle_config.autotrade_monsterignore)
diff --git a/src/map/vending.hpp b/src/map/vending.hpp
index fa6c7592a2..befaf8e397 100644
--- a/src/map/vending.hpp
+++ b/src/map/vending.hpp
@@ -8,7 +8,7 @@
 #include "../common/db.hpp"
 #include "../common/mmo.hpp"
 
-struct map_session_data;
+class map_session_data;
 struct s_search_store_search;
 struct s_autotrader;
 
@@ -23,13 +23,13 @@ void do_final_vending(void);
 void do_init_vending(void);
 void do_init_vending_autotrade( void );
  
-void vending_reopen( struct map_session_data* sd );
-void vending_closevending(struct map_session_data* sd);
-int8 vending_openvending(struct map_session_data* sd, const char* message, const uint8* data, int count, struct s_autotrader *at);
-void vending_vendinglistreq(struct map_session_data* sd, int id);
-void vending_purchasereq(struct map_session_data* sd, int aid, int uid, const uint8* data, int count);
-bool vending_search(struct map_session_data* sd, t_itemid nameid);
-bool vending_searchall(struct map_session_data* sd, const struct s_search_store_search* s);
+void vending_reopen( map_session_data* sd );
+void vending_closevending(map_session_data* sd);
+int8 vending_openvending(map_session_data* sd, const char* message, const uint8* data, int count, struct s_autotrader *at);
+void vending_vendinglistreq(map_session_data* sd, int id);
+void vending_purchasereq(map_session_data* sd, int aid, int uid, const uint8* data, int count);
+bool vending_search(map_session_data* sd, t_itemid nameid);
+bool vending_searchall(map_session_data* sd, const struct s_search_store_search* s);
 void vending_update(map_session_data &sd);
 
 #endif /* _VENDING_HPP_ */