6 files changed, 9 insertions, 9 deletions
diff --git a/server/Makefile b/server/Makefile
index ff1bd06..2fb8c2d 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -26,11 +26,11 @@ endif
 
 EXECUTABLE := dolmetschctl
 
-C_OBJS := osc.o \
-	midi.o \
-  slist.o \
+C_OBJS :=  slist.o \
+  osc_server.o \
+  midi_server.o \
   mixer.o \
-	dolmetschctl.o
+  dolmetschctl.o
 
 C_SRCS := $(C_OBJS:%.o=%.c)
 
@@ -91,4 +91,4 @@ remove-bin:
 remove-etc:
 
 purge: remove
-	rm -rf $(DESTDIR)$(ETCDIR)/$(EXECUTABLE)/
-\ No newline at end of file
+	rm -rf $(DESTDIR)$(ETCDIR)/$(EXECUTABLE)/
diff --git a/server/dolmetschctl.c b/server/dolmetschctl.c
index 5bb9965..3b20cb6 100644
--- a/server/dolmetschctl.c
+++ b/server/dolmetschctl.c
@@ -31,8 +31,8 @@
 #include <alsa/asoundlib.h>
 
 #include "mixer.h"
-#include "midi.h"
-#include "osc.h"
+#include "midi_server.h"
+#include "osc_server.h"
 
 
 void print_version()
diff --git a/server/midi.c b/server/midi_server.c
index 6ef5775..dbbf222 100644
--- a/server/midi.c
+++ b/server/midi_server.c
@@ -27,7 +27,7 @@
 #include <poll.h>
 #include <assert.h>
 
-#include "midi.h"
+#include "midi_server.h"
 
 #define NOTE_EN 0x00
 #define NOTE_DE 0x01
diff --git a/server/midi.h b/server/midi_server.h
index 537c356..537c356 100644
--- a/server/midi.h
+++ b/server/midi_server.h
diff --git a/server/osc.c b/server/osc_server.c
index 1011ad8..223a192 100644
--- a/server/osc.c
+++ b/server/osc_server.c
@@ -28,7 +28,7 @@
 #include <error.h>
 #include <assert.h>
 
-#include "osc.h"
+#include "osc_server.h"
 
 
 static void print_error(int num, const char *msg, const char *path)
diff --git a/server/osc.h b/server/osc_server.h
index 40210b3..40210b3 100644
--- a/server/osc.h
+++ b/server/osc_server.h