diff --git a/client/X11/CMakeLists.txt b/client/X11/CMakeLists.txt
index f1d8ba08f..56dd96bdb 100644
--- a/client/X11/CMakeLists.txt
+++ b/client/X11/CMakeLists.txt
@@ -44,8 +44,8 @@ set(${MODULE_PREFIX}_SRCS
 	xf_keyboard.h
 	xf_window.c
 	xf_window.h
-	xf_interface.c
-	xf_interface.h)
+	xf_client.c
+	xf_client.h)
 
 if(WITH_CLIENT_INTERFACE)
 	if(CLIENT_INTERFACE_SHARED)
diff --git a/client/X11/cli/xfreerdp.c b/client/X11/cli/xfreerdp.c
index a919c5360..af2b995b9 100644
--- a/client/X11/cli/xfreerdp.c
+++ b/client/X11/cli/xfreerdp.c
@@ -28,8 +28,7 @@
 
 #include <freerdp/freerdp.h>
 
-#include "xf_interface.h"
-
+#include "xf_client.h"
 #include "xfreerdp.h"
 
 int main(int argc, char* argv[])
diff --git a/client/X11/xf_channels.c b/client/X11/xf_channels.c
index dd2136fd5..91dda0b8e 100644
--- a/client/X11/xf_channels.c
+++ b/client/X11/xf_channels.c
@@ -23,7 +23,7 @@
 
 #include "xf_channels.h"
 
-#include "xf_interface.h"
+#include "xf_client.h"
 #include "xfreerdp.h"
 
 int xf_on_channel_connected(freerdp* instance, const char* name, void* pInterface)
diff --git a/client/X11/xf_interface.c b/client/X11/xf_client.c
similarity index 100%
rename from client/X11/xf_interface.c
rename to client/X11/xf_client.c
diff --git a/client/X11/xf_interface.h b/client/X11/xf_client.h
similarity index 93%
rename from client/X11/xf_interface.h
rename to client/X11/xf_client.h
index 6710ca37b..be88f099e 100644
--- a/client/X11/xf_interface.h
+++ b/client/X11/xf_client.h
@@ -17,8 +17,8 @@
  * limitations under the License.
  */
 
-#ifndef __XF_INTERFACE_H
-#define __XF_INTERFACE_H
+#ifndef __XF_CLIENT_H
+#define __XF_CLIENT_H
 
 #include <freerdp/api.h>
 #include <freerdp/freerdp.h>
@@ -48,4 +48,4 @@ FREERDP_API int RdpClientEntry(RDP_CLIENT_ENTRY_POINTS* pEntryPoints);
 }
 #endif
 
-#endif /* __XF_INTERFACE_H */
+#endif /* __XF_CLIENT_H */
diff --git a/client/X11/xf_cliprdr.h b/client/X11/xf_cliprdr.h
index 3f62e3268..3e3d680ee 100644
--- a/client/X11/xf_cliprdr.h
+++ b/client/X11/xf_cliprdr.h
@@ -20,7 +20,7 @@
 #ifndef __XF_CLIPRDR_H
 #define __XF_CLIPRDR_H
 
-#include "xf_interface.h"
+#include "xf_client.h"
 #include "xfreerdp.h"
 
 void xf_cliprdr_init(xfContext* xfc, rdpChannels* channels);
diff --git a/client/X11/xf_event.h b/client/X11/xf_event.h
index 8ed250e83..4a6492f37 100644
--- a/client/X11/xf_event.h
+++ b/client/X11/xf_event.h
@@ -22,7 +22,7 @@
 
 #include "xf_keyboard.h"
 
-#include "xf_interface.h"
+#include "xf_client.h"
 #include "xfreerdp.h"
 
 BOOL xf_event_process(freerdp* instance, XEvent* event);
diff --git a/client/X11/xf_gdi.h b/client/X11/xf_gdi.h
index 64e98d0cb..413f1c6e7 100644
--- a/client/X11/xf_gdi.h
+++ b/client/X11/xf_gdi.h
@@ -22,7 +22,7 @@
 
 #include <freerdp/gdi/gdi.h>
 
-#include "xf_interface.h"
+#include "xf_client.h"
 #include "xfreerdp.h"
 
 void xf_gdi_register_update_callbacks(rdpUpdate* update);
diff --git a/client/X11/xf_graphics.h b/client/X11/xf_graphics.h
index 60bbba6bf..8363bf553 100644
--- a/client/X11/xf_graphics.h
+++ b/client/X11/xf_graphics.h
@@ -20,7 +20,7 @@
 #ifndef __XF_GRAPHICS_H
 #define __XF_GRAPHICS_H
 
-#include "xf_interface.h"
+#include "xf_client.h"
 #include "xfreerdp.h"
 
 void xf_register_graphics(rdpGraphics* graphics);
diff --git a/client/X11/xf_input.h b/client/X11/xf_input.h
index 26498505b..367c7da23 100644
--- a/client/X11/xf_input.h
+++ b/client/X11/xf_input.h
@@ -20,7 +20,7 @@
 #ifndef __XF_INPUT_H
 #define __XF_INPUT_H
 
-#include "xf_interface.h"
+#include "xf_client.h"
 #include "xfreerdp.h"
 
 #ifdef WITH_XI
diff --git a/client/X11/xf_keyboard.h b/client/X11/xf_keyboard.h
index 65732ced8..0b84efa43 100644
--- a/client/X11/xf_keyboard.h
+++ b/client/X11/xf_keyboard.h
@@ -22,7 +22,7 @@
 
 #include <freerdp/locale/keyboard.h>
 
-#include "xf_interface.h"
+#include "xf_client.h"
 #include "xfreerdp.h"
 
 void xf_kbd_init(xfContext* xfc);
diff --git a/client/X11/xf_monitor.h b/client/X11/xf_monitor.h
index 58d465024..ed4bd21a8 100644
--- a/client/X11/xf_monitor.h
+++ b/client/X11/xf_monitor.h
@@ -40,7 +40,7 @@ struct _VIRTUAL_SCREEN
 };
 typedef struct _VIRTUAL_SCREEN VIRTUAL_SCREEN;
 
-#include "xf_interface.h"
+#include "xf_client.h"
 #include "xfreerdp.h"
 
 int xf_list_monitors(xfContext* xfc);
diff --git a/client/X11/xf_rail.h b/client/X11/xf_rail.h
index 3518e0388..d10bb03e5 100644
--- a/client/X11/xf_rail.h
+++ b/client/X11/xf_rail.h
@@ -20,7 +20,7 @@
 #ifndef __XF_RAIL_H
 #define __XF_RAIL_H
 
-#include "xf_interface.h"
+#include "xf_client.h"
 #include "xfreerdp.h"
 
 void xf_rail_paint(xfContext* xfc, rdpRail* rail, INT32 uleft, INT32 utop, UINT32 uright, UINT32 ubottom);
diff --git a/client/X11/xf_tsmf.h b/client/X11/xf_tsmf.h
index a8cf8cdae..eb7981851 100644
--- a/client/X11/xf_tsmf.h
+++ b/client/X11/xf_tsmf.h
@@ -20,7 +20,7 @@
 #ifndef __XF_TSMF_H
 #define __XF_TSMF_H
 
-#include "xf_interface.h"
+#include "xf_client.h"
 #include "xfreerdp.h"
 
 void xf_tsmf_init(xfContext* xfc, long xv_port);
diff --git a/client/X11/xf_window.h b/client/X11/xf_window.h
index c501b8224..e80023981 100644
--- a/client/X11/xf_window.h
+++ b/client/X11/xf_window.h
@@ -27,7 +27,7 @@
 typedef struct xf_localmove xfLocalMove;
 typedef struct xf_window xfWindow;
 
-#include "xf_interface.h"
+#include "xf_client.h"
 #include "xfreerdp.h"
 
 // Extended ICCM flags http://standards.freedesktop.org/wm-spec/wm-spec-latest.html