5 files changed, 15 insertions, 12 deletions
diff --git a/client/x11/pixels_source_p.h b/client/x11/pixels_source_p.h
index 000fe4d0..64b0c50e 100644
--- a/client/x11/pixels_source_p.h
+++ b/client/x11/pixels_source_p.h
@@ -29,7 +29,8 @@
 #ifdef USE_OPENGL
 #include "red_pixmap_gl.h"
 #endif // USE_OPENGL
-#include "pixman_utils.h"
+
+#include "common/pixman_utils.h"
 
 enum {
     PIXELS_SOURCE_TYPE_INVALID,
diff --git a/client/x11/platform.cpp b/client/x11/platform.cpp
index f535d6da..f35d5374 100644
--- a/client/x11/platform.cpp
+++ b/client/x11/platform.cpp
@@ -48,20 +48,21 @@
 #include <sys/time.h>
 #endif
 
+#include <spice/vd_agent.h>
+#include "common/rect.h"
+
 #include "platform.h"
 #include "application.h"
 #include "utils.h"
 #include "x_platform.h"
 #include "debug.h"
 #include "monitor.h"
-#include "rect.h"
 #include "record.h"
 #include "playback.h"
 #include "resource.h"
 #include "res.h"
 #include "cursor.h"
 #include "process_loop.h"
-#include <spice/vd_agent.h>
 
 #define DWORD uint32_t
 #define BOOL bool
diff --git a/client/x11/red_drawable.cpp b/client/x11/red_drawable.cpp
index fd5d4a16..bb8ceb44 100644
--- a/client/x11/red_drawable.cpp
+++ b/client/x11/red_drawable.cpp
@@ -26,7 +26,7 @@
 #include "utils.h"
 
 #ifdef USE_OPENGL
-#include "gl_utils.h"
+#include "common/gl_utils.h"
 #include <GL/gl.h>
 #include <GL/glu.h>
 #include <GL/glext.h>
diff --git a/client/x11/red_pixmap_gl.cpp b/client/x11/red_pixmap_gl.cpp
index 1e1e6e0f..8d81c31a 100644
--- a/client/x11/red_pixmap_gl.cpp
+++ b/client/x11/red_pixmap_gl.cpp
@@ -22,12 +22,12 @@
 #include <GL/glu.h>
 #include <GL/glext.h>
 #include <X11/Xlib.h>
+#include "common/gl_utils.h"
 
 #include "common.h"
 #include "red_pixmap_gl.h"
 #include "debug.h"
 #include "utils.h"
-#include "gl_utils.h"
 #include "pixels_source_p.h"
 #include "x_platform.h"
 #include "red_window_p.h"
diff --git a/client/x11/red_window.cpp b/client/x11/red_window.cpp
index fda90d59..83144a54 100644
--- a/client/x11/red_window.cpp
+++ b/client/x11/red_window.cpp
@@ -33,21 +33,22 @@
 #endif // USE_OPENGL
 #include <stdio.h>
 
+#include <spice/protocol.h>
+#include "common/region.h"
+
+#ifdef USE_OPENGL
+#include "common/gl_utils.h"
+#include "red_pixmap_gl.h"
+#endif // USE_OPENGL
+
 #include "red_window.h"
 #include "utils.h"
 #include "debug.h"
 #include "platform.h"
 #include "x_platform.h"
 #include "pixels_source_p.h"
-#include <spice/protocol.h>
-#include "region.h"
-#ifdef USE_OPENGL
-#include "gl_utils.h"
-#include "red_pixmap_gl.h"
-#endif // USE_OPENGL
 #include "x_icon.h"
 
-
 #define X_RETRIES 10
 #define X_RETRY_DELAY_MICRO (1000 * 100)
 #define RAISE_RETRIES X_RETRIES