x11-helper: Rename xcb.c

Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>

10 files changed, 3 insertions, 10 deletions

diff --git a/source/dialogs/drun.c b/source/dialogs/drun.c
index ae7eaea3..83aabef4 100644
--- a/source/dialogs/drun.c
+++ b/source/dialogs/drun.c
@@ -50,6 +50,7 @@
 #include "history.h"
 #include "dialogs/drun.h"
 #include "nkutils-xdg-theme.h"
+#include "xcb.h"
 
 #define DRUN_CACHE_FILE    "rofi2.druncache"
 
diff --git a/source/dialogs/window.c b/source/dialogs/window.c
index d19e1c61..f3276ba2 100644
--- a/source/dialogs/window.c
+++ b/source/dialogs/window.c
@@ -52,7 +52,6 @@
 #include "settings.h"
 #include "helper.h"
 #include "widgets/textbox.h"
-#include "x11-helper.h"
 #include "dialogs/window.h"
 
 #define WINLIST             32
diff --git a/source/helper.c b/source/helper.c
index 5299ced3..a75e8413 100644
--- a/source/helper.c
+++ b/source/helper.c
@@ -47,10 +47,10 @@
 #include <pango/pango.h>
 #include <pango/pango-fontmap.h>
 #include <pango/pangocairo.h>
+#include "xcb.h"
 #include "helper.h"
 #include "helper-theme.h"
 #include "settings.h"
-#include "x11-helper.h"
 #include "rofi.h"
 #include "view.h"
 
diff --git a/source/mode.c b/source/mode.c
index 5e070e3c..c8ccfa68 100644
--- a/source/mode.c
+++ b/source/mode.c
@@ -30,7 +30,6 @@
 #include <string.h>
 #include "rofi.h"
 #include "xrmoptions.h"
-#include "x11-helper.h"
 #include "mode.h"
 
 // This one should only be in mode implementations.
diff --git a/source/rofi.c b/source/rofi.c
index f18c880b..38c5cd12 100644
--- a/source/rofi.c
+++ b/source/rofi.c
@@ -58,7 +58,6 @@
 #include "rofi.h"
 #include "helper.h"
 #include "widgets/textbox.h"
-#include "x11-helper.h"
 #include "xrmoptions.h"
 #include "dialogs/dialogs.h"
 
diff --git a/source/view.c b/source/view.c
index 3e5e0a8f..f3569532 100644
--- a/source/view.c
+++ b/source/view.c
@@ -58,7 +58,6 @@
 #include "xkb-internal.h"
 #include "helper.h"
 #include "helper-theme.h"
-#include "x11-helper.h"
 #include "xrmoptions.h"
 #include "dialogs/dialogs.h"
 
diff --git a/source/widgets/scrollbar.c b/source/widgets/scrollbar.c
index bd5f7716..b6c70b18 100644
--- a/source/widgets/scrollbar.c
+++ b/source/widgets/scrollbar.c
@@ -31,7 +31,6 @@
 #include "widgets/textbox.h"
 #include "widgets/listview.h"
 #include "widgets/scrollbar.h"
-#include "x11-helper.h"
 
 #include "theme.h"
 
diff --git a/source/widgets/textbox.c b/source/widgets/textbox.c
index a5a8cfac..7bac65f5 100644
--- a/source/widgets/textbox.c
+++ b/source/widgets/textbox.c
@@ -36,7 +36,6 @@
 #include "keyb.h"
 #include "helper.h"
 #include "helper-theme.h"
-#include "x11-helper.h"
 #include "mode.h"
 #include "view.h"
 
diff --git a/source/x11-helper.c b/source/xcb.c
index 94b5b53d..e9a300a2 100644
--- a/source/x11-helper.c
+++ b/source/xcb.c
@@ -38,6 +38,7 @@
 #include <glib.h>
 #include <cairo.h>
 #include <cairo-xcb.h>
+#include <librsvg/rsvg.h>
 
 #include <xcb/xcb.h>
 #include <xcb/xcb_aux.h>
@@ -49,12 +50,10 @@
 #include "xcb.h"
 #include "settings.h"
 #include "helper.h"
-#include "x11-helper.h"
 
 #include <rofi.h>
 /** Checks if the if x and y is inside rectangle. */
 #define INTERSECT( x, y, x1, y1, w1, h1 )    ( ( ( ( x ) >= ( x1 ) ) && ( ( x ) < ( x1 + w1 ) ) ) && ( ( ( y ) >= ( y1 ) ) && ( ( y ) < ( y1 + h1 ) ) ) )
-#include "x11-helper.h"
 #include "xkb-internal.h"
 WindowManager current_window_manager = WM_EWHM;
 
diff --git a/source/xrmoptions.c b/source/xrmoptions.c
index 7fd87e56..9fa67ad9 100644
--- a/source/xrmoptions.c
+++ b/source/xrmoptions.c
@@ -36,7 +36,6 @@
 #include <glib.h>
 #include "xcb.h"
 #include "xcb-internal.h"
-#include "x11-helper.h"
 #include "rofi.h"
 #include "xrmoptions.h"
 #include "settings.h"