diff --git a/inc/luarpc_rpc.h b/inc/luarpc_rpc.h
index c38c4c28..56837fc2 100644
--- a/inc/luarpc_rpc.h
+++ b/inc/luarpc_rpc.h
@@ -1,6 +1,7 @@
 #include "cexcept.h"
 #include "type.h"
-#include "serial.h"
+#include "rpc_serial.h"
+#warning Not sure which of the two serial.h this should include
 
 /****************************************************************************/
 // Parameters
diff --git a/inc/serial.h b/inc/rpc_serial.h
similarity index 100%
rename from inc/serial.h
rename to inc/rpc_serial.h
diff --git a/mux_src/main.c b/mux_src/main.c
index 5d7e56ca..e17db0af 100644
--- a/mux_src/main.c
+++ b/mux_src/main.c
@@ -10,7 +10,7 @@
 #include "config.h"
 #include "log.h"
 #include "type.h"
-#include "serial.h"
+#include "rfs_serial.h"
 #include "sermux.h"
 #include "rfs.h"
 #include "deskutils.h"
diff --git a/rfs_server_src/main.c b/rfs_server_src/main.c
index c692f488..678432f4 100644
--- a/rfs_server_src/main.c
+++ b/rfs_server_src/main.c
@@ -3,7 +3,7 @@
 #include "net.h"
 #include "remotefs.h"
 #include "eluarpc.h"
-#include "serial.h"
+#include "rfs_serial.h"
 #include "server.h"
 #include "type.h"
 #include "log.h"
diff --git a/rfs_server_src/serial.h b/rfs_server_src/rfs_serial.h
similarity index 100%
rename from rfs_server_src/serial.h
rename to rfs_server_src/rfs_serial.h
diff --git a/rfs_server_src/rfs_transports.c b/rfs_server_src/rfs_transports.c
index 03904f14..ebfc1cb0 100644
--- a/rfs_server_src/rfs_transports.c
+++ b/rfs_server_src/rfs_transports.c
@@ -3,7 +3,7 @@
 #include "net.h"
 #include "remotefs.h"
 #include "eluarpc.h"
-#include "serial.h"
+#include "rfs_serial.h"
 #include "server.h"
 #include "type.h"
 #include "log.h"
diff --git a/rfs_server_src/serial_posix.c b/rfs_server_src/serial_posix.c
index 2fc6ea2f..88fca61c 100644
--- a/rfs_server_src/serial_posix.c
+++ b/rfs_server_src/serial_posix.c
@@ -1,6 +1,6 @@
 // Serial inteface implementation for POSIX-compliant systems
 
-#include "serial.h"
+#include "rfs_serial.h"
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/rfs_server_src/serial_win32.c b/rfs_server_src/serial_win32.c
index eb7b03e9..29134e00 100644
--- a/rfs_server_src/serial_win32.c
+++ b/rfs_server_src/serial_win32.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "type.h"
-#include "serial.h"
+#include "rfs_serial.h"
 
 #define WIN_ERROR     ( HANDLE )-1
 #define WIN_MAX_PORT_NAME   MAX_PATH
diff --git a/src/luarpc_desktop_serial.c b/src/luarpc_desktop_serial.c
index 2030f847..772b1a3b 100644
--- a/src/luarpc_desktop_serial.c
+++ b/src/luarpc_desktop_serial.c
@@ -14,7 +14,7 @@
 #include "lauxlib.h"
 
 #include "luarpc_rpc.h"
-#include "serial.h"
+#include "rpc_serial.h"
 
 #ifndef LUA_CROSS_COMPILER
 #include "platform_conf.h"
diff --git a/src/serial/serial_posix.c b/src/serial/serial_posix.c
index 7fa2c8c0..10632971 100644
--- a/src/serial/serial_posix.c
+++ b/src/serial/serial_posix.c
@@ -1,6 +1,6 @@
 // Serial inteface implementation for POSIX-compliant systems
 
-#include "serial.h"
+#include "rpc_serial.h"
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/src/serial/serial_win32.c b/src/serial/serial_win32.c
index 749eaeb0..70fd9a12 100644
--- a/src/serial/serial_win32.c
+++ b/src/serial/serial_win32.c
@@ -3,7 +3,7 @@
 #include <windows.h>
 #include <string.h>
 #include <stdio.h>
-#include "serial.h"
+#include "rpc_serial.h"
 
 #define WIN_ERROR     ( HANDLE )-1
 #define WIN_MAX_PORT_NAME   1024