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

108 files changed, 634 insertions, 950 deletions

diff --git a/.gitignore b/.gitignore
index d59b2ef..361fe2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,8 @@
 /map-server
 /eathena-monitor
 # Generated source files
-src/map/magic-interpreter-parser.h
-src/map/magic-interpreter-parser.c
-src/map/magic-interpreter-lexer.c
-
+/src/map/magic-interpreter-parser.hpp
+/src/map/magic-interpreter-parser.cpp
+/src/map/magic-interpreter-lexer.cpp
+# generated header dependencies
+/deps.make
diff --git a/GNUmakefile b/GNUmakefile
index 4162d7a..b00e55c 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -11,29 +11,29 @@ include make.defs
 	+mkdir -p $@
 
 # The default recipe is suboptimal
-%.c: %.l
+%.cpp: %.lpp
 	$(LEX) -o $@ $<
-%.c %.h: %.y
-	$(BISON) -d -o $*.c $<
+%.cpp %.h: %.ypp
+	$(BISON) -d -o $*.cpp $<
 
 
 # All this duplication is required because make handles pattern rules specially
-${BUILD_DIR}/char/%.o: src/char/%.c | ${BUILD_DIR}/char/
-	$(COMPILE.c) -o $@ $<
-${BUILD_DIR}/common/%.o: src/common/%.c | ${BUILD_DIR}/common/
-	$(COMPILE.c) -o $@ $<
-${BUILD_DIR}/ladmin/%.o: src/ladmin/%.c | ${BUILD_DIR}/ladmin/
-	$(COMPILE.c) -o $@ $<
-${BUILD_DIR}/login/%.o: src/login/%.c | ${BUILD_DIR}/login/
-	$(COMPILE.c) -o $@ $<
-${BUILD_DIR}/map/%.o: src/map/%.c | ${BUILD_DIR}/map/
-	$(COMPILE.c) -o $@ $<
-${BUILD_DIR}/tool/%.o: src/tool/%.c | ${BUILD_DIR}/tool/
-	$(COMPILE.c) -o $@ $<
-${BUILD_DIR}/webserver/%.o: src/webserver/%.c | ${BUILD_DIR}/webserver/
-	$(COMPILE.c) -o $@ $<
-${BUILD_DIR}/webserver/pages/%.o: src/webserver/pages/%.c | ${BUILD_DIR}/webserver/pages/
-	$(COMPILE.c) -o $@ $<
+${BUILD_DIR}/char/%.o: src/char/%.cpp | ${BUILD_DIR}/char/
+	$(COMPILE.cpp) -o $@ $<
+${BUILD_DIR}/common/%.o: src/common/%.cpp | ${BUILD_DIR}/common/
+	$(COMPILE.cpp) -o $@ $<
+${BUILD_DIR}/ladmin/%.o: src/ladmin/%.cpp | ${BUILD_DIR}/ladmin/
+	$(COMPILE.cpp) -o $@ $<
+${BUILD_DIR}/login/%.o: src/login/%.cpp | ${BUILD_DIR}/login/
+	$(COMPILE.cpp) -o $@ $<
+${BUILD_DIR}/map/%.o: src/map/%.cpp | ${BUILD_DIR}/map/
+	$(COMPILE.cpp) -o $@ $<
+${BUILD_DIR}/tool/%.o: src/tool/%.cpp | ${BUILD_DIR}/tool/
+	$(COMPILE.cpp) -o $@ $<
+${BUILD_DIR}/webserver/%.o: src/webserver/%.cpp | ${BUILD_DIR}/webserver/
+	$(COMPILE.cpp) -o $@ $<
+${BUILD_DIR}/webserver/pages/%.o: src/webserver/pages/%.cpp | ${BUILD_DIR}/webserver/pages/
+	$(COMPILE.cpp) -o $@ $<
 
 PROGS = login-server char-server map-server ladmin eathena-monitor webserver
 # Things to actually make
@@ -60,7 +60,6 @@ webserver: ${BUILD_DIR}/webserver/main
 ${BUILD_DIR}/char/char: ${BUILD_DIR}/char/char.o ${BUILD_DIR}/char/inter.o ${BUILD_DIR}/char/int_party.o ${BUILD_DIR}/char/int_guild.o ${BUILD_DIR}/char/int_storage.o ${BUILD_DIR}/common/core.o ${BUILD_DIR}/common/socket.o ${BUILD_DIR}/common/timer.o ${BUILD_DIR}/common/db.o ${BUILD_DIR}/common/lock.o ${BUILD_DIR}/common/mt_rand.o
 ${BUILD_DIR}/ladmin/ladmin: ${BUILD_DIR}/ladmin/ladmin.o ${BUILD_DIR}/common/md5calc.o ${BUILD_DIR}/common/core.o ${BUILD_DIR}/common/socket.o ${BUILD_DIR}/common/timer.o ${BUILD_DIR}/common/db.o ${BUILD_DIR}/common/mt_rand.o
 ${BUILD_DIR}/login/login: ${BUILD_DIR}/login/login.o ${BUILD_DIR}/common/core.o ${BUILD_DIR}/common/socket.o ${BUILD_DIR}/common/timer.o ${BUILD_DIR}/common/db.o ${BUILD_DIR}/common/lock.o ${BUILD_DIR}/common/mt_rand.o ${BUILD_DIR}/common/md5calc.o
-${BUILD_DIR}/map/map: LDLIBS=-lm
 ${BUILD_DIR}/map/map: ${BUILD_DIR}/map/map.o ${BUILD_DIR}/map/tmw.o ${BUILD_DIR}/map/magic-interpreter-lexer.o ${BUILD_DIR}/map/magic-interpreter-parser.o ${BUILD_DIR}/map/magic-interpreter-base.o ${BUILD_DIR}/map/magic-expr.o ${BUILD_DIR}/map/magic-stmt.o ${BUILD_DIR}/map/magic.o ${BUILD_DIR}/map/map.o ${BUILD_DIR}/map/chrif.o ${BUILD_DIR}/map/clif.o ${BUILD_DIR}/map/pc.o ${BUILD_DIR}/map/npc.o ${BUILD_DIR}/map/chat.o ${BUILD_DIR}/map/path.o ${BUILD_DIR}/map/itemdb.o ${BUILD_DIR}/map/mob.o ${BUILD_DIR}/map/script.o ${BUILD_DIR}/map/storage.o ${BUILD_DIR}/map/skill.o ${BUILD_DIR}/map/skill-pools.o ${BUILD_DIR}/map/atcommand.o ${BUILD_DIR}/map/battle.o ${BUILD_DIR}/map/intif.o ${BUILD_DIR}/map/trade.o ${BUILD_DIR}/map/party.o ${BUILD_DIR}/map/guild.o ${BUILD_DIR}/common/core.o ${BUILD_DIR}/common/socket.o ${BUILD_DIR}/common/timer.o ${BUILD_DIR}/common/grfio.o ${BUILD_DIR}/common/db.o ${BUILD_DIR}/common/lock.o ${BUILD_DIR}/common/nullpo.o ${BUILD_DIR}/common/mt_rand.o ${BUILD_DIR}/common/md5calc.o
 ${BUILD_DIR}/tool/eathena-monitor: ${BUILD_DIR}/tool/eathena-monitor.o
 ${BUILD_DIR}/tool/adduser: ${BUILD_DIR}/tool/adduser.o ${BUILD_DIR}/common/socket.o
@@ -70,8 +69,8 @@ ${BUILD_DIR}/tool/marriage-info: ${BUILD_DIR}/tool/marriage-info.o ${BUILD_DIR}/
 ${BUILD_DIR}/webserver/main: ${BUILD_DIR}/webserver/main.o ${BUILD_DIR}/webserver/parse.o ${BUILD_DIR}/webserver/generate.o ${BUILD_DIR}/webserver/htmlstyle.o ${BUILD_DIR}/webserver/logs.o ${BUILD_DIR}/webserver/pages/about.o ${BUILD_DIR}/webserver/pages/sample.o ${BUILD_DIR}/webserver/pages/notdone.o
 
 deps.make:
-	for F in `find src/ -name '*.c'`; do \
-	    gcc -m32 -std=c99 -MM "$$F" -MT "$$(sed 's/src/$${BUILD_DIR}/;s/\.c/.o/' <<< "$$F")"; \
+	for F in `find src/ -name '*.cpp'`; do \
+	    ${CXX} ${CPPFLAGS} -MM "$$F" -MT "$$(sed 's/src/$${BUILD_DIR}/;s/\.cpp/.o/' <<< "$$F")"; \
 	done > deps.make
 
 include deps.make
diff --git a/deps.make b/deps.make
deleted file mode 100644
index 34c7328..0000000
--- a/deps.make
+++ /dev/null
@@ -1,308 +0,0 @@
-${BUILD_DIR}/webserver/main.o: src/webserver/main.c
-${BUILD_DIR}/webserver/logs.o: src/webserver/logs.c
-${BUILD_DIR}/webserver/generate.o: src/webserver/generate.c
-${BUILD_DIR}/webserver/parse.o: src/webserver/parse.c
-${BUILD_DIR}/webserver/pages/about.o: src/webserver/pages/about.c
-${BUILD_DIR}/webserver/pages/notdone.o: src/webserver/pages/notdone.c
-${BUILD_DIR}/webserver/pages/sample.o: src/webserver/pages/sample.c
-${BUILD_DIR}/webserver/htmlstyle.o: src/webserver/htmlstyle.c
-${BUILD_DIR}/common/mt_rand.o: src/common/mt_rand.c src/common/mt_rand.h \
- src/common/sanity.h
-${BUILD_DIR}/common/timer.o: src/common/timer.c src/common/timer.h \
- src/common/sanity.h src/common/utils.h
-${BUILD_DIR}/common/nullpo.o: src/common/nullpo.c src/common/nullpo.h \
- src/common/sanity.h
-${BUILD_DIR}/common/lock.o: src/common/lock.c src/common/lock.h \
- src/common/socket.h src/common/sanity.h
-${BUILD_DIR}/common/grfio.o: src/common/grfio.c src/common/utils.h \
- src/common/grfio.h src/common/mmo.h src/common/socket.h \
- src/common/sanity.h
-${BUILD_DIR}/common/md5calc.o: src/common/md5calc.c src/common/md5calc.h \
- src/common/sanity.h src/common/mt_rand.h
-${BUILD_DIR}/common/dbtest.o: src/common/dbtest.c src/common/db.h \
- src/common/sanity.h
-${BUILD_DIR}/common/db.o: src/common/db.c src/common/db.h \
- src/common/sanity.h src/common/utils.h
-${BUILD_DIR}/common/socket.o: src/common/socket.c src/common/mmo.h \
- src/common/utils.h src/common/socket.h src/common/sanity.h
-${BUILD_DIR}/common/core.o: src/common/core.c src/common/core.h \
- src/common/socket.h src/common/sanity.h src/common/timer.h \
- src/common/version.h src/common/mt_rand.h src/common/nullpo.h
-${BUILD_DIR}/login/login.o: src/login/login.c src/login/../common/core.h \
- src/login/../common/socket.h src/login/../common/sanity.h \
- src/login/../common/timer.h src/login/login.h src/login/../common/mmo.h \
- src/login/../common/utils.h src/login/../common/version.h \
- src/login/../common/db.h src/login/../common/lock.h \
- src/login/../common/mt_rand.h src/login/../common/md5calc.h
-${BUILD_DIR}/char/int_guild.o: src/char/int_guild.c src/char/inter.h \
- src/char/int_guild.h src/char/int_storage.h src/char/../common/mmo.h \
- src/char/../common/utils.h src/char/char.h src/char/../common/socket.h \
- src/char/../common/sanity.h src/char/../common/db.h \
- src/char/../common/lock.h
-${BUILD_DIR}/char/inter.o: src/char/inter.c src/char/../common/mmo.h \
- src/char/../common/utils.h src/char/char.h src/char/../common/socket.h \
- src/char/../common/sanity.h src/char/../common/timer.h \
- src/char/../common/db.h src/char/inter.h src/char/int_party.h \
- src/char/int_guild.h src/char/int_storage.h src/char/../common/lock.h
-${BUILD_DIR}/char/int_party.o: src/char/int_party.c src/char/inter.h \
- src/char/int_party.h src/char/../common/mmo.h src/char/../common/utils.h \
- src/char/char.h src/char/../common/socket.h src/char/../common/sanity.h \
- src/char/../common/db.h src/char/../common/lock.h
-${BUILD_DIR}/char/int_storage.o: src/char/int_storage.c \
- src/char/../common/mmo.h src/char/../common/utils.h \
- src/char/../common/socket.h src/char/../common/sanity.h \
- src/char/../common/db.h src/char/../common/lock.h src/char/char.h \
- src/char/inter.h src/char/int_storage.h src/char/int_guild.h
-${BUILD_DIR}/char/char.o: src/char/char.c src/char/../common/core.h \
- src/char/../common/socket.h src/char/../common/sanity.h \
- src/char/../common/timer.h src/char/../common/mmo.h \
- src/char/../common/utils.h src/char/../common/version.h \
- src/char/../common/lock.h src/char/char.h src/char/inter.h \
- src/char/int_guild.h src/char/int_party.h src/char/int_storage.h
-${BUILD_DIR}/tool/itemfrob.o: src/tool/itemfrob.c \
- src/tool/../common/mmo.h src/tool/../common/utils.h \
- src/tool/../char/char.c src/tool/../char/../common/core.h \
- src/tool/../char/../common/socket.h src/tool/../char/../common/sanity.h \
- src/tool/../char/../common/timer.h src/tool/../char/../common/mmo.h \
- src/tool/../char/../common/version.h src/tool/../char/../common/lock.h \
- src/tool/../char/char.h src/tool/../char/inter.h \
- src/tool/../char/int_guild.h src/tool/../char/int_party.h \
- src/tool/../char/int_storage.h
-${BUILD_DIR}/tool/eathena-monitor.o: src/tool/eathena-monitor.c
-${BUILD_DIR}/tool/adduser.o: src/tool/adduser.c
-${BUILD_DIR}/tool/marriage-info.o: src/tool/marriage-info.c \
- src/tool/../login/login.h src/tool/../common/mmo.h \
- src/tool/../common/utils.h src/tool/../char/char.c \
- src/tool/../char/../common/core.h src/tool/../char/../common/socket.h \
- src/tool/../char/../common/sanity.h src/tool/../char/../common/timer.h \
- src/tool/../char/../common/mmo.h src/tool/../char/../common/version.h \
- src/tool/../char/../common/lock.h src/tool/../char/char.h \
- src/tool/../char/inter.h src/tool/../char/int_guild.h \
- src/tool/../char/int_party.h src/tool/../char/int_storage.h
-${BUILD_DIR}/tool/skillfrob.o: src/tool/skillfrob.c \
- src/tool/../common/mmo.h src/tool/../common/utils.h \
- src/tool/../char/char.c src/tool/../char/../common/core.h \
- src/tool/../char/../common/socket.h src/tool/../char/../common/sanity.h \
- src/tool/../char/../common/timer.h src/tool/../char/../common/mmo.h \
- src/tool/../char/../common/version.h src/tool/../char/../common/lock.h \
- src/tool/../char/char.h src/tool/../char/inter.h \
- src/tool/../char/int_guild.h src/tool/../char/int_party.h \
- src/tool/../char/int_storage.h
-${BUILD_DIR}/tool/convert.o: src/tool/convert.c
-${BUILD_DIR}/tool/mapfrob.o: src/tool/mapfrob.c src/tool/../common/mmo.h \
- src/tool/../common/utils.h src/tool/../char/char.c \
- src/tool/../char/../common/core.h src/tool/../char/../common/socket.h \
- src/tool/../char/../common/sanity.h src/tool/../char/../common/timer.h \
- src/tool/../char/../common/mmo.h src/tool/../char/../common/version.h \
- src/tool/../char/../common/lock.h src/tool/../char/char.h \
- src/tool/../char/inter.h src/tool/../char/int_guild.h \
- src/tool/../char/int_party.h src/tool/../char/int_storage.h
-${BUILD_DIR}/map/itemdb.o: src/map/itemdb.c src/map/../common/db.h \
- src/map/../common/sanity.h src/map/../common/grfio.h \
- src/map/../common/nullpo.h src/map/map.h src/map/../common/mmo.h \
- src/map/../common/utils.h src/map/../common/timer.h src/map/battle.h \
- src/map/itemdb.h src/map/script.h src/map/pc.h \
- src/map/../common/socket.h src/map/../common/mt_rand.h
-${BUILD_DIR}/map/magic.o: src/map/magic.c src/map/magic-interpreter.h \
- src/map/../common/nullpo.h src/map/../common/sanity.h src/map/battle.h \
- src/map/chat.h src/map/map.h src/map/../common/mmo.h \
- src/map/../common/utils.h src/map/../common/timer.h \
- src/map/../common/db.h src/map/chrif.h src/map/clif.h src/map/storage.h \
- src/map/intif.h src/map/itemdb.h src/map/magic.h src/map/mob.h \
- src/map/npc.h src/map/pc.h src/map/party.h src/map/script.h \
- src/map/skill.h src/map/trade.h src/map/../common/socket.h
-${BUILD_DIR}/map/guild.o: src/map/guild.c src/map/guild.h \
- src/map/storage.h src/map/../common/mmo.h src/map/../common/utils.h \
- src/map/../common/db.h src/map/../common/sanity.h \
- src/map/../common/timer.h src/map/../common/socket.h \
- src/map/../common/nullpo.h src/map/battle.h src/map/npc.h src/map/pc.h \
- src/map/map.h src/map/mob.h src/map/intif.h src/map/clif.h src/map/tmw.h
-${BUILD_DIR}/map/mob.o: src/map/mob.c src/map/../common/timer.h \
- src/map/../common/sanity.h src/map/../common/socket.h \
- src/map/../common/db.h src/map/../common/nullpo.h \
- src/map/../common/mt_rand.h src/map/map.h src/map/../common/mmo.h \
- src/map/../common/utils.h src/map/clif.h src/map/storage.h \
- src/map/intif.h src/map/pc.h src/map/mob.h src/map/guild.h \
- src/map/itemdb.h src/map/skill.h src/map/magic.h src/map/battle.h \
- src/map/party.h src/map/npc.h
-${BUILD_DIR}/map/storage.o: src/map/storage.c src/map/../common/db.h \
- src/map/../common/sanity.h src/map/../common/nullpo.h src/map/storage.h \
- src/map/../common/mmo.h src/map/../common/utils.h src/map/chrif.h \
- src/map/itemdb.h src/map/map.h src/map/../common/timer.h src/map/clif.h \
- src/map/intif.h src/map/pc.h src/map/guild.h src/map/battle.h \
- src/map/atcommand.h
-${BUILD_DIR}/map/path.o: src/map/path.c src/map/map.h \
- src/map/../common/mmo.h src/map/../common/utils.h \
- src/map/../common/timer.h src/map/../common/sanity.h \
- src/map/../common/db.h src/map/battle.h src/map/../common/nullpo.h
-${BUILD_DIR}/map/magic-interpreter-parser.o: \
- src/map/magic-interpreter-parser.c src/map/magic-interpreter.h \
- src/map/../common/nullpo.h src/map/../common/sanity.h src/map/battle.h \
- src/map/chat.h src/map/map.h src/map/../common/mmo.h \
- src/map/../common/utils.h src/map/../common/timer.h \
- src/map/../common/db.h src/map/chrif.h src/map/clif.h src/map/storage.h \
- src/map/intif.h src/map/itemdb.h src/map/magic.h src/map/mob.h \
- src/map/npc.h src/map/pc.h src/map/party.h src/map/script.h \
- src/map/skill.h src/map/trade.h src/map/../common/socket.h \
- src/map/magic-expr.h src/map/magic-interpreter-aux.h
-${BUILD_DIR}/map/skill.o: src/map/skill.c src/map/../common/timer.h \
- src/map/../common/sanity.h src/map/../common/nullpo.h \
- src/map/../common/mt_rand.h src/map/magic.h src/map/clif.h src/map/map.h \
- src/map/../common/mmo.h src/map/../common/utils.h src/map/../common/db.h \
- src/map/storage.h src/map/intif.h src/map/battle.h src/map/itemdb.h \
- src/map/mob.h src/map/party.h src/map/pc.h src/map/script.h \
- src/map/skill.h src/map/../common/socket.h
-${BUILD_DIR}/map/magic-interpreter-lexer.o: \
- src/map/magic-interpreter-lexer.c src/map/magic-interpreter.h \
- src/map/../common/nullpo.h src/map/../common/sanity.h src/map/battle.h \
- src/map/chat.h src/map/map.h src/map/../common/mmo.h \
- src/map/../common/utils.h src/map/../common/timer.h \
- src/map/../common/db.h src/map/chrif.h src/map/clif.h src/map/storage.h \
- src/map/intif.h src/map/itemdb.h src/map/magic.h src/map/mob.h \
- src/map/npc.h src/map/pc.h src/map/party.h src/map/script.h \
- src/map/skill.h src/map/trade.h src/map/../common/socket.h \
- src/map/magic-interpreter-parser.h
-${BUILD_DIR}/map/magic-stmt.o: src/map/magic-stmt.c \
- src/map/magic-interpreter.h src/map/../common/nullpo.h \
- src/map/../common/sanity.h src/map/battle.h src/map/chat.h src/map/map.h \
- src/map/../common/mmo.h src/map/../common/utils.h \
- src/map/../common/timer.h src/map/../common/db.h src/map/chrif.h \
- src/map/clif.h src/map/storage.h src/map/intif.h src/map/itemdb.h \
- src/map/magic.h src/map/mob.h src/map/npc.h src/map/pc.h src/map/party.h \
- src/map/script.h src/map/skill.h src/map/trade.h \
- src/map/../common/socket.h src/map/magic-expr.h \
- src/map/magic-interpreter-aux.h src/map/magic-expr-eval.h
-${BUILD_DIR}/map/chat.o: src/map/chat.c src/map/../common/db.h \
- src/map/../common/sanity.h src/map/../common/nullpo.h src/map/map.h \
- src/map/../common/mmo.h src/map/../common/utils.h \
- src/map/../common/timer.h src/map/clif.h src/map/storage.h src/map/pc.h \
- src/map/chat.h src/map/npc.h
-${BUILD_DIR}/map/skill-pools.o: src/map/skill-pools.c \
- src/map/../common/timer.h src/map/../common/sanity.h \
- src/map/../common/nullpo.h src/map/../common/mt_rand.h src/map/magic.h \
- src/map/clif.h src/map/map.h src/map/../common/mmo.h \
- src/map/../common/utils.h src/map/../common/db.h src/map/storage.h \
- src/map/intif.h src/map/battle.h src/map/itemdb.h src/map/mob.h \
- src/map/party.h src/map/pc.h src/map/script.h src/map/skill.h \
- src/map/../common/socket.h
-${BUILD_DIR}/map/trade.o: src/map/trade.c src/map/clif.h src/map/map.h \
- src/map/../common/mmo.h src/map/../common/utils.h \
- src/map/../common/timer.h src/map/../common/sanity.h \
- src/map/../common/db.h src/map/storage.h src/map/itemdb.h \
- src/map/trade.h src/map/pc.h src/map/npc.h src/map/battle.h \
- src/map/../common/nullpo.h
-${BUILD_DIR}/map/party.o: src/map/party.c src/map/party.h \
- src/map/../common/db.h src/map/../common/sanity.h \
- src/map/../common/timer.h src/map/../common/socket.h \
- src/map/../common/nullpo.h src/map/pc.h src/map/map.h \
- src/map/../common/mmo.h src/map/../common/utils.h src/map/battle.h \
- src/map/intif.h src/map/clif.h src/map/storage.h src/map/skill.h \
- src/map/magic.h src/map/tmw.h
-${BUILD_DIR}/map/npc.o: src/map/npc.c src/map/../common/nullpo.h \
- src/map/../common/sanity.h src/map/../common/timer.h src/map/battle.h \
- src/map/clif.h src/map/map.h src/map/../common/mmo.h \
- src/map/../common/utils.h src/map/../common/db.h src/map/storage.h \
- src/map/intif.h src/map/itemdb.h src/map/mob.h src/map/npc.h \
- src/map/pc.h src/map/script.h src/map/skill.h src/map/magic.h \
- src/map/../common/socket.h
-${BUILD_DIR}/map/magic-interpreter-base.o: \
- src/map/magic-interpreter-base.c src/map/magic.h src/map/clif.h \
- src/map/map.h src/map/../common/mmo.h src/map/../common/utils.h \
- src/map/../common/timer.h src/map/../common/sanity.h \
- src/map/../common/db.h src/map/storage.h src/map/intif.h \
- src/map/magic-interpreter.h src/map/../common/nullpo.h src/map/battle.h \
- src/map/chat.h src/map/chrif.h src/map/itemdb.h src/map/mob.h \
- src/map/npc.h src/map/pc.h src/map/party.h src/map/script.h \
- src/map/skill.h src/map/trade.h src/map/../common/socket.h \
- src/map/magic-expr.h src/map/magic-interpreter-aux.h
-${BUILD_DIR}/map/pc.o: src/map/pc.c src/map/../common/socket.h \
- src/map/../common/sanity.h src/map/../common/timer.h \
- src/map/../common/db.h src/map/../common/nullpo.h \
- src/map/../common/mt_rand.h src/map/atcommand.h src/map/map.h \
- src/map/../common/mmo.h src/map/../common/utils.h src/map/battle.h \
- src/map/chat.h src/map/chrif.h src/map/clif.h src/map/storage.h \
- src/map/guild.h src/map/intif.h src/map/itemdb.h src/map/mob.h \
- src/map/npc.h src/map/party.h src/map/pc.h src/map/script.h \
- src/map/skill.h src/map/magic.h src/map/trade.h
-${BUILD_DIR}/map/tmw.o: src/map/tmw.c src/map/tmw.h src/map/map.h \
- src/map/../common/mmo.h src/map/../common/utils.h \
- src/map/../common/timer.h src/map/../common/sanity.h \
- src/map/../common/db.h src/map/../common/socket.h \
- src/map/../common/version.h src/map/../common/nullpo.h \
- src/map/atcommand.h src/map/battle.h src/map/chat.h src/map/chrif.h \
- src/map/clif.h src/map/storage.h src/map/guild.h src/map/intif.h \
- src/map/itemdb.h src/map/magic.h src/map/mob.h src/map/npc.h \
- src/map/party.h src/map/pc.h src/map/script.h src/map/skill.h \
- src/map/trade.h
-${BUILD_DIR}/map/intif.o: src/map/intif.c src/map/../common/nullpo.h \
- src/map/../common/sanity.h src/map/../common/socket.h \
- src/map/../common/timer.h src/map/battle.h src/map/chrif.h \
- src/map/clif.h src/map/map.h src/map/../common/mmo.h \
- src/map/../common/utils.h src/map/../common/db.h src/map/storage.h \
- src/map/guild.h src/map/intif.h src/map/party.h src/map/pc.h
-${BUILD_DIR}/map/magic-expr.o: src/map/magic-expr.c src/map/magic-expr.h \
- src/map/magic-interpreter.h src/map/../common/nullpo.h \
- src/map/../common/sanity.h src/map/battle.h src/map/chat.h src/map/map.h \
- src/map/../common/mmo.h src/map/../common/utils.h \
- src/map/../common/timer.h src/map/../common/db.h src/map/chrif.h \
- src/map/clif.h src/map/storage.h src/map/intif.h src/map/itemdb.h \
- src/map/magic.h src/map/mob.h src/map/npc.h src/map/pc.h src/map/party.h \
- src/map/script.h src/map/skill.h src/map/trade.h \
- src/map/../common/socket.h src/map/magic-interpreter-aux.h \
- src/map/magic-expr-eval.h src/map/../common/mt_rand.h
-${BUILD_DIR}/map/battle.o: src/map/battle.c src/map/battle.h \
- src/map/../common/timer.h src/map/../common/sanity.h \
- src/map/../common/nullpo.h src/map/clif.h src/map/map.h \
- src/map/../common/mmo.h src/map/../common/utils.h src/map/../common/db.h \
- src/map/storage.h src/map/guild.h src/map/itemdb.h src/map/mob.h \
- src/map/pc.h src/map/skill.h src/map/magic.h src/map/intif.h \
- src/map/../common/socket.h src/map/../common/mt_rand.h
-${BUILD_DIR}/map/script.o: src/map/script.c src/map/../common/socket.h \
- src/map/../common/sanity.h src/map/../common/timer.h \
- src/map/../common/lock.h src/map/../common/mt_rand.h src/map/atcommand.h \
- src/map/map.h src/map/../common/mmo.h src/map/../common/utils.h \
- src/map/../common/db.h src/map/battle.h src/map/chat.h src/map/chrif.h \
- src/map/clif.h src/map/storage.h src/map/guild.h src/map/intif.h \
- src/map/itemdb.h src/map/mob.h src/map/npc.h src/map/party.h \
- src/map/pc.h src/map/script.h src/map/skill.h src/map/magic.h
-${BUILD_DIR}/map/clif.o: src/map/clif.c src/map/../common/socket.h \
- src/map/../common/sanity.h src/map/../common/timer.h \
- src/map/../common/version.h src/map/../common/nullpo.h \
- src/map/../common/md5calc.h src/map/../common/mt_rand.h \
- src/map/atcommand.h src/map/map.h src/map/../common/mmo.h \
- src/map/../common/utils.h src/map/../common/db.h src/map/battle.h \
- src/map/chat.h src/map/chrif.h src/map/clif.h src/map/storage.h \
- src/map/guild.h src/map/intif.h src/map/itemdb.h src/map/magic.h \
- src/map/mob.h src/map/npc.h src/map/party.h src/map/pc.h \
- src/map/script.h src/map/skill.h src/map/tmw.h src/map/trade.h
-${BUILD_DIR}/map/chrif.o: src/map/chrif.c src/map/../common/socket.h \
- src/map/../common/sanity.h src/map/../common/timer.h src/map/map.h \
- src/map/../common/mmo.h src/map/../common/utils.h src/map/../common/db.h \
- src/map/battle.h src/map/chrif.h src/map/clif.h src/map/storage.h \
- src/map/intif.h src/map/npc.h src/map/pc.h src/map/../common/nullpo.h \
- src/map/itemdb.h
-${BUILD_DIR}/map/atcommand.o: src/map/atcommand.c \
- src/map/../common/socket.h src/map/../common/sanity.h \
- src/map/../common/timer.h src/map/../common/nullpo.h \
- src/map/../common/mt_rand.h src/map/atcommand.h src/map/map.h \
- src/map/../common/mmo.h src/map/../common/utils.h src/map/../common/db.h \
- src/map/battle.h src/map/clif.h src/map/storage.h src/map/chrif.h \
- src/map/guild.h src/map/intif.h src/map/itemdb.h src/map/mob.h \
- src/map/npc.h src/map/pc.h src/map/party.h src/map/script.h \
- src/map/skill.h src/map/magic.h src/map/trade.h src/map/../common/core.h \
- src/map/tmw.h
-${BUILD_DIR}/map/map.o: src/map/map.c src/map/../common/core.h \
- src/map/../common/timer.h src/map/../common/sanity.h \
- src/map/../common/db.h src/map/../common/grfio.h \
- src/map/../common/mt_rand.h src/map/map.h src/map/../common/mmo.h \
- src/map/../common/utils.h src/map/chrif.h src/map/clif.h \
- src/map/storage.h src/map/intif.h src/map/npc.h src/map/pc.h \
- src/map/mob.h src/map/chat.h src/map/itemdb.h src/map/skill.h \
- src/map/magic.h src/map/trade.h src/map/party.h src/map/battle.h \
- src/map/script.h src/map/guild.h src/map/atcommand.h \
- src/map/../common/nullpo.h src/map/../common/socket.h
-${BUILD_DIR}/ladmin/ladmin.o: src/ladmin/ladmin.c \
- src/ladmin/../common/core.h src/ladmin/../common/socket.h \
- src/ladmin/../common/sanity.h src/ladmin/ladmin.h \
- src/ladmin/../common/version.h src/ladmin/../common/mmo.h \
- src/ladmin/../common/utils.h src/ladmin/../common/md5calc.h
diff --git a/make.defs b/make.defs
index 067c22b..9328688 100644
--- a/make.defs
+++ b/make.defs
@@ -1,16 +1,13 @@
 # defaults
-CC = gcc
+CXX = g++
 LEX = flex
 BISON = bison
-CFLAGS = -pipe -g -O2
+CXXFLAGS = -pipe -g -O2
 
 # works on both x86 and x86_64
-override CC += -m32 -std=gnu99
+override CXX += -m32 -std=c++0x
+# for linking
+override CC = ${CXX}
 
-# TODO check if this is actually needed - I don't think it should be
-ifeq ($(findstring CYGWIN,$(shell uname)), CYGWIN)
-  override CFLAGS += -DFD_SETSIZE=4096 -DCYGWIN
-else
-  override CFLAGS += -fstack-protector
-endif
+override CXXFLAGS += -fstack-protector
 
diff --git a/src/char/char.c b/src/char/char.cpp
index 2a46283..a57520b 100644
--- a/src/char/char.c
+++ b/src/char/char.cpp
@@ -18,21 +18,21 @@
 #include <stdarg.h>
 #include <sys/wait.h>
 
-#include "../common/core.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/mmo.h"
-#include "../common/version.h"
-#include "../common/lock.h"
-#include "char.h"
-
-#include "inter.h"
-#include "int_guild.h"
-#include "int_party.h"
-#include "int_storage.h"
+#include "../common/core.hpp"
+#include "../common/socket.hpp"
+#include "../common/timer.hpp"
+#include "../common/mmo.hpp"
+#include "../common/version.hpp"
+#include "../common/lock.hpp"
+#include "char.hpp"
+
+#include "inter.hpp"
+#include "int_guild.hpp"
+#include "int_party.hpp"
+#include "int_storage.hpp"
 
 #ifdef MEMWATCH
-#include "memwatch.h"
+#include "memwatch.hpp"
 #endif
 
 struct mmo_map_server server[MAX_MAP_SERVERS];
diff --git a/src/char/char.h b/src/char/char.hpp
index cc64024..22b7678 100644
--- a/src/char/char.h
+++ b/src/char/char.hpp
@@ -1,6 +1,6 @@
 // $Id: char.h,v 1.1.1.1 2004/09/10 17:26:50 MagicalTux Exp $
-#ifndef _CHAR_H_
-#define _CHAR_H_
+#ifndef CHAR_HPP
+#define CHAR_HPP
 
 #define MAX_MAP_SERVERS 30
 
diff --git a/src/char/int_guild.c b/src/char/int_guild.cpp
index 05aae6b..fe9a95b 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.cpp
@@ -1,12 +1,12 @@
 // $Id: int_guild.c,v 1.2 2004/09/25 19:36:53 Akitasha Exp $
-#include "inter.h"
-#include "int_guild.h"
-#include "int_storage.h"
-#include "../common/mmo.h"
-#include "char.h"
-#include "../common/socket.h"
-#include "../common/db.h"
-#include "../common/lock.h"
+#include "inter.hpp"
+#include "int_guild.hpp"
+#include "int_storage.hpp"
+#include "../common/mmo.hpp"
+#include "char.hpp"
+#include "../common/socket.hpp"
+#include "../common/db.hpp"
+#include "../common/lock.hpp"
 
 #include <string.h>
 #include <stdio.h>
diff --git a/src/char/int_guild.h b/src/char/int_guild.hpp
index 5ac9a51..2833e2d 100644
--- a/src/char/int_guild.h
+++ b/src/char/int_guild.hpp
@@ -1,6 +1,6 @@
 // $Id: int_guild.h,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $
-#ifndef _INT_GUILD_H_
-#define _INT_GUILD_H_
+#ifndef INT_GUILD_HPP
+#define INT_GUILD_HPP
 
 int  inter_guild_init (void);
 int  inter_guild_save (void);
diff --git a/src/char/int_party.c b/src/char/int_party.cpp
index 6f8d023..7d0e0ce 100644
--- a/src/char/int_party.c
+++ b/src/char/int_party.cpp
@@ -1,11 +1,11 @@
 // $Id: int_party.c,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $
-#include "inter.h"
-#include "int_party.h"
-#include "../common/mmo.h"
-#include "char.h"
-#include "../common/socket.h"
-#include "../common/db.h"
-#include "../common/lock.h"
+#include "inter.hpp"
+#include "int_party.hpp"
+#include "../common/mmo.hpp"
+#include "char.hpp"
+#include "../common/socket.hpp"
+#include "../common/db.hpp"
+#include "../common/lock.hpp"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/char/int_party.h b/src/char/int_party.hpp
index 2007ed5..93e8887 100644
--- a/src/char/int_party.h
+++ b/src/char/int_party.hpp
@@ -1,6 +1,6 @@
 // $Id: int_party.h,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $
-#ifndef _INT_PARTY_H_
-#define _INT_PARTY_H_
+#ifndef INT_PARTY_HPP
+#define INT_PARTY_HPP
 
 int  inter_party_init (void);
 int  inter_party_save (void);
diff --git a/src/char/int_storage.c b/src/char/int_storage.cpp
index e565572..b197213 100644
--- a/src/char/int_storage.c
+++ b/src/char/int_storage.cpp
@@ -3,14 +3,14 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "../common/mmo.h"
-#include "../common/socket.h"
-#include "../common/db.h"
-#include "../common/lock.h"
-#include "char.h"
-#include "inter.h"
-#include "int_storage.h"
-#include "int_guild.h"
+#include "../common/mmo.hpp"
+#include "../common/socket.hpp"
+#include "../common/db.hpp"
+#include "../common/lock.hpp"
+#include "char.hpp"
+#include "inter.hpp"
+#include "int_storage.hpp"
+#include "int_guild.hpp"
 
 // ファイル名のデフォルト
 // inter_config_read()で再設定される
diff --git a/src/char/int_storage.h b/src/char/int_storage.hpp
index f1859c6..9986f2d 100644
--- a/src/char/int_storage.h
+++ b/src/char/int_storage.hpp
@@ -1,6 +1,6 @@
 // $Id: int_storage.h,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $
-#ifndef _INT_STORAGE_H_
-#define _INT_STORAGE_H_
+#ifndef INT_STORAGE_HPP
+#define INT_STORAGE_HPP
 
 int  inter_storage_init (void);
 void inter_storage_final (void);
diff --git a/src/char/inter.c b/src/char/inter.cpp
index e886bf6..af95a2d 100644
--- a/src/char/inter.c
+++ b/src/char/inter.cpp
@@ -1,17 +1,17 @@
 // $Id: inter.c,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $
-#include "../common/mmo.h"
-#include "char.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/db.h"
+#include "../common/mmo.hpp"
+#include "char.hpp"
+#include "../common/socket.hpp"
+#include "../common/timer.hpp"
+#include "../common/db.hpp"
 #include <string.h>
 #include <stdlib.h>
 
-#include "inter.h"
-#include "int_party.h"
-#include "int_guild.h"
-#include "int_storage.h"
-#include "../common/lock.h"
+#include "inter.hpp"
+#include "int_party.hpp"
+#include "int_guild.hpp"
+#include "int_storage.hpp"
+#include "../common/lock.hpp"
 
 #define WISDATA_TTL (60*1000)   // Existence time of Wisp/page data (60 seconds)
                                 // that is the waiting time of answers of all map-servers
diff --git a/src/char/inter.h b/src/char/inter.hpp
index 219f195..769324c 100644
--- a/src/char/inter.h
+++ b/src/char/inter.hpp
@@ -1,6 +1,6 @@
 // $Id: inter.h,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $
-#ifndef _INTER_H_
-#define _INTER_H_
+#ifndef INTER_HPP
+#define INTER_HPP
 
 int  inter_init (const char *file);
 int  inter_save (void);
diff --git a/src/common/core.c b/src/common/core.cpp
index b08276c..38b2260 100644
--- a/src/common/core.c
+++ b/src/common/core.cpp
@@ -4,12 +4,12 @@
 #include <signal.h>
 #include <sys/wait.h>
 
-#include "core.h"
-#include "socket.h"
-#include "timer.h"
-#include "version.h"
-#include "mt_rand.h"
-#include "nullpo.h"
+#include "core.hpp"
+#include "socket.hpp"
+#include "timer.hpp"
+#include "version.hpp"
+#include "mt_rand.hpp"
+#include "nullpo.hpp"
 
 /// Defined by each server
 extern int  do_init (int, char **);
diff --git a/src/common/core.h b/src/common/core.hpp
index 44473e9..8a52c55 100644
--- a/src/common/core.h
+++ b/src/common/core.hpp
@@ -1,5 +1,5 @@
-#ifndef CORE_H
-#define CORE_H
+#ifndef CORE_HPP
+#define CORE_HPP
 #include <stdbool.h>
 /// core.c contains a server-independent main() function
 /// and then runs a do_sendrecv loop
@@ -16,4 +16,4 @@ extern int  do_init (int, char **);
 /// or when if we manage to exit() gracefully.
 extern void term_func (void);
 
-#endif // CORE_H
+#endif // CORE_HPP
diff --git a/src/common/db.c b/src/common/db.cpp
index f56a511..21a3597 100644
--- a/src/common/db.c
+++ b/src/common/db.cpp
@@ -1,10 +1,10 @@
-#include "db.h"
+#include "db.hpp"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "utils.h"
+#include "utils.hpp"
 
 #define ROOT_SIZE 4096
 
diff --git a/src/common/db.h b/src/common/db.hpp
index 7152854..145ba13 100644
--- a/src/common/db.h
+++ b/src/common/db.hpp
@@ -1,7 +1,7 @@
 // WARNING: there is a system header by this name
-#ifndef DB_H
-#define DB_H
-# include "sanity.h"
+#ifndef DB_HPP
+#define DB_HPP
+# include "sanity.hpp"
 
 # include <stdarg.h>
 
diff --git a/src/common/grfio.c b/src/common/grfio.cpp
index d640263..1b89b18 100644
--- a/src/common/grfio.c
+++ b/src/common/grfio.cpp
@@ -4,10 +4,10 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#include "utils.h"
-#include "grfio.h"
-#include "mmo.h"
-#include "socket.h"
+#include "utils.hpp"
+#include "grfio.hpp"
+#include "mmo.hpp"
+#include "socket.hpp"
 
 //----------------------------
 //  file entry table struct
diff --git a/src/common/grfio.h b/src/common/grfio.hpp
index 4919a7b..3485904 100644
--- a/src/common/grfio.h
+++ b/src/common/grfio.hpp
@@ -2,8 +2,8 @@
 // Note .gat files are mapped to .wlk files by data/resnametable.txt
 // Note that there currently is a 1-1 correlation between them,
 // but it is possible for a single .wlk to have multiple .gats reference it
-#ifndef GRFIO_H
-#define GRFIO_H
+#ifndef GRFIO_HPP
+#define GRFIO_HPP
 
 /// Load file into memory
 # define grfio_read(resourcename) grfio_reads (resourcename, NULL)
@@ -14,4 +14,4 @@ void *grfio_reads (const char *resourcename, size_t *size);
 // This is only called once, and that is to check the existence of a file.
 size_t grfio_size (const char *resourcename) __attribute__((deprecated));
 
-#endif // GRFIO_H
+#endif // GRFIO_HPP
diff --git a/src/common/lock.c b/src/common/lock.cpp
index dd42ef2..2ba9a0a 100644
--- a/src/common/lock.c
+++ b/src/common/lock.cpp
@@ -1,7 +1,7 @@
 #include <unistd.h>
 #include <stdio.h>
-#include "lock.h"
-#include "socket.h"
+#include "lock.hpp"
+#include "socket.hpp"
 
 /// Protected file writing
 /// (Until the file is closed, it keeps the old file)
diff --git a/src/common/lock.h b/src/common/lock.hpp
index 2f087fd..19c1302 100644
--- a/src/common/lock.h
+++ b/src/common/lock.hpp
@@ -1,8 +1,8 @@
-#ifndef LOCK_H
-#define LOCK_H
+#ifndef LOCK_HPP
+#define LOCK_HPP
 /// Locked FILE I/O
 // Changes are made in a separate file until lock_fclose
 FILE *lock_fopen (const char *filename, int *info);
 void lock_fclose (FILE * fp, const char *filename, int *info);
 
-#endif // LOCK_H
+#endif // LOCK_HPP
diff --git a/src/common/md5calc.c b/src/common/md5calc.cpp
index ba8f6af..f00861d 100644
--- a/src/common/md5calc.c
+++ b/src/common/md5calc.cpp
@@ -1,6 +1,6 @@
-#include "md5calc.h"
+#include "md5calc.hpp"
 #include <string.h>
-#include "mt_rand.h"
+#include "mt_rand.hpp"
 
 // auxilary data
 /*
diff --git a/src/common/md5calc.h b/src/common/md5calc.hpp
index b864791..1dde2ed 100644
--- a/src/common/md5calc.h
+++ b/src/common/md5calc.hpp
@@ -1,7 +1,7 @@
-#ifndef MD5CALC_H
-#define MD5CALC_H
+#ifndef MD5CALC_HPP
+#define MD5CALC_HPP
 
-#include "sanity.h"
+#include "sanity.hpp"
 
 #include <netinet/in.h>
 
diff --git a/src/common/mmo.h b/src/common/mmo.hpp
index 64e0523..2ca93b0 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.hpp
@@ -1,9 +1,9 @@
 /// Global structures and defines
-#ifndef MMO_H
-#define MMO_H
+#ifndef MMO_HPP
+#define MMO_HPP
 
 # include <time.h>
-# include "utils.h"              // LCCWIN32
+# include "utils.hpp"              // LCCWIN32
 
 # define FIFOSIZE_SERVERLINK    256*1024
 
@@ -280,4 +280,4 @@ enum
 
 };
 
-#endif // MMO_H
+#endif // MMO_HPP
diff --git a/src/common/mt_rand.c b/src/common/mt_rand.cpp
index e4e8d12..89872ad 100644
--- a/src/common/mt_rand.c
+++ b/src/common/mt_rand.cpp
@@ -46,7 +46,7 @@
 */
 
 #include <time.h>
-#include "mt_rand.h"
+#include "mt_rand.hpp"
 
 #define N              624                  // length of state vector
 #define M              397                  // a period parameter
diff --git a/src/common/mt_rand.h b/src/common/mt_rand.hpp
index 84d32e5..c7bae4e 100644
--- a/src/common/mt_rand.h
+++ b/src/common/mt_rand.hpp
@@ -1,7 +1,7 @@
-#ifndef MT_RAND_H
-#define MT_RAND_H
+#ifndef MT_RAND_HPP
+#define MT_RAND_HPP
 
-# include "sanity.h"
+# include "sanity.hpp"
 
 /// Initialize the generator (called automatically with time() if you don't)
 void mt_seed (uint32_t seed);
@@ -21,4 +21,4 @@ uint32_t mt_random (void);
 # define MRAND(mod) ((int)(mt_random() % (mod)))
 # define MPRAND(add, mod) ((add) + MRAND(mod))
 
-#endif // MT_RAND_H
+#endif // MT_RAND_HPP
diff --git a/src/common/nullpo.c b/src/common/nullpo.cpp
index 8c7c405..6dd2736 100644
--- a/src/common/nullpo.c
+++ b/src/common/nullpo.cpp
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
-#include "nullpo.h"
+#include "nullpo.hpp"
 
 static void nullpo_info_core (const char *file, int line, const char *func,
                               const char *fmt, va_list ap);
diff --git a/src/common/nullpo.h b/src/common/nullpo.hpp
index 9b33b4b..7aff691 100644
--- a/src/common/nullpo.h
+++ b/src/common/nullpo.hpp
@@ -1,6 +1,6 @@
 /// return wrappers for unexpected NULL pointers
-#ifndef NULLPO_H
-#define NULLPO_H
+#ifndef NULLPO_HPP
+#define NULLPO_HPP
 /// Comment this out to live dangerously
 # define NULLPO_CHECK
 
@@ -39,7 +39,7 @@
 #  define nullpo_retr_f(ret, t, fmt, ...) t;
 # endif // NULLPO_CHECK
 
-# include "sanity.h"
+# include "sanity.hpp"
 
 /// Used by macros in this header
 bool nullpo_chk (const char *file, int line, const char *func,
@@ -58,4 +58,4 @@ void nullpo_info_f (const char *file, int line, const char *func,
                     const char *fmt, ...)
     __attribute__ ((format (printf, 4, 5)));
 
-#endif // NULLPO_H
+#endif // NULLPO_HPP
diff --git a/src/common/sanity.h b/src/common/sanity.hpp
index 168671f..7ffd077 100644
--- a/src/common/sanity.h
+++ b/src/common/sanity.hpp
@@ -1,8 +1,8 @@
 /// return wrappers for unexpected NULL pointers
-#ifndef SANITY_H
-#define SANITY_H
-# if __STDC_VERSION__ < 199901L
-#  error "Please compile in C99 mode"
+#ifndef SANITY_HPP
+#define SANITY_HPP
+# ifndef __cplusplus
+#  error "Please compile in C++ mode"
 # endif
 # if __GNUC__ < 3
 // I don't specifically know what version this requires,
@@ -22,15 +22,10 @@
 # endif
 
 /// A name for unused function arguments - can be repeated
-# define UNUSED UNUSED_IMPL(__COUNTER__)
-// Don't you just love the hoops the preprocessor makes you go through?
-#  define UNUSED_IMPL(arg) UNUSED_IMPL2(arg)
-#  define UNUSED_IMPL2(suffix) unused_ ## suffix __attribute__((unused))
-/// Convert conditions to use the bool type
-# include <stdbool.h>
+# define UNUSED /* empty works for C++ */
 /// Convert type assumptions to use the standard types here
-# include <stdint.h>
+# include <cstdint>
 /// size_t, NULL
-# include <stddef.h>
+# include <cstddef>
 
-#endif // SANITY_H
+#endif // SANITY_HPP
diff --git a/src/common/socket.c b/src/common/socket.cpp
index 67a5102..cc6e4b3 100644
--- a/src/common/socket.c
+++ b/src/common/socket.cpp
@@ -15,9 +15,9 @@
 #include <fcntl.h>
 #include <string.h>
 
-#include "mmo.h"                // [Valaris] thanks to fov
-#include "socket.h"
-#include "utils.h"
+#include "mmo.hpp"                // [Valaris] thanks to fov
+#include "socket.hpp"
+#include "utils.hpp"
 
 fd_set readfds;
 int  fd_max;
diff --git a/src/common/socket.h b/src/common/socket.hpp
index b886df0..00f2df0 100644
--- a/src/common/socket.h
+++ b/src/common/socket.hpp
@@ -1,7 +1,7 @@
-#ifndef SOCKET_H
-#define SOCKET_H
+#ifndef SOCKET_HPP
+#define SOCKET_HPP
 
-# include "sanity.h"
+# include "sanity.hpp"
 
 # include <stdio.h>
 
@@ -132,4 +132,4 @@ void fclose_ (FILE * fp);
 FILE *fopen_ (const char *path, const char *mode);
 bool free_fds (void);
 
-#endif // SOCKET_H
+#endif // SOCKET_HPP
diff --git a/src/common/timer.c b/src/common/timer.cpp
index 6795824..66aaa9b 100644
--- a/src/common/timer.c
+++ b/src/common/timer.cpp
@@ -6,8 +6,8 @@
 #include <sys/socket.h>
 #include <sys/time.h>
 
-#include "timer.h"
-#include "utils.h"
+#include "timer.hpp"
+#include "utils.hpp"
 
 static struct TimerData *timer_data;
 static uint32_t timer_data_max, timer_data_num;
diff --git a/src/common/timer.h b/src/common/timer.hpp
index e6a292c..fdda344 100644
--- a/src/common/timer.h
+++ b/src/common/timer.hpp
@@ -1,7 +1,7 @@
-#ifndef TIMER_H
-#define TIMER_H
+#ifndef TIMER_HPP
+#define TIMER_HPP
 
-# include "sanity.h"
+# include "sanity.hpp"
 
 enum TIMER_TYPE
 {
@@ -58,4 +58,4 @@ interval_t do_timer (tick_t tick);
 
 
 
-#endif // TIMER_H
+#endif // TIMER_HPP
diff --git a/src/common/utils.h b/src/common/utils.hpp
index 961d960..7c7da16 100644
--- a/src/common/utils.h
+++ b/src/common/utils.hpp
@@ -1,5 +1,5 @@
-#ifndef UTILS_H
-#define UTILS_H
+#ifndef UTILS_HPP
+#define UTILS_HPP
 /*
 Notes about memory allocation in tmwAthena:
 There used to be 3 sources of allocation: these macros,
@@ -15,4 +15,4 @@ future calls should either use this or depend on the coming segfault.
   if (!((result) = (type *) realloc ((result), sizeof(type) * (number))))\
       { perror("SYSERR: realloc failure"); abort(); } else (void)0
 
-#endif //UTILS_H
+#endif //UTILS_HPP
diff --git a/src/common/version.h b/src/common/version.hpp
index 46165aa..d72f41e 100644
--- a/src/common/version.h
+++ b/src/common/version.hpp
@@ -1,8 +1,8 @@
 /// Some constants to identify the version of (e)Athena
 /// The values are different if the client connects (-1,'T','M','W',flags32)
 // These numbers have never been changed while TMW
-#ifndef VERSION_H
-#define VERSION_H
+#ifndef VERSION_HPP
+#define VERSION_HPP
 //When a server receives a 0x7530 packet from an admin connection,
 //it sends an 0x7531 packet with the following bytes
 # define ATHENA_MAJOR_VERSION    1   // Major Version
@@ -21,4 +21,4 @@
 // and this as two bytes
 # define ATHENA_MOD_VERSION   1052   // mod version (patch No.)
 
-#endif // VERSION_H
+#endif // VERSION_HPP
diff --git a/src/ladmin/ladmin.c b/src/ladmin/ladmin.cpp
index 3728799..01eb244 100644
--- a/src/ladmin/ladmin.c
+++ b/src/ladmin/ladmin.cpp
@@ -22,18 +22,18 @@
 #include <stdarg.h>             // valist
 #include <ctype.h>              // tolower
 
-#include "../common/core.h"
-#include "../common/socket.h"
-#include "ladmin.h"
-#include "../common/version.h"
-#include "../common/mmo.h"
+#include "../common/core.hpp"
+#include "../common/socket.hpp"
+#include "ladmin.hpp"
+#include "../common/version.hpp"
+#include "../common/mmo.hpp"
 
 #ifdef PASSWORDENC
-#include "../common/md5calc.h"
+#include "../common/md5calc.hpp"
 #endif
 
 #ifdef MEMWATCH
-#include "memwatch.h"
+#include "memwatch.hpp"
 #endif
 
 int eathena_interactive_session; // from core.c
diff --git a/src/ladmin/ladmin.h b/src/ladmin/ladmin.hpp
index dc1efe6..77d7fe4 100644
--- a/src/ladmin/ladmin.h
+++ b/src/ladmin/ladmin.hpp
@@ -1,6 +1,6 @@
 // $Id: ladmin.h,v 1.1.1.1 2004/09/10 17:26:52 MagicalTux Exp $
-#ifndef _LADMIN_H_
-#define _LADMIN_H_
+#ifndef LADMIN_HPP
+#define LADMIN_HPP
 
 #define LADMIN_CONF_NAME	"conf/ladmin_athena.conf"
 #define PASSWORDENC		3       // A definition is given when making an encryption password correspond.
diff --git a/src/login/login.c b/src/login/login.cpp
index cd46049..543f32f 100644
--- a/src/login/login.c
+++ b/src/login/login.cpp
@@ -18,20 +18,20 @@
 #include <netdb.h>
 #include <sys/wait.h>
 
-#include "../common/core.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "login.h"
-#include "../common/mmo.h"
-#include "../common/version.h"
-#include "../common/db.h"
-#include "../common/lock.h"
-#include "../common/mt_rand.h"
-
-#include "../common/md5calc.h"
+#include "../common/core.hpp"
+#include "../common/socket.hpp"
+#include "../common/timer.hpp"
+#include "login.hpp"
+#include "../common/mmo.hpp"
+#include "../common/version.hpp"
+#include "../common/db.hpp"
+#include "../common/lock.hpp"
+#include "../common/mt_rand.hpp"
+
+#include "../common/md5calc.hpp"
 
 #ifdef MEMWATCH
-#include "memwatch.h"
+#include "memwatch.hpp"
 #endif
 
 int  account_id_count = START_ACCOUNT_NUM;
diff --git a/src/login/login.h b/src/login/login.hpp
index a1f8fef..49d1c12 100644
--- a/src/login/login.h
+++ b/src/login/login.hpp
@@ -1,6 +1,6 @@
 // $Id: login.h,v 1.1.1.1 2004/09/10 17:26:53 MagicalTux Exp $
-#ifndef _LOGIN_H_
-#define _LOGIN_H_
+#ifndef LOGIN_HPP
+#define LOGIN_HPP
 
 #define MAX_SERVERS 30
 
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
diff --git a/src/tool/adduser.c b/src/tool/adduser.cpp
index 1954b66..1954b66 100644
--- a/src/tool/adduser.c
+++ b/src/tool/adduser.cpp
diff --git a/src/tool/convert.c b/src/tool/convert.cpp
index e256fc9..e256fc9 100644
--- a/src/tool/convert.c
+++ b/src/tool/convert.cpp
diff --git a/src/tool/eathena-monitor.c b/src/tool/eathena-monitor.cpp
index 1b1abd5..1b1abd5 100644
--- a/src/tool/eathena-monitor.c
+++ b/src/tool/eathena-monitor.cpp
diff --git a/src/tool/itemfrob.c b/src/tool/itemfrob.cpp
index 4651452..81638eb 100644
--- a/src/tool/itemfrob.c
+++ b/src/tool/itemfrob.cpp
@@ -3,9 +3,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "../common/mmo.h"
+#include "../common/mmo.hpp"
 // Yes, this is intentional
-#include "../char/char.c"
+#include "../char/char.cpp"
 
 // Well, this is not terribly elegant, but I don't have that much time.
 #define MAX_ITEM_ID 65535
diff --git a/src/tool/mapfrob.c b/src/tool/mapfrob.cpp
index 9dc1a5b..8663ae0 100644
--- a/src/tool/mapfrob.c
+++ b/src/tool/mapfrob.cpp
@@ -3,9 +3,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "../common/mmo.h"
+#include "../common/mmo.hpp"
 // Yes, this is intentional
-#include "../char/char.c"
+#include "../char/char.cpp"
 
 // Well, this is not terribly elegant, but I don't have that much time.
 #define MAX_MAP 1024
diff --git a/src/tool/marriage-info.c b/src/tool/marriage-info.cpp
index 4d7cbc3..3552a9b 100644
--- a/src/tool/marriage-info.c
+++ b/src/tool/marriage-info.cpp
@@ -7,10 +7,10 @@ src/char/int_party.o src/char/int_storage.o src/char/inter.o
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "../login/login.h"
-#include "../common/mmo.h"
+#include "../login/login.hpp"
+#include "../common/mmo.hpp"
 // Yes, this is intentional
-#include "../char/char.c"
+#include "../char/char.cpp"
 
 int mode;
 #define MODE_MARRIED	0
diff --git a/src/tool/moneycount/athena_text.cpp b/src/tool/moneycount/athena_text.cpp
index 59269fa..8cf5457 100644
--- a/src/tool/moneycount/athena_text.cpp
+++ b/src/tool/moneycount/athena_text.cpp
@@ -1,10 +1,10 @@
-#include "athena_text.h"
+#include "athena_text.hpp"
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
-#include "mmo.h"
+#include "mmo.hpp"
 
 //-------------------------------------------------------------------------
 // Function to set the character from the line (at read of characters file)
diff --git a/src/tool/moneycount/athena_text.h b/src/tool/moneycount/athena_text.hpp
index 705c979..e4b7025 100644
--- a/src/tool/moneycount/athena_text.h
+++ b/src/tool/moneycount/athena_text.hpp
@@ -1,6 +1,6 @@
-#ifndef ATHENA_TEXT_H
-#define ATHENA_TEXT_H
-#include "mmo.h"
+#ifndef ATHENA_TEXT_HPP
+#define ATHENA_TEXT_HPP
+#include "mmo.hpp"
 
 int mmo_char_fromstr (char *str, struct mmo_charstatus *p);
 
diff --git a/src/tool/moneycount/main.cpp b/src/tool/moneycount/main.cpp
index d15f223..2c3d56c 100644
--- a/src/tool/moneycount/main.cpp
+++ b/src/tool/moneycount/main.cpp
@@ -7,8 +7,8 @@
 #include <algorithm>
 #include <cmath>
 
-#include "mmo.h"
-#include "athena_text.h"
+#include "mmo.hpp"
+#include "athena_text.hpp"
 #include "inf.hpp"
 
 #define ATHENA_FILE "save/athena.txt"
diff --git a/src/tool/moneycount/mmo.h b/src/tool/moneycount/mmo.hpp
index bd62b49..beb29c5 100644
--- a/src/tool/moneycount/mmo.h
+++ b/src/tool/moneycount/mmo.hpp
@@ -1,8 +1,8 @@
 // $Id: mmo.h,v 1.3 2004/09/25 20:12:25 PoW Exp $
 // Original : mmo.h 2003/03/14 12:07:02 Rev.1.7
 
-#ifndef	_MMO_H_
-#define	_MMO_H_
+#ifndef MMO_HPP
+#define MMO_HPP
 
 #include <time.h>
 
@@ -305,5 +305,5 @@ enum
 
 };
 
-#endif // _MMO_H_
+#endif // MMO_HPP
 
diff --git a/src/tool/skillfrob.c b/src/tool/skillfrob.cpp
index 44855ac..901f765 100644
--- a/src/tool/skillfrob.c
+++ b/src/tool/skillfrob.cpp
@@ -3,8 +3,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "../common/mmo.h"
-#include "../char/char.c"
+#include "../common/mmo.hpp"
+#include "../char/char.cpp"
 
 unsigned char skills[MAX_SKILL];
 
diff --git a/src/webserver/generate.c b/src/webserver/generate.cpp
index 1fed224..1fed224 100644
--- a/src/webserver/generate.c
+++ b/src/webserver/generate.cpp
diff --git a/src/webserver/htmlstyle.c b/src/webserver/htmlstyle.cpp
index 3007a24..3007a24 100644
--- a/src/webserver/htmlstyle.c
+++ b/src/webserver/htmlstyle.cpp
diff --git a/src/webserver/logs.c b/src/webserver/logs.cpp
index 67bf55e..67bf55e 100644
--- a/src/webserver/logs.c
+++ b/src/webserver/logs.cpp
diff --git a/src/webserver/main.c b/src/webserver/main.cpp
index 0e227d3..0e227d3 100644
--- a/src/webserver/main.c
+++ b/src/webserver/main.cpp
diff --git a/src/webserver/pages/about.c b/src/webserver/pages/about.cpp
index b548da9..b548da9 100644
--- a/src/webserver/pages/about.c
+++ b/src/webserver/pages/about.cpp
diff --git a/src/webserver/pages/notdone.c b/src/webserver/pages/notdone.cpp
index 1fcd44b..1fcd44b 100644
--- a/src/webserver/pages/notdone.c
+++ b/src/webserver/pages/notdone.cpp
diff --git a/src/webserver/pages/sample.c b/src/webserver/pages/sample.cpp
index 6a33dc0..6a33dc0 100644
--- a/src/webserver/pages/sample.c
+++ b/src/webserver/pages/sample.cpp
diff --git a/src/webserver/parse.c b/src/webserver/parse.cpp
index 66ef43b..66ef43b 100644
--- a/src/webserver/parse.c
+++ b/src/webserver/parse.cpp