diff --git a/Makefile.in b/Makefile.in
index 77259875f..072b92b2d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -41,7 +41,7 @@ HEADERS	      = @HEADERS@
 
 OBJS	      = @OBJS@ \
 	        src/bitstream.o \
-		src/control.o \
+		src/control_socket.o \
 		src/debug.o \
 		src/host.o \
 		src/messaging.o \
diff --git a/src/control.cpp b/src/control_socket.cpp
similarity index 99%
rename from src/control.cpp
rename to src/control_socket.cpp
index 852ce6383..4e2a2b3d1 100644
--- a/src/control.cpp
+++ b/src/control_socket.cpp
@@ -1,5 +1,5 @@
 /*
- * FILE:    control.c
+ * FILE:    control_socket.c
  * AUTHORS: Martin Benes     <martinbenesh@gmail.com>
  *          Lukas Hejtmanek  <xhejtman@ics.muni.cz>
  *          Petr Holub       <hopet@ics.muni.cz>
@@ -50,7 +50,7 @@
 #include "config_win32.h"
 #endif // HAVE_CONFIG_H
 
-#include "control.h"
+#include "control_socket.h"
 
 #include <set>
 
diff --git a/src/control.h b/src/control_socket.h
similarity index 98%
rename from src/control.h
rename to src/control_socket.h
index b4315fdb9..b48a55918 100644
--- a/src/control.h
+++ b/src/control_socket.h
@@ -1,5 +1,5 @@
 /*
- * FILE:    control.h
+ * FILE:    control_socket.h
  * AUTHORS: Martin Benes     <martinbenesh@gmail.com>
  *          Lukas Hejtmanek  <xhejtman@ics.muni.cz>
  *          Petr Holub       <hopet@ics.muni.cz>
diff --git a/src/hd-rum-translator/hd-rum-translator.c b/src/hd-rum-translator/hd-rum-translator.c
index c6594e1c6..3dd0be9d8 100644
--- a/src/hd-rum-translator/hd-rum-translator.c
+++ b/src/hd-rum-translator/hd-rum-translator.c
@@ -16,7 +16,7 @@
 #include <pthread.h>
 #include <fcntl.h>
 
-#include "control.h"
+#include "control_socket.h"
 #include "hd-rum-translator/hd-rum-recompress.h"
 #include "hd-rum-translator/hd-rum-decompress.h"
 #include "module.h"
diff --git a/src/main.c b/src/main.c
index a9f3cf184..8b9122555 100644
--- a/src/main.c
+++ b/src/main.c
@@ -62,7 +62,7 @@
 #include <getopt.h>
 #include <pthread.h>
 #include "capture_filter.h"
-#include "control.h"
+#include "control_socket.h"
 #include "debug.h"
 #include "host.h"
 #include "messaging.h"
diff --git a/src/stats.cpp b/src/stats.cpp
index 87042b949..397118869 100644
--- a/src/stats.cpp
+++ b/src/stats.cpp
@@ -3,7 +3,7 @@
 #include <map>
 #include <string>
 
-#include "control.h"
+#include "control_socket.h"
 #include "compat/platform_spin.h"
 #include "debug.h"
 #include "messaging.h"