diff --git a/CPPLINT.cfg b/CPPLINT.cfg
index b1e51b79c2924edc480ecea0c457d62d328850d8..c2c1e740a5f8045a9d4f645fa23e39f883f3e95a 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 e2e300af863ef5ba31a466950c08cc5559301076..cedb58f16d2e54d70a36063dd911dcb521883845 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 1e73d68b042cabcd58e33ddf9b2255045fc97a5d..d2a0382ddf71939dcde0dbfbe459505b82446de1 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 9c488e5020db760f45216a158969e71a3133bc74..3a4c98f301b426d9268caad430ad96a0901d4ab7 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 f363a5df7d64d23a1b93b5c71cffadc90f71ea7e..3d5079fed85558c3bc05863e89149096ed86e8a7 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 ec2fdeb7e6a537955e9e71a696bb054e1bc58160..58ad246753dc3282c2e2a1760e40a389df0d02b6 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 d3fb863b00b9ceace10555457adc4989c2c5689f..9ff61cfd3e8679b13a5ef52b362518389a2038d3 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 2bdb867e6a2c5e349d1045da3049887c7d6d7561..5db0cd0feb0d742ac232230ece3e40c079238b47 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 7ab1826ac3cb6b20d92ba4f87b358f572569848f..d0f89029623a11b742f752c5be650334a8974db9 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 9f88d4a153f736c3269e50230c0b72e43ba5ec3e..ba8a29174bbfc17ee045c1b061b34526d387632d 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 1e5ce5934755a8e43068e9d100c6be91f5326bab..1caee73b3136fe5dcd5dfbfe27e4838c847bc71d 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 1c6092ea41285473d360c2d5a9cf8bd849dfea35..cb21b0ca3555629680b129b25b3569fe2d1abb95 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 b723ade8ce33a25bb560ebf601c08955f23a7016..720c49912cd2cf7db150b977e0e8a62ce23ea3f3 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 f021679caf795af938cb2e0dbf3e73b15ed366d8..6784b912b9a150f12ea8ddbc61741aa62d2f2c34 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 46edf8d28af06f5657ce79bdd415eb054ad216e4..2cb78d86081e4171cdc49b24cea665a418ebf680 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 62bd9382fbe73b9ee5a30115eaedf0b0cbb9c025..2e04da1c07bf6f572b80d64fdb6b3a47e5d81410 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 2e9b23172e36faf3a3cac828ac1f3a55845be0bf..7cbd25a2396348c43a80767f3b12c202f45c6d74 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 43cb015c9b73d5476cd0a57ddc626285ac07104f..054e3b3fdabcc620b35f34f950d09034c4c94282 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 d0e300b3a3d62bf3a746bdd5a12389b146e6bd02..e2a5b62f0d310b3049c91c2ed68de991d805730d 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 9a5ff0b5a77dda8a7c7c53cdcc850a5be8109c87..8de21dfcac0d5182ea0694037bd166b43bfb7200 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 d8761dea32be276e896f11ad6118a0fd03c2035f..b2717fd8c8bd24994b8a2da5aedc5c252f70ea4c 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 0fa269eaf5b005d31c6424e08463aa70515c8bd7..d662ec086855bcf7633c32e8f534065dbb713654 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 011495f855848607951df899dd97ad4583b62436..03fff95477946ca1f1bac42a340163884fff9447 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 65e0b276c64d659675ed2143da6d57358005e147..476a13a2cef08feb701961f180dd11679f064662 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 0d043863a828152f684a917203bb4d8b50c7340b..ad1e162f1c6a8cb05fdc2af48251e6a2681594d6 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 ae52f20f2a37b3375018cda79c916b18ca5f2af6..1e6fdefb9143dc6adb3411557dd2ff8115d89e32 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 ab3a2ae89a444c7048a85f1ec496ec7905bb760d..e300af80991ac9bcae6ec643d5b1c53a64be235d 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 567836f9f00533ce6e99e77b5aa5ef4aedd0e443..2b4418a24db5784dcd9ca543455840f97a827c10 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 e71f48c741a50ea1a5497091f1aed233f0fda847..b936f5bfdf0bf2c2e7d55dfcfb33562dd3c9fca3 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 e7cf1167ed44ec3efd4c95c13bfb94f09b433b59..4e13222f3302b123485585b4dd802bef71d65ea9 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 5c5a25a0bd89f30d38aa71d482e94f3d24cf7679..8aeb7cd51358c1cc3f99b079ee83c42f323f0332 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 1f4ea0e907f70d87b0b750f52d51e6042f87d01b..e72383395fbb0cfb32369421e0f211e898902915 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 a09ee04acdde9baf2e828b571ac3ab2b308704a3..961e63ebd5bdf298149977646a84dec42b3fdeb0 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 7f98eafbf76ed723583f38c19651de7112d42691..18ad415e8e302ce9bb74cffe9271b99eee7bc05a 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 3947ab2739a91ddb46f2ba2c02851a70d18d274d..4f54c27445c0b9b393967e4a042b36e2ac23287b 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 0d6d09f81577a7d821cce315996fcb6fae0090d5..42b185687c0da7a490d9a201cf7ba3294a5f16a2 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 6d899130fcd65593dd943493a17a6468138911e8..aae86473db9646b98a87c8b3cee5b395433e3371 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 5f0246c2c1a14dbc9f92d37378859b695195cd38..a3d3a50360d4d4b641a7789d5ea1f9184c9509c3 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 3e061f851be4fc872189ee85d28ff199f5e78a8d..a7e8cf62d4a865278feb58bf2d6c2b5d24147797 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 170199fc7db3204e90934540e314344248c119dd..72f6cf715271c97ea9afbef6394344bc8bb81d9d 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 90ed505d3b879eefbda81b24288c1b3ee7c95aab..df0fd62269c3ba0dee6dd399331c82e80d97905d 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 f5a45d193ac89f3fa6caf04088ba2e75828e1f37..33005af6dfbe29183bf6dc32b9f5c42c6a1e882b 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 b22d03b1ebe802cfaab9b5ea6828682af3fdccbd..300e93e366525348744d8dc13b3944186c65c7cf 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 c70e44f1a5aa66dd0e9d875e6355ba2ccc5a549f..a3a5aafb7256abbf092f7603600d53442bab1105 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 b99923056d6643817b3bd5fc7a15166cf3110d8c..1db74f3348a7bba2b69ef55cc84f4965d15a3d65 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 5c8db578795ee1004779c3f1632237ed163ac926..d87e8cb14cd7ded27bf7d456bf0e3c6825c8a460 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