12 files changed, 26 insertions, 21 deletions
diff --git a/src/tool/GNUmakefile b/src/tool/GNUmakefile
index 2efc93b..24ee766 100644
--- a/src/tool/GNUmakefile
+++ b/src/tool/GNUmakefile
@@ -1,7 +1,7 @@
 .SUFFIXES:
 all:
-	make -C ../.. tools
+	${MAKE} -C ../.. eathena-monitor
 clean:
 	rm -r ../../obj/tool/
 %::
-	make -C ../.. obj/tool/$@
+	${MAKE} -C ../.. obj/tool/$@
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..e070c8a 100644
--- a/src/tool/eathena-monitor.c
+++ b/src/tool/eathena-monitor.cpp
@@ -73,6 +73,7 @@ const char *config = CONFIG;
 
 pid_t pid_login, pid_map, pid_char;
 
+static
 const char* make_path (const char* base, const char* path) {
     size_t base_len = strlen(base);
     size_t path_len = strlen(path);
@@ -84,6 +85,7 @@ const char* make_path (const char* base, const char* path) {
     return out;
 }
 
+static
 void parse_option (char *name, char *value) {
     if (!strcasecmp(name, "login_server")) {
         login_server = strdup(value);
@@ -100,6 +102,7 @@ void parse_option (char *name, char *value) {
     }
 }
 
+static
 void read_config(const char *filename) {
     FILE *input;
     char string[1000];
@@ -138,6 +141,7 @@ void read_config(const char *filename) {
     fclose (input);
 }
 
+static
 pid_t start_process(const char *exec) {
     const char *args[2] = {exec, NULL};
     pid_t pid = fork();
@@ -155,6 +159,7 @@ pid_t start_process(const char *exec) {
 }
 
 // Kill all children with the same signal we got, then ourself.
+static
 void stop_process(int sig) {
     if (pid_map) kill(pid_map, sig);
     if (pid_login) kill(pid_login, sig);
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];