Applied a consistent look to all header files (copyright, ifdefs)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9891 54d463be-8e91-2dee-dedb-b68131a5f0ec

71 files changed, 138 insertions, 98 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 89ef39a7c..1c6cfb32f 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2007/02/21
+	* Applied a consistent look to all header files (copyright, ifdefs)
 	* Minor stuff (typos, socket.c, junk in login reply packet) [ultramage]
 2007/02/19
 	* Fixed @cartlist info message typo [Lupus]
diff --git a/src/char/char.h b/src/char/char.h
index e70fe7e4f..947d12d3f 100644
--- a/src/char/char.h
+++ b/src/char/char.h
@@ -55,4 +55,5 @@ extern char char_txt[];
 int char_config_read(const char *cfgName);
 int mmo_char_fromstr(char *str, struct mmo_charstatus *p, struct global_reg *reg, int *reg_num);
 int parse_friend_txt(struct mmo_charstatus *p);
-#endif
+
+#endif /* _CHAR_H_ */
diff --git a/src/char/int_guild.h b/src/char/int_guild.h
index 616384b94..6b0e9f7b5 100644
--- a/src/char/int_guild.h
+++ b/src/char/int_guild.h
@@ -19,4 +19,5 @@ extern char castle_txt[1024];
 //For the TXT->SQL converter
 int inter_guild_fromstr(char *str, struct guild *g);
 int inter_guildcastle_fromstr(char *str, struct guild_castle *gc);
-#endif
+
+#endif /* _INT_GUILD_H_ */
diff --git a/src/char/int_homun.h b/src/char/int_homun.h
index 5987d23f8..d56ab97a9 100644
--- a/src/char/int_homun.h
+++ b/src/char/int_homun.h
@@ -13,4 +13,4 @@ int inter_homun_parse_frommap(int fd);
 
 extern char homun_txt[1024];
 
-#endif
+#endif /* _INT_HOMUN_H_ */
diff --git a/src/char/int_party.h b/src/char/int_party.h
index 8f4ff5d18..453699617 100644
--- a/src/char/int_party.h
+++ b/src/char/int_party.h
@@ -16,4 +16,5 @@ extern char party_txt[1024];
 
 //For the TXT->SQL converter
 int inter_party_fromstr(char *str, struct party *p);
-#endif
+
+#endif /* _INT_PARTY_H_ */
diff --git a/src/char/int_pet.h b/src/char/int_pet.h
index 2c72628bb..43f354798 100644
--- a/src/char/int_pet.h
+++ b/src/char/int_pet.h
@@ -15,4 +15,5 @@ extern char pet_txt[1024];
 
 //Exported for use in the TXT-SQL converter.
 int inter_pet_fromstr(char *str,struct s_pet *p);
-#endif
+
+#endif /* _INT_PET_H_ */
diff --git a/src/char/int_status.h b/src/char/int_status.h
index bc93b1024..3ddf08299 100644
--- a/src/char/int_status.h
+++ b/src/char/int_status.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef __INT_STATUS__
-#define __INT_STATUS__
+#ifndef _INT_STATUS_H_
+#define _INT_STATUS_H_
 
 #include "char.h"
 
@@ -21,4 +21,5 @@ void inter_status_save(void);
 void status_init(void);
 void status_final(void);
 #endif
-#endif
+
+#endif /* _INT_STATUS_H_ */
diff --git a/src/char/int_storage.h b/src/char/int_storage.h
index 7007646f9..976d77034 100644
--- a/src/char/int_storage.h
+++ b/src/char/int_storage.h
@@ -19,4 +19,5 @@ extern char guild_storage_txt[1024];
 //Exported for use in the TXT-SQL converter.
 int storage_fromstr(char *str,struct storage *p);
 int guild_storage_fromstr(char *str,struct guild_storage *p);
-#endif
+
+#endif /* _INT_STORAGE_H_ */
diff --git a/src/char/inter.h b/src/char/inter.h
index 1789848c5..5a6a0edde 100644
--- a/src/char/inter.h
+++ b/src/char/inter.h
@@ -25,4 +25,5 @@ extern char main_chat_nick[16];
 //For TXT->SQL conversion
 extern char accreg_txt[];
 int inter_accreg_fromstr(const char *str, struct accreg *reg);
-#endif
+
+#endif /* _INTER_H_ */
diff --git a/src/char_sql/char.h b/src/char_sql/char.h
index 4a95fd0f8..41ce45ea6 100644
--- a/src/char_sql/char.h
+++ b/src/char_sql/char.h
@@ -1,7 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
-#ifndef _CHARSQL_H_
-#define _CHARSQL_H_
+
+#ifndef _CHAR_SQL_H_
+#define _CHAR_SQL_H_
 
 #include "../common/core.h"
 #include "../common/socket.h"
@@ -106,4 +107,5 @@ extern int debug_mysql_query(char *file, int line, void *mysql, const char *q);
 //Exported for use in the TXT-SQL converter.
 int mmo_char_tosql(int char_id, struct mmo_charstatus *p);
 void sql_config_read(const char *cfgName);
-#endif
+
+#endif /* _CHAR_SQL_H_ */
diff --git a/src/char_sql/int_homun.c b/src/char_sql/int_homun.c
index 22edad8d0..2260ddf20 100644
--- a/src/char_sql/int_homun.c
+++ b/src/char_sql/int_homun.c
@@ -1,5 +1,5 @@
-// Homunculus saving by Albator and Orn for eAthena.
-// GNU/GPL rulez !
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/char_sql/int_homun.h b/src/char_sql/int_homun.h
index 2b9af8ebc..fa49c659f 100644
--- a/src/char_sql/int_homun.h
+++ b/src/char_sql/int_homun.h
@@ -1,8 +1,8 @@
-// Homunculus saving by Albator and Orn for eAthena.
-// GNU/GPL rulez !
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
 
-#ifndef _INT_HOMUN_H_
-#define _INT_HOMUN_H_
+#ifndef _INT_HOMUN_SQL_H_
+#define _INT_HOMUN_SQL_H_
 
 int inter_homunculus_sql_init(void);
 void inter_homunculus_sql_final(void);
@@ -12,4 +12,4 @@ int mapif_delete_homunculus(int fd);
 int inter_delete_homunculus(int hom_id);
 int inter_homunculus_parse_frommap(int fd);
 
-#endif
+#endif /* _INT_HOMUN_SQL_H_ */
diff --git a/src/char_sql/int_party.h b/src/char_sql/int_party.h
index 1e54b8b47..c244ab59e 100644
--- a/src/char_sql/int_party.h
+++ b/src/char_sql/int_party.h
@@ -26,4 +26,5 @@ int inter_party_CharOnline(int char_id, int party_id);
 int inter_party_CharOffline(int char_id, int party_id);
 //Required for the TXT->SQL converter
 int inter_party_tosql(struct party *p, int flag, int index);
-#endif
+
+#endif /* _INT_PARTY_SQL_H_ */
diff --git a/src/char_sql/int_pet.h b/src/char_sql/int_pet.h
index 1b03c9768..5c1955857 100644
--- a/src/char_sql/int_pet.h
+++ b/src/char_sql/int_pet.h
@@ -15,4 +15,5 @@ int inter_pet_sql_init(void);
 
 //Exported for use in the TXT-SQL converter.
 int inter_pet_tosql(int pet_id, struct s_pet *p);
-#endif
+
+#endif /* _INT_PET_SQL_H_ */
diff --git a/src/char_sql/int_storage.h b/src/char_sql/int_storage.h
index 3cba41e64..dd71ef9ed 100644
--- a/src/char_sql/int_storage.h
+++ b/src/char_sql/int_storage.h
@@ -14,4 +14,5 @@ int inter_storage_parse_frommap(int fd);
 //Exported for use in the TXT-SQL converter.
 int storage_tosql(int account_id,struct storage *p);
 int guild_storage_tosql(int guild_id, struct guild_storage *p);
-#endif
+
+#endif /* _INT_STORAGE_SQL_H_ */
diff --git a/src/char_sql/inter.h b/src/char_sql/inter.h
index ecfde71c0..c1567cfe6 100644
--- a/src/char_sql/inter.h
+++ b/src/char_sql/inter.h
@@ -53,4 +53,5 @@ extern char login_db_server_db[32];
 extern char main_chat_nick[16];
 
 int inter_accreg_tosql(int account_id, int char_id, struct accreg *reg, int type);
-#endif
+
+#endif /* _INTER_SQL_H_ */
diff --git a/src/char_sql/itemdb.h b/src/char_sql/itemdb.h
index 53b1d3e02..4fbd59f96 100644
--- a/src/char_sql/itemdb.h
+++ b/src/char_sql/itemdb.h
@@ -3,6 +3,7 @@
 
 #ifndef _ITEMDB_H_
 #define _ITEMDB_H_
+
 #include "mmo.h"
 
 //FIXME: Maybe it would be better to move this enum to mmo.h,
@@ -40,4 +41,4 @@ int itemdb_isequip2(struct item_data *);
 void do_final_itemdb(void);
 int do_init_itemdb(void);
 
-#endif
+#endif /* _ITEMDB_H_ */
diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h
index 76f494851..1eea1c465 100644
--- a/src/common/cbasetypes.h
+++ b/src/common/cbasetypes.h
@@ -1,5 +1,6 @@
 #ifndef _CBASETYPES_H_
 #define _CBASETYPES_H_
+
 /*              +--------+-----------+--------+---------+
  *              | ILP32  |   LP64    |  ILP64 | (LL)P64 |
  * +------------+--------+-----------+--------+---------+
diff --git a/src/common/core.h b/src/common/core.h
index 06ce86448..5e396cc7a 100644
--- a/src/common/core.h
+++ b/src/common/core.h
@@ -20,4 +20,4 @@ extern void set_server_type(void);
 extern void set_termfunc(void (*termfunc)(void));
 extern void do_final(void);
 
-#endif	// _CORE_H_
+#endif /* _CORE_H_ */
diff --git a/src/common/db.h b/src/common/db.h
index a79c88822..0c19b5fc2 100644
--- a/src/common/db.h
+++ b/src/common/db.h
@@ -702,4 +702,4 @@ void* linkdb_search ( struct linkdb_node** head, void *key);
 void* linkdb_erase  ( struct linkdb_node** head, void *key);
 void  linkdb_final  ( struct linkdb_node** head );
 
-#endif
+#endif /* _DB_H_ */
diff --git a/src/common/grfio.h b/src/common/grfio.h
index 572258b04..0d6268b0d 100644
--- a/src/common/grfio.h
+++ b/src/common/grfio.h
@@ -19,4 +19,5 @@ int decode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char*
 int encode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen);
 int deflate_file (const char *source, const char *filename);
 
-#endif	// _GRFIO_H_
+#endif /* _GRFIO_H_ */
+
diff --git a/src/common/lock.h b/src/common/lock.h
index e90fbf745..537305ccf 100644
--- a/src/common/lock.h
+++ b/src/common/lock.h
@@ -9,5 +9,4 @@
 FILE* lock_fopen(const char* filename,int *info);
 int   lock_fclose(FILE *fp,const char* filename,int *info);
 
-#endif
-
+#endif /* _LOCK_H_ */
diff --git a/src/common/malloc.h b/src/common/malloc.h
index 1af9cba62..5411d670d 100644
--- a/src/common/malloc.h
+++ b/src/common/malloc.h
@@ -3,6 +3,7 @@
 
 #ifndef _MALLOC_H_
 #define _MALLOC_H_
+
 // Q: What are the 'a'-variant allocation functions?
 // A: They allocate memory from the stack, which is automatically 
 //    freed when the invoking function returns.
@@ -157,4 +158,4 @@ unsigned int malloc_usage (void);
 void malloc_init (void);
 void malloc_final (void);
 
-#endif
+#endif /* _MALLOC_H_ */
diff --git a/src/common/mapindex.c b/src/common/mapindex.c
index 070326463..be6580ae5 100644
--- a/src/common/mapindex.c
+++ b/src/common/mapindex.c
@@ -1,3 +1,6 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/common/mapindex.h b/src/common/mapindex.h
index 7a0286adf..68989031d 100644
--- a/src/common/mapindex.h
+++ b/src/common/mapindex.h
@@ -1,5 +1,9 @@
-#ifndef _MAX_INDEX_H
-#define _MAX_INDEX_H
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#ifndef _MAPINDEX_H_
+#define _MAPINDEX_H_
+
 //File in charge of assigning a numberic ID to each map in existance for space saving when passing map info between servers.
 extern char mapindex_cfgfile[80];
 
@@ -38,4 +42,4 @@ const char* mapindex_id2name(unsigned short);
 void mapindex_init(void);
 void mapindex_final(void);
 
-#endif
+#endif /* _MAPINDEX_H_ */
diff --git a/src/common/md5calc.h b/src/common/md5calc.h
index 9bc554f69..fc1c274f2 100644
--- a/src/common/md5calc.h
+++ b/src/common/md5calc.h
@@ -4,4 +4,4 @@
 void MD5_String(const char * string, char * output);
 void MD5_String2binary(const char * string, char * output);
 
-#endif
+#endif /* _MD5CALC_H_ */
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 48a8266e7..f946b46cb 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -511,4 +511,4 @@ enum {
 	#endif
 #endif
 
-#endif	// _MMO_H_
+#endif /* _MMO_H_ */
diff --git a/src/common/nullpo.h b/src/common/nullpo.h
index d5ccb8f95..71525dd00 100644
--- a/src/common/nullpo.h
+++ b/src/common/nullpo.h
@@ -234,4 +234,4 @@ void nullpo_info_f(const char *file, int line, const char *func,
                    __attribute__((format(printf,4,5)));
 
 
-#endif
+#endif /* _NULLPO_H_ */
diff --git a/src/common/plugin.h b/src/common/plugin.h
index f30a15e5e..3ddbaae98 100644
--- a/src/common/plugin.h
+++ b/src/common/plugin.h
@@ -80,4 +80,4 @@ typedef void Plugin_Event_Func(void);
 #define PLUGIN_EVENTS_TABLE	struct _Plugin_Event_Table plugin_event_table[]
 void** plugin_call_table;
 
-#endif	// _PLUGIN_H_
+#endif /* _PLUGIN_H_ */
diff --git a/src/common/plugins.h b/src/common/plugins.h
index 9cb4b94b4..70dd6b326 100644
--- a/src/common/plugins.h
+++ b/src/common/plugins.h
@@ -63,4 +63,4 @@ void plugin_unload(Plugin* plugin);
 void plugins_init(void);
 void plugins_final(void);
 
-#endif	// _PLUGINS_H_
+#endif /* _PLUGINS_H_ */
diff --git a/src/common/showmsg.h b/src/common/showmsg.h
index cf9c16d23..31933f17a 100644
--- a/src/common/showmsg.h
+++ b/src/common/showmsg.h
@@ -93,4 +93,4 @@ extern int ShowDebug(const char *, ...);
 extern int ShowError(const char *, ...);
 extern int ShowFatalError(const char *, ...);
 
-#endif
+#endif /* _SHOWMSG_H_ */
diff --git a/src/common/socket.h b/src/common/socket.h
index 1c4a1bd8c..0c96edb20 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -141,4 +141,4 @@ int socket_getips(uint32* ips, int max);
 extern uint32 addr_[16];   // ip addresses of local host (host byte order)
 extern int naddr_;   // # of ip addresses
 
-#endif	// _SOCKET_H_
+#endif /* _SOCKET_H_ */
diff --git a/src/common/strlib.h b/src/common/strlib.h
index f242b5cc4..8303c182f 100644
--- a/src/common/strlib.h
+++ b/src/common/strlib.h
@@ -1,8 +1,9 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _J_STR_LIB_H_
-#define _J_STR_LIB_H_
+#ifndef _STRLIB_H_
+#define _STRLIB_H_
+
 #define J_MAX_MALLOC_SIZE 65535
 // String function library.
 // code by Jioh L. Jung (ziozzang@4wish.net)
@@ -26,4 +27,4 @@ const char *stristr(const char *haystack, const char *needle);
 size_t strnlen (const char* string, size_t maxlen);
 #endif
 
-#endif
+#endif /* _STRLIB_H_ */
diff --git a/src/common/timer.h b/src/common/timer.h
index 4b683d966..23cb6beaa 100644
--- a/src/common/timer.h
+++ b/src/common/timer.h
@@ -59,4 +59,4 @@ unsigned long get_uptime(void);
 void timer_init(void);
 void timer_final(void);
 
-#endif	// _TIMER_H_
+#endif /* _TIMER_H_ */
diff --git a/src/common/utils.h b/src/common/utils.h
index efd477c9b..3e74374bc 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef COMMON_UTILS_H
-#define COMMON_UTILS_H
+#ifndef _UTILS_H_
+#define _UTILS_H_
 
 #include <stdarg.h>
 
@@ -41,4 +41,4 @@ extern unsigned short GetWord(unsigned long val, size_t num);
 extern unsigned short MakeWord(unsigned char byte0, unsigned char byte1);
 extern unsigned long MakeDWord(unsigned short word0, unsigned short word1);
 
-#endif
+#endif /* _UTILS_H_ */
diff --git a/src/common/version.h b/src/common/version.h
index 2560c1019..71a93dcd9 100644
--- a/src/common/version.h
+++ b/src/common/version.h
@@ -27,4 +27,4 @@
 // C言語の仕様上、最初に0を付けると8進数になるので間違えないで下さい。
 #define ATHENA_MOD_VERSION	1249	// mod version (patch No.)
 
-#endif
+#endif /* _VERSION_H_ */
diff --git a/src/ladmin/ladmin.c b/src/ladmin/ladmin.c
index 343967d46..107d98d09 100644
--- a/src/ladmin/ladmin.c
+++ b/src/ladmin/ladmin.c
@@ -1,4 +1,4 @@
-// (c) eAthena Dev Team - Licensed under GNU GPL
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/src/ladmin/ladmin.h b/src/ladmin/ladmin.h
index 64a67146e..b335984c7 100644
--- a/src/ladmin/ladmin.h
+++ b/src/ladmin/ladmin.h
@@ -1,4 +1,4 @@
-// (c) eAthena Dev Team - Licensed under GNU GPL
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
 #ifndef _LADMIN_H_
@@ -10,4 +10,4 @@
 							// It is made into 2 at the time of passwordencrypt2.
 							// When it is made 3, it corresponds to both.
 
-#endif
+#endif /* _LADMIN_H_ */
diff --git a/src/login/login.h b/src/login/login.h
index 38901ff33..441f2bac1 100644
--- a/src/login/login.h
+++ b/src/login/login.h
@@ -39,4 +39,5 @@ struct mmo_char_server {
 
 extern struct mmo_char_server server[MAX_SERVERS];
 extern int server_fd[MAX_SERVERS];
-#endif
+
+#endif /* _LOGIN_H_ */
diff --git a/src/login_sql/login.h b/src/login_sql/login.h
index f3b604664..882a284e9 100644
--- a/src/login_sql/login.h
+++ b/src/login_sql/login.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _LOGIN_H_
-#define _LOGIN_H_
+#ifndef _LOGIN_SQL_H_
+#define _LOGIN_SQL_H_
 
 #define MAX_SERVERS 30
 
@@ -51,4 +51,4 @@ struct mmo_char_server {
 };
 
 
-#endif
+#endif /* _LOGIN_SQL_H_ */
diff --git a/src/map/atcommand.h b/src/map/atcommand.h
index 84b4fa0ed..644237245 100644
--- a/src/map/atcommand.h
+++ b/src/map/atcommand.h
@@ -325,5 +325,4 @@ extern char atcommand_symbol;
 #define MAX_MSG 1000
 extern char* msg_table[MAX_MSG];
 
-#endif
-
+#endif /* _ATCOMMAND_H_ */
diff --git a/src/map/battle.h b/src/map/battle.h
index 12e217218..c04fcfbfb 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -444,4 +444,4 @@ extern void battle_set_defaults(void);
 extern int battle_set_value(char *, char *);
 int battle_get_value(char *);
 
-#endif
+#endif /* _BATTLE_H_ */
diff --git a/src/map/charcommand.h b/src/map/charcommand.h
index 5982ffe30..979594251 100644
--- a/src/map/charcommand.h
+++ b/src/map/charcommand.h
@@ -70,5 +70,5 @@ int get_charcommand_level(const CharCommandType type);
 
 int charcommand_config_read(const char *cfgName);
 extern char charcommand_symbol;
-#endif
 
+#endif /* _CHARCOMMAND_H_ */
diff --git a/src/map/charsave.h b/src/map/charsave.h
index 5743c1c65..5734ebf58 100644
--- a/src/map/charsave.h
+++ b/src/map/charsave.h
@@ -18,4 +18,4 @@
 	void charsave_save_scdata(int account_id, int char_id, struct status_change* sc_data, int max_sc);
 #endif
 
-#endif
+#endif /* _CHARSAVE_H_ */
diff --git a/src/map/chat.h b/src/map/chat.h
index 702fd7dad..bfb1a0a80 100644
--- a/src/map/chat.h
+++ b/src/map/chat.h
@@ -19,4 +19,4 @@ int chat_enableevent(struct chat_data *cd);
 int chat_disableevent(struct chat_data *cd);
 int chat_npckickall(struct chat_data *cd);
 
-#endif
+#endif /* _CHAT_H_ */
diff --git a/src/map/chrif.h b/src/map/chrif.h
index 302b31f56..a94591cd4 100644
--- a/src/map/chrif.h
+++ b/src/map/chrif.h
@@ -55,4 +55,4 @@ int do_init_chrif(void);
 
 int chrif_flush_fifo(void);
 
-#endif
+#endif /* _CHRIF_H_ */
diff --git a/src/map/clif.h b/src/map/clif.h
index 5ce426f96..ca3ae2278 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -362,6 +362,4 @@ int clif_hom_food(struct map_session_data *sd,int foodid,int fail);	//[orn]
 void clif_send_homdata(struct map_session_data *sd, int type, int param);	//[orn]
 int clif_hwalkok(struct homun_data *hd);	//[orn]
 
-#endif
-
-
+#endif /* _CLIF_H_ */
diff --git a/src/map/date.h b/src/map/date.h
index 2b8ffe991..cc19d88d1 100644
--- a/src/map/date.h
+++ b/src/map/date.h
@@ -3,7 +3,6 @@
 
 #ifndef _DATE_H_
 #define _DATE_H_
-#endif
 
 int date_get_year(void);
 int date_get_month(void);
@@ -15,3 +14,5 @@ int date_get_sec(void);
 int is_day_of_sun(void);
 int is_day_of_moon(void);
 int is_day_of_star(void);
+
+#endif /* _DATE_H_ */
diff --git a/src/map/guild.h b/src/map/guild.h
index 6171c72f2..e569c0d15 100644
--- a/src/map/guild.h
+++ b/src/map/guild.h
@@ -91,4 +91,4 @@ int guild_agit_break(struct mob_data *md);
 
 void do_final_guild(void);
 
-#endif
+#endif /* _GUILD_H_ */
diff --git a/src/map/intif.h b/src/map/intif.h
index 56f2f4783..b1d82940c 100644
--- a/src/map/intif.h
+++ b/src/map/intif.h
@@ -70,4 +70,4 @@ int intif_homunculus_requestdelete(int homun_id);
 
 int CheckForCharServer(void);
 
-#endif
+#endif /* _INTIF_H_ */
diff --git a/src/map/irc.c b/src/map/irc.c
index 55eafdcd9..2300dd3ac 100644
--- a/src/map/irc.c
+++ b/src/map/irc.c
@@ -1,5 +1,5 @@
-#ifndef _IRC_H_
-#define _IRC_H_
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
 
 #include <ctype.h>
 #include <stdio.h>
@@ -545,5 +545,3 @@ int irc_read_conf(char *file) {
 
 	return 1;
 }
-
-#endif //_IRC_H_
diff --git a/src/map/irc.h b/src/map/irc.h
index 2297f013b..163ac0793 100644
--- a/src/map/irc.h
+++ b/src/map/irc.h
@@ -1,3 +1,9 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#ifndef _IRC_H_
+#define _IRC_H_
+
 #include "map.h"
 
 // IRC .conf file [Zido]
@@ -53,3 +59,5 @@ int set_access(char *nick,int level); // [Zido]
 int get_access(char *nick); // [Zido]
 int irc_rmnames(void); // [Zido]
 int irc_read_conf(char *file); // [Zido]
+
+#endif /* _IRC_H_ */
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index 0b9e2a466..fb3d25964 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -142,4 +142,4 @@ void itemdb_reload(void);
 void do_final_itemdb(void);
 int do_init_itemdb(void);
 
-#endif
+#endif /* _ITEMDB_H_ */
diff --git a/src/map/log.h b/src/map/log.h
index 872506ac5..9f82f61a2 100644
--- a/src/map/log.h
+++ b/src/map/log.h
@@ -53,4 +53,4 @@ extern struct Log_Config {
 	char log_branch_db[32], log_pick_db[32], log_zeny_db[32], log_mvpdrop_db[32], log_gm_db[32], log_npc_db[32], log_chat_db[32];
 } log_config;
 
-#endif
+#endif /* _LOG_H_ */
diff --git a/src/map/mail.h b/src/map/mail.h
index d6f865f78..fca124ae4 100644
--- a/src/map/mail.h
+++ b/src/map/mail.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-// Mail System for eAthena
-// Created by Valaris
+#ifndef _MAIL_H_
+#define _MAIL_H_
 
 int mail_check(struct map_session_data *sd, int type);
 int mail_read(struct map_session_data *sd, int message_id);
@@ -10,3 +10,5 @@ int mail_delete(struct map_session_data *sd, int message_id);
 int mail_send(struct map_session_data *sd, char *name, char *message, int flag);
 
 int do_init_mail(void);
+
+#endif /* _MAIL_H_ */
diff --git a/src/map/map.h b/src/map/map.h
index a8e24d7fe..69cd1383b 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -1503,4 +1503,4 @@ typedef struct homun_data       TBL_HOM;
 extern int lowest_gm_level;
 extern char main_chat_nick[16];
 
-#endif
+#endif /* _MAP_H_ */
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index f7799e500..a11373032 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -1,3 +1,6 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/map/mercenary.h b/src/map/mercenary.h
index e5e194967..6103acc00 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.h
@@ -1,5 +1,9 @@
-// Homunculus and future Mercenary system code go here [Celest]
-// implemented by [orn]
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#ifndef _MERCENARY_H_
+#define _MERCENARY_H_
+
 struct homunculus_db {
 	int class_ ;
 	char name[NAME_LENGTH];
@@ -81,3 +85,5 @@ int merc_skill_tree_get_max(int id, int b_class);
 void merc_hom_init_timers(struct homun_data * hd);
 void merc_skill_reload(void);
 void merc_reload(void);
+
+#endif /* _MERCENARY_H_ */
diff --git a/src/map/mob.h b/src/map/mob.h
index f13cce8da..09dfb5a2a 100644
--- a/src/map/mob.h
+++ b/src/map/mob.h
@@ -203,4 +203,4 @@ int mob_clone_delete(int class_);
 
 void mob_reload(void);
 
-#endif
+#endif /* _MOB_H_ */
diff --git a/src/map/npc.h b/src/map/npc.h
index ea28964f5..86bce296c 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -88,5 +88,4 @@ extern char *current_file;
 
 struct npc_data *fake_nd;
 
-#endif
-
+#endif /* _NPC_H_ */
diff --git a/src/map/party.h b/src/map/party.h
index 0b7c9a858..4c87dd501 100644
--- a/src/map/party.h
+++ b/src/map/party.h
@@ -47,4 +47,4 @@ int party_sub_count(struct block_list *bl, va_list ap);
 int party_foreachsamemap(int (*func)(struct block_list *,va_list),struct map_session_data *sd,int type,...);
 
 
-#endif
+#endif /* _PARTY_H_ */
diff --git a/src/map/pc.h b/src/map/pc.h
index f95a27085..dc6be203d 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -315,4 +315,5 @@ int duel_checktime(struct map_session_data* sd);
 
 int pc_read_motd(void); // [Valaris]
 int pc_disguise(struct map_session_data *sd, int class_);
-#endif
+
+#endif /* _PC_H_ */
diff --git a/src/map/pet.h b/src/map/pet.h
index 3bb6d0906..821874359 100644
--- a/src/map/pet.h
+++ b/src/map/pet.h
@@ -65,5 +65,4 @@ int read_petdb(void);
 int do_init_pet(void);
 int do_final_pet(void);
 
-#endif
-
+#endif /* _PET_H_ */
diff --git a/src/map/script.h b/src/map/script.h
index 09b4a797b..bad0374dd 100644
--- a/src/map/script.h
+++ b/src/map/script.h
@@ -90,5 +90,4 @@ int script_reload(void);
 
 extern char mapreg_txt[];
 
-#endif
-
+#endif /* _SCRIPT_H_ */
diff --git a/src/map/skill.h b/src/map/skill.h
index ddb9042a0..cab8039c0 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -956,4 +956,4 @@ enum {
 	UNT_GROUNDDRIFT_FIRE,
 };
 
-#endif
+#endif /* _SKILL_H_ */
diff --git a/src/map/status.h b/src/map/status.h
index ce8fbd827..3c8d37e69 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -657,4 +657,4 @@ int status_check_visibility(struct block_list *src, struct block_list *target);
 int status_readdb(void);
 int do_init_status(void);
 
-#endif
+#endif /* _STATUS_H_ */
diff --git a/src/map/storage.h b/src/map/storage.h
index 2140a2ec5..a9f109319 100644
--- a/src/map/storage.h
+++ b/src/map/storage.h
@@ -42,4 +42,4 @@ int storage_comp_item(const void *_i1, const void *_i2);
 void sortage_sortitem(struct storage* stor);
 void sortage_gsortitem(struct guild_storage* gstor);
 
-#endif
+#endif /* _STORAGE_H_ */
diff --git a/src/map/trade.h b/src/map/trade.h
index bcd609271..cbcf34f2a 100644
--- a/src/map/trade.h
+++ b/src/map/trade.h
@@ -12,4 +12,4 @@ void trade_tradeok(struct map_session_data *sd);
 void trade_tradecancel(struct map_session_data *sd);
 void trade_tradecommit(struct map_session_data *sd);
 
-#endif	// _TRADE_H_
+#endif /* _TRADE_H_ */
diff --git a/src/map/unit.c b/src/map/unit.c
index 80e0137cf..79dcd3a80 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -1,6 +1,6 @@
-// Copyright (c) jAthena Dev Teams - Licensed under GNU GPL
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
-// Merged originally from jA by Skotlex
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/map/unit.h b/src/map/unit.h
index 9b53f90bf..32fc3cce7 100644
--- a/src/map/unit.h
+++ b/src/map/unit.h
@@ -1,6 +1,6 @@
-// Copyright (c) jAthena Dev Teams - Licensed under GNU GPL
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
-// Merged originally from jA by Skotlex
+
 #ifndef _UNIT_H_
 #define _UNIT_H_
 
@@ -69,4 +69,5 @@ int do_final_unit(void);
 
 extern const int dirx[8];
 extern const int diry[8];
+
 #endif /* _UNIT_H_ */
diff --git a/src/map/vending.h b/src/map/vending.h
index f4014a894..d9db08b6d 100644
--- a/src/map/vending.h
+++ b/src/map/vending.h
@@ -11,4 +11,4 @@ void vending_openvending(struct map_session_data *sd,int len,char *message,int f
 void vending_vendinglistreq(struct map_session_data *sd,int id);
 void vending_purchasereq(struct map_session_data *sd,int len,int id,unsigned char *p);
 
-#endif	// _VENDING_H_
+#endif /* _VENDING_H_ */