From 3c2d55c69c95b39bccdc0e2f1991c314a4aa3611 Mon Sep 17 00:00:00 2001
From: Sean Davis <smd.seandavis@gmail.com>
Date: Mon, 19 Nov 2018 21:02:10 -0500
Subject: [PATCH] Remove subdirs from includes to fix distcheck
---
CPPLINT.cfg | 2 +-
savers/floaters.c | 2 +-
savers/gs-theme-engine.c | 4 ++--
savers/gs-theme-window.c | 2 +-
savers/gste-popsquares.c | 4 ++--
savers/gste-popsquares.h | 2 +-
savers/gste-slideshow.c | 4 ++--
savers/gste-slideshow.h | 2 +-
savers/popsquares.c | 6 +++---
savers/slideshow.c | 8 ++++----
savers/xdg-user-dir-lookup.c | 2 +-
src/copy-theme-dialog.c | 2 +-
src/gs-auth-bsdauth.c | 4 ++--
src/gs-auth-helper.c | 4 ++--
src/gs-auth-pam.c | 4 ++--
src/gs-auth-pwent.c | 2 +-
src/gs-debug.c | 2 +-
src/gs-fade.c | 6 +++---
src/gs-grab-x11.c | 6 +++---
src/gs-job.c | 6 +++---
src/gs-listener-dbus.c | 6 +++---
src/gs-listener-x11.c | 6 +++---
src/gs-lock-plug.c | 12 ++++++------
src/gs-manager.c | 18 +++++++++---------
src/gs-manager.h | 2 +-
src/gs-monitor.c | 18 +++++++++---------
src/gs-prefs.c | 2 +-
src/gs-theme-manager.c | 4 ++--
src/gs-visual-gl.c | 4 ++--
src/gs-window-x11.c | 8 ++++----
src/setuid.c | 2 +-
src/subprocs.c | 2 +-
src/test-fade.c | 4 ++--
src/test-passwd.c | 4 ++--
src/test-window.c | 6 +++---
src/xfce-rr.c | 4 ++--
src/xfce4-screensaver-dialog.c | 10 +++++-----
src/xfce4-screensaver-gl-helper.c | 2 +-
src/xfce4-screensaver-preferences.c | 14 +++++++-------
src/xfce4-screensaver.c | 6 +++---
src/xfcekbd-config-private.h | 4 ++--
src/xfcekbd-desktop-config.c | 4 ++--
src/xfcekbd-indicator-config.c | 6 +++---
src/xfcekbd-indicator-config.h | 2 +-
src/xfcekbd-indicator.c | 8 ++++----
src/xfcekbd-keyboard-config.c | 4 ++--
46 files changed, 118 insertions(+), 118 deletions(-)
diff --git a/CPPLINT.cfg b/CPPLINT.cfg
index b1e51b79..c2c1e740 100644
--- a/CPPLINT.cfg
+++ b/CPPLINT.cfg
@@ -1,3 +1,3 @@
-filter=-whitespace/parens,-whitespace/braces,-readability/casting,-runtime/int,-build/include_what_you_use
+filter=-build/include_subdir,-build/include_what_you_use,-readability/casting,-runtime/int,-whitespace/braces,-whitespace/parens
linelength=120
extensions=c,h
diff --git a/savers/floaters.c b/savers/floaters.c
index e2e300af..cedb58f1 100644
--- a/savers/floaters.c
+++ b/savers/floaters.c
@@ -39,7 +39,7 @@
#include <libxfce4util/libxfce4util.h>
-#include "savers/gs-theme-window.h"
+#include "gs-theme-window.h"
#ifndef trunc
#define trunc(x) (((x) > 0.0) ? floor((x)) : -floor(-(x)))
diff --git a/savers/gs-theme-engine.c b/savers/gs-theme-engine.c
index 1e73d68b..d2a0382d 100644
--- a/savers/gs-theme-engine.c
+++ b/savers/gs-theme-engine.c
@@ -29,8 +29,8 @@
#include <glib.h>
#include <gtk/gtk.h>
-#include "savers/gs-theme-engine.h"
-#include "savers/gs-theme-engine-marshal.h"
+#include "gs-theme-engine.h"
+#include "gs-theme-engine-marshal.h"
static void gs_theme_engine_class_init (GSThemeEngineClass *klass);
static void gs_theme_engine_init (GSThemeEngine *engine);
diff --git a/savers/gs-theme-window.c b/savers/gs-theme-window.c
index 9c488e50..3a4c98f3 100644
--- a/savers/gs-theme-window.c
+++ b/savers/gs-theme-window.c
@@ -34,7 +34,7 @@
#include <gdk/gdkx.h>
#include <gtk/gtk.h>
-#include "savers/gs-theme-window.h"
+#include "gs-theme-window.h"
static void gs_theme_window_finalize (GObject *object);
static void gs_theme_window_real_realize (GtkWidget *widget);
diff --git a/savers/gste-popsquares.c b/savers/gste-popsquares.c
index f363a5df..3d5079fe 100644
--- a/savers/gste-popsquares.c
+++ b/savers/gste-popsquares.c
@@ -30,8 +30,8 @@
#include <glib.h>
#include <gtk/gtk.h>
-#include "savers/gs-theme-engine.h"
-#include "savers/gste-popsquares.h"
+#include "gs-theme-engine.h"
+#include "gste-popsquares.h"
static void gste_popsquares_class_init (GSTEPopsquaresClass *klass);
static void gste_popsquares_init (GSTEPopsquares *engine);
diff --git a/savers/gste-popsquares.h b/savers/gste-popsquares.h
index ec2fdeb7..58ad2467 100644
--- a/savers/gste-popsquares.h
+++ b/savers/gste-popsquares.h
@@ -26,7 +26,7 @@
#include <glib.h>
#include <gdk/gdk.h>
-#include "savers/gs-theme-engine.h"
+#include "gs-theme-engine.h"
G_BEGIN_DECLS
diff --git a/savers/gste-slideshow.c b/savers/gste-slideshow.c
index d3fb863b..9ff61cfd 100644
--- a/savers/gste-slideshow.c
+++ b/savers/gste-slideshow.c
@@ -30,8 +30,8 @@
#include <glib.h>
#include <gtk/gtk.h>
-#include "savers/gs-theme-engine.h"
-#include "savers/gste-slideshow.h"
+#include "gs-theme-engine.h"
+#include "gste-slideshow.h"
static void gste_slideshow_class_init (GSTESlideshowClass *klass);
static void gste_slideshow_init (GSTESlideshow *engine);
diff --git a/savers/gste-slideshow.h b/savers/gste-slideshow.h
index 2bdb867e..5db0cd0f 100644
--- a/savers/gste-slideshow.h
+++ b/savers/gste-slideshow.h
@@ -26,7 +26,7 @@
#include <glib.h>
#include <gdk/gdk.h>
-#include "savers/gs-theme-engine.h"
+#include "gs-theme-engine.h"
G_BEGIN_DECLS
diff --git a/savers/popsquares.c b/savers/popsquares.c
index 7ab1826a..d0f89029 100644
--- a/savers/popsquares.c
+++ b/savers/popsquares.c
@@ -28,9 +28,9 @@
#include <libxfce4util/libxfce4util.h>
-#include "savers/gs-theme-window.h"
-#include "savers/gs-theme-engine.h"
-#include "savers/gste-popsquares.h"
+#include "gs-theme-window.h"
+#include "gs-theme-engine.h"
+#include "gste-popsquares.h"
int
main (int argc,
diff --git a/savers/slideshow.c b/savers/slideshow.c
index 9f88d4a1..ba8a2917 100644
--- a/savers/slideshow.c
+++ b/savers/slideshow.c
@@ -32,10 +32,10 @@
#include <libxfce4util/libxfce4util.h>
-#include "savers/gs-theme-window.h"
-#include "savers/gs-theme-engine.h"
-#include "savers/gste-slideshow.h"
-#include "savers/xdg-user-dir-lookup.h"
+#include "gs-theme-window.h"
+#include "gs-theme-engine.h"
+#include "gste-slideshow.h"
+#include "xdg-user-dir-lookup.h"
int
main (int argc, char **argv) {
diff --git a/savers/xdg-user-dir-lookup.c b/savers/xdg-user-dir-lookup.c
index 1e5ce593..1caee73b 100644
--- a/savers/xdg-user-dir-lookup.c
+++ b/savers/xdg-user-dir-lookup.c
@@ -29,7 +29,7 @@
#include <stdlib.h>
#include <string.h>
-#include "savers/xdg-user-dir-lookup.h"
+#include "xdg-user-dir-lookup.h"
char *
xdg_user_dir_lookup (const char *type)
diff --git a/src/copy-theme-dialog.c b/src/copy-theme-dialog.c
index 1c6092ea..cb21b0ca 100644
--- a/src/copy-theme-dialog.c
+++ b/src/copy-theme-dialog.c
@@ -32,7 +32,7 @@
#include <libxfce4util/libxfce4util.h>
-#include "src/copy-theme-dialog.h"
+#include "copy-theme-dialog.h"
static void
copy_theme_dialog_class_init (CopyThemeDialogClass *klass);
diff --git a/src/gs-auth-bsdauth.c b/src/gs-auth-bsdauth.c
index b723ade8..720c4991 100644
--- a/src/gs-auth-bsdauth.c
+++ b/src/gs-auth-bsdauth.c
@@ -35,8 +35,8 @@
#include <login_cap.h>
#include <bsd_auth.h>
-#include "src/gs-auth.h"
-#include "src/subprocs.h"
+#include "gs-auth.h"
+#include "subprocs.h"
static gboolean verbose_enabled = FALSE;
diff --git a/src/gs-auth-helper.c b/src/gs-auth-helper.c
index f021679c..6784b912 100644
--- a/src/gs-auth-helper.c
+++ b/src/gs-auth-helper.c
@@ -47,8 +47,8 @@
#include <glib.h>
#include <glib/gstdio.h>
-#include "src/gs-auth.h"
-#include "src/subprocs.h"
+#include "gs-auth.h"
+#include "subprocs.h"
static gboolean verbose_enabled = FALSE;
diff --git a/src/gs-auth-pam.c b/src/gs-auth-pam.c
index 46edf8d2..2cb78d86 100644
--- a/src/gs-auth-pam.c
+++ b/src/gs-auth-pam.c
@@ -47,8 +47,8 @@
#include <unistd.h>
#endif
-#include "src/gs-auth.h"
-#include "src/subprocs.h"
+#include "gs-auth.h"
+#include "subprocs.h"
/* Some time between Red Hat 4.2 and 7.0, the words were transposed
in the various PAM_x_CRED macro names. Yay!
diff --git a/src/gs-auth-pwent.c b/src/gs-auth-pwent.c
index 62bd9382..2e04da1c 100644
--- a/src/gs-auth-pwent.c
+++ b/src/gs-auth-pwent.c
@@ -87,7 +87,7 @@
#endif
-#include "src/gs-auth.h"
+#include "gs-auth.h"
static gboolean verbose_enabled = FALSE;
diff --git a/src/gs-debug.c b/src/gs-debug.c
index 2e9b2317..7cbd25a2 100644
--- a/src/gs-debug.c
+++ b/src/gs-debug.c
@@ -32,7 +32,7 @@
#include <glib.h>
#include <glib/gstdio.h>
-#include "src/gs-debug.h"
+#include "gs-debug.h"
static gboolean debugging = FALSE;
static FILE *debug_out = NULL;
diff --git a/src/gs-fade.c b/src/gs-fade.c
index 43cb015c..054e3b3f 100644
--- a/src/gs-fade.c
+++ b/src/gs-fade.c
@@ -39,9 +39,9 @@
#include <unistd.h>
#endif /* HAVE_UNISTD_H */
-#include "src/gs-fade.h"
-#include "src/gs-debug.h"
-#include "src/xfce-rr.h"
+#include "gs-fade.h"
+#include "gs-debug.h"
+#include "xfce-rr.h"
/* XFree86 4.x+ Gamma fading */
#ifdef HAVE_XF86VMODE_GAMMA
diff --git a/src/gs-grab-x11.c b/src/gs-grab-x11.c
index d0e300b3..e2a5b62f 100644
--- a/src/gs-grab-x11.c
+++ b/src/gs-grab-x11.c
@@ -36,9 +36,9 @@
# include <X11/extensions/xf86misc.h>
#endif /* HAVE_XF86MISCSETGRABKEYSSTATE */
-#include "src/gs-window.h"
-#include "src/gs-grab.h"
-#include "src/gs-debug.h"
+#include "gs-window.h"
+#include "gs-grab.h"
+#include "gs-debug.h"
static void gs_grab_class_init (GSGrabClass *klass);
static void gs_grab_init (GSGrab *grab);
diff --git a/src/gs-job.c b/src/gs-job.c
index 9a5ff0b5..8de21dfc 100644
--- a/src/gs-job.c
+++ b/src/gs-job.c
@@ -40,9 +40,9 @@
#include <sys/resource.h>
#endif
-#include "src/gs-debug.h"
-#include "src/gs-job.h"
-#include "src/subprocs.h"
+#include "gs-debug.h"
+#include "gs-job.h"
+#include "subprocs.h"
static void gs_job_class_init (GSJobClass *klass);
static void gs_job_init (GSJob *job);
diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
index d8761dea..b2717fd8 100644
--- a/src/gs-listener-dbus.c
+++ b/src/gs-listener-dbus.c
@@ -39,9 +39,9 @@
#include <systemd/sd-login.h>
#endif
-#include "src/gs-listener-dbus.h"
-#include "src/gs-marshal.h"
-#include "src/gs-debug.h"
+#include "gs-listener-dbus.h"
+#include "gs-marshal.h"
+#include "gs-debug.h"
static void gs_listener_class_init (GSListenerClass *klass);
static void gs_listener_init (GSListener *listener);
diff --git a/src/gs-listener-x11.c b/src/gs-listener-x11.c
index 0fa269ea..d662ec08 100644
--- a/src/gs-listener-x11.c
+++ b/src/gs-listener-x11.c
@@ -36,9 +36,9 @@
#include <X11/extensions/scrnsaver.h>
#endif
-#include "src/gs-listener-x11.h"
-#include "src/gs-marshal.h"
-#include "src/gs-debug.h"
+#include "gs-listener-x11.h"
+#include "gs-marshal.h"
+#include "gs-debug.h"
static void gs_listener_x11_class_init (GSListenerX11Class *klass);
static void gs_listener_x11_init (GSListenerX11 *listener);
diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
index 011495f8..03fff954 100644
--- a/src/gs-lock-plug.c
+++ b/src/gs-lock-plug.c
@@ -41,14 +41,14 @@
#include <libxfce4util/libxfce4util.h>
-#include "src/gs-lock-plug.h"
-#include "src/gs-debug.h"
-#include "src/xfce-bg.h"
-#include "src/xfce-desktop-utils.h"
-#include "src/xfce4-screensaver-dialog-ui.h"
+#include "gs-lock-plug.h"
+#include "gs-debug.h"
+#include "xfce-bg.h"
+#include "xfce-desktop-utils.h"
+#include "xfce4-screensaver-dialog-ui.h"
#ifdef WITH_KBD_LAYOUT_INDICATOR
-#include "src/xfcekbd-indicator.h"
+#include "xfcekbd-indicator.h"
#endif
#define MDM_FLEXISERVER_COMMAND "mdmflexiserver"
diff --git a/src/gs-manager.c b/src/gs-manager.c
index 65e0b276..476a13a2 100644
--- a/src/gs-manager.c
+++ b/src/gs-manager.c
@@ -29,15 +29,15 @@
#include <gdk/gdkx.h>
#include <gio/gio.h>
-#include "src/gs-debug.h"
-#include "src/gs-grab.h"
-#include "src/gs-fade.h"
-#include "src/gs-job.h"
-#include "src/gs-manager.h"
-#include "src/gs-prefs.h" /* for GSSaverMode */
-#include "src/gs-theme-manager.h"
-#include "src/gs-window.h"
-#include "src/xfce-bg.h"
+#include "gs-debug.h"
+#include "gs-grab.h"
+#include "gs-fade.h"
+#include "gs-job.h"
+#include "gs-manager.h"
+#include "gs-prefs.h" /* for GSSaverMode */
+#include "gs-theme-manager.h"
+#include "gs-window.h"
+#include "xfce-bg.h"
static void gs_manager_class_init (GSManagerClass *klass);
static void gs_manager_init (GSManager *manager);
diff --git a/src/gs-manager.h b/src/gs-manager.h
index 0d043863..ad1e162f 100644
--- a/src/gs-manager.h
+++ b/src/gs-manager.h
@@ -23,7 +23,7 @@
#ifndef SRC_GS_MANAGER_H_
#define SRC_GS_MANAGER_H_
-#include "src/gs-prefs.h"
+#include "gs-prefs.h"
G_BEGIN_DECLS
diff --git a/src/gs-monitor.c b/src/gs-monitor.c
index ae52f20f..1e6fdefb 100644
--- a/src/gs-monitor.c
+++ b/src/gs-monitor.c
@@ -34,15 +34,15 @@
#include <glib-object.h>
#include <gdk/gdkx.h>
-#include "src/gs-debug.h"
-#include "src/gs-fade.h"
-#include "src/gs-grab.h"
-#include "src/gs-listener-dbus.h"
-#include "src/gs-listener-x11.h"
-#include "src/gs-manager.h"
-#include "src/gs-monitor.h"
-#include "src/gs-prefs.h"
-#include "src/xfce4-screensaver.h"
+#include "gs-debug.h"
+#include "gs-fade.h"
+#include "gs-grab.h"
+#include "gs-listener-dbus.h"
+#include "gs-listener-x11.h"
+#include "gs-manager.h"
+#include "gs-monitor.h"
+#include "gs-prefs.h"
+#include "xfce4-screensaver.h"
static void gs_monitor_class_init(GSMonitorClass* klass);
static void gs_monitor_init(GSMonitor* monitor);
diff --git a/src/gs-prefs.c b/src/gs-prefs.c
index ab3a2ae8..e300af80 100644
--- a/src/gs-prefs.c
+++ b/src/gs-prefs.c
@@ -31,7 +31,7 @@
#include <xfconf/xfconf.h>
-#include "src/gs-prefs.h"
+#include "gs-prefs.h"
static void gs_prefs_class_init (GSPrefsClass *klass);
static void gs_prefs_init (GSPrefs *prefs);
diff --git a/src/gs-theme-manager.c b/src/gs-theme-manager.c
index 567836f9..2b4418a2 100644
--- a/src/gs-theme-manager.c
+++ b/src/gs-theme-manager.c
@@ -35,8 +35,8 @@
#include <garcon/garcon.h>
-#include "src/gs-theme-manager.h"
-#include "src/gs-debug.h"
+#include "gs-theme-manager.h"
+#include "gs-debug.h"
static void gs_theme_manager_class_init (GSThemeManagerClass *klass);
static void gs_theme_manager_init (GSThemeManager *theme_manager);
diff --git a/src/gs-visual-gl.c b/src/gs-visual-gl.c
index e71f48c7..b936f5bf 100644
--- a/src/gs-visual-gl.c
+++ b/src/gs-visual-gl.c
@@ -35,8 +35,8 @@
#include <GL/glx.h>
#endif /* HAVE_GL */
-#include "src/gs-visual-gl.h"
-#include "src/gs-debug.h"
+#include "gs-visual-gl.h"
+#include "gs-debug.h"
GdkVisual *
gs_visual_gl_get_best_for_display (GdkDisplay *display) {
diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
index e7cf1167..4e13222f 100644
--- a/src/gs-window-x11.c
+++ b/src/gs-window-x11.c
@@ -37,10 +37,10 @@
#include <X11/extensions/shape.h>
#endif
-#include "src/gs-debug.h"
-#include "src/gs-marshal.h"
-#include "src/gs-window.h"
-#include "src/subprocs.h"
+#include "gs-debug.h"
+#include "gs-marshal.h"
+#include "gs-window.h"
+#include "subprocs.h"
static void gs_window_class_init (GSWindowClass *klass);
static void gs_window_init (GSWindow *window);
diff --git a/src/setuid.c b/src/setuid.c
index 5c5a25a0..8aeb7cd5 100644
--- a/src/setuid.c
+++ b/src/setuid.c
@@ -28,7 +28,7 @@
#include <errno.h>
#endif
-#include "src/setuid.h"
+#include "setuid.h"
static char *
uid_gid_string (uid_t uid,
diff --git a/src/subprocs.c b/src/subprocs.c
index 1f4ea0e9..e7238339 100644
--- a/src/subprocs.c
+++ b/src/subprocs.c
@@ -38,7 +38,7 @@
#define fork vfork
#endif /* VMS */
-#include "src/subprocs.h"
+#include "subprocs.h"
#if !defined(SIGCHLD) && defined(SIGCLD)
# define SIGCHLD SIGCLD
diff --git a/src/test-fade.c b/src/test-fade.c
index a09ee04a..961e63eb 100644
--- a/src/test-fade.c
+++ b/src/test-fade.c
@@ -40,8 +40,8 @@
#include <X11/extensions/xf86vmode.h>
#endif
-#include "src/gs-fade.h"
-#include "src/gs-debug.h"
+#include "gs-fade.h"
+#include "gs-debug.h"
#define XF86_VIDMODE_NAME "XFree86-VidModeExtension"
diff --git a/src/test-passwd.c b/src/test-passwd.c
index 7f98eafb..18ad415e 100644
--- a/src/test-passwd.c
+++ b/src/test-passwd.c
@@ -34,8 +34,8 @@
#include <libxfce4util/libxfce4util.h>
-#include "src/gs-auth.h"
-#include "src/setuid.h"
+#include "gs-auth.h"
+#include "setuid.h"
/* Initializations that potentially take place as a priveleged user:
If the executable is setuid root, then these initializations
diff --git a/src/test-window.c b/src/test-window.c
index 3947ab27..4f54c274 100644
--- a/src/test-window.c
+++ b/src/test-window.c
@@ -29,9 +29,9 @@
#include <libxfce4util/libxfce4util.h>
-#include "src/gs-debug.h"
-#include "src/gs-grab.h"
-#include "src/gs-window.h"
+#include "gs-debug.h"
+#include "gs-grab.h"
+#include "gs-window.h"
static GSGrab *grab = NULL;
diff --git a/src/xfce-rr.c b/src/xfce-rr.c
index 0d6d09f8..42b18568 100644
--- a/src/xfce-rr.c
+++ b/src/xfce-rr.c
@@ -37,8 +37,8 @@
#include <libxfce4util/libxfce4util.h>
-#include "src/xfce-rr.h"
-#include "src/xfce-rr-private.h"
+#include "xfce-rr.h"
+#include "xfce-rr-private.h"
#define DISPLAY(o) ((o)->info->screen->priv->xdisplay)
diff --git a/src/xfce4-screensaver-dialog.c b/src/xfce4-screensaver-dialog.c
index 6d899130..aae86473 100644
--- a/src/xfce4-screensaver-dialog.c
+++ b/src/xfce4-screensaver-dialog.c
@@ -39,11 +39,11 @@
#include <libxfce4util/libxfce4util.h>
#include <xfconf/xfconf.h>
-#include "src/gs-auth.h"
-#include "src/gs-debug.h"
-#include "src/gs-lock-plug.h"
-#include "src/setuid.h"
-#include "src/xfce4-screensaver-dialog-css.h"
+#include "gs-auth.h"
+#include "gs-debug.h"
+#include "gs-lock-plug.h"
+#include "setuid.h"
+#include "xfce4-screensaver-dialog-css.h"
#define MAX_FAILURES 5
diff --git a/src/xfce4-screensaver-gl-helper.c b/src/xfce4-screensaver-gl-helper.c
index 5f0246c2..a3d3a503 100644
--- a/src/xfce4-screensaver-gl-helper.c
+++ b/src/xfce4-screensaver-gl-helper.c
@@ -29,7 +29,7 @@
#include <libxfce4util/libxfce4util.h>
-#include "src/gs-visual-gl.h"
+#include "gs-visual-gl.h"
int
main (int argc,
diff --git a/src/xfce4-screensaver-preferences.c b/src/xfce4-screensaver-preferences.c
index 3e061f85..a7e8cf62 100644
--- a/src/xfce4-screensaver-preferences.c
+++ b/src/xfce4-screensaver-preferences.c
@@ -39,13 +39,13 @@
#include <libxfce4ui/libxfce4ui.h>
#include <xfconf/xfconf.h>
-#include "src/copy-theme-dialog.h"
-#include "src/gs-debug.h"
-#include "src/gs-job.h"
-#include "src/gs-prefs.h" /* for GS_MODE enum */
-#include "src/gs-theme-manager.h"
-#include "src/xfce-desktop-utils.h"
-#include "src/xfce4-screensaver-preferences-ui.h"
+#include "copy-theme-dialog.h"
+#include "gs-debug.h"
+#include "gs-job.h"
+#include "gs-prefs.h" /* for GS_MODE enum */
+#include "gs-theme-manager.h"
+#include "xfce-desktop-utils.h"
+#include "xfce4-screensaver-preferences-ui.h"
#define GPM_COMMAND "xfce4-power-manager-settings"
diff --git a/src/xfce4-screensaver.c b/src/xfce4-screensaver.c
index 170199fc..72f6cf71 100644
--- a/src/xfce4-screensaver.c
+++ b/src/xfce4-screensaver.c
@@ -37,9 +37,9 @@
#include <libxfce4util/libxfce4util.h>
#include <xfconf/xfconf.h>
-#include "src/gs-monitor.h"
-#include "src/gs-debug.h"
-#include "src/xfce4-screensaver.h"
+#include "gs-monitor.h"
+#include "gs-debug.h"
+#include "xfce4-screensaver.h"
void xfce4_screensaver_quit(void) {
gtk_main_quit();
diff --git a/src/xfcekbd-config-private.h b/src/xfcekbd-config-private.h
index 90ed505d..df0fd622 100644
--- a/src/xfcekbd-config-private.h
+++ b/src/xfcekbd-config-private.h
@@ -21,8 +21,8 @@
#ifndef SRC_XFCEKBD_CONFIG_PRIVATE_H_
#define SRC_XFCEKBD_CONFIG_PRIVATE_H_
-#include "src/xfcekbd-desktop-config.h"
-#include "src/xfcekbd-keyboard-config.h"
+#include "xfcekbd-desktop-config.h"
+#include "xfcekbd-keyboard-config.h"
#define SETTINGS_XFCONF_CHANNEL "xfce4-screensaver"
diff --git a/src/xfcekbd-desktop-config.c b/src/xfcekbd-desktop-config.c
index f5a45d19..33005af6 100644
--- a/src/xfcekbd-desktop-config.c
+++ b/src/xfcekbd-desktop-config.c
@@ -31,8 +31,8 @@
#include <libxfce4util/libxfce4util.h>
#include <xfconf/xfconf.h>
-#include "src/xfcekbd-desktop-config.h"
-#include "src/xfcekbd-config-private.h"
+#include "xfcekbd-desktop-config.h"
+#include "xfcekbd-config-private.h"
/*
* static common functions
diff --git a/src/xfcekbd-indicator-config.c b/src/xfcekbd-indicator-config.c
index b22d03b1..300e93e3 100644
--- a/src/xfcekbd-indicator-config.c
+++ b/src/xfcekbd-indicator-config.c
@@ -32,9 +32,9 @@
#include <libxfce4util/libxfce4util.h>
#include <xfconf/xfconf.h>
-#include "src/xfcekbd-keyboard-config.h"
-#include "src/xfcekbd-indicator-config.h"
-#include "src/xfcekbd-config-private.h"
+#include "xfcekbd-keyboard-config.h"
+#include "xfcekbd-indicator-config.h"
+#include "xfcekbd-config-private.h"
/*
* static applet config functions
diff --git a/src/xfcekbd-indicator-config.h b/src/xfcekbd-indicator-config.h
index c70e44f1..a3a5aafb 100644
--- a/src/xfcekbd-indicator-config.h
+++ b/src/xfcekbd-indicator-config.h
@@ -24,7 +24,7 @@
#include <gtk/gtk.h>
#include <xfconf/xfconf.h>
-#include "src/xfcekbd-keyboard-config.h"
+#include "xfcekbd-keyboard-config.h"
/*
* Indicator configuration
diff --git a/src/xfcekbd-indicator.c b/src/xfcekbd-indicator.c
index b9992305..1db74f33 100644
--- a/src/xfcekbd-indicator.c
+++ b/src/xfcekbd-indicator.c
@@ -28,10 +28,10 @@
#include <libxfce4util/libxfce4util.h>
-#include "src/xfcekbd-desktop-config.h"
-#include "src/xfcekbd-indicator.h"
-#include "src/xfcekbd-indicator-config.h"
-#include "src/xfcekbd-indicator-marshal.h"
+#include "xfcekbd-desktop-config.h"
+#include "xfcekbd-indicator.h"
+#include "xfcekbd-indicator-config.h"
+#include "xfcekbd-indicator-marshal.h"
typedef struct _gki_globals {
XklEngine *engine;
diff --git a/src/xfcekbd-keyboard-config.c b/src/xfcekbd-keyboard-config.c
index 5c8db578..d87e8cb1 100644
--- a/src/xfcekbd-keyboard-config.c
+++ b/src/xfcekbd-keyboard-config.c
@@ -28,8 +28,8 @@
#include <libxfce4util/libxfce4util.h>
-#include "src/xfcekbd-config-private.h"
-#include "src/xfcekbd-keyboard-config.h"
+#include "xfcekbd-config-private.h"
+#include "xfcekbd-keyboard-config.h"
/*
* XfcekbdKeyboardConfig
--
GitLab