5 files changed, 27 insertions, 42 deletions
diff --git a/src/server/Makefile b/src/server/Makefile
deleted file mode 100644
index 41e140e..0000000
--- a/src/server/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-all: heightScore.o publicServer.o serverConfigFile.o
-
-heightScore.o: heightScore.c heightScore.h
-	$(CC) $(CFLAGS) -o heightScore.o -c heightScore.c
-
-publicServer.o: publicServer.c publicServer.h
-	$(CC) $(CFLAGS) -o publicServer.o -c publicServer.c
-
-serverConfigFile.o: serverConfigFile.c serverConfigFile.h
-	$(CC) $(CFLAGS) -o serverConfigFile.o -c serverConfigFile.c
-
-clean:
-	rm -rf *.o
diff --git a/src/server/heightScore.c b/src/server/heightScore.c
index f36dcf7..fa7402e 100644
--- a/src/server/heightScore.c
+++ b/src/server/heightScore.c
@@ -4,10 +4,10 @@
 #include <string.h>
 #include <assert.h>
 
-#include "base/main.h"
-#include "base/list.h"
-#include "base/textFile.h"
-#include "server/heightScore.h"
+#include "main.h"
+#include "list.h"
+#include "textFile.h"
+#include "heightScore.h"
 
 static textFile_t *textFile;
 
diff --git a/src/server/publicServer.c b/src/server/publicServer.c
index d7246a0..b92056c 100644
--- a/src/server/publicServer.c
+++ b/src/server/publicServer.c
@@ -15,24 +15,24 @@
 #include <errno.h>
 #endif
 
-#include "base/main.h"
-#include "base/list.h"
-#include "base/tux.h"
-#include "base/idManager.h"
-#include "base/myTimer.h"
-#include "base/arena.h"
-#include "base/item.h"
-#include "base/shot.h"
-#include "base/arenaFile.h"
-#include "base/proto.h"
-#include "base/modules.h"
-#include "base/net_multiplayer.h"
-
-#include "server/publicServer.h"
-#include "server/serverConfigFile.h"
-#include "server/heightScore.h"
-
-#include "net_unix/dns.h"
+#include "main.h"
+#include "list.h"
+#include "tux.h"
+#include "idManager.h"
+#include "myTimer.h"
+#include "arena.h"
+#include "item.h"
+#include "shot.h"
+#include "arenaFile.h"
+#include "proto.h"
+#include "modules.h"
+#include "net_multiplayer.h"
+
+#include "publicServer.h"
+#include "serverConfigFile.h"
+#include "heightScore.h"
+
+#include "dns.h"
 
 static int arenaId;
 static arena_t *arena;
diff --git a/src/server/publicServer.h b/src/server/publicServer.h
index 111ff9c..7fb22da 100644
--- a/src/server/publicServer.h
+++ b/src/server/publicServer.h
@@ -3,7 +3,7 @@
 
 #define PUBLIC_SERVER_H
 
-#include "base/arena.h"
+#include "arena.h"
 
 #define WORLD_COUNT_ROUND_UNLIMITED	-1
 
diff --git a/src/server/serverConfigFile.c b/src/server/serverConfigFile.c
index 48d57eb..749bb2d 100644
--- a/src/server/serverConfigFile.c
+++ b/src/server/serverConfigFile.c
@@ -4,10 +4,10 @@
 #include <string.h>
 #include <assert.h>
 
-#include "base/main.h"
-#include "base/list.h"
-#include "base/textFile.h"
-#include "server/serverConfigFile.h"
+#include "main.h"
+#include "list.h"
+#include "textFile.h"
+#include "serverConfigFile.h"
 
 static textFile_t *serverTextFile;