6 files changed, 8 insertions, 8 deletions
diff --git a/client/Makefile b/client/Makefile
index bb767d9..0d47f83 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -27,8 +27,8 @@ endif
 EXECUTABLE := dolmetschctl-client
 
 C_OBJS := slist.o \
-	midi.o \
-	osc.o \
+	midi_client.o \
+	osc_client.o \
   dolmetschctl-client.o
 
 C_SRCS := $(C_OBJS:%.o=%.c)
diff --git a/client/dolmetschctl-client.c b/client/dolmetschctl-client.c
index b67f238..9815924 100644
--- a/client/dolmetschctl-client.c
+++ b/client/dolmetschctl-client.c
@@ -30,8 +30,8 @@
 #include <lo/lo.h>
 #include <alsa/asoundlib.h>
 
-#include "midi.h"
-#include "osc.h"
+#include "midi_client.h"
+#include "osc_client.h"
 
 
 void print_version()
diff --git a/client/midi.c b/client/midi_client.c
index 7075432..456ec7d 100644
--- a/client/midi.c
+++ b/client/midi_client.c
@@ -27,7 +27,7 @@
 #include <poll.h>
 #include <assert.h>
 
-#include "midi.h"
+#include "midi_client.h"
 
 #define NOTE_EN 0x00
 #define NOTE_DE 0x01
diff --git a/client/midi.h b/client/midi_client.h
index 1a051ae..7ae65bd 100644
--- a/client/midi.h
+++ b/client/midi_client.h
@@ -27,7 +27,7 @@
 #include <poll.h>
 
 #include "slist.h"
-#include "osc.h"
+#include "osc_client.h"
 
 typedef struct {
   u_int8_t* buf_;
diff --git a/client/osc.c b/client/osc_client.c
index 79ee76e..a70eb67 100644
--- a/client/osc.c
+++ b/client/osc_client.c
@@ -28,8 +28,8 @@
 #include <error.h>
 #include <assert.h>
 
-#include "osc.h"
-#include "midi.h"
+#include "osc_client.h"
+#include "midi_client.h"
 
 
 static void print_error(int num, const char *msg, const char *path)
diff --git a/client/osc.h b/client/osc_client.h
index 9d1ad94..9d1ad94 100644
--- a/client/osc.h
+++ b/client/osc_client.h