Index: server/makefile
===================================================================
--- server/makefile	(revision cbc595dd131d6db74f170c0777eaaa3d1eb055f6)
+++ server/makefile	(revision 1a1aebd28a93302f0e0ffb98837bda5a39f9349a)
@@ -3,10 +3,10 @@
 FLAGS = $(LIB_FLAGS)
 COMMON_PATH = ../common
-DEPENDENCIES = message.o Player.o DataAccess.o
+DEPENDENCIES = Message.o Player.o DataAccess.o
 
 server : server.cpp $(DEPENDENCIES)
 	$(CC) -o $@ $+ $(FLAGS)
 
-message.o : $(COMMON_PATH)/message.cpp
+Message.o : $(COMMON_PATH)/Message.cpp
 	$(CC) -c -o $@ $?
 
Index: server/server.cpp
===================================================================
--- server/server.cpp	(revision cbc595dd131d6db74f170c0777eaaa3d1eb055f6)
+++ server/server.cpp	(revision 1a1aebd28a93302f0e0ffb98837bda5a39f9349a)
@@ -1,4 +1,2 @@
-#include "../common/compiler.h"
-
 #include <cstdlib>
 #include <cstdio>
@@ -21,7 +19,9 @@
 #include <openssl/err.h>
 
+#include "../common/Compiler.h"
+#include "../common/Message.h"
+
 #include "Player.h"
 #include "DataAccess.h"
-#include "../common/message.h"
 
 using namespace std;