7 files changed, 18 insertions, 35 deletions
diff --git a/src/audio/Makefile b/src/audio/Makefile
deleted file mode 100644
index a5dff01..0000000
--- a/src/audio/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-all: audio.o music.o sound.o
-
-audio.o: audio.c audio.h
-	$(CC) $(CFLAGS) -o audio.o -c audio.c
-
-music.o: music.c music.h
-	$(CC) $(CFLAGS) -o music.o -c music.c
-
-sound.o: sound.c sound.h
-	$(CC) $(CFLAGS) -o sound.o -c sound.c
-
-
-
-clean:
-	rm -rf *.o
diff --git a/src/audio/audio.c b/src/audio/audio.c
index d7f4a9b..8397788 100644
--- a/src/audio/audio.c
+++ b/src/audio/audio.c
@@ -3,9 +3,9 @@
 #include <assert.h>
 #include <SDL_mixer.h>
 
-#include "base/main.h"
-#include "audio/audio.h"
-#include "client/interface.h"
+#include "main.h"
+#include "audio.h"
+#include "interface.h"
 
 static bool_t isAudioInit = FALSE;
 
diff --git a/src/audio/audio.h b/src/audio/audio.h
index 04c58e7..242bb9a 100644
--- a/src/audio/audio.h
+++ b/src/audio/audio.h
@@ -3,7 +3,7 @@
 
 #define AUDIO_H
 
-#include "base/main.h"
+#include "main.h"
 
 extern bool_t isAudioInicialized();
 extern void initAudio();
diff --git a/src/audio/music.c b/src/audio/music.c
index b449950..cf3db24 100644
--- a/src/audio/music.c
+++ b/src/audio/music.c
@@ -3,14 +3,14 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "base/main.h"
-#include "base/list.h"
-#include "base/storage.h"
+#include "main.h"
+#include "list.h"
+#include "storage.h"
 
-#include "client/interface.h"
+#include "interface.h"
 
-#include "audio/audio.h"
-#include "audio/music.h"
+#include "audio.h"
+#include "music.h"
 
 static list_t *listStorage;
 
diff --git a/src/audio/music.h b/src/audio/music.h
index d87f382..0ae83c4 100644
--- a/src/audio/music.h
+++ b/src/audio/music.h
@@ -6,7 +6,7 @@
 #ifndef NO_SOUND
 
 #include <SDL_mixer.h>
-#include "base/main.h"
+#include "main.h"
 
 #define MUSIC_GROUP_BASE "base"
 #define MUSIC_GROUP_USER "user"
diff --git a/src/audio/sound.c b/src/audio/sound.c
index 37803c4..652de67 100644
--- a/src/audio/sound.c
+++ b/src/audio/sound.c
@@ -3,14 +3,14 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "base/main.h"
-#include "base/list.h"
-#include "base/storage.h"
+#include "main.h"
+#include "list.h"
+#include "storage.h"
 
-#include "client/interface.h"
+#include "interface.h"
 
-#include "audio/audio.h"
-#include "audio/sound.h"
+#include "audio.h"
+#include "sound.h"
 
 static list_t *listStorage;
 
diff --git a/src/audio/sound.h b/src/audio/sound.h
index ec1beb1..337ef3b 100644
--- a/src/audio/sound.h
+++ b/src/audio/sound.h
@@ -6,7 +6,7 @@
 #ifndef NO_SOUND
 
 #include <SDL_mixer.h>
-#include "base/main.h"
+#include "main.h"
 
 #define SOUND_GROUP_BASE "base"
 #define SOUND_GROUP_USER "user"