Index: client/Client/main.cpp
===================================================================
--- client/Client/main.cpp	(revision cbc595dd131d6db74f170c0777eaaa3d1eb055f6)
+++ client/Client/main.cpp	(revision b53c6b345affaea1c625ed8caa8faf8df17f5992)
@@ -1,4 +1,2 @@
-#include "../../common/compiler.h"
-
 #if defined WINDOWS
    #include <winsock2.h>
@@ -23,5 +21,6 @@
 #include <allegro5/allegro_ttf.h>
 
-#include "../../common/message.h"
+#include "../../common/Compiler.h"
+#include "../../common/Message.h"
 
 #include "Window.h"
Index: client/makefile
===================================================================
--- client/makefile	(revision cbc595dd131d6db74f170c0777eaaa3d1eb055f6)
+++ client/makefile	(revision b53c6b345affaea1c625ed8caa8faf8df17f5992)
@@ -1,2 +1,2 @@
-gameClient : ../common/message.cpp Client/main.cpp
+gameClient : ../common/Message.cpp Client/main.cpp
 	g++ -o $@ $?
Index: common/Compiler.h
===================================================================
--- common/Compiler.h	(revision b53c6b345affaea1c625ed8caa8faf8df17f5992)
+++ common/Compiler.h	(revision b53c6b345affaea1c625ed8caa8faf8df17f5992)
@@ -0,0 +1,11 @@
+#if defined _WIN64
+   #define WINDOWS
+#elif defined _WIN32
+   #define WINDOWS
+#elif defined __linux
+   #define LINUX
+#elif defined __unix
+   #define LINUX
+#elif defined __posix
+   #define LINUX
+#endif
Index: common/Message.cpp
===================================================================
--- common/Message.cpp	(revision b53c6b345affaea1c625ed8caa8faf8df17f5992)
+++ common/Message.cpp	(revision b53c6b345affaea1c625ed8caa8faf8df17f5992)
@@ -0,0 +1,24 @@
+#include "Message.h"
+
+#include "Compiler.h"
+
+#if defined WINDOWS
+   #include <winsock2.h>
+   #include <WS2tcpip.h>
+#elif defined LINUX
+   #include <sys/socket.h>
+   #include <netinet/in.h>
+#endif
+
+int sendMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest)
+{
+   return sendto(sock, (char*)msg, sizeof(NETWORK_MSG), 0, (struct sockaddr *)dest, sizeof(struct sockaddr_in));
+}
+
+int receiveMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest)
+{
+   socklen_t socklen = sizeof(struct sockaddr_in);
+
+   // assume we don't care about the value of socklen
+   return recvfrom(sock, (char*)msg, sizeof(NETWORK_MSG), 0, (struct sockaddr *)dest, &socklen);
+}
Index: common/Message.h
===================================================================
--- common/Message.h	(revision b53c6b345affaea1c625ed8caa8faf8df17f5992)
+++ common/Message.h	(revision b53c6b345affaea1c625ed8caa8faf8df17f5992)
@@ -0,0 +1,19 @@
+#ifndef _MESSAGE_H
+#define _MESSAGE_H
+
+#define MSG_TYPE_REGISTER     1
+#define MSG_TYPE_LOGIN        2
+#define MSG_TYPE_LOGOUT       3
+#define MSG_TYPE_CHAT         4
+
+typedef struct
+{
+   short type;
+   char buffer[256];
+} NETWORK_MSG;
+
+int sendMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest);
+
+int receiveMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest);
+
+#endif
Index: mmon/compiler.h
===================================================================
--- common/compiler.h	(revision cbc595dd131d6db74f170c0777eaaa3d1eb055f6)
+++ 	(revision )
@@ -1,11 +1,0 @@
-#if defined _WIN64
-   #define WINDOWS
-#elif defined _WIN32
-   #define WINDOWS
-#elif defined __linux
-   #define LINUX
-#elif defined __unix
-   #define LINUX
-#elif defined __posix
-   #define LINUX
-#endif
Index: mmon/message.cpp
===================================================================
--- common/message.cpp	(revision cbc595dd131d6db74f170c0777eaaa3d1eb055f6)
+++ 	(revision )
@@ -1,24 +1,0 @@
-#include "message.h"
-
-#include "compiler.h"
-
-#if defined WINDOWS
-   #include <winsock2.h>
-   #include <WS2tcpip.h>
-#elif defined LINUX
-   #include <sys/socket.h>
-   #include <netinet/in.h>
-#endif
-
-int sendMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest)
-{
-   return sendto(sock, (char*)msg, sizeof(NETWORK_MSG), 0, (struct sockaddr *)dest, sizeof(struct sockaddr_in));
-}
-
-int receiveMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest)
-{
-   socklen_t socklen = sizeof(struct sockaddr_in);
-
-   // assume we don't care about the value of socklen
-   return recvfrom(sock, (char*)msg, sizeof(NETWORK_MSG), 0, (struct sockaddr *)dest, &socklen);
-}
Index: mmon/message.h
===================================================================
--- common/message.h	(revision cbc595dd131d6db74f170c0777eaaa3d1eb055f6)
+++ 	(revision )
@@ -1,19 +1,0 @@
-#ifndef _MESSAGE_H
-#define _MESSAGE_H
-
-#define MSG_TYPE_REGISTER     1
-#define MSG_TYPE_LOGIN        2
-#define MSG_TYPE_LOGOUT       3
-#define MSG_TYPE_CHAT         4
-
-typedef struct
-{
-   short type;
-   char buffer[256];
-} NETWORK_MSG;
-
-int sendMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest);
-
-int receiveMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest);
-
-#endif
Index: server/makefile
===================================================================
--- server/makefile	(revision cbc595dd131d6db74f170c0777eaaa3d1eb055f6)
+++ server/makefile	(revision b53c6b345affaea1c625ed8caa8faf8df17f5992)
@@ -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 b53c6b345affaea1c625ed8caa8faf8df17f5992)
@@ -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;