Rename files for C++ conversion. Does not compile.

After updating, you can remove these files, as shown in 'git status':

 Untracked files:
   (use "git add <file>..." to include in what will be committed)

	src/map/magic-interpreter-lexer.c
	src/map/magic-interpreter-parser.c
	src/map/magic-interpreter-parser.h

49 files changed, 432 insertions, 432 deletions

diff --git a/src/map/atcommand.c b/src/map/atcommand.cpp
index 88e756d..8f62ca2 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.cpp
@@ -10,29 +10,29 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/mt_rand.h"
-
-#include "atcommand.h"
-#include "battle.h"
-#include "clif.h"
-#include "chrif.h"
-#include "guild.h"
-#include "intif.h"
-#include "itemdb.h"
-#include "map.h"
-#include "mob.h"
-#include "npc.h"
-#include "pc.h"
-#include "party.h"
-#include "script.h"
-#include "skill.h"
-#include "trade.h"
-
-#include "../common/core.h"
-#include "tmw.h"
+#include "../common/socket.hpp"
+#include "../common/timer.hpp"
+#include "../common/nullpo.hpp"
+#include "../common/mt_rand.hpp"
+
+#include "atcommand.hpp"
+#include "battle.hpp"
+#include "clif.hpp"
+#include "chrif.hpp"
+#include "guild.hpp"
+#include "intif.hpp"
+#include "itemdb.hpp"
+#include "map.hpp"
+#include "mob.hpp"
+#include "npc.hpp"
+#include "pc.hpp"
+#include "party.hpp"
+#include "script.hpp"
+#include "skill.hpp"
+#include "trade.hpp"
+
+#include "../common/core.hpp"
+#include "tmw.hpp"
 
 #define STATE_BLIND 0x10
 
diff --git a/src/map/atcommand.h b/src/map/atcommand.hpp
index 0b141cb..824a7cf 100644
--- a/src/map/atcommand.h
+++ b/src/map/atcommand.hpp
@@ -1,8 +1,8 @@
 // $Id: atcommand.h 148 2004-09-30 14:05:37Z MouseJstr $
-#ifndef _ATCOMMAND_H_
-#define _ATCOMMAND_H_
+#ifndef ATCOMMAND_HPP
+#define ATCOMMAND_HPP
 
-#include "map.h"
+#include "map.hpp"
 
 enum AtCommandType
 {
diff --git a/src/map/battle.c b/src/map/battle.cpp
index 5e87b07..a46db13 100644
--- a/src/map/battle.c
+++ b/src/map/battle.cpp
@@ -4,23 +4,23 @@
 #include <string.h>
 #include <math.h>
 
-#include "battle.h"
+#include "battle.hpp"
 
-#include "../common/timer.h"
-#include "../common/nullpo.h"
+#include "../common/timer.hpp"
+#include "../common/nullpo.hpp"
 
-#include "clif.h"
-#include "guild.h"
-#include "itemdb.h"
-#include "map.h"
-#include "mob.h"
-#include "pc.h"
-#include "skill.h"
-#include "../common/socket.h"
-#include "../common/mt_rand.h"
+#include "clif.hpp"
+#include "guild.hpp"
+#include "itemdb.hpp"
+#include "map.hpp"
+#include "mob.hpp"
+#include "pc.hpp"
+#include "skill.hpp"
+#include "../common/socket.hpp"
+#include "../common/mt_rand.hpp"
 
 #ifdef MEMWATCH
-#include "memwatch.h"
+#include "memwatch.hpp"
 #endif
 
 int  attr_fix_table[4][10][10];
diff --git a/src/map/battle.h b/src/map/battle.hpp
index 66ca3d4..5f2a22f 100644
--- a/src/map/battle.h
+++ b/src/map/battle.hpp
@@ -1,6 +1,6 @@
 // $Id: battle.h,v 1.6 2004/09/29 21:08:17 Akitasha Exp $
-#ifndef _BATTLE_H_
-#define _BATTLE_H_
+#ifndef BATTLE_HPP
+#define BATTLE_HPP
 
 // ダメージ
 struct Damage
diff --git a/src/map/chat.c b/src/map/chat.cpp
index ccb75df..0615b41 100644
--- a/src/map/chat.c
+++ b/src/map/chat.cpp
@@ -3,16 +3,16 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../common/db.h"
-#include "../common/nullpo.h"
-#include "map.h"
-#include "clif.h"
-#include "pc.h"
-#include "chat.h"
-#include "npc.h"
+#include "../common/db.hpp"
+#include "../common/nullpo.hpp"
+#include "map.hpp"
+#include "clif.hpp"
+#include "pc.hpp"
+#include "chat.hpp"
+#include "npc.hpp"
 
 #ifdef MEMWATCH
-#include "memwatch.h"
+#include "memwatch.hpp"
 #endif
 
 int  chat_triggerevent (struct chat_data *cd);
diff --git a/src/map/chat.h b/src/map/chat.hpp
index 7f61f54..3a9ccb6 100644
--- a/src/map/chat.h
+++ b/src/map/chat.hpp
@@ -1,8 +1,8 @@
 // $Id: chat.h,v 1.3 2004/09/25 05:32:18 MouseJstr Exp $
-#ifndef _CHAT_H_
-#define _CHAT_H_
+#ifndef CHAT_HPP
+#define CHAT_HPP
 
-#include "map.h"
+#include "map.hpp"
 
 int  chat_createchat (struct map_session_data *, int, int, char *, char *,
                       int);
diff --git a/src/map/chrif.c b/src/map/chrif.cpp
index 5e2cd4c..0223e67 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.cpp
@@ -13,20 +13,20 @@
 #include <sys/types.h>
 #include <time.h>
 
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "map.h"
-#include "battle.h"
-#include "chrif.h"
-#include "clif.h"
-#include "intif.h"
-#include "npc.h"
-#include "pc.h"
-#include "../common/nullpo.h"
-#include "itemdb.h"
+#include "../common/socket.hpp"
+#include "../common/timer.hpp"
+#include "map.hpp"
+#include "battle.hpp"
+#include "chrif.hpp"
+#include "clif.hpp"
+#include "intif.hpp"
+#include "npc.hpp"
+#include "pc.hpp"
+#include "../common/nullpo.hpp"
+#include "itemdb.hpp"
 
 #ifdef MEMWATCH
-#include "memwatch.h"
+#include "memwatch.hpp"
 #endif
 
 static const int packet_len_table[0x20] = {
diff --git a/src/map/chrif.h b/src/map/chrif.hpp
index e891be7..5b0341e 100644
--- a/src/map/chrif.h
+++ b/src/map/chrif.hpp
@@ -1,6 +1,6 @@
 // $Id: chrif.h,v 1.3 2004/09/25 11:39:17 MouseJstr Exp $
-#ifndef _CHRIF_H_
-#define _CHRIF_H_
+#ifndef CHRIF_HPP
+#define CHRIF_HPP
 
 void chrif_setuserid (char *);
 void chrif_setpasswd (char *);
diff --git a/src/map/clif.c b/src/map/clif.cpp
index 30348fe..2d6ddf1 100644
--- a/src/map/clif.c
+++ b/src/map/clif.cpp
@@ -18,35 +18,35 @@
 #endif
 #include <time.h>
 
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/version.h"
-#include "../common/nullpo.h"
-#include "../common/md5calc.h"
-#include "../common/mt_rand.h"
-
-#include "atcommand.h"
-#include "battle.h"
-#include "chat.h"
-#include "chrif.h"
-#include "clif.h"
-#include "guild.h"
-#include "intif.h"
-#include "itemdb.h"
-#include "magic.h"
-#include "map.h"
-#include "mob.h"
-#include "npc.h"
-#include "party.h"
-#include "pc.h"
-#include "script.h"
-#include "skill.h"
-#include "storage.h"
-#include "tmw.h"
-#include "trade.h"
+#include "../common/socket.hpp"
+#include "../common/timer.hpp"
+#include "../common/version.hpp"
+#include "../common/nullpo.hpp"
+#include "../common/md5calc.hpp"
+#include "../common/mt_rand.hpp"
+
+#include "atcommand.hpp"
+#include "battle.hpp"
+#include "chat.hpp"
+#include "chrif.hpp"
+#include "clif.hpp"
+#include "guild.hpp"
+#include "intif.hpp"
+#include "itemdb.hpp"
+#include "magic.hpp"
+#include "map.hpp"
+#include "mob.hpp"
+#include "npc.hpp"
+#include "party.hpp"
+#include "pc.hpp"
+#include "script.hpp"
+#include "skill.hpp"
+#include "storage.hpp"
+#include "tmw.hpp"
+#include "trade.hpp"
 
 #ifdef MEMWATCH
-#include "memwatch.h"
+#include "memwatch.hpp"
 #endif
 
 #define STATE_BLIND 0x10
diff --git a/src/map/clif.h b/src/map/clif.hpp
index a1914e3..f484a18 100644
--- a/src/map/clif.h
+++ b/src/map/clif.hpp
@@ -1,6 +1,6 @@
 // $Id: clif.h,v 1.4 2004/09/25 05:32:18 MouseJstr Exp $
-#ifndef _CLIF_H_
-#define _CLIF_H_
+#ifndef CLIF_HPP
+#define CLIF_HPP
 
 #include <sys/types.h>
 
@@ -13,7 +13,7 @@ typedef unsigned int in_addr_t;
 #include <arpa/inet.h>
 #endif
 
-#include "map.h"
+#include "map.hpp"
 
 void clif_setip (char *);
 void clif_setport (int);
@@ -105,7 +105,7 @@ int  clif_tradecancelled (struct map_session_data *sd);
 int  clif_tradecompleted (struct map_session_data *sd, int fail);
 
 // storage
-#include "storage.h"
+#include "storage.hpp"
 int  clif_storageitemlist (struct map_session_data *sd, struct storage *stor);
 int  clif_storageequiplist (struct map_session_data *sd,
                             struct storage *stor);
diff --git a/src/map/guild.c b/src/map/guild.cpp
index e4e0ca8..c001f78 100644
--- a/src/map/guild.c
+++ b/src/map/guild.cpp
@@ -3,23 +3,23 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "guild.h"
-#include "storage.h"
-#include "../common/db.h"
-#include "../common/timer.h"
-#include "../common/socket.h"
-#include "../common/nullpo.h"
-#include "battle.h"
-#include "npc.h"
-#include "pc.h"
-#include "map.h"
-#include "mob.h"
-#include "intif.h"
-#include "clif.h"
-#include "tmw.h"
+#include "guild.hpp"
+#include "storage.hpp"
+#include "../common/db.hpp"
+#include "../common/timer.hpp"
+#include "../common/socket.hpp"
+#include "../common/nullpo.hpp"
+#include "battle.hpp"
+#include "npc.hpp"
+#include "pc.hpp"
+#include "map.hpp"
+#include "mob.hpp"
+#include "intif.hpp"
+#include "clif.hpp"
+#include "tmw.hpp"
 
 #ifdef MEMWATCH
-#include "memwatch.h"
+#include "memwatch.hpp"
 #endif
 
 static struct dbt *guild_db;
diff --git a/src/map/guild.h b/src/map/guild.hpp
index 8e7c32e..f6d1356 100644
--- a/src/map/guild.h
+++ b/src/map/guild.hpp
@@ -1,6 +1,6 @@
 // $Id: guild.h,v 1.4 2004/09/25 05:32:18 MouseJstr Exp $
-#ifndef _GUILD_H_
-#define _GUILD_H_
+#ifndef GUILD_HPP
+#define GUILD_HPP
 
 struct map_session_data;
 struct mob_data;
diff --git a/src/map/intif.c b/src/map/intif.cpp
index 7069e3a..3ccb13a 100644
--- a/src/map/intif.c
+++ b/src/map/intif.cpp
@@ -18,22 +18,22 @@
 #include <fcntl.h>
 #include <string.h>
 
-#include "../common/nullpo.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-
-#include "battle.h"
-#include "chrif.h"
-#include "clif.h"
-#include "guild.h"
-#include "intif.h"
-#include "map.h"
-#include "party.h"
-#include "pc.h"
-#include "storage.h"
+#include "../common/nullpo.hpp"
+#include "../common/socket.hpp"
+#include "../common/timer.hpp"
+
+#include "battle.hpp"
+#include "chrif.hpp"
+#include "clif.hpp"
+#include "guild.hpp"
+#include "intif.hpp"
+#include "map.hpp"
+#include "party.hpp"
+#include "pc.hpp"
+#include "storage.hpp"
 
 #ifdef MEMWATCH
-#include "memwatch.h"
+#include "memwatch.hpp"
 #endif
 
 static const int packet_len_table[] = {
diff --git a/src/map/intif.h b/src/map/intif.hpp
index 374c95a..dc002e5 100644
--- a/src/map/intif.h
+++ b/src/map/intif.hpp
@@ -1,6 +1,6 @@
 // $Id: intif.h,v 1.2 2004/09/25 05:32:18 MouseJstr Exp $
-#ifndef _INTIF_H_
-#define _INFIF_H_
+#ifndef INTIF_HPP
+#define INFIF_HPP
 
 int  intif_parse (int fd);
 
diff --git a/src/map/itemdb.c b/src/map/itemdb.cpp
index f89446b..c1255bd 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.cpp
@@ -3,19 +3,19 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../common/db.h"
-#include "../common/grfio.h"
-#include "../common/nullpo.h"
-#include "map.h"
-#include "battle.h"
-#include "itemdb.h"
-#include "script.h"
-#include "pc.h"
-#include "../common/socket.h"
-#include "../common/mt_rand.h"
+#include "../common/db.hpp"
+#include "../common/grfio.hpp"
+#include "../common/nullpo.hpp"
+#include "map.hpp"
+#include "battle.hpp"
+#include "itemdb.hpp"
+#include "script.hpp"
+#include "pc.hpp"
+#include "../common/socket.hpp"
+#include "../common/mt_rand.hpp"
 
 #ifdef MEMWATCH
-#include "memwatch.h"
+#include "memwatch.hpp"
 #endif
 
 #define MAX_RANDITEM	2000
diff --git a/src/map/itemdb.h b/src/map/itemdb.hpp
index de07822..ef5eab2 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.hpp
@@ -1,8 +1,8 @@
 // $Id: itemdb.h,v 1.3 2004/09/25 05:32:18 MouseJstr Exp $
-#ifndef _ITEMDB_H_
-#define _ITEMDB_H_
+#ifndef ITEMDB_HPP
+#define ITEMDB_HPP
 
-#include "map.h"
+#include "map.hpp"
 
 struct item_data
 {
diff --git a/src/map/magic-expr-eval.h b/src/map/magic-expr-eval.hpp
index 71c1d86..71c1d86 100644
--- a/src/map/magic-expr-eval.h
+++ b/src/map/magic-expr-eval.hpp
diff --git a/src/map/magic-expr.c b/src/map/magic-expr.cpp
index a0a4935..d75042d 100644
--- a/src/map/magic-expr.c
+++ b/src/map/magic-expr.cpp
@@ -1,9 +1,9 @@
-#include "magic-expr.h"
-#include "magic-expr-eval.h"
-#include "itemdb.h"
+#include "magic-expr.hpp"
+#include "magic-expr-eval.hpp"
+#include "itemdb.hpp"
 #include <math.h>
 
-#include "../common/mt_rand.h"
+#include "../common/mt_rand.hpp"
 
 #define IS_SOLID(c) ((c) == 1 || (c) == 5)
 
diff --git a/src/map/magic-expr.h b/src/map/magic-expr.hpp
index e912d14..4551585 100644
--- a/src/map/magic-expr.h
+++ b/src/map/magic-expr.hpp
@@ -1,7 +1,7 @@
-#ifndef MAGIC_EXPR_H_
-#define MAGIC_EXPR_H_
-#include "magic-interpreter.h"
-#include "magic-interpreter-aux.h"
+#ifndef MAGIC_EXPR_HPP
+#define MAGIC_EXPR_HPP
+#include "magic-interpreter.hpp"
+#include "magic-interpreter-aux.hpp"
 
 #ifndef MAX
 #  define MAX(x,y) (((x)>(y)) ? (x) : (y))
diff --git a/src/map/magic-interpreter-aux.h b/src/map/magic-interpreter-aux.hpp
index 975e502..ea05b88 100644
--- a/src/map/magic-interpreter-aux.h
+++ b/src/map/magic-interpreter-aux.hpp
@@ -1,5 +1,5 @@
-#ifndef MAGIC_INTERPRETER_AUX_H_
-#define MAGIC_INTERPRETER_AUX_H_
+#ifndef MAGIC_INTERPRETER_AUX_HPP
+#define MAGIC_INTERPRETER_AUX_HPP
 
 #define CHECK_TYPE(v, t) ((v)->ty == t)
 
diff --git a/src/map/magic-interpreter-base.c b/src/map/magic-interpreter-base.cpp
index 671f962..1dc90a5 100644
--- a/src/map/magic-interpreter-base.c
+++ b/src/map/magic-interpreter-base.cpp
@@ -1,7 +1,7 @@
-#include "magic.h"
-#include "magic-interpreter.h"
-#include "magic-expr.h"
-#include "magic-interpreter-aux.h"
+#include "magic.hpp"
+#include "magic-interpreter.hpp"
+#include "magic-expr.hpp"
+#include "magic-interpreter-aux.hpp"
 
 static void set_int_p (val_t * v, int i, int t)
 {
diff --git a/src/map/magic-interpreter-lexer.l b/src/map/magic-interpreter-lexer.lpp
index 2c9792f..c7f9c09 100644
--- a/src/map/magic-interpreter-lexer.l
+++ b/src/map/magic-interpreter-lexer.lpp
@@ -1,6 +1,6 @@
 %{
-#include "magic-interpreter.h"
-#include "magic-interpreter-parser.h"
+#include "magic-interpreter.hpp"
+#include "magic-interpreter-parser.hpp"
 
 #ifdef HEADING
 #  undef HEADING
diff --git a/src/map/magic-interpreter-parser.y b/src/map/magic-interpreter-parser.ypp
index 9df0f3e..2648be9 100644
--- a/src/map/magic-interpreter-parser.y
+++ b/src/map/magic-interpreter-parser.ypp
@@ -1,6 +1,6 @@
 %{
-#include "magic-interpreter.h"
-#include "magic-expr.h"
+#include "magic-interpreter.hpp"
+#include "magic-expr.hpp"
 #include <stdarg.h>
 
 magic_conf_t magic_conf;
diff --git a/src/map/magic-interpreter.h b/src/map/magic-interpreter.hpp
index 0b4b73c..e040975 100644
--- a/src/map/magic-interpreter.h
+++ b/src/map/magic-interpreter.hpp
@@ -1,34 +1,34 @@
 /* Magic interpreter */
 
-#ifndef MAGIC_INTERPRETER_H
-#define MAGIC_INTERPRETER_H
+#ifndef MAGIC_INTERPRETER_HPP
+#define MAGIC_INTERPRETER_HPP
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 
-#include "../common/nullpo.h"
-
-#include "battle.h"
-#include "chat.h"
-#include "chrif.h"
-#include "clif.h"
-#include "intif.h"
-#include "itemdb.h"
-#include "magic.h"
-#include "map.h"
-#include "mob.h"
-#include "npc.h"
-#include "pc.h"
-#include "party.h"
-#include "script.h"
-#include "skill.h"
-#include "storage.h"
-#include "trade.h"
-
-#include "../common/timer.h"
-#include "../common/socket.h"
+#include "../common/nullpo.hpp"
+
+#include "battle.hpp"
+#include "chat.hpp"
+#include "chrif.hpp"
+#include "clif.hpp"
+#include "intif.hpp"
+#include "itemdb.hpp"
+#include "magic.hpp"
+#include "map.hpp"
+#include "mob.hpp"
+#include "npc.hpp"
+#include "pc.hpp"
+#include "party.hpp"
+#include "script.hpp"
+#include "skill.hpp"
+#include "storage.hpp"
+#include "trade.hpp"
+
+#include "../common/timer.hpp"
+#include "../common/socket.hpp"
 
 #define SPELLARG_NONE	0       /* No spell parameter */
 #define SPELLARG_PC	1           /* Spell parameter describes pc (defaults to self) */
diff --git a/src/map/magic-stmt.c b/src/map/magic-stmt.cpp
index 5569217..20130dd 100644
--- a/src/map/magic-stmt.c
+++ b/src/map/magic-stmt.cpp
@@ -1,7 +1,7 @@
-#include "magic-interpreter.h"
-#include "magic-expr.h"
-#include "magic-expr-eval.h"
-#include "magic-interpreter-aux.h"
+#include "magic-interpreter.hpp"
+#include "magic-expr.hpp"
+#include "magic-expr-eval.hpp"
+#include "magic-interpreter-aux.hpp"
 
 int
  clif_spawn_fake_npc_for_player (struct map_session_data *sd,
diff --git a/src/map/magic.c b/src/map/magic.cpp
index 797dc16..03b18a4 100644
--- a/src/map/magic.c
+++ b/src/map/magic.cpp
@@ -3,7 +3,7 @@
 #include <string.h>
 #include <math.h>
 
-#include "magic-interpreter.h"
+#include "magic-interpreter.hpp"
 
 #undef DEBUG
 
diff --git a/src/map/magic.h b/src/map/magic.hpp
index 1979914..0c776ea 100644
--- a/src/map/magic.h
+++ b/src/map/magic.hpp
@@ -1,8 +1,8 @@
-#ifndef MAGIC_H_
-#define MAGIC_H_
+#ifndef MAGIC_HPP
+#define MAGIC_HPP
 
-#include "clif.h"
-#include "intif.h"
+#include "clif.hpp"
+#include "intif.hpp"
 
 #define MAGIC_CONFIG_FILE "conf/magic.conf"
 
diff --git a/src/map/map.c b/src/map/map.cpp
index d840486..3c778df 100644
--- a/src/map/map.c
+++ b/src/map/map.cpp
@@ -9,34 +9,34 @@
 #include <netdb.h>
 #endif
 
-#include "../common/core.h"
-#include "../common/timer.h"
-#include "../common/db.h"
-#include "../common/grfio.h"
-#include "../common/mt_rand.h"
-#include "map.h"
-#include "chrif.h"
-#include "clif.h"
-#include "intif.h"
-#include "npc.h"
-#include "pc.h"
-#include "mob.h"
-#include "chat.h"
-#include "itemdb.h"
-#include "storage.h"
-#include "skill.h"
-#include "trade.h"
-#include "party.h"
-#include "battle.h"
-#include "script.h"
-#include "guild.h"
-#include "atcommand.h"
-#include "../common/nullpo.h"
-#include "../common/socket.h"
-#include "magic.h"
+#include "../common/core.hpp"
+#include "../common/timer.hpp"
+#include "../common/db.hpp"
+#include "../common/grfio.hpp"
+#include "../common/mt_rand.hpp"
+#include "map.hpp"
+#include "chrif.hpp"
+#include "clif.hpp"
+#include "intif.hpp"
+#include "npc.hpp"
+#include "pc.hpp"
+#include "mob.hpp"
+#include "chat.hpp"
+#include "itemdb.hpp"
+#include "storage.hpp"
+#include "skill.hpp"
+#include "trade.hpp"
+#include "party.hpp"
+#include "battle.hpp"
+#include "script.hpp"
+#include "guild.hpp"
+#include "atcommand.hpp"
+#include "../common/nullpo.hpp"
+#include "../common/socket.hpp"
+#include "magic.hpp"
 
 #ifdef MEMWATCH
-#include "memwatch.h"
+#include "memwatch.hpp"
 #endif
 
 // 極力 staticでローカルに収める
diff --git a/src/map/map.h b/src/map/map.hpp
index a480cd0..5d3e0a2 100644
--- a/src/map/map.h
+++ b/src/map/map.hpp
@@ -1,15 +1,15 @@
 // $Id: map.h,v 1.8 2004/09/25 11:39:17 MouseJstr Exp $
-#ifndef _MAP_H_
-#define _MAP_H_
+#ifndef MAP_HPP
+#define MAP_HPP
 
 #include <stdio.h>
 #include <stdarg.h>
 #include <time.h>
 #include <sys/time.h>
 #include <netinet/in.h>
-#include "../common/mmo.h"
-#include "../common/timer.h"
-#include "../common/db.h"
+#include "../common/mmo.hpp"
+#include "../common/timer.hpp"
+#include "../common/db.hpp"
 
 #ifndef MAX
 #  define MAX(x,y) (((x)>(y)) ? (x) : (y))
diff --git a/src/map/mob.c b/src/map/mob.cpp
index 7be069e..a722920 100644
--- a/src/map/mob.c
+++ b/src/map/mob.cpp
@@ -5,25 +5,25 @@
 #include <stdarg.h>
 #include <string.h>
 
-#include "../common/timer.h"
-#include "../common/socket.h"
-#include "../common/db.h"
-#include "../common/nullpo.h"
-#include "../common/mt_rand.h"
-#include "map.h"
-#include "clif.h"
-#include "intif.h"
-#include "pc.h"
-#include "mob.h"
-#include "guild.h"
-#include "itemdb.h"
-#include "skill.h"
-#include "battle.h"
-#include "party.h"
-#include "npc.h"
+#include "../common/timer.hpp"
+#include "../common/socket.hpp"
+#include "../common/db.hpp"
+#include "../common/nullpo.hpp"
+#include "../common/mt_rand.hpp"
+#include "map.hpp"
+#include "clif.hpp"
+#include "intif.hpp"
+#include "pc.hpp"
+#include "mob.hpp"
+#include "guild.hpp"
+#include "itemdb.hpp"
+#include "skill.hpp"
+#include "battle.hpp"
+#include "party.hpp"
+#include "npc.hpp"
 
 #ifdef MEMWATCH
-#include "memwatch.h"
+#include "memwatch.hpp"
 #endif
 
 #ifndef max
diff --git a/src/map/mob.h b/src/map/mob.hpp
index b5d642a..6161bab 100644
--- a/src/map/mob.h
+++ b/src/map/mob.hpp
@@ -1,7 +1,7 @@
 // $Id: mob.h,v 1.4 2004/09/25 05:32:18 MouseJstr Exp $
-#ifndef _MOB_H_
-#define _MOB_H_
-#include "../common/timer.h"
+#ifndef MOB_HPP
+#define MOB_HPP
+#include "../common/timer.hpp"
 #define MAX_RANDOMMONSTER 3
 
 struct mob_skill
diff --git a/src/map/npc.c b/src/map/npc.cpp
index a925430..b2612f0 100644
--- a/src/map/npc.c
+++ b/src/map/npc.cpp
@@ -6,24 +6,24 @@
 #include <math.h>
 #include <time.h>
 
-#include "../common/nullpo.h"
-#include "../common/timer.h"
-
-#include "battle.h"
-#include "clif.h"
-#include "../common/db.h"
-#include "intif.h"
-#include "itemdb.h"
-#include "map.h"
-#include "mob.h"
-#include "npc.h"
-#include "pc.h"
-#include "script.h"
-#include "skill.h"
-#include "../common/socket.h"
+#include "../common/nullpo.hpp"
+#include "../common/timer.hpp"
+
+#include "battle.hpp"
+#include "clif.hpp"
+#include "../common/db.hpp"
+#include "intif.hpp"
+#include "itemdb.hpp"
+#include "map.hpp"
+#include "mob.hpp"
+#include "npc.hpp"
+#include "pc.hpp"
+#include "script.hpp"
+#include "skill.hpp"
+#include "../common/socket.hpp"
 
 #ifdef MEMWATCH
-#include "memwatch.h"
+#include "memwatch.hpp"
 #endif
 
 struct npc_src_list
diff --git a/src/map/npc.h b/src/map/npc.hpp
index 757c7ab..6bb9370 100644
--- a/src/map/npc.h
+++ b/src/map/npc.hpp
@@ -1,6 +1,6 @@
 // $Id: npc.h,v 1.5 2004/09/25 11:39:17 MouseJstr Exp $
-#ifndef _NPC_H_
-#define _NPC_H_
+#ifndef NPC_HPP
+#define NPC_HPP
 
 #define START_NPC_NUM 110000000
 
diff --git a/src/map/party.c b/src/map/party.cpp
index 6c2e627..1c4088a 100644
--- a/src/map/party.c
+++ b/src/map/party.cpp
@@ -3,21 +3,21 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "party.h"
-#include "../common/db.h"
-#include "../common/timer.h"
-#include "../common/socket.h"
-#include "../common/nullpo.h"
-#include "pc.h"
-#include "map.h"
-#include "battle.h"
-#include "intif.h"
-#include "clif.h"
-#include "skill.h"
-#include "tmw.h"
+#include "party.hpp"
+#include "../common/db.hpp"
+#include "../common/timer.hpp"
+#include "../common/socket.hpp"
+#include "../common/nullpo.hpp"
+#include "pc.hpp"
+#include "map.hpp"
+#include "battle.hpp"
+#include "intif.hpp"
+#include "clif.hpp"
+#include "skill.hpp"
+#include "tmw.hpp"
 
 #ifdef MEMWATCH
-#include "memwatch.h"
+#include "memwatch.hpp"
 #endif
 
 #define PARTY_SEND_XYHP_INVERVAL	1000    // 座標やＨＰ送信の間隔
diff --git a/src/map/party.h b/src/map/party.hpp
index 2e8bf78..e40609a 100644
--- a/src/map/party.h
+++ b/src/map/party.hpp
@@ -1,6 +1,6 @@
 // $Id: party.h,v 1.3 2004/09/25 05:32:18 MouseJstr Exp $
-#ifndef _PARTY_H_
-#define _PARTY_H_
+#ifndef PARTY_HPP
+#define PARTY_HPP
 
 #include <stdarg.h>
 
diff --git a/src/map/path.c b/src/map/path.cpp
index 7a864ed..b68dae6 100644
--- a/src/map/path.c
+++ b/src/map/path.cpp
@@ -3,12 +3,12 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "map.h"
-#include "battle.h"
-#include "../common/nullpo.h"
+#include "map.hpp"
+#include "battle.hpp"
+#include "../common/nullpo.hpp"
 
 #ifdef MEMWATCH
-#include "memwatch.h"
+#include "memwatch.hpp"
 #endif
 
 //#define PATH_STANDALONETEST
diff --git a/src/map/pc.c b/src/map/pc.cpp
index 8096679..7d02545 100644
--- a/src/map/pc.c
+++ b/src/map/pc.cpp
@@ -5,33 +5,33 @@
 #include <ctype.h>
 #include <time.h>
 
-#include "../common/socket.h"             // [Valaris]
-#include "../common/timer.h"
-#include "../common/db.h"
-
-#include "../common/nullpo.h"
-#include "../common/mt_rand.h"
-
-#include "atcommand.h"
-#include "battle.h"
-#include "chat.h"
-#include "chrif.h"
-#include "clif.h"
-#include "guild.h"
-#include "intif.h"
-#include "itemdb.h"
-#include "map.h"
-#include "mob.h"
-#include "npc.h"
-#include "party.h"
-#include "pc.h"
-#include "script.h"
-#include "skill.h"
-#include "storage.h"
-#include "trade.h"
+#include "../common/socket.hpp"             // [Valaris]
+#include "../common/timer.hpp"
+#include "../common/db.hpp"
+
+#include "../common/nullpo.hpp"
+#include "../common/mt_rand.hpp"
+
+#include "atcommand.hpp"
+#include "battle.hpp"
+#include "chat.hpp"
+#include "chrif.hpp"
+#include "clif.hpp"
+#include "guild.hpp"
+#include "intif.hpp"
+#include "itemdb.hpp"
+#include "map.hpp"
+#include "mob.hpp"
+#include "npc.hpp"
+#include "party.hpp"
+#include "pc.hpp"
+#include "script.hpp"
+#include "skill.hpp"
+#include "storage.hpp"
+#include "trade.hpp"
 
 #ifdef MEMWATCH
-#include "memwatch.h"
+#include "memwatch.hpp"
 #endif
 
 #define PVP_CALCRANK_INTERVAL 1000  // PVP順位計算の間隔
diff --git a/src/map/pc.h b/src/map/pc.hpp
index 742d9d4..7237957 100644
--- a/src/map/pc.h
+++ b/src/map/pc.hpp
@@ -1,9 +1,9 @@
 // $Id: pc.h,v 1.4 2004/09/25 05:32:18 MouseJstr Exp $
 
-#ifndef _PC_H_
-#define _PC_H_
+#ifndef PC_HPP
+#define PC_HPP
 
-#include "map.h"
+#include "map.hpp"
 
 #define OPTION_MASK 0xd7b8
 #define CART_MASK 0x788
diff --git a/src/map/script.c b/src/map/script.cpp
index 12fbab2..9e851bb 100644
--- a/src/map/script.c
+++ b/src/map/script.cpp
@@ -15,32 +15,32 @@
 #include <time.h>
 #include <math.h>
 
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/lock.h"
-#include "../common/mt_rand.h"
-
-#include "atcommand.h"
-#include "battle.h"
-#include "chat.h"
-#include "chrif.h"
-#include "clif.h"
-#include "../common/db.h"
-#include "guild.h"
-#include "intif.h"
-#include "itemdb.h"
-#include "../common/lock.h"
-#include "map.h"
-#include "mob.h"
-#include "npc.h"
-#include "party.h"
-#include "pc.h"
-#include "script.h"
-#include "skill.h"
-#include "storage.h"
+#include "../common/socket.hpp"
+#include "../common/timer.hpp"
+#include "../common/lock.hpp"
+#include "../common/mt_rand.hpp"
+
+#include "atcommand.hpp"
+#include "battle.hpp"
+#include "chat.hpp"
+#include "chrif.hpp"
+#include "clif.hpp"
+#include "../common/db.hpp"
+#include "guild.hpp"
+#include "intif.hpp"
+#include "itemdb.hpp"
+#include "../common/lock.hpp"
+#include "map.hpp"
+#include "mob.hpp"
+#include "npc.hpp"
+#include "party.hpp"
+#include "pc.hpp"
+#include "script.hpp"
+#include "skill.hpp"
+#include "storage.hpp"
 
 #ifdef MEMWATCH
-#include "memwatch.h"
+#include "memwatch.hpp"
 #endif
 
 #define SCRIPT_BLOCK_SIZE 256
diff --git a/src/map/script.h b/src/map/script.hpp
index 62d3ee1..a96bc5a 100644
--- a/src/map/script.h
+++ b/src/map/script.hpp
@@ -1,6 +1,6 @@
 // $Id: script.h,v 1.2 2004/09/25 05:32:19 MouseJstr Exp $
-#ifndef _SCRIPT_H_
-#define _SCRIPT_H_
+#ifndef SCRIPT_HPP
+#define SCRIPT_HPP
 
 struct script_data
 {
diff --git a/src/map/skill-pools.c b/src/map/skill-pools.cpp
index 0c91360..6ab6ea5 100644
--- a/src/map/skill-pools.c
+++ b/src/map/skill-pools.cpp
@@ -3,25 +3,25 @@
 #include <string.h>
 #include <time.h>
 
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/mt_rand.h"
-#include "magic.h"
-
-#include "battle.h"
-#include "clif.h"
-#include "intif.h"
-#include "itemdb.h"
-#include "map.h"
-#include "mob.h"
-#include "party.h"
-#include "pc.h"
-#include "script.h"
-#include "skill.h"
-#include "../common/socket.h"
+#include "../common/timer.hpp"
+#include "../common/nullpo.hpp"
+#include "../common/mt_rand.hpp"
+#include "magic.hpp"
+
+#include "battle.hpp"
+#include "clif.hpp"
+#include "intif.hpp"
+#include "itemdb.hpp"
+#include "map.hpp"
+#include "mob.hpp"
+#include "party.hpp"
+#include "pc.hpp"
+#include "script.hpp"
+#include "skill.hpp"
+#include "../common/socket.hpp"
 
 #ifdef MEMWATCH
-#include "memwatch.h"
+#include "memwatch.hpp"
 #endif
 
 int  skill_pool_skills[MAX_POOL_SKILLS];
diff --git a/src/map/skill.c b/src/map/skill.cpp
index e232820..779af98 100644
--- a/src/map/skill.c
+++ b/src/map/skill.cpp
@@ -6,25 +6,25 @@
 #include <string.h>
 #include <time.h>
 
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/mt_rand.h"
-#include "magic.h"
-
-#include "battle.h"
-#include "clif.h"
-#include "intif.h"
-#include "itemdb.h"
-#include "map.h"
-#include "mob.h"
-#include "party.h"
-#include "pc.h"
-#include "script.h"
-#include "skill.h"
-#include "../common/socket.h"
+#include "../common/timer.hpp"
+#include "../common/nullpo.hpp"
+#include "../common/mt_rand.hpp"
+#include "magic.hpp"
+
+#include "battle.hpp"
+#include "clif.hpp"
+#include "intif.hpp"
+#include "itemdb.hpp"
+#include "map.hpp"
+#include "mob.hpp"
+#include "party.hpp"
+#include "pc.hpp"
+#include "script.hpp"
+#include "skill.hpp"
+#include "../common/socket.hpp"
 
 #ifdef MEMWATCH
-#include "memwatch.h"
+#include "memwatch.hpp"
 #endif
 
 #define SKILLUNITTIMER_INVERVAL	100
diff --git a/src/map/skill.h b/src/map/skill.hpp
index 6c8795a..e2aaba5 100644
--- a/src/map/skill.h
+++ b/src/map/skill.hpp
@@ -1,11 +1,11 @@
 // $Id: skill.h,v 1.5 2004/09/25 05:32:19 MouseJstr Exp $
-#ifndef _SKILL_H_
-#define _SKILL_H_
+#ifndef SKILL_HPP
+#define SKILL_HPP
 
-#include "../common/timer.h"
+#include "../common/timer.hpp"
 
-#include "map.h"
-#include "magic.h"
+#include "map.hpp"
+#include "magic.hpp"
 
 #define MAX_SKILL_DB			450
 #define MAX_SKILL_PRODUCE_DB	 150
diff --git a/src/map/storage.c b/src/map/storage.cpp
index 4a0d934..d1d3cb0 100644
--- a/src/map/storage.c
+++ b/src/map/storage.cpp
@@ -5,18 +5,18 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../common/db.h"
-#include "../common/nullpo.h"
-
-#include "storage.h"
-#include "chrif.h"
-#include "itemdb.h"
-#include "clif.h"
-#include "intif.h"
-#include "pc.h"
-#include "guild.h"
-#include "battle.h"
-#include "atcommand.h"
+#include "../common/db.hpp"
+#include "../common/nullpo.hpp"
+
+#include "storage.hpp"
+#include "chrif.hpp"
+#include "itemdb.hpp"
+#include "clif.hpp"
+#include "intif.hpp"
+#include "pc.hpp"
+#include "guild.hpp"
+#include "battle.hpp"
+#include "atcommand.hpp"
 
 static struct dbt *storage_db;
 static struct dbt *guild_storage_db;
diff --git a/src/map/storage.h b/src/map/storage.hpp
index daaec2c..22625df 100644
--- a/src/map/storage.h
+++ b/src/map/storage.hpp
@@ -1,10 +1,10 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#ifndef _STORAGE_H_
-#define _STORAGE_H_
+#ifndef STORAGE_HPP
+#define STORAGE_HPP
 
-#include "../common/mmo.h"
+#include "../common/mmo.hpp"
 
 int  storage_storageopen (struct map_session_data *sd);
 int  storage_storageadd (struct map_session_data *sd, int index, int amount);
diff --git a/src/map/tmw.c b/src/map/tmw.cpp
index 3487c1d..7506270 100644
--- a/src/map/tmw.c
+++ b/src/map/tmw.cpp
@@ -4,31 +4,31 @@
 #include <ctype.h>
 #include <stdarg.h>
 
-#include "tmw.h"
-
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/version.h"
-#include "../common/nullpo.h"
-
-#include "atcommand.h"
-#include "battle.h"
-#include "chat.h"
-#include "chrif.h"
-#include "clif.h"
-#include "guild.h"
-#include "intif.h"
-#include "itemdb.h"
-#include "magic.h"
-#include "map.h"
-#include "mob.h"
-#include "npc.h"
-#include "party.h"
-#include "pc.h"
-#include "script.h"
-#include "skill.h"
-#include "storage.h"
-#include "trade.h"
+#include "tmw.hpp"
+
+#include "../common/socket.hpp"
+#include "../common/timer.hpp"
+#include "../common/version.hpp"
+#include "../common/nullpo.hpp"
+
+#include "atcommand.hpp"
+#include "battle.hpp"
+#include "chat.hpp"
+#include "chrif.hpp"
+#include "clif.hpp"
+#include "guild.hpp"
+#include "intif.hpp"
+#include "itemdb.hpp"
+#include "magic.hpp"
+#include "map.hpp"
+#include "mob.hpp"
+#include "npc.hpp"
+#include "party.hpp"
+#include "pc.hpp"
+#include "script.hpp"
+#include "skill.hpp"
+#include "storage.hpp"
+#include "trade.hpp"
 
 int tmw_CheckChatSpam (struct map_session_data *sd, char *message)
 {
diff --git a/src/map/tmw.h b/src/map/tmw.hpp
index 5141159..5b20a6c 100644
--- a/src/map/tmw.h
+++ b/src/map/tmw.hpp
@@ -1,8 +1,8 @@
 //
-#ifndef _TMW_H_
-#define _TMW_H_
+#ifndef TMW_HPP
+#define TMW_HPP
 
-#include "map.h"
+#include "map.hpp"
 
 int  tmw_CheckChatSpam (struct map_session_data *sd, char *message);
 int  tmw_ShorterStrlen (char *s1, char *s2);
@@ -11,4 +11,4 @@ void tmw_GmHackMsg (const char *fmt, ...);
 void tmw_AutoBan (struct map_session_data *sd, char *reason, int length);
 void tmw_TrimStr (char *str);
 
-#endif /* _TMW_H_ */
+#endif /* TMW_H_ */
diff --git a/src/map/trade.c b/src/map/trade.cpp
index ae70f0d..147db1b 100644
--- a/src/map/trade.c
+++ b/src/map/trade.cpp
@@ -1,15 +1,15 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "clif.h"
-#include "itemdb.h"
-#include "map.h"
-#include "trade.h"
-#include "pc.h"
-#include "npc.h"
-#include "battle.h"
-#include "storage.h"
-#include "../common/nullpo.h"
+#include "clif.hpp"
+#include "itemdb.hpp"
+#include "map.hpp"
+#include "trade.hpp"
+#include "pc.hpp"
+#include "npc.hpp"
+#include "battle.hpp"
+#include "storage.hpp"
+#include "../common/nullpo.hpp"
 
 /*==========================================
  * 取引要請を相手に送る
diff --git a/src/map/trade.h b/src/map/trade.hpp
index a846388..1e885f4 100644
--- a/src/map/trade.h
+++ b/src/map/trade.hpp
@@ -1,8 +1,8 @@
 // $Id: trade.h,v 1.2 2004/09/25 05:32:19 MouseJstr Exp $
-#ifndef	_TRADE_H_
-#define	_TRADE_H_
+#ifndef TRADE_HPP
+#define TRADE_HPP
 
-#include "map.h"
+#include "map.hpp"
 void trade_traderequest (struct map_session_data *sd, int target_id);
 void trade_tradeack (struct map_session_data *sd, int type);
 void trade_tradeadditem (struct map_session_data *sd, int index, int amount);
@@ -11,4 +11,4 @@ void trade_tradecancel (struct map_session_data *sd);
 void trade_tradecommit (struct map_session_data *sd);
 void trade_verifyzeny (struct map_session_data *sd);
 
-#endif // _TRADE_H_
+#endif // TRADE_HPP