local #include files inside "" instead <>

author: Pablo Barciela <[email protected]> 2019-04-07 21:47:17 +0200
committer: raveit65 <[email protected]> 2022-07-19 23:18:58 +0200
commit: a9a7eb57df62a6f4a8dbbba161dc3c8ed2c57f7d (patch)
tree: f69fc5590238539a38cc9dfe2a8189cb7e17cc93
parent: d0034595d42dc8db1abff7dd8c29d0b5c2dbc299 (diff)
download: caja-a9a7eb57df62a6f4a8dbbba161dc3c8ed2c57f7d.tar.bz2
caja-a9a7eb57df62a6f4a8dbbba161dc3c8ed2c57f7d.tar.xz
189 files changed, 1427 insertions, 1202 deletions
diff --git a/eel/check-program.c b/eel/check-program.c
index b0cb3d9a..66df7c00 100644
--- a/eel/check-program.c
+++ b/eel/check-program.c
@@ -23,16 +23,16 @@
 */
 
 #include <config.h>
-
-#include <eel/eel-debug.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-lib-self-check-functions.h>
-#include <eel/eel-self-checks.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <libxml/parser.h>
 #include <stdlib.h>
 
+#include "eel-debug.h"
+#include "eel-glib-extensions.h"
+#include "eel-lib-self-check-functions.h"
+#include "eel-self-checks.h"
+
 int
 main (int argc, char *argv[])
 {
diff --git a/eel/eel-accessibility.c b/eel/eel-accessibility.c
index 8f000e87..94c429a3 100644
--- a/eel/eel-accessibility.c
+++ b/eel/eel-accessibility.c
@@ -25,7 +25,8 @@
 #include <config.h>
 #include <gtk/gtk.h>
 #include <atk/atkrelationset.h>
-#include <eel/eel-accessibility.h>
+
+#include "eel-accessibility.h"
 
 void
 eel_accessibility_set_up_label_widget_relation (GtkWidget *label, GtkWidget *widget)
diff --git a/eel/eel-art-gtk-extensions.h b/eel/eel-art-gtk-extensions.h
index fbb554d5..76b3a1c6 100644
--- a/eel/eel-art-gtk-extensions.h
+++ b/eel/eel-art-gtk-extensions.h
@@ -35,8 +35,8 @@
 #ifndef EEL_ART_GTK_EXTENSIONS_H
 #define EEL_ART_GTK_EXTENSIONS_H
 
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-art-extensions.h>
+#include "eel-gtk-extensions.h"
+#include "eel-art-extensions.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/eel/eel-background.c b/eel/eel-background.c
index 9f4bc0c9..d419af3d 100644
--- a/eel/eel-background.c
+++ b/eel/eel-background.c
@@ -25,18 +25,20 @@
 */
 
 #include <config.h>
-#include "eel-background.h"
-#include "eel-gdk-extensions.h"
-#include "eel-glib-extensions.h"
-#include "eel-lib-self-check-functions.h"
 #include <gtk/gtk.h>
-#include <eel/eel-canvas.h>
 #include <cairo-xlib.h>
 #include <gdk/gdkx.h>
 #include <gio/gio.h>
 #include <math.h>
 #include <stdio.h>
-#include <libcaja-private/caja-global-preferences.h>
+
+#include "eel-background.h"
+#include "eel-gdk-extensions.h"
+#include "eel-glib-extensions.h"
+#include "eel-lib-self-check-functions.h"
+#include "eel-canvas.h"
+
+#include "../libcaja-private/caja-global-preferences.h"
 
 enum
 {
diff --git a/eel/eel-canvas-rect-ellipse.h b/eel/eel-canvas-rect-ellipse.h
index e391dfb4..d9fbc904 100644
--- a/eel/eel-canvas-rect-ellipse.h
+++ b/eel/eel-canvas-rect-ellipse.h
@@ -35,7 +35,7 @@
 #define EEL_CANVAS_RECT_ELLIPSE_H
 
 
-#include <eel/eel-canvas.h>
+#include "eel-canvas.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/eel/eel-gtk-container.h b/eel/eel-gtk-container.h
index ab65873b..011c34e5 100644
--- a/eel/eel-gtk-container.h
+++ b/eel/eel-gtk-container.h
@@ -27,7 +27,7 @@
 #define EEL_GTK_CONTAINER_H
 
 #include <gtk/gtk.h>
-#include <eel/eel-art-extensions.h>
+#include "eel-art-extensions.h"
 
 void eel_gtk_container_child_expose_event (GtkContainer   *container,
         GtkWidget      *child,
diff --git a/eel/eel-gtk-extensions.h b/eel/eel-gtk-extensions.h
index 87476be8..45accfd7 100644
--- a/eel/eel-gtk-extensions.h
+++ b/eel/eel-gtk-extensions.h
@@ -30,7 +30,7 @@
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
-#include <eel/eel-gdk-extensions.h>
+#include "eel-gdk-extensions.h"
 
 /* GtkWindow */
 void                  eel_gtk_window_set_initial_geometry             (GtkWindow            *window,
diff --git a/eel/eel-image-table.h b/eel/eel-image-table.h
index a3ef4633..21216e0c 100644
--- a/eel/eel-image-table.h
+++ b/eel/eel-image-table.h
@@ -25,7 +25,7 @@
 #ifndef EEL_IMAGE_TABLE_H
 #define EEL_IMAGE_TABLE_H
 
-#include <eel/eel-wrap-table.h>
+#include "eel-wrap-table.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/eel/eel-labeled-image.h b/eel/eel-labeled-image.h
index f5cf5dc3..50295c9a 100644
--- a/eel/eel-labeled-image.h
+++ b/eel/eel-labeled-image.h
@@ -48,7 +48,7 @@
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
-#include <eel/eel-art-extensions.h>
+#include "eel-art-extensions.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/eel/eel-self-checks.h b/eel/eel-self-checks.h
index 50313258..18ed63f4 100644
--- a/eel/eel-self-checks.h
+++ b/eel/eel-self-checks.h
@@ -27,7 +27,7 @@
 
 #include <glib.h>
 
-#include <eel/eel-art-extensions.h>
+#include "eel-art-extensions.h"
 
 #define EEL_CHECK_RESULT(type, expression, expected_value) \
 G_STMT_START { \
diff --git a/eel/eel.h b/eel/eel.h
index c86bc99a..2d4e20c8 100644
--- a/eel/eel.h
+++ b/eel/eel.h
@@ -25,24 +25,24 @@
 #ifndef EEL_H
 #define EEL_H
 
-#include <eel/eel-art-extensions.h>
-#include <eel/eel-art-gtk-extensions.h>
-#include <eel/eel-background.h>
-#include <eel/eel-gdk-extensions.h>
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-mate-extensions.h>
-#include <eel/eel-graphic-effects.h>
-#include <eel/eel-gtk-container.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-image-table.h>
-#include <eel/eel-labeled-image.h>
-#include <eel/eel-self-checks.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
-#include <eel/eel-vfs-extensions.h>
-#include <eel/eel-wrap-table.h>
-#include <eel/eel-xml-extensions.h>
+#include "eel-art-extensions.h"
+#include "eel-art-gtk-extensions.h"
+#include "eel-background.h"
+#include "eel-gdk-extensions.h"
+#include "eel-gdk-pixbuf-extensions.h"
+#include "eel-glib-extensions.h"
+#include "eel-mate-extensions.h"
+#include "eel-graphic-effects.h"
+#include "eel-gtk-container.h"
+#include "eel-gtk-extensions.h"
+#include "eel-gtk-macros.h"
+#include "eel-image-table.h"
+#include "eel-labeled-image.h"
+#include "eel-self-checks.h"
+#include "eel-stock-dialogs.h"
+#include "eel-string.h"
+#include "eel-vfs-extensions.h"
+#include "eel-wrap-table.h"
+#include "eel-xml-extensions.h"
 
 #endif /* EEL_H */
diff --git a/libcaja-extension/caja-extension-private.h b/libcaja-extension/caja-extension-private.h
index a22e7e74..42217398 100644
--- a/libcaja-extension/caja-extension-private.h
+++ b/libcaja-extension/caja-extension-private.h
@@ -24,7 +24,7 @@
 #ifndef CAJA_EXTENSION_PRIVATE_H
 #define CAJA_EXTENSION_PRIVATE_H
 
-#include <libcaja-extension/caja-file-info.h>
+#include "caja-file-info.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/libcaja-private/caja-autorun.c b/libcaja-private/caja-autorun.c
index 04033445..339f49bc 100644
--- a/libcaja-private/caja-autorun.c
+++ b/libcaja-private/caja-autorun.c
@@ -33,8 +33,8 @@
 #include <gdk/gdkkeysyms.h>
 #include <cairo-gobject.h>
 
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-stock-dialogs.h>
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-stock-dialogs.h"
 
 #include "caja-icon-info.h"
 #include "caja-global-preferences.h"
diff --git a/libcaja-private/caja-autorun.h b/libcaja-private/caja-autorun.h
index 43223639..8e45af0e 100644
--- a/libcaja-private/caja-autorun.h
+++ b/libcaja-private/caja-autorun.h
@@ -41,8 +41,10 @@
 #define CAJA_AUTORUN_H
 
 #include <gtk/gtk.h>
-#include <eel/eel-background.h>
-#include <libcaja-private/caja-file.h>
+
+#include "../eel/eel-background.h"
+
+#include "caja-file.h"
 
 typedef void (*CajaAutorunComboBoxChanged) (gboolean selected_ask,
         gboolean selected_ignore,
diff --git a/libcaja-private/caja-bookmark.c b/libcaja-private/caja-bookmark.c
index 22fb58a5..1017508c 100644
--- a/libcaja-private/caja-bookmark.c
+++ b/libcaja-private/caja-bookmark.c
@@ -23,17 +23,17 @@
 */
 
 #include <config.h>
-#include "caja-bookmark.h"
-
-#include "caja-file.h"
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-vfs-extensions.h>
 #include <gtk/gtk.h>
 #include <gio/gio.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-icon-names.h>
+
+#include "../eel/eel-gdk-pixbuf-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-vfs-extensions.h"
+
+#include "caja-bookmark.h"
+#include "caja-file.h"
+#include "caja-icon-names.h"
 
 enum
 {
diff --git a/libcaja-private/caja-clipboard-monitor.c b/libcaja-private/caja-clipboard-monitor.c
index e9507a72..94c58759 100644
--- a/libcaja-private/caja-clipboard-monitor.c
+++ b/libcaja-private/caja-clipboard-monitor.c
@@ -23,14 +23,15 @@
 */
 
 #include <config.h>
+#include <gtk/gtk.h>
+
+#include "../eel/eel-debug.h"
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-glib-extensions.h"
+
 #include "caja-clipboard-monitor.h"
 #include "caja-file.h"
 
-#include <eel/eel-debug.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-glib-extensions.h>
-#include <gtk/gtk.h>
-
 /* X11 has a weakness when it comes to clipboard handling,
  * there is no way to get told when the owner of the clipboard
  * changes. This is often needed, for instance to set the
diff --git a/libcaja-private/caja-column-chooser.h b/libcaja-private/caja-column-chooser.h
index 3a25080e..c94f3f03 100644
--- a/libcaja-private/caja-column-chooser.h
+++ b/libcaja-private/caja-column-chooser.h
@@ -26,7 +26,8 @@
 #define CAJA_COLUMN_CHOOSER_H
 
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-file.h>
+
+#include "caja-file.h"
 
 #define CAJA_TYPE_COLUMN_CHOOSER caja_column_chooser_get_type()
 #define CAJA_COLUMN_CHOOSER(obj) \
diff --git a/libcaja-private/caja-column-utilities.c b/libcaja-private/caja-column-utilities.c
index 57dae7f5..e4aba54a 100644
--- a/libcaja-private/caja-column-utilities.c
+++ b/libcaja-private/caja-column-utilities.c
@@ -23,14 +23,15 @@
 */
 
 #include <config.h>
-#include "caja-column-utilities.h"
-
 #include <string.h>
-#include <eel/eel-glib-extensions.h>
 #include <glib/gi18n.h>
-#include <libcaja-extension/caja-column-provider.h>
-#include <libcaja-private/caja-extensions.h>
-#include <libcaja-private/caja-module.h>
+
+#include "../eel/eel-glib-extensions.h"
+#include "../libcaja-extension/caja-column-provider.h"
+
+#include "caja-column-utilities.h"
+#include "caja-extensions.h"
+#include "caja-module.h"
 
 static GList *
 get_builtin_columns (void)
diff --git a/libcaja-private/caja-column-utilities.h b/libcaja-private/caja-column-utilities.h
index 73800c5f..8bd4c825 100644
--- a/libcaja-private/caja-column-utilities.h
+++ b/libcaja-private/caja-column-utilities.h
@@ -25,8 +25,9 @@
 #ifndef CAJA_COLUMN_UTILITIES_H
 #define CAJA_COLUMN_UTILITIES_H
 
-#include <libcaja-extension/caja-column.h>
-#include <libcaja-private/caja-file.h>
+#include "../libcaja-extension/caja-column.h"
+
+#include "caja-file.h"
 
 GList *caja_get_all_columns       (void);
 GList *caja_get_common_columns    (void);
diff --git a/libcaja-private/caja-customization-data.c b/libcaja-private/caja-customization-data.c
index 0302323d..eb4b7d12 100644
--- a/libcaja-private/caja-customization-data.c
+++ b/libcaja-private/caja-customization-data.c
@@ -26,16 +26,6 @@
    names and images */
 
 #include <config.h>
-#include "caja-customization-data.h"
-
-#include "caja-file-utilities.h"
-#include <eel/eel-gdk-extensions.h>
-#include <eel/eel-gdk-extensions.h>
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-string.h>
-#include <eel/eel-vfs-extensions.h>
-#include <eel/eel-xml-extensions.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <glib.h>
 #include <gtk/gtk.h>
@@ -44,6 +34,17 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "../eel/eel-gdk-extensions.h"
+#include "../eel/eel-gdk-extensions.h"
+#include "../eel/eel-gdk-pixbuf-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-string.h"
+#include "../eel/eel-vfs-extensions.h"
+#include "../eel/eel-xml-extensions.h"
+
+#include "caja-customization-data.h"
+#include "caja-file-utilities.h"
+
 typedef enum
 {
     READ_PUBLIC_CUSTOMIZATIONS,
diff --git a/libcaja-private/caja-desktop-directory-file.c b/libcaja-private/caja-desktop-directory-file.c
index 1484dc3f..8775e607 100644
--- a/libcaja-private/caja-desktop-directory-file.c
+++ b/libcaja-private/caja-desktop-directory-file.c
@@ -24,21 +24,22 @@
 */
 
 #include <config.h>
-#include "caja-desktop-directory-file.h"
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <string.h>
+
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-macros.h"
 
+#include "caja-desktop-directory-file.h"
 #include "caja-desktop-metadata.h"
 #include "caja-directory-notify.h"
 #include "caja-directory-private.h"
 #include "caja-file-attributes.h"
 #include "caja-file-private.h"
 #include "caja-file-utilities.h"
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-macros.h>
 #include "caja-desktop-directory.h"
 #include "caja-metadata.h"
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <string.h>
 
 struct CajaDesktopDirectoryFileDetails
 {
diff --git a/libcaja-private/caja-desktop-directory-file.h b/libcaja-private/caja-desktop-directory-file.h
index c78906f2..c77d4e84 100644
--- a/libcaja-private/caja-desktop-directory-file.h
+++ b/libcaja-private/caja-desktop-directory-file.h
@@ -26,7 +26,7 @@
 #ifndef CAJA_DESKTOP_DIRECTORY_FILE_H
 #define CAJA_DESKTOP_DIRECTORY_FILE_H
 
-#include <libcaja-private/caja-file.h>
+#include "caja-file.h"
 
 #define CAJA_TYPE_DESKTOP_DIRECTORY_FILE caja_desktop_directory_file_get_type()
 #define CAJA_DESKTOP_DIRECTORY_FILE(obj) \
diff --git a/libcaja-private/caja-desktop-directory.c b/libcaja-private/caja-desktop-directory.c
index 5ec63864..9a0d3ca3 100644
--- a/libcaja-private/caja-desktop-directory.c
+++ b/libcaja-private/caja-desktop-directory.c
@@ -25,16 +25,17 @@
 */
 
 #include <config.h>
-#include "caja-desktop-directory.h"
+#include <gtk/gtk.h>
+
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-macros.h"
 
+#include "caja-desktop-directory.h"
 #include "caja-directory-private.h"
 #include "caja-file.h"
 #include "caja-file-private.h"
 #include "caja-file-utilities.h"
 #include "caja-global-preferences.h"
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <gtk/gtk.h>
 
 struct CajaDesktopDirectoryDetails
 {
diff --git a/libcaja-private/caja-desktop-directory.h b/libcaja-private/caja-desktop-directory.h
index da18fb87..1cd2cdeb 100644
--- a/libcaja-private/caja-desktop-directory.h
+++ b/libcaja-private/caja-desktop-directory.h
@@ -27,7 +27,7 @@
 #ifndef CAJA_DESKTOP_DIRECTORY_H
 #define CAJA_DESKTOP_DIRECTORY_H
 
-#include <libcaja-private/caja-directory.h>
+#include "caja-directory.h"
 
 #define CAJA_TYPE_DESKTOP_DIRECTORY caja_desktop_directory_get_type()
 #define CAJA_DESKTOP_DIRECTORY(obj) \
diff --git a/libcaja-private/caja-desktop-icon-file.c b/libcaja-private/caja-desktop-icon-file.c
index a91b926d..6cf64b3f 100644
--- a/libcaja-private/caja-desktop-icon-file.c
+++ b/libcaja-private/caja-desktop-icon-file.c
@@ -24,8 +24,13 @@
 */
 
 #include <config.h>
-#include "caja-desktop-icon-file.h"
+#include <glib/gi18n.h>
+#include <string.h>
+#include <gio/gio.h>
+
+#include "../eel/eel-glib-extensions.h"
 
+#include "caja-desktop-icon-file.h"
 #include "caja-desktop-metadata.h"
 #include "caja-desktop-directory-file.h"
 #include "caja-directory-notify.h"
@@ -34,11 +39,7 @@
 #include "caja-file-private.h"
 #include "caja-file-utilities.h"
 #include "caja-file-operations.h"
-#include <eel/eel-glib-extensions.h>
 #include "caja-desktop-directory.h"
-#include <glib/gi18n.h>
-#include <string.h>
-#include <gio/gio.h>
 
 struct _CajaDesktopIconFilePrivate
 {
diff --git a/libcaja-private/caja-desktop-icon-file.h b/libcaja-private/caja-desktop-icon-file.h
index 280fbe81..bcabbcd1 100644
--- a/libcaja-private/caja-desktop-icon-file.h
+++ b/libcaja-private/caja-desktop-icon-file.h
@@ -26,8 +26,8 @@
 #ifndef CAJA_DESKTOP_ICON_FILE_H
 #define CAJA_DESKTOP_ICON_FILE_H
 
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-desktop-link.h>
+#include "caja-file.h"
+#include "caja-desktop-link.h"
 
 #define CAJA_TYPE_DESKTOP_ICON_FILE caja_desktop_icon_file_get_type()
 #define CAJA_DESKTOP_ICON_FILE(obj) \
diff --git a/libcaja-private/caja-desktop-link-monitor.c b/libcaja-private/caja-desktop-link-monitor.c
index 9d1e5d71..d76b393a 100644
--- a/libcaja-private/caja-desktop-link-monitor.c
+++ b/libcaja-private/caja-desktop-link-monitor.c
@@ -23,23 +23,24 @@
 */
 
 #include <config.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <gio/gio.h>
+#include <string.h>
+
+#include "../eel/eel-debug.h"
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-vfs-extensions.h"
+#include "../eel/eel-stock-dialogs.h"
+
 #include "caja-desktop-link-monitor.h"
 #include "caja-desktop-link.h"
 #include "caja-desktop-icon-file.h"
 #include "caja-directory.h"
 #include "caja-desktop-directory.h"
 #include "caja-global-preferences.h"
-
-#include <eel/eel-debug.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-vfs-extensions.h>
-#include <eel/eel-stock-dialogs.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <gio/gio.h>
-#include <libcaja-private/caja-trash-monitor.h>
-#include <string.h>
+#include "caja-trash-monitor.h"
 
 struct CajaDesktopLinkMonitorDetails
 {
diff --git a/libcaja-private/caja-desktop-link-monitor.h b/libcaja-private/caja-desktop-link-monitor.h
index bcf89c0d..65f7598e 100644
--- a/libcaja-private/caja-desktop-link-monitor.h
+++ b/libcaja-private/caja-desktop-link-monitor.h
@@ -26,7 +26,8 @@
 #define CAJA_DESKTOP_LINK_MONITOR_H
 
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-desktop-link.h>
+
+#include "caja-desktop-link.h"
 
 #define CAJA_TYPE_DESKTOP_LINK_MONITOR caja_desktop_link_monitor_get_type()
 #define CAJA_DESKTOP_LINK_MONITOR(obj) \
diff --git a/libcaja-private/caja-desktop-link.c b/libcaja-private/caja-desktop-link.c
index 360c75cc..d6261a89 100644
--- a/libcaja-private/caja-desktop-link.c
+++ b/libcaja-private/caja-desktop-link.c
@@ -23,18 +23,19 @@
 */
 
 #include <config.h>
+#include <glib/gi18n.h>
+#include <gio/gio.h>
+#include <string.h>
+
 #include "caja-desktop-link.h"
 #include "caja-desktop-link-monitor.h"
 #include "caja-desktop-icon-file.h"
 #include "caja-directory-private.h"
 #include "caja-desktop-directory.h"
 #include "caja-icon-names.h"
-#include <glib/gi18n.h>
-#include <gio/gio.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-trash-monitor.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <string.h>
+#include "caja-file-utilities.h"
+#include "caja-trash-monitor.h"
+#include "caja-global-preferences.h"
 
 struct _CajaDesktopLinkPrivate
 {
diff --git a/libcaja-private/caja-desktop-link.h b/libcaja-private/caja-desktop-link.h
index 5411622e..a35cda19 100644
--- a/libcaja-private/caja-desktop-link.h
+++ b/libcaja-private/caja-desktop-link.h
@@ -25,9 +25,10 @@
 #ifndef CAJA_DESKTOP_LINK_H
 #define CAJA_DESKTOP_LINK_H
 
-#include <libcaja-private/caja-file.h>
 #include <gio/gio.h>
 
+#include "caja-file.h"
+
 #define CAJA_TYPE_DESKTOP_LINK caja_desktop_link_get_type()
 #define CAJA_DESKTOP_LINK(obj) \
   (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAJA_TYPE_DESKTOP_LINK, CajaDesktopLink))
diff --git a/libcaja-private/caja-desktop-metadata.h b/libcaja-private/caja-desktop-metadata.h
index dfd98b4a..10c21802 100644
--- a/libcaja-private/caja-desktop-metadata.h
+++ b/libcaja-private/caja-desktop-metadata.h
@@ -29,7 +29,7 @@
 
 #include <glib.h>
 
-#include <libcaja-private/caja-file.h>
+#include "caja-file.h"
 
 void caja_desktop_set_metadata_string (CajaFile *file,
                                        const gchar *name,
diff --git a/libcaja-private/caja-directory-async.c b/libcaja-private/caja-directory-async.c
index 983b6e7c..0a1f2cb5 100644
--- a/libcaja-private/caja-directory-async.c
+++ b/libcaja-private/caja-directory-async.c
@@ -23,6 +23,12 @@
 */
 
 #include <config.h>
+#include <gtk/gtk.h>
+#include <libxml/parser.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "../eel/eel-glib-extensions.h"
 
 #include "caja-directory-notify.h"
 #include "caja-directory-private.h"
@@ -33,11 +39,6 @@
 #include "caja-global-preferences.h"
 #include "caja-link.h"
 #include "caja-marshal.h"
-#include <eel/eel-glib-extensions.h>
-#include <gtk/gtk.h>
-#include <libxml/parser.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 /* turn this on to see messages about each load_directory call: */
 #if 0
diff --git a/libcaja-private/caja-directory-background.c b/libcaja-private/caja-directory-background.c
index 02bccb6e..c577c332 100644
--- a/libcaja-private/caja-directory-background.c
+++ b/libcaja-private/caja-directory-background.c
@@ -27,17 +27,18 @@
 */
 
 #include <config.h>
-#include "caja-directory-background.h"
+#include <gtk/gtk.h>
+#include <string.h>
+
+#include "../eel/eel-gdk-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-background.h"
 
-#include <eel/eel-gdk-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-background.h>
+#include "caja-directory-background.h"
 #include "caja-dnd.h"
 #include "caja-global-preferences.h"
 #include "caja-metadata.h"
 #include "caja-file-attributes.h"
-#include <gtk/gtk.h>
-#include <string.h>
 
 static void caja_background_changed_cb (EelBackground *background,
                                         GdkDragAction  action,
diff --git a/libcaja-private/caja-directory-background.h b/libcaja-private/caja-directory-background.h
index c86e8136..e92b40ba 100644
--- a/libcaja-private/caja-directory-background.h
+++ b/libcaja-private/caja-directory-background.h
@@ -26,9 +26,10 @@
             Jasmine Hassan <[email protected]>
 */
 
-#include <eel/eel-background.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-icon-container.h>
+#include "../eel/eel-background.h"
+
+#include "caja-file.h"
+#include "caja-icon-container.h"
 
 void     caja_connect_background_to_file_metadata    (GtkWidget         *widget,
                                                       CajaFile          *file,
diff --git a/libcaja-private/caja-directory-notify.h b/libcaja-private/caja-directory-notify.h
index 707ea8d8..dabf35e5 100644
--- a/libcaja-private/caja-directory-notify.h
+++ b/libcaja-private/caja-directory-notify.h
@@ -23,7 +23,8 @@
 */
 
 #include <gdk/gdk.h>
-#include <libcaja-private/caja-file.h>
+
+#include "caja-file.h"
 
 typedef struct
 {
diff --git a/libcaja-private/caja-directory-private.h b/libcaja-private/caja-directory-private.h
index 3a4531a2..7fb36c09 100644
--- a/libcaja-private/caja-directory-private.h
+++ b/libcaja-private/caja-directory-private.h
@@ -23,14 +23,16 @@
 */
 
 #include <gio/gio.h>
-#include <eel/eel-vfs-extensions.h>
-#include <libcaja-private/caja-directory.h>
-#include <libcaja-private/caja-file-queue.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-monitor.h>
-#include <libcaja-extension/caja-info-provider.h>
 #include <libxml/tree.h>
 
+#include "../eel/eel-vfs-extensions.h"
+#include "../libcaja-extension/caja-info-provider.h"
+
+#include "caja-directory.h"
+#include "caja-file-queue.h"
+#include "caja-file.h"
+#include "caja-monitor.h"
+
 typedef struct LinkInfoReadState LinkInfoReadState;
 typedef struct TopLeftTextReadState TopLeftTextReadState;
 typedef struct FileMonitors FileMonitors;
diff --git a/libcaja-private/caja-directory.c b/libcaja-private/caja-directory.c
index d9d66c2d..02732744 100644
--- a/libcaja-private/caja-directory.c
+++ b/libcaja-private/caja-directory.c
@@ -23,8 +23,13 @@
 */
 
 #include <config.h>
-#include "caja-directory-private.h"
+#include <gtk/gtk.h>
+#include <string.h>
+
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-macros.h"
 
+#include "caja-directory-private.h"
 #include "caja-directory-notify.h"
 #include "caja-file-attributes.h"
 #include "caja-file-private.h"
@@ -35,10 +40,6 @@
 #include "caja-metadata.h"
 #include "caja-desktop-directory.h"
 #include "caja-vfs-directory.h"
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <gtk/gtk.h>
-#include <string.h>
 
 enum
 {
diff --git a/libcaja-private/caja-directory.h b/libcaja-private/caja-directory.h
index 08697a0b..b375e015 100644
--- a/libcaja-private/caja-directory.h
+++ b/libcaja-private/caja-directory.h
@@ -27,7 +27,8 @@
 
 #include <gtk/gtk.h>
 #include <gio/gio.h>
-#include <libcaja-private/caja-file-attributes.h>
+
+#include "caja-file-attributes.h"
 
 G_BEGIN_DECLS
 
diff --git a/libcaja-private/caja-dnd.c b/libcaja-private/caja-dnd.c
index d7dfdc14..9e6d09bc 100644
--- a/libcaja-private/caja-dnd.c
+++ b/libcaja-private/caja-dnd.c
@@ -27,22 +27,23 @@
 /* FIXME: This should really be back in Caja, not here in Eel. */
 
 #include <config.h>
-#include "caja-dnd.h"
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-string.h"
+#include "../eel/eel-vfs-extensions.h"
 
+#include "caja-dnd.h"
 #include "caja-program-choosing.h"
 #include "caja-link.h"
 #include "caja-window-slot-info.h"
 #include "caja-window-info.h"
 #include "caja-view.h"
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-string.h>
-#include <eel/eel-vfs-extensions.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <stdio.h>
-#include <string.h>
+#include "caja-file-utilities.h"
 
 /* a set of defines stolen from the eel-icon-dnd.c file.
  * These are in microseconds.
diff --git a/libcaja-private/caja-dnd.h b/libcaja-private/caja-dnd.h
index ae4ee675..10c25673 100644
--- a/libcaja-private/caja-dnd.h
+++ b/libcaja-private/caja-dnd.h
@@ -28,7 +28,8 @@
 #define CAJA_DND_H
 
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-window-slot-info.h>
+
+#include "caja-window-slot-info.h"
 
 /* Drag & Drop target names. */
 #define CAJA_ICON_DND_MATE_ICON_LIST_TYPE	"x-special/mate-icon-list"
diff --git a/libcaja-private/caja-emblem-utils.c b/libcaja-private/caja-emblem-utils.c
index 2f4aa054..e9e8f48a 100644
--- a/libcaja-private/caja-emblem-utils.c
+++ b/libcaja-private/caja-emblem-utils.c
@@ -37,8 +37,8 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-stock-dialogs.h>
+#include "../eel/eel-gdk-pixbuf-extensions.h"
+#include "../eel/eel-stock-dialogs.h"
 
 #include "caja-file.h"
 #include "caja-emblem-utils.h"
diff --git a/libcaja-private/caja-entry.c b/libcaja-private/caja-entry.c
index 466b57e8..c0a85b2c 100644
--- a/libcaja-private/caja-entry.c
+++ b/libcaja-private/caja-entry.c
@@ -25,16 +25,16 @@
  */
 
 #include <config.h>
-#include "caja-entry.h"
-
 #include <string.h>
-#include "caja-global-preferences.h"
-#include <eel/eel-gdk-extensions.h>
-#include <eel/eel-gtk-macros.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
+#include "../eel/eel-gdk-extensions.h"
+#include "../eel/eel-gtk-macros.h"
+
+#include "caja-entry.h"
+#include "caja-global-preferences.h"
 
 struct CajaEntryDetails
 {
diff --git a/libcaja-private/caja-file-conflict-dialog.c b/libcaja-private/caja-file-conflict-dialog.c
index 61af0d92..dbd75a2e 100644
--- a/libcaja-private/caja-file-conflict-dialog.c
+++ b/libcaja-private/caja-file-conflict-dialog.c
@@ -24,16 +24,16 @@
 */
 
 #include <config.h>
-#include "caja-file-conflict-dialog.h"
-
 #include <string.h>
 #include <glib-object.h>
 #include <gio/gio.h>
 #include <glib/gi18n.h>
 #include <pango/pango.h>
-#include <eel/eel-vfs-extensions.h>
-#include <eel/eel-stock-dialogs.h>
 
+#include "../eel/eel-vfs-extensions.h"
+#include "../eel/eel-stock-dialogs.h"
+
+#include "caja-file-conflict-dialog.h"
 #include "caja-file.h"
 #include "caja-icon-info.h"
 
diff --git a/libcaja-private/caja-file-dnd.h b/libcaja-private/caja-file-dnd.h
index 117e1823..4d9d0a90 100644
--- a/libcaja-private/caja-file-dnd.h
+++ b/libcaja-private/caja-file-dnd.h
@@ -25,8 +25,8 @@
 #ifndef CAJA_FILE_DND_H
 #define CAJA_FILE_DND_H
 
-#include <libcaja-private/caja-dnd.h>
-#include <libcaja-private/caja-file.h>
+#include "caja-dnd.h"
+#include "caja-file.h"
 
 #define CAJA_FILE_DND_ERASE_KEYWORD "erase"
 
diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c
index 6de6fdfe..f563f2a8 100644
--- a/libcaja-private/caja-file-operations.c
+++ b/libcaja-private/caja-file-operations.c
@@ -35,20 +35,6 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <stdlib.h>
-
-#include "caja-file-operations.h"
-
-#include "caja-debug-log.h"
-#include "caja-file-changes-queue.h"
-#include "caja-lib-self-check-functions.h"
-
-#include "caja-progress-info.h"
-
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-vfs-extensions.h>
-
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <gdk/gdk.h>
@@ -57,6 +43,17 @@
 #include <gio/gio.h>
 #include <glib.h>
 #include <libnotify/notify.h>
+
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-stock-dialogs.h"
+#include "../eel/eel-vfs-extensions.h"
+
+#include "caja-file-operations.h"
+#include "caja-debug-log.h"
+#include "caja-file-changes-queue.h"
+#include "caja-lib-self-check-functions.h"
+#include "caja-progress-info.h"
 #include "caja-file-changes-queue.h"
 #include "caja-file-private.h"
 #include "caja-desktop-icon-file.h"
diff --git a/libcaja-private/caja-file-private.h b/libcaja-private/caja-file-private.h
index f5e77be7..95556051 100644
--- a/libcaja-private/caja-file-private.h
+++ b/libcaja-private/caja-file-private.h
@@ -25,12 +25,13 @@
 #ifndef CAJA_FILE_PRIVATE_H
 #define CAJA_FILE_PRIVATE_H
 
-#include <libcaja-private/caja-directory.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-monitor.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-string.h>
-#include <libcaja-private/caja-undostack-manager.h>
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-string.h"
+
+#include "caja-directory.h"
+#include "caja-file.h"
+#include "caja-monitor.h"
+#include "caja-undostack-manager.h"
 
 #define CAJA_FILE_LARGE_TOP_LEFT_TEXT_MAXIMUM_CHARACTERS_PER_LINE 80
 #define CAJA_FILE_LARGE_TOP_LEFT_TEXT_MAXIMUM_LINES               24
diff --git a/libcaja-private/caja-file-queue.h b/libcaja-private/caja-file-queue.h
index 32dee492..1d18f14e 100644
--- a/libcaja-private/caja-file-queue.h
+++ b/libcaja-private/caja-file-queue.h
@@ -23,7 +23,7 @@
 #ifndef CAJA_FILE_QUEUE_H
 #define CAJA_FILE_QUEUE_H
 
-#include <libcaja-private/caja-file.h>
+#include "caja-file.h"
 
 typedef struct CajaFileQueue CajaFileQueue;
 
diff --git a/libcaja-private/caja-file-utilities.c b/libcaja-private/caja-file-utilities.c
index 46f90b0a..355bb82e 100644
--- a/libcaja-private/caja-file-utilities.c
+++ b/libcaja-private/caja-file-utilities.c
@@ -23,8 +23,18 @@
 */
 
 #include <config.h>
-#include "caja-file-utilities.h"
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <glib/gstdio.h>
+#include <gio/gio.h>
+#include <stdlib.h>
+
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-stock-dialogs.h"
+#include "../eel/eel-string.h"
+#include "../eel/eel-debug.h"
 
+#include "caja-file-utilities.h"
 #include "caja-global-preferences.h"
 #include "caja-lib-self-check-functions.h"
 #include "caja-metadata.h"
@@ -32,15 +42,6 @@
 #include "caja-file-operations.h"
 #include "caja-search-directory.h"
 #include "caja-signaller.h"
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
-#include <eel/eel-debug.h>
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <glib/gstdio.h>
-#include <gio/gio.h>
-#include <stdlib.h>
 
 #define DEFAULT_CAJA_DIRECTORY_MODE (0755)
 
diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c
index 337eeb30..694e5dd4 100644
--- a/libcaja-private/caja-file.c
+++ b/libcaja-private/caja-file.c
@@ -23,8 +23,33 @@
 */
 
 #include <config.h>
-#include "caja-file.h"
+#include <grp.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <glib/gstdio.h>
+#include <gio/gio.h>
+#include <glib.h>
+#include <libxml/parser.h>
+#include <pwd.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <sys/time.h>
+#include <time.h>
+#include <unistd.h>
+#include <sys/stat.h>
+
+#include "../eel/eel-debug.h"
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-vfs-extensions.h"
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-string.h"
+
+#include "../libcaja-extension/caja-file-info.h"
+#include "../libcaja-extension/caja-extension-private.h"
+#include "../libcaja-private/caja-extensions.h"
 
+#include "caja-file.h"
 #include "caja-directory-notify.h"
 #include "caja-directory-private.h"
 #include "caja-signaller.h"
@@ -46,31 +71,6 @@
 #include "caja-ui-utilities.h"
 #include "caja-vfs-file.h"
 #include "caja-saved-search-file.h"
-#include <eel/eel-debug.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-vfs-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-string.h>
-#include <grp.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <glib/gstdio.h>
-#include <gio/gio.h>
-#include <glib.h>
-
-#include <libcaja-extension/caja-file-info.h>
-#include <libcaja-extension/caja-extension-private.h>
-#include <libcaja-private/caja-extensions.h>
-
-#include <libxml/parser.h>
-#include <pwd.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <sys/time.h>
-#include <time.h>
-#include <unistd.h>
-#include <sys/stat.h>
 
 #ifdef HAVE_SELINUX
 #include <selinux/selinux.h>
diff --git a/libcaja-private/caja-file.h b/libcaja-private/caja-file.h
index 4c24b15a..0a04a53c 100644
--- a/libcaja-private/caja-file.h
+++ b/libcaja-private/caja-file.h
@@ -27,8 +27,9 @@
 
 #include <gtk/gtk.h>
 #include <gio/gio.h>
-#include <libcaja-private/caja-file-attributes.h>
-#include <libcaja-private/caja-icon-info.h>
+
+#include "caja-file-attributes.h"
+#include "caja-icon-info.h"
 
 G_BEGIN_DECLS
 
diff --git a/libcaja-private/caja-global-preferences.c b/libcaja-private/caja-global-preferences.c
index c5f6f193..36783dc9 100644
--- a/libcaja-private/caja-global-preferences.c
+++ b/libcaja-private/caja-global-preferences.c
@@ -24,15 +24,16 @@
 */
 
 #include <config.h>
-#include "caja-global-preferences.h"
+#include <glib/gi18n.h>
+
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-stock-dialogs.h"
+#include "../eel/eel-string.h"
 
+#include "caja-global-preferences.h"
 #include "caja-file-utilities.h"
 #include "caja-file.h"
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
-#include <glib/gi18n.h>
 
 /*
  * Public functions
diff --git a/libcaja-private/caja-icon-canvas-item.c b/libcaja-private/caja-icon-canvas-item.c
index 1a35fda7..37ba1672 100644
--- a/libcaja-private/caja-icon-canvas-item.c
+++ b/libcaja-private/caja-icon-canvas-item.c
@@ -24,21 +24,7 @@
 
 #include <config.h>
 #include <math.h>
-#include "caja-icon-canvas-item.h"
-
 #include <glib/gi18n.h>
-
-#include "caja-file-utilities.h"
-#include "caja-global-preferences.h"
-#include "caja-icon-private.h"
-#include <eel/eel-art-extensions.h>
-#include <eel/eel-gdk-extensions.h>
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-graphic-effects.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-string.h>
-#include <eel/eel-accessibility.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
@@ -49,6 +35,20 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "../eel/eel-art-extensions.h"
+#include "../eel/eel-gdk-extensions.h"
+#include "../eel/eel-gdk-pixbuf-extensions.h"
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-graphic-effects.h"
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-string.h"
+#include "../eel/eel-accessibility.h"
+
+#include "caja-icon-canvas-item.h"
+#include "caja-file-utilities.h"
+#include "caja-global-preferences.h"
+#include "caja-icon-private.h"
+
 #define EMBLEM_SPACING 2
 
 /* gap between bottom of icon and start of text box */
diff --git a/libcaja-private/caja-icon-canvas-item.h b/libcaja-private/caja-icon-canvas-item.h
index 507fd8ad..58215412 100644
--- a/libcaja-private/caja-icon-canvas-item.h
+++ b/libcaja-private/caja-icon-canvas-item.h
@@ -25,8 +25,8 @@
 #ifndef CAJA_ICON_CANVAS_ITEM_H
 #define CAJA_ICON_CANVAS_ITEM_H
 
-#include <eel/eel-canvas.h>
-#include <eel/eel-art-extensions.h>
+#include "../eel/eel-canvas.h"
+#include "../eel/eel-art-extensions.h"
 
 G_BEGIN_DECLS
 
diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c
index b082f9b7..3a376faf 100644
--- a/libcaja-private/caja-icon-container.c
+++ b/libcaja-private/caja-icon-container.c
@@ -27,25 +27,7 @@
 
 #include <config.h>
 #include <math.h>
-#include "caja-icon-container.h"
-
-#include "caja-debug-log.h"
-#include "caja-global-preferences.h"
-#include "caja-icon-private.h"
-#include "caja-lib-self-check-functions.h"
-#include "caja-marshal.h"
 #include <atk/atkaction.h>
-#include <eel/eel-accessibility.h>
-#include <eel/eel-background.h>
-#include <eel/eel-vfs-extensions.h>
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-mate-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-art-extensions.h>
-#include <eel/eel-editable-label.h>
-#include <eel/eel-string.h>
-#include <eel/eel-canvas.h>
-#include <eel/eel-canvas-rect-ellipse.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
@@ -53,6 +35,25 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "../eel/eel-accessibility.h"
+#include "../eel/eel-background.h"
+#include "../eel/eel-vfs-extensions.h"
+#include "../eel/eel-gdk-pixbuf-extensions.h"
+#include "../eel/eel-mate-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-art-extensions.h"
+#include "../eel/eel-editable-label.h"
+#include "../eel/eel-string.h"
+#include "../eel/eel-canvas.h"
+#include "../eel/eel-canvas-rect-ellipse.h"
+
+#include "caja-icon-container.h"
+#include "caja-debug-log.h"
+#include "caja-global-preferences.h"
+#include "caja-icon-private.h"
+#include "caja-lib-self-check-functions.h"
+#include "caja-marshal.h"
+
 #define TAB_NAVIGATION_DISABLED
 
 /* Interval for updating the rubberband selection, in milliseconds.  */
diff --git a/libcaja-private/caja-icon-container.h b/libcaja-private/caja-icon-container.h
index cb24bca2..2bc03818 100644
--- a/libcaja-private/caja-icon-container.h
+++ b/libcaja-private/caja-icon-container.h
@@ -26,8 +26,9 @@
 #ifndef CAJA_ICON_CONTAINER_H
 #define CAJA_ICON_CONTAINER_H
 
-#include <eel/eel-canvas.h>
-#include <libcaja-private/caja-icon-info.h>
+#include "../eel/eel-canvas.h"
+
+#include "caja-icon-info.h"
 
 #define CAJA_TYPE_ICON_CONTAINER caja_icon_container_get_type()
 #define CAJA_ICON_CONTAINER(obj) \
diff --git a/libcaja-private/caja-icon-dnd.c b/libcaja-private/caja-icon-dnd.c
index 0917960c..0215a98f 100644
--- a/libcaja-private/caja-icon-dnd.c
+++ b/libcaja-private/caja-icon-dnd.c
@@ -33,32 +33,34 @@
 
 #include <config.h>
 #include <math.h>
-#include "caja-icon-dnd.h"
+#include <stdio.h>
+#include <string.h>
+
+#include <gdk/gdkkeysyms.h>
+#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
+#include "../eel/eel-background.h"
+#include "../eel/eel-gdk-pixbuf-extensions.h"
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-mate-extensions.h"
+#include "../eel/eel-graphic-effects.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-stock-dialogs.h"
+#include "../eel/eel-string.h"
+#include "../eel/eel-vfs-extensions.h"
+#include "../eel/eel-canvas-rect-ellipse.h"
+
+#include "caja-icon-dnd.h"
 #include "caja-debug-log.h"
 #include "caja-file-dnd.h"
 #include "caja-icon-private.h"
 #include "caja-link.h"
 #include "caja-metadata.h"
-#include <eel/eel-background.h>
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-mate-extensions.h>
-#include <eel/eel-graphic-effects.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
-#include <eel/eel-vfs-extensions.h>
-#include <gdk/gdkkeysyms.h>
-#include <gdk/gdkx.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <eel/eel-canvas-rect-ellipse.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-file-changes-queue.h>
-#include <stdio.h>
-#include <string.h>
+#include "caja-file-utilities.h"
+#include "caja-file-changes-queue.h"
 
 static const GtkTargetEntry drag_types [] =
 {
diff --git a/libcaja-private/caja-icon-dnd.h b/libcaja-private/caja-icon-dnd.h
index 6cf14aa0..2cea0f1d 100644
--- a/libcaja-private/caja-icon-dnd.h
+++ b/libcaja-private/caja-icon-dnd.h
@@ -28,8 +28,8 @@
 #ifndef CAJA_ICON_DND_H
 #define CAJA_ICON_DND_H
 
-#include <libcaja-private/caja-icon-container.h>
-#include <libcaja-private/caja-dnd.h>
+#include "caja-icon-container.h"
+#include "caja-dnd.h"
 
 /* DnD-related information. */
 typedef struct
diff --git a/libcaja-private/caja-icon-private.h b/libcaja-private/caja-icon-private.h
index 7145a3c4..6d1657d5 100644
--- a/libcaja-private/caja-icon-private.h
+++ b/libcaja-private/caja-icon-private.h
@@ -25,10 +25,11 @@
 #ifndef CAJA_ICON_CONTAINER_PRIVATE_H
 #define CAJA_ICON_CONTAINER_PRIVATE_H
 
-#include <eel/eel-glib-extensions.h>
-#include <libcaja-private/caja-icon-canvas-item.h>
-#include <libcaja-private/caja-icon-container.h>
-#include <libcaja-private/caja-icon-dnd.h>
+#include "../eel/eel-glib-extensions.h"
+
+#include "caja-icon-canvas-item.h"
+#include "caja-icon-container.h"
+#include "caja-icon-dnd.h"
 
 /* An Icon. */
 
diff --git a/libcaja-private/caja-lib-self-check-functions.h b/libcaja-private/caja-lib-self-check-functions.h
index 4fa973e3..4e9a2de0 100644
--- a/libcaja-private/caja-lib-self-check-functions.h
+++ b/libcaja-private/caja-lib-self-check-functions.h
@@ -23,7 +23,7 @@
    Author: Darin Adler <[email protected]>
 */
 
-#include <eel/eel-self-checks.h>
+#include "../eel/eel-self-checks.h"
 
 void caja_run_lib_self_checks (void);
 
diff --git a/libcaja-private/caja-link.c b/libcaja-private/caja-link.c
index 4f39a474..733cae22 100644
--- a/libcaja-private/caja-link.c
+++ b/libcaja-private/caja-link.c
@@ -24,19 +24,21 @@
 */
 
 #include <config.h>
-#include "caja-link.h"
+#include <stdlib.h>
+#include <string.h>
+
+#include <glib/gi18n.h>
+#include <gio/gio.h>
 
+#include "../eel/eel-vfs-extensions.h"
+
+#include "caja-link.h"
 #include "caja-directory-notify.h"
 #include "caja-directory.h"
 #include "caja-file-utilities.h"
 #include "caja-file.h"
 #include "caja-program-choosing.h"
 #include "caja-icon-names.h"
-#include <eel/eel-vfs-extensions.h>
-#include <glib/gi18n.h>
-#include <gio/gio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #define MAIN_GROUP "Desktop Entry"
 
diff --git a/libcaja-private/caja-mime-actions.c b/libcaja-private/caja-mime-actions.c
index 09e809ce..789086e1 100644
--- a/libcaja-private/caja-mime-actions.c
+++ b/libcaja-private/caja-mime-actions.c
@@ -23,16 +23,17 @@
 */
 
 #include <config.h>
-#include "caja-mime-actions.h"
+#include <string.h>
 
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
-#include <string.h>
 #include <gdk/gdkx.h>
 
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-stock-dialogs.h"
+#include "../eel/eel-string.h"
+
+#include "caja-mime-actions.h"
 #include "caja-file-attributes.h"
 #include "caja-file.h"
 #include "caja-autorun.h"
diff --git a/libcaja-private/caja-mime-actions.h b/libcaja-private/caja-mime-actions.h
index 3a8ba638..48c9c1c5 100644
--- a/libcaja-private/caja-mime-actions.h
+++ b/libcaja-private/caja-mime-actions.h
@@ -27,9 +27,9 @@
 
 #include <gio/gio.h>
 
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-window-info.h>
-#include <libcaja-private/caja-window-slot-info.h>
+#include "caja-file.h"
+#include "caja-window-info.h"
+#include "caja-window-slot-info.h"
 
 CajaFileAttributes caja_mime_actions_get_required_file_attributes (void);
 
diff --git a/libcaja-private/caja-mime-application-chooser.c b/libcaja-private/caja-mime-application-chooser.c
index 5abb9cda..d043b22a 100644
--- a/libcaja-private/caja-mime-application-chooser.c
+++ b/libcaja-private/caja-mime-application-chooser.c
@@ -26,19 +26,20 @@
 */
 
 #include <config.h>
-#include "caja-mime-application-chooser.h"
-
-#include "caja-open-with-dialog.h"
-#include "caja-signaller.h"
-#include "caja-file.h"
-#include <eel/eel-stock-dialogs.h>
-
 #include <string.h>
+
 #include <glib/gi18n-lib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 
+#include "../eel/eel-stock-dialogs.h"
+
+#include "caja-mime-application-chooser.h"
+#include "caja-open-with-dialog.h"
+#include "caja-signaller.h"
+#include "caja-file.h"
+
 struct _CajaMimeApplicationChooserDetails
 {
     char *uri;
diff --git a/libcaja-private/caja-module.c b/libcaja-private/caja-module.c
index e2ec7ea7..d7405d4d 100644
--- a/libcaja-private/caja-module.c
+++ b/libcaja-private/caja-module.c
@@ -22,12 +22,13 @@
  */
 
 #include <config.h>
-#include "caja-module.h"
-
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-debug.h>
 #include <gmodule.h>
-#include <libcaja-private/caja-extensions.h>
+
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-debug.h"
+
+#include "caja-module.h"
+#include "caja-extensions.h"
 
 #define CAJA_TYPE_MODULE    	(caja_module_get_type ())
 #define CAJA_MODULE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), CAJA_TYPE_MODULE, CajaModule))
diff --git a/libcaja-private/caja-open-with-dialog.c b/libcaja-private/caja-open-with-dialog.c
index e42a8fbd..f12775d7 100644
--- a/libcaja-private/caja-open-with-dialog.c
+++ b/libcaja-private/caja-open-with-dialog.c
@@ -26,16 +26,17 @@
 */
 
 #include <config.h>
-#include "caja-open-with-dialog.h"
-#include "caja-signaller.h"
-
-#include <eel/eel-stock-dialogs.h>
-
 #include <string.h>
+#include <cairo-gobject.h>
+
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <gio/gio.h>
-#include <cairo-gobject.h>
+
+#include "../eel/eel-stock-dialogs.h"
+
+#include "caja-open-with-dialog.h"
+#include "caja-signaller.h"
 
 #define sure_string(s)                    ((const char *)((s)!=NULL?(s):""))
 #define DESKTOP_ENTRY_GROUP		  "Desktop Entry"
diff --git a/libcaja-private/caja-program-choosing.c b/libcaja-private/caja-program-choosing.c
index 920261d7..5efdb7ec 100644
--- a/libcaja-private/caja-program-choosing.c
+++ b/libcaja-private/caja-program-choosing.c
@@ -24,24 +24,25 @@
 */
 
 #include <config.h>
-#include "caja-program-choosing.h"
+#include <stdlib.h>
 
-#include "caja-mime-actions.h"
-#include "caja-global-preferences.h"
-#include "caja-icon-info.h"
-#include "caja-recent.h"
-#include "caja-desktop-icon-file.h"
-#include <eel/eel-mate-extensions.h>
-#include <eel/eel-stock-dialogs.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <gio/gdesktopappinfo.h>
-#include <stdlib.h>
-
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 
+#include "../eel/eel-mate-extensions.h"
+#include "../eel/eel-stock-dialogs.h"
+
+#include "caja-program-choosing.h"
+#include "caja-mime-actions.h"
+#include "caja-global-preferences.h"
+#include "caja-icon-info.h"
+#include "caja-recent.h"
+#include "caja-desktop-icon-file.h"
+
 /**
  * application_cannot_open_location
  *
diff --git a/libcaja-private/caja-program-choosing.h b/libcaja-private/caja-program-choosing.h
index 50646a55..9f3c7b52 100644
--- a/libcaja-private/caja-program-choosing.h
+++ b/libcaja-private/caja-program-choosing.h
@@ -28,7 +28,8 @@
 
 #include <gtk/gtk.h>
 #include <gio/gio.h>
-#include <libcaja-private/caja-file.h>
+
+#include "caja-file.h"
 
 typedef void (*CajaApplicationChoiceCallback) (GAppInfo                      *application,
         gpointer			  callback_data);
diff --git a/libcaja-private/caja-progress-info.c b/libcaja-private/caja-progress-info.c
index 0023c65e..d11cf69a 100644
--- a/libcaja-private/caja-progress-info.c
+++ b/libcaja-private/caja-progress-info.c
@@ -24,12 +24,15 @@
 
 #include <config.h>
 #include <math.h>
+#include <string.h>
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <eel/eel-glib-extensions.h>
+
+#include "../eel/eel-glib-extensions.h"
+
 #include "caja-progress-info.h"
 #include "caja-global-preferences.h"
-#include <string.h>
 
 enum
 {
diff --git a/libcaja-private/caja-query.c b/libcaja-private/caja-query.c
index a654eb2c..023231d8 100644
--- a/libcaja-private/caja-query.c
+++ b/libcaja-private/caja-query.c
@@ -23,12 +23,13 @@
 
 #include <config.h>
 #include <string.h>
+#include <glib/gi18n.h>
+
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-glib-extensions.h"
 
 #include "caja-query.h"
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-glib-extensions.h>
-#include <glib/gi18n.h>
-#include <libcaja-private/caja-file-utilities.h>
+#include "caja-file-utilities.h"
 
 struct CajaQueryDetails
 {
diff --git a/libcaja-private/caja-recent.c b/libcaja-private/caja-recent.c
index f2925175..9b8d0e9c 100644
--- a/libcaja-private/caja-recent.c
+++ b/libcaja-private/caja-recent.c
@@ -18,9 +18,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "caja-recent.h"
+#include "../eel/eel-vfs-extensions.h"
 
-#include <eel/eel-vfs-extensions.h>
+#include "caja-recent.h"
 
 #define DEFAULT_APP_EXEC "gio open %u"
 
diff --git a/libcaja-private/caja-recent.h b/libcaja-private/caja-recent.h
index dac63637..d2147237 100644
--- a/libcaja-private/caja-recent.h
+++ b/libcaja-private/caja-recent.h
@@ -4,9 +4,10 @@
 #define __CAJA_RECENT_H__
 
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-file.h>
 #include <gio/gio.h>
 
+#include "caja-file.h"
+
 void caja_recent_add_file (CajaFile *file,
                            GAppInfo *application);
 
diff --git a/libcaja-private/caja-saved-search-file.h b/libcaja-private/caja-saved-search-file.h
index 35d93fd7..42089993 100644
--- a/libcaja-private/caja-saved-search-file.h
+++ b/libcaja-private/caja-saved-search-file.h
@@ -26,7 +26,7 @@
 #ifndef CAJA_SAVED_SEARCH_FILE_H
 #define CAJA_SAVED_SEARCH_FILE_H
 
-#include <libcaja-private/caja-vfs-file.h>
+#include "caja-vfs-file.h"
 
 #define CAJA_TYPE_SAVED_SEARCH_FILE caja_saved_search_file_get_type()
 #define CAJA_SAVED_SEARCH_FILE(obj) \
diff --git a/libcaja-private/caja-search-directory-file.c b/libcaja-private/caja-search-directory-file.c
index ec6d5788..9ba6e648 100644
--- a/libcaja-private/caja-search-directory-file.c
+++ b/libcaja-private/caja-search-directory-file.c
@@ -24,18 +24,20 @@
 */
 
 #include <config.h>
-#include "caja-search-directory-file.h"
+#include <string.h>
+
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
+#include "../eel/eel-glib-extensions.h"
+
+#include "caja-search-directory-file.h"
 #include "caja-directory-notify.h"
 #include "caja-directory-private.h"
 #include "caja-file-attributes.h"
 #include "caja-file-private.h"
 #include "caja-file-utilities.h"
-#include <eel/eel-glib-extensions.h>
 #include "caja-search-directory.h"
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <string.h>
 
 struct CajaSearchDirectoryFileDetails
 {
diff --git a/libcaja-private/caja-search-directory-file.h b/libcaja-private/caja-search-directory-file.h
index 2bfb7a7e..ac6a8d0d 100644
--- a/libcaja-private/caja-search-directory-file.h
+++ b/libcaja-private/caja-search-directory-file.h
@@ -26,7 +26,7 @@
 #ifndef CAJA_SEARCH_DIRECTORY_FILE_H
 #define CAJA_SEARCH_DIRECTORY_FILE_H
 
-#include <libcaja-private/caja-file.h>
+#include "caja-file.h"
 
 #define CAJA_TYPE_SEARCH_DIRECTORY_FILE caja_search_directory_file_get_type()
 #define CAJA_SEARCH_DIRECTORY_FILE(obj) \
diff --git a/libcaja-private/caja-search-directory.c b/libcaja-private/caja-search-directory.c
index e6fb7cd5..befc4aca 100644
--- a/libcaja-private/caja-search-directory.c
+++ b/libcaja-private/caja-search-directory.c
@@ -21,19 +21,21 @@
 */
 
 #include <config.h>
+#include <string.h>
+
+#include <gtk/gtk.h>
+#include <gio/gio.h>
+#include <sys/time.h>
+
+#include "../eel/eel-glib-extensions.h"
+
 #include "caja-search-directory.h"
 #include "caja-search-directory-file.h"
-
 #include "caja-directory-private.h"
 #include "caja-file.h"
 #include "caja-file-private.h"
 #include "caja-file-utilities.h"
 #include "caja-search-engine.h"
-#include <eel/eel-glib-extensions.h>
-#include <gtk/gtk.h>
-#include <gio/gio.h>
-#include <string.h>
-#include <sys/time.h>
 
 struct CajaSearchDirectoryDetails
 {
diff --git a/libcaja-private/caja-search-directory.h b/libcaja-private/caja-search-directory.h
index b7e6a00b..4214f097 100644
--- a/libcaja-private/caja-search-directory.h
+++ b/libcaja-private/caja-search-directory.h
@@ -25,8 +25,8 @@
 #ifndef CAJA_SEARCH_DIRECTORY_H
 #define CAJA_SEARCH_DIRECTORY_H
 
-#include <libcaja-private/caja-directory.h>
-#include <libcaja-private/caja-query.h>
+#include "caja-directory.h"
+#include "caja-query.h"
 
 #define CAJA_TYPE_SEARCH_DIRECTORY caja_search_directory_get_type()
 #define CAJA_SEARCH_DIRECTORY(obj) \
diff --git a/libcaja-private/caja-search-engine-beagle.c b/libcaja-private/caja-search-engine-beagle.c
index 14bbb605..4b546898 100644
--- a/libcaja-private/caja-search-engine-beagle.c
+++ b/libcaja-private/caja-search-engine-beagle.c
@@ -22,11 +22,12 @@
  */
 
 #include <config.h>
-#include "caja-search-engine-beagle.h"
-
-#include <eel/eel-gtk-macros.h>
 #include <gmodule.h>
 
+#include "../eel/eel-gtk-macros.h"
+
+#include "caja-search-engine-beagle.h"
+
 typedef struct _BeagleHit BeagleHit;
 typedef struct _BeagleQuery BeagleQuery;
 typedef struct _BeagleClient BeagleClient;
diff --git a/libcaja-private/caja-search-engine-beagle.h b/libcaja-private/caja-search-engine-beagle.h
index 4fe65663..cd213acc 100644
--- a/libcaja-private/caja-search-engine-beagle.h
+++ b/libcaja-private/caja-search-engine-beagle.h
@@ -24,7 +24,7 @@
 #ifndef CAJA_SEARCH_ENGINE_BEAGLE_H
 #define CAJA_SEARCH_ENGINE_BEAGLE_H
 
-#include <libcaja-private/caja-search-engine.h>
+#include "caja-search-engine.h"
 
 #define CAJA_TYPE_SEARCH_ENGINE_BEAGLE		(caja_search_engine_beagle_get_type ())
 #define CAJA_SEARCH_ENGINE_BEAGLE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), CAJA_TYPE_SEARCH_ENGINE_BEAGLE, CajaSearchEngineBeagle))
diff --git a/libcaja-private/caja-search-engine-simple.c b/libcaja-private/caja-search-engine-simple.c
index 519ea51a..bb03054a 100644
--- a/libcaja-private/caja-search-engine-simple.c
+++ b/libcaja-private/caja-search-engine-simple.c
@@ -22,14 +22,15 @@
  */
 
 #include <config.h>
-#include "caja-search-engine-simple.h"
-
 #include <string.h>
 #include <glib.h>
 
-#include <eel/eel-gtk-macros.h>
 #include <gio/gio.h>
 
+#include "../eel/eel-gtk-macros.h"
+
+#include "caja-search-engine-simple.h"
+
 #define BATCH_SIZE 500
 
 typedef struct
diff --git a/libcaja-private/caja-search-engine-simple.h b/libcaja-private/caja-search-engine-simple.h
index a66fe7b1..eaf4a77a 100644
--- a/libcaja-private/caja-search-engine-simple.h
+++ b/libcaja-private/caja-search-engine-simple.h
@@ -24,7 +24,7 @@
 #ifndef CAJA_SEARCH_ENGINE_SIMPLE_H
 #define CAJA_SEARCH_ENGINE_SIMPLE_H
 
-#include <libcaja-private/caja-search-engine.h>
+#include "caja-search-engine.h"
 
 #define CAJA_TYPE_SEARCH_ENGINE_SIMPLE		(caja_search_engine_simple_get_type ())
 #define CAJA_SEARCH_ENGINE_SIMPLE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), CAJA_TYPE_SEARCH_ENGINE_SIMPLE, CajaSearchEngineSimple))
diff --git a/libcaja-private/caja-search-engine-tracker.c b/libcaja-private/caja-search-engine-tracker.c
index 5f97a70e..b7a97508 100644
--- a/libcaja-private/caja-search-engine-tracker.c
+++ b/libcaja-private/caja-search-engine-tracker.c
@@ -22,11 +22,13 @@
  */
 
 #include <config.h>
-#include "caja-search-engine-tracker.h"
-#include <eel/eel-gtk-macros.h>
 #include <gmodule.h>
 #include <string.h>
 
+#include "../eel/eel-gtk-macros.h"
+
+#include "caja-search-engine-tracker.h"
+
 typedef struct _TrackerClient TrackerClient;
 
 typedef enum
diff --git a/libcaja-private/caja-search-engine-tracker.h b/libcaja-private/caja-search-engine-tracker.h
index 72c6ef67..d9682e49 100644
--- a/libcaja-private/caja-search-engine-tracker.h
+++ b/libcaja-private/caja-search-engine-tracker.h
@@ -24,7 +24,7 @@
 #ifndef CAJA_SEARCH_ENGINE_TRACKER_H
 #define CAJA_SEARCH_ENGINE_TRACKER_H
 
-#include <libcaja-private/caja-search-engine.h>
+#include "caja-search-engine.h"
 
 #define CAJA_TYPE_SEARCH_ENGINE_TRACKER		(caja_search_engine_tracker_get_type ())
 #define CAJA_SEARCH_ENGINE_TRACKER(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), CAJA_TYPE_SEARCH_ENGINE_TRACKER, CajaSearchEngineTracker))
diff --git a/libcaja-private/caja-search-engine.c b/libcaja-private/caja-search-engine.c
index 59bb05ab..e7cca500 100644
--- a/libcaja-private/caja-search-engine.c
+++ b/libcaja-private/caja-search-engine.c
@@ -22,13 +22,14 @@
  */
 
 #include <config.h>
+
+#include "../eel/eel-gtk-macros.h"
+
 #include "caja-search-engine.h"
 #include "caja-search-engine-beagle.h"
 #include "caja-search-engine-simple.h"
 #include "caja-search-engine-tracker.h"
 
-#include <eel/eel-gtk-macros.h>
-
 struct CajaSearchEngineDetails
 {
     int none;
diff --git a/libcaja-private/caja-search-engine.h b/libcaja-private/caja-search-engine.h
index 3f37d2fc..3d811ff4 100644
--- a/libcaja-private/caja-search-engine.h
+++ b/libcaja-private/caja-search-engine.h
@@ -25,7 +25,8 @@
 #define CAJA_SEARCH_ENGINE_H
 
 #include <glib-object.h>
-#include <libcaja-private/caja-query.h>
+
+#include "caja-query.h"
 
 #define CAJA_TYPE_SEARCH_ENGINE		(caja_search_engine_get_type ())
 #define CAJA_SEARCH_ENGINE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), CAJA_TYPE_SEARCH_ENGINE, CajaSearchEngine))
diff --git a/libcaja-private/caja-sidebar-provider.h b/libcaja-private/caja-sidebar-provider.h
index 21febd6a..2c762e14 100644
--- a/libcaja-private/caja-sidebar-provider.h
+++ b/libcaja-private/caja-sidebar-provider.h
@@ -25,8 +25,8 @@
 #ifndef CAJA_SIDEBAR_PROVIDER_H
 #define CAJA_SIDEBAR_PROVIDER_H
 
-#include <libcaja-private/caja-sidebar.h>
-#include <libcaja-private/caja-window-info.h>
+#include "caja-sidebar.h"
+#include "caja-window-info.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/libcaja-private/caja-signaller.c b/libcaja-private/caja-signaller.c
index 0d31bed7..3e7a53cd 100644
--- a/libcaja-private/caja-signaller.c
+++ b/libcaja-private/caja-signaller.c
@@ -27,9 +27,10 @@
  */
 
 #include <config.h>
-#include "caja-signaller.h"
 
-#include <eel/eel-debug.h>
+#include "../eel/eel-debug.h"
+
+#include "caja-signaller.h"
 
 typedef GObject CajaSignaller;
 typedef GObjectClass CajaSignallerClass;
diff --git a/libcaja-private/caja-thumbnails.c b/libcaja-private/caja-thumbnails.c
index 3f009475..62d36648 100644
--- a/libcaja-private/caja-thumbnails.c
+++ b/libcaja-private/caja-thumbnails.c
@@ -24,28 +24,29 @@
 */
 
 #include <config.h>
-#include "caja-thumbnails.h"
-
-#define MATE_DESKTOP_USE_UNSTABLE_API
-
-#include "caja-directory-notify.h"
-#include "caja-global-preferences.h"
-#include "caja-file-utilities.h"
 #include <math.h>
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-graphic-effects.h>
-#include <eel/eel-string.h>
-#include <eel/eel-debug.h>
-#include <eel/eel-vfs-extensions.h>
-#include <gtk/gtk.h>
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/wait.h>
 #include <unistd.h>
 #include <signal.h>
+
+#include <gtk/gtk.h>
+#include <sys/wait.h>
+
+#define MATE_DESKTOP_USE_UNSTABLE_API
 #include <libmate-desktop/mate-desktop-thumbnail.h>
 
+#include "../eel/eel-gdk-pixbuf-extensions.h"
+#include "../eel/eel-graphic-effects.h"
+#include "../eel/eel-string.h"
+#include "../eel/eel-debug.h"
+#include "../eel/eel-vfs-extensions.h"
+
+#include "caja-thumbnails.h"
+#include "caja-directory-notify.h"
+#include "caja-global-preferences.h"
+#include "caja-file-utilities.h"
 #include "caja-file-private.h"
 
 /* turn this on to see messages about thumbnail creation */
diff --git a/libcaja-private/caja-thumbnails.h b/libcaja-private/caja-thumbnails.h
index e391149f..95ffb7fb 100644
--- a/libcaja-private/caja-thumbnails.h
+++ b/libcaja-private/caja-thumbnails.h
@@ -26,7 +26,8 @@
 #define CAJA_THUMBNAILS_H
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libcaja-private/caja-file.h>
+
+#include "caja-file.h"
 
 /* Returns NULL if there's no thumbnail yet. */
 void       caja_create_thumbnail                (CajaFile *file);
diff --git a/libcaja-private/caja-trash-monitor.c b/libcaja-private/caja-trash-monitor.c
index 9fe9e715..a48feb70 100644
--- a/libcaja-private/caja-trash-monitor.c
+++ b/libcaja-private/caja-trash-monitor.c
@@ -24,15 +24,17 @@
 */
 
 #include <config.h>
-#include "caja-trash-monitor.h"
 
+#include <gio/gio.h>
+#include <string.h>
+
+#include "../eel/eel-debug.h"
+
+#include "caja-trash-monitor.h"
 #include "caja-directory-notify.h"
 #include "caja-directory.h"
 #include "caja-file-attributes.h"
 #include "caja-icon-names.h"
-#include <eel/eel-debug.h>
-#include <gio/gio.h>
-#include <string.h>
 
 struct _CajaTrashMonitorPrivate
 {
diff --git a/libcaja-private/caja-tree-view-drag-dest.c b/libcaja-private/caja-tree-view-drag-dest.c
index 0cd60fd5..4698c1e6 100644
--- a/libcaja-private/caja-tree-view-drag-dest.c
+++ b/libcaja-private/caja-tree-view-drag-dest.c
@@ -29,18 +29,20 @@
  */
 
 #include <config.h>
-#include "caja-tree-view-drag-dest.h"
+#include <stdio.h>
+#include <string.h>
 
-#include <eel/eel-gtk-macros.h>
 #include <gtk/gtk.h>
+
+#include "../eel/eel-gtk-macros.h"
+
+#include "caja-tree-view-drag-dest.h"
 #include "caja-file-dnd.h"
 #include "caja-file-changes-queue.h"
 #include "caja-icon-dnd.h"
 #include "caja-link.h"
 #include "caja-marshal.h"
 #include "caja-debug-log.h"
-#include <stdio.h>
-#include <string.h>
 
 #define AUTO_SCROLL_MARGIN 20
 
diff --git a/libcaja-private/caja-ui-utilities.c b/libcaja-private/caja-ui-utilities.c
index 1cdb5125..69d963f3 100644
--- a/libcaja-private/caja-ui-utilities.c
+++ b/libcaja-private/caja-ui-utilities.c
@@ -23,15 +23,17 @@
 */
 
 #include <config.h>
-#include "caja-ui-utilities.h"
-#include "caja-file-utilities.h"
-#include "caja-icon-info.h"
-#include <gio/gio.h>
 
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <eel/eel-debug.h>
-#include <eel/eel-graphic-effects.h>
+#include <gio/gio.h>
+
+#include "../eel/eel-debug.h"
+#include "../eel/eel-graphic-effects.h"
+
+#include "caja-ui-utilities.h"
+#include "caja-file-utilities.h"
+#include "caja-icon-info.h"
 
 void
 caja_ui_unmerge_ui (GtkUIManager *ui_manager,
diff --git a/libcaja-private/caja-ui-utilities.h b/libcaja-private/caja-ui-utilities.h
index c7a8d595..e51c2487 100644
--- a/libcaja-private/caja-ui-utilities.h
+++ b/libcaja-private/caja-ui-utilities.h
@@ -25,7 +25,8 @@
 #define CAJA_UI_UTILITIES_H
 
 #include <gtk/gtk.h>
-#include <libcaja-extension/caja-menu-item.h>
+
+#include "../libcaja-extension/caja-menu-item.h"
 
 char *      caja_get_ui_directory              (void);
 char *      caja_ui_file                       (const char        *partial_path);
diff --git a/libcaja-private/caja-vfs-directory.c b/libcaja-private/caja-vfs-directory.c
index 278992af..0698afd3 100644
--- a/libcaja-private/caja-vfs-directory.c
+++ b/libcaja-private/caja-vfs-directory.c
@@ -24,10 +24,11 @@
 */
 
 #include <config.h>
-#include "caja-vfs-directory.h"
 
+#include "../eel/eel-gtk-macros.h"
+
+#include "caja-vfs-directory.h"
 #include "caja-directory-private.h"
-#include <eel/eel-gtk-macros.h>
 #include "caja-file-private.h"
 
 static void caja_vfs_directory_init       (gpointer   object,
diff --git a/libcaja-private/caja-vfs-directory.h b/libcaja-private/caja-vfs-directory.h
index 969dbbe1..646d5389 100644
--- a/libcaja-private/caja-vfs-directory.h
+++ b/libcaja-private/caja-vfs-directory.h
@@ -26,7 +26,7 @@
 #ifndef CAJA_VFS_DIRECTORY_H
 #define CAJA_VFS_DIRECTORY_H
 
-#include <libcaja-private/caja-directory.h>
+#include "caja-directory.h"
 
 #define CAJA_TYPE_VFS_DIRECTORY caja_vfs_directory_get_type()
 #define CAJA_VFS_DIRECTORY(obj) \
diff --git a/libcaja-private/caja-vfs-file.c b/libcaja-private/caja-vfs-file.c
index 00048d06..f2908a26 100644
--- a/libcaja-private/caja-vfs-file.c
+++ b/libcaja-private/caja-vfs-file.c
@@ -24,14 +24,16 @@
 */
 
 #include <config.h>
-#include "caja-vfs-file.h"
 
+#include <glib/gi18n.h>
+
+#include "../eel/eel-gtk-macros.h"
+
+#include "caja-vfs-file.h"
 #include "caja-directory-notify.h"
 #include "caja-directory-private.h"
 #include "caja-file-private.h"
 #include "caja-autorun.h"
-#include <eel/eel-gtk-macros.h>
-#include <glib/gi18n.h>
 
 static void caja_vfs_file_init       (gpointer   object,
                                       gpointer   klass);
diff --git a/libcaja-private/caja-vfs-file.h b/libcaja-private/caja-vfs-file.h
index 1069464c..0019f45f 100644
--- a/libcaja-private/caja-vfs-file.h
+++ b/libcaja-private/caja-vfs-file.h
@@ -26,7 +26,7 @@
 #ifndef CAJA_VFS_FILE_H
 #define CAJA_VFS_FILE_H
 
-#include <libcaja-private/caja-file.h>
+#include "caja-file.h"
 
 #define CAJA_TYPE_VFS_FILE caja_vfs_file_get_type()
 #define CAJA_VFS_FILE(obj) \
diff --git a/libcaja-private/caja-view-factory.h b/libcaja-private/caja-view-factory.h
index e40fd8aa..294c2245 100644
--- a/libcaja-private/caja-view-factory.h
+++ b/libcaja-private/caja-view-factory.h
@@ -27,10 +27,11 @@
 
 #include <string.h>
 
-#include <libcaja-private/caja-view.h>
-#include <libcaja-private/caja-window-slot-info.h>
 #include <gio/gio.h>
 
+#include "caja-view.h"
+#include "caja-window-slot-info.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/libcaja-private/caja-view.h b/libcaja-private/caja-view.h
index 3f2da382..93fafdab 100644
--- a/libcaja-private/caja-view.h
+++ b/libcaja-private/caja-view.h
@@ -29,7 +29,7 @@
 #include <gtk/gtk.h>
 
 /* For CajaZoomLevel */
-#include <libcaja-private/caja-icon-info.h>
+#include "caja-icon-info.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/libcaja-private/caja-window-info.h b/libcaja-private/caja-window-info.h
index b4cf8722..ea2d23c6 100644
--- a/libcaja-private/caja-window-info.h
+++ b/libcaja-private/caja-window-info.h
@@ -26,9 +26,11 @@
 #define CAJA_WINDOW_INFO_H
 
 #include <glib-object.h>
-#include <libcaja-private/caja-view.h>
+
 #include <gtk/gtk.h>
 
+#include "caja-view.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/caja-application.c b/src/caja-application.c
index 666bb9ed..85285304 100644
--- a/src/caja-application.c
+++ b/src/caja-application.c
@@ -27,15 +27,48 @@
  */
 
 #include <config.h>
-#include "caja-application.h"
+#include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
 
+#include <libxml/xmlsave.h>
+#include <glib/gstdio.h>
+#include <glib/gi18n.h>
+#include <gio/gio.h>
+#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
+#include <libnotify/notify.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#define MATE_DESKTOP_USE_UNSTABLE_API
+#include <libmate-desktop/mate-bg.h>
+
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-stock-dialogs.h"
+
+#include "../libcaja-private/caja-debug-log.h"
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-lib-self-check-functions.h"
+#include "../libcaja-private/caja-extensions.h"
+#include "../libcaja-private/caja-module.h"
+#include "../libcaja-private/caja-desktop-link-monitor.h"
+#include "../libcaja-private/caja-directory-private.h"
+#include "../libcaja-private/caja-signaller.h"
+#include "../libcaja-extension/caja-menu-provider.h"
+#include "../libcaja-private/caja-autorun.h"
+
+#if ENABLE_EMPTY_VIEW
+#include "file-manager/fm-empty-view.h"
+#endif /* ENABLE_EMPTY_VIEW */
 #include "file-manager/fm-desktop-icon-view.h"
 #include "file-manager/fm-icon-view.h"
 #include "file-manager/fm-list-view.h"
 #include "file-manager/fm-tree-view.h"
-#if ENABLE_EMPTY_VIEW
-#include "file-manager/fm-empty-view.h"
-#endif /* ENABLE_EMPTY_VIEW */
+
+#include "caja-application.h"
 #include "caja-information-panel.h"
 #include "caja-history-sidebar.h"
 #include "caja-places-sidebar.h"
@@ -43,9 +76,6 @@
 #include "caja-notes-viewer.h"
 #include "caja-emblem-sidebar.h"
 #include "caja-image-properties-page.h"
-#include <fcntl.h>
-#include <string.h>
-#include <unistd.h>
 #include "caja-desktop-window.h"
 #include "caja-spatial-window.h"
 #include "caja-navigation-window.h"
@@ -56,33 +86,6 @@
 #include "caja-window-private.h"
 #include "caja-window-manage-views.h"
 #include "caja-freedesktop-dbus.h"
-#include <libxml/xmlsave.h>
-#include <glib/gstdio.h>
-#include <glib/gi18n.h>
-#include <gio/gio.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-stock-dialogs.h>
-#include <gdk/gdkx.h>
-#include <gtk/gtk.h>
-#include <libnotify/notify.h>
-#include <libcaja-private/caja-debug-log.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-lib-self-check-functions.h>
-#include <libcaja-private/caja-extensions.h>
-#include <libcaja-private/caja-module.h>
-#include <libcaja-private/caja-desktop-link-monitor.h>
-#include <libcaja-private/caja-directory-private.h>
-#include <libcaja-private/caja-signaller.h>
-#include <libcaja-extension/caja-menu-provider.h>
-#include <libcaja-private/caja-autorun.h>
-#define MATE_DESKTOP_USE_UNSTABLE_API
-#include <libmate-desktop/mate-bg.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 
 /* Keep window from shrinking down ridiculously small; numbers are somewhat arbitrary */
 #define APPLICATION_WINDOW_MIN_WIDTH	300
diff --git a/src/caja-application.h b/src/caja-application.h
index 7c72bb61..feb0fb98 100644
--- a/src/caja-application.h
+++ b/src/caja-application.h
@@ -32,7 +32,7 @@
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
-#include <libegg/eggsmclient.h>
+#include "../libegg/eggsmclient.h"
 
 #define CAJA_DESKTOP_ICON_VIEW_IID "OAFIID:Caja_File_Manager_Desktop_Icon_View"
 
diff --git a/src/caja-autorun-software.c b/src/caja-autorun-software.c
index 4e24fa80..019cb5c6 100644
--- a/src/caja-autorun-software.c
+++ b/src/caja-autorun-software.c
@@ -24,18 +24,17 @@
 
 
 #include <config.h>
-
 #include <unistd.h>
 #include <string.h>
 #include <time.h>
 #include <errno.h>
+
 #include <gtk/gtk.h>
 #include <gio/gio.h>
-
 #include <glib/gi18n.h>
 
-#include <libcaja-private/caja-module.h>
-#include <libcaja-private/caja-icon-info.h>
+#include "../libcaja-private/caja-module.h"
+#include "../libcaja-private/caja-icon-info.h"
 
 typedef struct
 {
diff --git a/src/caja-bookmark-list.c b/src/caja-bookmark-list.c
index a8a2adb2..33beaef9 100644
--- a/src/caja-bookmark-list.c
+++ b/src/caja-bookmark-list.c
@@ -26,14 +26,15 @@
  */
 
 #include <config.h>
-#include "caja-bookmark-list.h"
-
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-icon-names.h>
+#include <string.h>
 
 #include <gio/gio.h>
-#include <string.h>
+
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-file.h"
+#include "../libcaja-private/caja-icon-names.h"
+
+#include "caja-bookmark-list.h"
 
 #define LOAD_JOB 1
 #define SAVE_JOB 2
diff --git a/src/caja-bookmark-list.h b/src/caja-bookmark-list.h
index abe420a3..fe232bde 100644
--- a/src/caja-bookmark-list.h
+++ b/src/caja-bookmark-list.h
@@ -28,9 +28,10 @@
 #ifndef CAJA_BOOKMARK_LIST_H
 #define CAJA_BOOKMARK_LIST_H
 
-#include <libcaja-private/caja-bookmark.h>
 #include <gio/gio.h>
 
+#include "../libcaja-private/caja-bookmark.h"
+
 typedef struct CajaBookmarkList CajaBookmarkList;
 typedef struct CajaBookmarkListClass CajaBookmarkListClass;
 
diff --git a/src/caja-bookmarks-window.c b/src/caja-bookmarks-window.c
index b5ac38b8..1bc023e8 100644
--- a/src/caja-bookmarks-window.c
+++ b/src/caja-bookmarks-window.c
@@ -26,16 +26,20 @@
  */
 
 #include <config.h>
+#include <cairo-gobject.h>
+
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-mate-extensions.h"
+
+#include "../libcaja-private/caja-global-preferences.h"
+
 #include "caja-bookmarks-window.h"
 #include "caja-window.h"
 #include "caja-navigation-window.h"
 #include "caja-spatial-window.h"
-#include <libcaja-private/caja-global-preferences.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-mate-extensions.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#include <cairo-gobject.h>
 
 /* Static variables to keep track of window state. If there were
  * more than one bookmark-editing window, these would be struct or
diff --git a/src/caja-connect-server-dialog-main.c b/src/caja-connect-server-dialog-main.c
index c2936747..2d646c67 100644
--- a/src/caja-connect-server-dialog-main.c
+++ b/src/caja-connect-server-dialog-main.c
@@ -26,18 +26,16 @@
  */
 
 #include <config.h>
+#include <stdlib.h>
 
 #include <glib/gi18n.h>
-
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 
-#include <stdlib.h>
-
-#include <eel/eel-stock-dialogs.h>
+#include "../eel/eel-stock-dialogs.h"
 
-#include <libcaja-private/caja-icon-names.h>
-#include <libcaja-private/caja-global-preferences.h>
+#include "../libcaja-private/caja-icon-names.h"
+#include "../libcaja-private/caja-global-preferences.h"
 
 #include "caja-connect-server-dialog.h"
 
diff --git a/src/caja-connect-server-dialog-nonmain.c b/src/caja-connect-server-dialog-nonmain.c
index e08dfd3d..3948baba 100644
--- a/src/caja-connect-server-dialog-nonmain.c
+++ b/src/caja-connect-server-dialog-nonmain.c
@@ -22,9 +22,12 @@
  */
 
 #include <config.h>
+
 #include <gio/gio.h>
+
+#include "../libcaja-private/caja-global-preferences.h"
+
 #include "caja-connect-server-dialog.h"
-#include <libcaja-private/caja-global-preferences.h>
 
 /* This file contains the glue for the calls from the connect to server dialog
  * to the main caja binary. A different version of this glue is in
diff --git a/src/caja-connect-server-dialog.c b/src/caja-connect-server-dialog.c
index c08ae9d2..6e36e3d0 100644
--- a/src/caja-connect-server-dialog.c
+++ b/src/caja-connect-server-dialog.c
@@ -23,23 +23,23 @@
  */
 
 #include <config.h>
-
-#include "caja-connect-server-dialog.h"
-
 #include <string.h>
-#include <eel/eel-stock-dialogs.h>
+
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
+#include "../eel/eel-stock-dialogs.h"
+
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-icon-names.h"
+
+#include "caja-connect-server-dialog.h"
 #include "caja-application.h"
 #include "caja-bookmark-list.h"
 #include "caja-connect-server-operation.h"
 #include "caja-window.h"
 
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-icon-names.h>
-
 /* TODO:
  * - name entry + pre-fill
  * - NetworkManager integration
diff --git a/src/caja-desktop-window.c b/src/caja-desktop-window.c
index 50305b97..6b4af389 100644
--- a/src/caja-desktop-window.c
+++ b/src/caja-desktop-window.c
@@ -23,19 +23,22 @@
  */
 
 #include <config.h>
-#include "caja-desktop-window.h"
-#include "caja-window-private.h"
-#include "caja-actions.h"
 
 #include <X11/Xatom.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
-#include <eel/eel-background.h>
-#include <eel/eel-vfs-extensions.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-icon-names.h>
 #include <gio/gio.h>
-#include <glib/gi18n.h>    
+#include <glib/gi18n.h>
+
+#include "../eel/eel-background.h"
+#include "../eel/eel-vfs-extensions.h"
+
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-icon-names.h"
+
+#include "caja-desktop-window.h"
+#include "caja-window-private.h"
+#include "caja-actions.h"
 
 /* Tell screen readers that this is a desktop window */
 
diff --git a/src/caja-emblem-sidebar.c b/src/caja-emblem-sidebar.c
index 03767d54..8c05963e 100644
--- a/src/caja-emblem-sidebar.c
+++ b/src/caja-emblem-sidebar.c
@@ -29,24 +29,27 @@
  */
 
 #include <config.h>
-#include "caja-emblem-sidebar.h"
-
 #include <stdio.h>
-#include <eel/eel-wrap-table.h>
-#include <eel/eel-labeled-image.h>
-#include <eel/eel-graphic-effects.h>
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-gtk-extensions.h>
+
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libcaja-private/caja-icon-dnd.h>
-#include <libcaja-private/caja-emblem-utils.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-sidebar-provider.h>
-#include <libcaja-private/caja-module.h>
-#include <libcaja-private/caja-signaller.h>
+
+#include "../eel/eel-wrap-table.h"
+#include "../eel/eel-labeled-image.h"
+#include "../eel/eel-graphic-effects.h"
+#include "../eel/eel-gdk-pixbuf-extensions.h"
+#include "../eel/eel-stock-dialogs.h"
+#include "../eel/eel-gtk-extensions.h"
+
+#include "../libcaja-private/caja-icon-dnd.h"
+#include "../libcaja-private/caja-emblem-utils.h"
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-sidebar-provider.h"
+#include "../libcaja-private/caja-module.h"
+#include "../libcaja-private/caja-signaller.h"
+
+#include "caja-emblem-sidebar.h"
 
 struct CajaEmblemSidebarDetails
 {
diff --git a/src/caja-file-management-properties-main.c b/src/caja-file-management-properties-main.c
index b2b79552..5cdebdcf 100644
--- a/src/caja-file-management-properties-main.c
+++ b/src/caja-file-management-properties-main.c
@@ -27,8 +27,8 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-module.h>
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-module.h"
 
 #include "caja-file-management-properties.h"
 
diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c
index 7f540707..430642e7 100644
--- a/src/caja-file-management-properties.c
+++ b/src/caja-file-management-properties.c
@@ -23,27 +23,25 @@
 */
 
 #include <config.h>
-
-#include "caja-file-management-properties.h"
-
 #include <string.h>
 #include <time.h>
+
 #include <gtk/gtk.h>
 #include <gio/gio.h>
-
 #include <glib/gi18n.h>
 
-#include <eel/eel-glib-extensions.h>
+#include "../eel/eel-glib-extensions.h"
 
-#include <libcaja-private/caja-column-chooser.h>
-#include <libcaja-private/caja-column-utilities.h>
-#include <libcaja-private/caja-extensions.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-module.h>
+#include "../libcaja-private/caja-column-chooser.h"
+#include "../libcaja-private/caja-column-utilities.h"
+#include "../libcaja-private/caja-extensions.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-module.h"
+#include "../libcaja-private/caja-autorun.h"
 
-#include <libcaja-private/caja-autorun.h>
+#include "../libcaja-extension/caja-configurable.h"
 
-#include <libcaja-extension/caja-configurable.h>
+#include "caja-file-management-properties.h"
 
 /* string enum preferences */
 #define CAJA_FILE_MANAGEMENT_PROPERTIES_DEFAULT_VIEW_WIDGET "default_view_combobox"
diff --git a/src/caja-freedesktop-dbus.c b/src/caja-freedesktop-dbus.c
index 28544f63..849e0a66 100644
--- a/src/caja-freedesktop-dbus.c
+++ b/src/caja-freedesktop-dbus.c
@@ -23,15 +23,15 @@
 
 #include <config.h>
 
-#include "caja-application.h"
-#include "caja-freedesktop-dbus.h"
-#include "caja-freedesktop-generated.h"
+#include <gio/gio.h>
 
-#include <libcaja-private/caja-debug-log.h>
+#include "../libcaja-private/caja-debug-log.h"
 
 #include "file-manager/fm-properties-window.h"
 
-#include <gio/gio.h>
+#include "caja-application.h"
+#include "caja-freedesktop-dbus.h"
+#include "caja-freedesktop-generated.h"
 
 struct _CajaFreedesktopDBus {
     GObject parent;
diff --git a/src/caja-history-sidebar.c b/src/caja-history-sidebar.c
index 2b6ddd92..fe224ed6 100644
--- a/src/caja-history-sidebar.c
+++ b/src/caja-history-sidebar.c
@@ -27,17 +27,19 @@
 
 #include <config.h>
 
-#include <eel/eel-gtk-extensions.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <cairo-gobject.h>
-#include <libcaja-private/caja-bookmark.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-sidebar-provider.h>
-#include <libcaja-private/caja-module.h>
-#include <libcaja-private/caja-signaller.h>
-#include <libcaja-private/caja-window-info.h>
-#include <libcaja-private/caja-window-slot-info.h>
+
+#include "../eel/eel-gtk-extensions.h"
+
+#include "../libcaja-private/caja-bookmark.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-sidebar-provider.h"
+#include "../libcaja-private/caja-module.h"
+#include "../libcaja-private/caja-signaller.h"
+#include "../libcaja-private/caja-window-info.h"
+#include "../libcaja-private/caja-window-slot-info.h"
 
 #include "caja-history-sidebar.h"
 
diff --git a/src/caja-history-sidebar.h b/src/caja-history-sidebar.h
index 45740e24..3c09564a 100644
--- a/src/caja-history-sidebar.h
+++ b/src/caja-history-sidebar.h
@@ -28,8 +28,9 @@
 #define _CAJA_HISTORY_SIDEBAR_H
 
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-view.h>
-#include <libcaja-private/caja-window-info.h>
+
+#include "../libcaja-private/caja-view.h"
+#include "../libcaja-private/caja-window-info.h"
 
 #define CAJA_HISTORY_SIDEBAR_ID    "history"
 
diff --git a/src/caja-image-properties-page.c b/src/caja-image-properties-page.c
index 8a6078e2..0234cedc 100644
--- a/src/caja-image-properties-page.c
+++ b/src/caja-image-properties-page.c
@@ -24,16 +24,11 @@
  */
 
 #include <config.h>
-#include "caja-image-properties-page.h"
+#include <string.h>
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include <eel/eel-vfs-extensions.h>
-#include <libcaja-extension/caja-property-page-provider.h>
-#include <libcaja-private/caja-module.h>
-#include <string.h>
-
 #ifdef HAVE_EXIF
 #include <libexif/exif-data.h>
 #include <libexif/exif-ifd.h>
@@ -44,6 +39,13 @@
 #include <exempi/xmpconsts.h>
 #endif /*HAVE_EXEMPI*/
 
+#include "../eel/eel-vfs-extensions.h"
+
+#include "../libcaja-extension/caja-property-page-provider.h"
+#include "../libcaja-private/caja-module.h"
+
+#include "caja-image-properties-page.h"
+
 #define LOAD_BUFFER_SIZE 8192
 
 struct _CajaImagePropertiesPagePrivate
diff --git a/src/caja-information-panel.c b/src/caja-information-panel.c
index d4a22df4..e1d0fe73 100644
--- a/src/caja-information-panel.c
+++ b/src/caja-information-panel.c
@@ -24,30 +24,32 @@
  */
 
 #include <config.h>
-#include "caja-information-panel.h"
-
-#include "caja-sidebar-title.h"
 
-#include <eel/eel-background.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
-#include <eel/eel-vfs-extensions.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libcaja-private/caja-dnd.h>
-#include <libcaja-private/caja-directory.h>
-#include <libcaja-private/caja-file-dnd.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-keep-last-vertical-box.h>
-#include <libcaja-private/caja-metadata.h>
-#include <libcaja-private/caja-mime-actions.h>
-#include <libcaja-private/caja-program-choosing.h>
-#include <libcaja-private/caja-sidebar-provider.h>
-#include <libcaja-private/caja-module.h>
+
+#include "../eel/eel-background.h"
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-stock-dialogs.h"
+#include "../eel/eel-string.h"
+#include "../eel/eel-vfs-extensions.h"
+
+#include "../libcaja-private/caja-dnd.h"
+#include "../libcaja-private/caja-directory.h"
+#include "../libcaja-private/caja-file-dnd.h"
+#include "../libcaja-private/caja-file.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-keep-last-vertical-box.h"
+#include "../libcaja-private/caja-metadata.h"
+#include "../libcaja-private/caja-mime-actions.h"
+#include "../libcaja-private/caja-program-choosing.h"
+#include "../libcaja-private/caja-sidebar-provider.h"
+#include "../libcaja-private/caja-module.h"
+
+#include "caja-information-panel.h"
+#include "caja-sidebar-title.h"
 
 struct _CajaInformationPanelPrivate
 {
diff --git a/src/caja-information-panel.h b/src/caja-information-panel.h
index 5ccdd9d6..94d605d3 100644
--- a/src/caja-information-panel.h
+++ b/src/caja-information-panel.h
@@ -28,7 +28,7 @@
 #ifndef CAJA_INFORMATION_PANEL_H
 #define CAJA_INFORMATION_PANEL_H
 
-#include <eel/eel-background-box.h>
+#include "../eel/eel-background-box.h"
 
 #define CAJA_TYPE_INFORMATION_PANEL caja_information_panel_get_type()
 #define CAJA_INFORMATION_PANEL(obj) \
diff --git a/src/caja-location-bar.c b/src/caja-location-bar.c
index 7763f40b..a0f9500a 100644
--- a/src/caja-location-bar.c
+++ b/src/caja-location-bar.c
@@ -31,25 +31,28 @@
  */
 
 #include <config.h>
-#include "caja-location-bar.h"
+#include <stdio.h>
+#include <string.h>
+
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+
+#include "../eel/eel-accessibility.h"
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-stock-dialogs.h"
+#include "../eel/eel-string.h"
+#include "../eel/eel-vfs-extensions.h"
 
+#include "../libcaja-private/caja-icon-dnd.h"
+#include "../libcaja-private/caja-clipboard.h"
+
+#include "caja-location-bar.h"
 #include "caja-location-entry.h"
 #include "caja-window-private.h"
 #include "caja-window.h"
 #include "caja-navigation-window-pane.h"
-#include <eel/eel-accessibility.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
-#include <eel/eel-vfs-extensions.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <libcaja-private/caja-icon-dnd.h>
-#include <libcaja-private/caja-clipboard.h>
-#include <stdio.h>
-#include <string.h>
 
 #define CAJA_DND_URI_LIST_TYPE 	  "text/uri-list"
 #define CAJA_DND_TEXT_PLAIN_TYPE 	  "text/plain"
diff --git a/src/caja-location-bar.h b/src/caja-location-bar.h
index 628f2f4b..5b6b56e0 100644
--- a/src/caja-location-bar.h
+++ b/src/caja-location-bar.h
@@ -30,10 +30,12 @@
 #ifndef CAJA_LOCATION_BAR_H
 #define CAJA_LOCATION_BAR_H
 
+#include <gtk/gtk.h>
+
+#include "../libcaja-private/caja-entry.h"
+
 #include "caja-navigation-window.h"
 #include "caja-navigation-window-pane.h"
-#include <libcaja-private/caja-entry.h>
-#include <gtk/gtk.h>
 
 #define CAJA_TYPE_LOCATION_BAR caja_location_bar_get_type()
 #define CAJA_LOCATION_BAR(obj) \
diff --git a/src/caja-location-dialog.c b/src/caja-location-dialog.c
index e207a1ef..a341b48b 100644
--- a/src/caja-location-dialog.c
+++ b/src/caja-location-dialog.c
@@ -22,15 +22,18 @@
  */
 
 #include <config.h>
-#include "caja-location-dialog.h"
 
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-stock-dialogs.h>
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-file-utilities.h>
+#include <glib/gi18n.h>
+
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-stock-dialogs.h"
+
+#include "../libcaja-private/caja-file-utilities.h"
+
+#include "caja-location-dialog.h"
 #include "caja-location-entry.h"
 #include "caja-desktop-window.h"
-#include <glib/gi18n.h>
 
 struct _CajaLocationDialogDetails
 {
diff --git a/src/caja-location-entry.c b/src/caja-location-entry.c
index fef9902c..4cfa7c22 100644
--- a/src/caja-location-entry.c
+++ b/src/caja-location-entry.c
@@ -31,24 +31,27 @@
  */
 
 #include <config.h>
-#include "caja-location-entry.h"
+#include <stdio.h>
+#include <string.h>
 
-#include "caja-window-private.h"
-#include "caja-window.h"
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-entry.h>
-#include <libcaja-private/caja-icon-dnd.h>
-#include <libcaja-private/caja-clipboard.h>
-#include <stdio.h>
-#include <string.h>
+
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-stock-dialogs.h"
+#include "../eel/eel-string.h"
+
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-entry.h"
+#include "../libcaja-private/caja-icon-dnd.h"
+#include "../libcaja-private/caja-clipboard.h"
+
+#include "caja-location-entry.h"
+#include "caja-window-private.h"
+#include "caja-window.h"
 
 struct CajaLocationEntryDetails
 {
diff --git a/src/caja-location-entry.h b/src/caja-location-entry.h
index cac45553..3d0aad56 100644
--- a/src/caja-location-entry.h
+++ b/src/caja-location-entry.h
@@ -27,7 +27,7 @@
 #ifndef CAJA_LOCATION_ENTRY_H
 #define CAJA_LOCATION_ENTRY_H
 
-#include <libcaja-private/caja-entry.h>
+#include "../libcaja-private/caja-entry.h"
 
 #define CAJA_TYPE_LOCATION_ENTRY caja_location_entry_get_type()
 #define CAJA_LOCATION_ENTRY(obj) \
diff --git a/src/caja-main.c b/src/caja-main.c
index a6e296ff..10914246 100644
--- a/src/caja-main.c
+++ b/src/caja-main.c
@@ -28,35 +28,38 @@
 /* caja-main.c: Implementation of the routines that drive program lifecycle and main window creation/destruction. */
 
 #include <config.h>
-#include "caja-window.h"
 #include <dlfcn.h>
 #include <signal.h>
-#include <eel/eel-debug.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-self-checks.h>
-#include <libegg/eggdesktopfile.h>
-#include <gdk/gdkx.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <gio/gdesktopappinfo.h>
-#include <libcaja-private/caja-debug-log.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-icon-names.h>
-#include <libxml/parser.h>
 #ifdef HAVE_LOCALE_H
-	#include <locale.h>
+#include <locale.h>
 #endif
 #ifdef HAVE_MALLOC_H
-	#include <malloc.h>
+#include <malloc.h>
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <gio/gdesktopappinfo.h>
+#include <libxml/parser.h>
 #ifdef HAVE_EXEMPI
-	#include <exempi/xmp.h>
+#include <exempi/xmp.h>
 #endif
 
+#include "../eel/eel-debug.h"
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-self-checks.h"
+
+#include "../libcaja-private/caja-debug-log.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-icon-names.h"
+
+#include "../libegg/eggdesktopfile.h"
+
+#include "caja-window.h"
 
 static void dump_debug_log (void)
 {
diff --git a/src/caja-navigation-action.c b/src/caja-navigation-action.c
index 6acc8eac..fe7719b6 100644
--- a/src/caja-navigation-action.c
+++ b/src/caja-navigation-action.c
@@ -29,12 +29,14 @@
 
 #include <config.h>
 
+#include <gtk/gtk.h>
+
+#include "../eel/eel-gtk-extensions.h"
+
 #include "caja-navigation-action.h"
 #include "caja-navigation-window.h"
 #include "caja-window-private.h"
 #include "caja-navigation-window-slot.h"
-#include <gtk/gtk.h>
-#include <eel/eel-gtk-extensions.h>
 
 static void caja_navigation_action_init       (CajaNavigationAction *action);
 static void caja_navigation_action_class_init (CajaNavigationActionClass *class);
diff --git a/src/caja-navigation-window-menus.c b/src/caja-navigation-window-menus.c
index abf59b1f..0769119c 100644
--- a/src/caja-navigation-window-menus.c
+++ b/src/caja-navigation-window-menus.c
@@ -26,9 +26,23 @@
  *                           split into separate file just for convenience.
  */
 #include <config.h>
-
 #include <locale.h>
 
+#include <libxml/parser.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-mate-extensions.h"
+#include "../eel/eel-stock-dialogs.h"
+#include "../eel/eel-string.h"
+
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-ui-utilities.h"
+#include "../libcaja-private/caja-search-engine.h"
+#include "../libcaja-private/caja-signaller.h"
+
 #include "caja-actions.h"
 #include "caja-notebook.h"
 #include "caja-navigation-action.h"
@@ -43,18 +57,6 @@
 #include "caja-window-private.h"
 #include "caja-window-bookmarks.h"
 #include "caja-navigation-window-pane.h"
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-mate-extensions.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
-#include <libxml/parser.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-ui-utilities.h>
-#include <libcaja-private/caja-search-engine.h>
-#include <libcaja-private/caja-signaller.h>
 
 #define MENU_PATH_HISTORY_PLACEHOLDER			"/MenuBar/Other Menus/Go/History Placeholder"
 
diff --git a/src/caja-navigation-window-pane.c b/src/caja-navigation-window-pane.c
index 71d666a5..8c9c97be 100644
--- a/src/caja-navigation-window-pane.c
+++ b/src/caja-navigation-window-pane.c
@@ -22,6 +22,13 @@
    Author: Holger Berndt <[email protected]>
 */
 
+#include "../eel/eel-gtk-extensions.h"
+
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-window-slot-info.h"
+#include "../libcaja-private/caja-view-factory.h"
+#include "../libcaja-private/caja-entry.h"
+
 #include "caja-navigation-window-pane.h"
 #include "caja-window-private.h"
 #include "caja-window-manage-views.h"
@@ -30,14 +37,6 @@
 #include "caja-notebook.h"
 #include "caja-window-slot.h"
 
-#include <eel/eel-gtk-extensions.h>
-
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-window-slot-info.h>
-#include <libcaja-private/caja-view-factory.h>
-#include <libcaja-private/caja-entry.h>
-
-
 static void caja_navigation_window_pane_init       (CajaNavigationWindowPane *pane);
 static void caja_navigation_window_pane_class_init (CajaNavigationWindowPaneClass *class);
 static void caja_navigation_window_pane_dispose    (GObject *object);
diff --git a/src/caja-navigation-window-slot.c b/src/caja-navigation-window-slot.c
index 4b3cb461..d38b4ed0 100644
--- a/src/caja-navigation-window-slot.c
+++ b/src/caja-navigation-window-slot.c
@@ -22,14 +22,16 @@
    Author: Christian Neumair <[email protected]>
 */
 
+#include "../eel/eel-gtk-macros.h"
+
+#include "../libcaja-private/caja-window-slot-info.h"
+#include "../libcaja-private/caja-file.h"
+
 #include "caja-window-slot.h"
 #include "caja-navigation-window-slot.h"
 #include "caja-window-private.h"
 #include "caja-search-bar.h"
 #include "caja-navigation-window-pane.h"
-#include <libcaja-private/caja-window-slot-info.h>
-#include <libcaja-private/caja-file.h>
-#include <eel/eel-gtk-macros.h>
 
 static void caja_navigation_window_slot_init       (CajaNavigationWindowSlot *slot);
 static void caja_navigation_window_slot_class_init (CajaNavigationWindowSlotClass *class);
diff --git a/src/caja-navigation-window.c b/src/caja-navigation-window.c
index 9bef3cc2..b0d3dd00 100644
--- a/src/caja-navigation-window.c
+++ b/src/caja-navigation-window.c
@@ -29,8 +29,38 @@
 /* caja-window.c: Implementation of the main window object */
 
 #include <config.h>
-#include "caja-window-private.h"
+#include <math.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#ifdef HAVE_X11_XF86KEYSYM_H
+#include <X11/XF86keysym.h>
+#endif
+#include <sys/time.h>
 
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-string.h"
+
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-file-attributes.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-icon-info.h"
+#include "../libcaja-private/caja-metadata.h"
+#include "../libcaja-private/caja-mime-actions.h"
+#include "../libcaja-private/caja-program-choosing.h"
+#include "../libcaja-private/caja-sidebar.h"
+#include "../libcaja-private/caja-view-factory.h"
+#include "../libcaja-private/caja-clipboard.h"
+#include "../libcaja-private/caja-module.h"
+#include "../libcaja-private/caja-sidebar-provider.h"
+#include "../libcaja-private/caja-search-directory.h"
+#include "../libcaja-private/caja-signaller.h"
+
+#include "caja-navigation-window.h"
+#include "caja-window-private.h"
 #include "caja-actions.h"
 #include "caja-application.h"
 #include "caja-bookmarks-window.h"
@@ -41,32 +71,6 @@
 #include "caja-notebook.h"
 #include "caja-window-manage-views.h"
 #include "caja-navigation-window-pane.h"
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-string.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk/gdkx.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#ifdef HAVE_X11_XF86KEYSYM_H
-#include <X11/XF86keysym.h>
-#endif
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-file-attributes.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-icon-info.h>
-#include <libcaja-private/caja-metadata.h>
-#include <libcaja-private/caja-mime-actions.h>
-#include <libcaja-private/caja-program-choosing.h>
-#include <libcaja-private/caja-sidebar.h>
-#include <libcaja-private/caja-view-factory.h>
-#include <libcaja-private/caja-clipboard.h>
-#include <libcaja-private/caja-module.h>
-#include <libcaja-private/caja-sidebar-provider.h>
-#include <libcaja-private/caja-search-directory.h>
-#include <libcaja-private/caja-signaller.h>
-#include <math.h>
-#include <sys/time.h>
 
 #define MAX_TITLE_LENGTH 180
 
diff --git a/src/caja-navigation-window.h b/src/caja-navigation-window.h
index abc2591d..6bd3ce45 100644
--- a/src/caja-navigation-window.h
+++ b/src/caja-navigation-window.h
@@ -31,9 +31,12 @@
 #define CAJA_NAVIGATION_WINDOW_H
 
 #include <gtk/gtk.h>
-#include <eel/eel-glib-extensions.h>
-#include <libcaja-private/caja-bookmark.h>
-#include <libcaja-private/caja-sidebar.h>
+
+#include "../eel/eel-glib-extensions.h"
+
+#include "../libcaja-private/caja-bookmark.h"
+#include "../libcaja-private/caja-sidebar.h"
+
 #include "caja-application.h"
 #include "caja-information-panel.h"
 #include "caja-side-pane.h"
diff --git a/src/caja-notebook.c b/src/caja-notebook.c
index 751e6161..8bdaab8e 100644
--- a/src/caja-notebook.c
+++ b/src/caja-notebook.c
@@ -24,7 +24,13 @@
  *
  */
 
-#include "config.h"
+#include <config.h>
+
+#include <glib/gi18n.h>
+#include <gio/gio.h>
+#include <gtk/gtk.h>
+
+#include "../libcaja-private/caja-dnd.h"
 
 #include "caja-notebook.h"
 #include "caja-navigation-window.h"
@@ -32,11 +38,6 @@
 #include "caja-window-private.h"
 #include "caja-window-slot.h"
 #include "caja-navigation-window-pane.h"
-#include <libcaja-private/caja-dnd.h>
-
-#include <glib/gi18n.h>
-#include <gio/gio.h>
-#include <gtk/gtk.h>
 
 #define AFTER_ALL_TABS -1
 
diff --git a/src/caja-notes-viewer.c b/src/caja-notes-viewer.c
index 46ffdeae..842a6fed 100644
--- a/src/caja-notes-viewer.c
+++ b/src/caja-notes-viewer.c
@@ -27,23 +27,25 @@
 
 #include <config.h>
 
-#include "caja-notes-viewer.h"
-
-#include <eel/eel-debug.h>
-#include <eel/eel-gtk-extensions.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libcaja-private/caja-file-attributes.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-metadata.h>
-#include <libcaja-private/caja-clipboard.h>
-#include <libcaja-private/caja-module.h>
-#include <libcaja-private/caja-sidebar-provider.h>
-#include <libcaja-private/caja-window-info.h>
-#include <libcaja-private/caja-window-slot-info.h>
-#include <libcaja-extension/caja-property-page-provider.h>
+
+#include "../eel/eel-debug.h"
+#include "../eel/eel-gtk-extensions.h"
+
+#include "../libcaja-private/caja-file-attributes.h"
+#include "../libcaja-private/caja-file.h"
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-metadata.h"
+#include "../libcaja-private/caja-clipboard.h"
+#include "../libcaja-private/caja-module.h"
+#include "../libcaja-private/caja-sidebar-provider.h"
+#include "../libcaja-private/caja-window-info.h"
+#include "../libcaja-private/caja-window-slot-info.h"
+#include "../libcaja-extension/caja-property-page-provider.h"
+
+#include "caja-notes-viewer.h"
 
 #define SAVE_TIMEOUT 3
 
diff --git a/src/caja-notes-viewer.h b/src/caja-notes-viewer.h
index ab5965f5..225d884c 100644
--- a/src/caja-notes-viewer.h
+++ b/src/caja-notes-viewer.h
@@ -27,8 +27,9 @@
 #define _CAJA_NOTES_VIEWER_H
 
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-view.h>
-#include <libcaja-private/caja-window-info.h>
+
+#include "../libcaja-private/caja-view.h"
+#include "../libcaja-private/caja-window-info.h"
 
 #define CAJA_NOTES_SIDEBAR_ID    "notes"
 
diff --git a/src/caja-pathbar.c b/src/caja-pathbar.c
index b5f7a526..fb640f47 100644
--- a/src/caja-pathbar.c
+++ b/src/caja-pathbar.c
@@ -20,16 +20,19 @@
 
 #include <config.h>
 #include <string.h>
+
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-icon-names.h>
-#include <libcaja-private/caja-trash-monitor.h>
-#include <libcaja-private/caja-dnd.h>
-#include <libcaja-private/caja-icon-dnd.h>
+
+#include "../libcaja-private/caja-file.h"
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-icon-names.h"
+#include "../libcaja-private/caja-trash-monitor.h"
+#include "../libcaja-private/caja-dnd.h"
+#include "../libcaja-private/caja-icon-dnd.h"
+
 #include "caja-pathbar.h"
 
 enum
diff --git a/src/caja-places-sidebar.c b/src/caja-places-sidebar.c
index 0a479095..92ad68d0 100644
--- a/src/caja-places-sidebar.c
+++ b/src/caja-places-sidebar.c
@@ -23,37 +23,40 @@
  */
 
 #include <config.h>
+#include <cairo-gobject.h>
 
-#include <eel/eel-debug.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-graphic-effects.h>
-#include <eel/eel-string.h>
-#include <eel/eel-stock-dialogs.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libcaja-private/caja-debug-log.h>
-#include <libcaja-private/caja-dnd.h>
-#include <libcaja-private/caja-bookmark.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-sidebar-provider.h>
-#include <libcaja-private/caja-module.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-file-operations.h>
-#include <libcaja-private/caja-trash-monitor.h>
-#include <libcaja-private/caja-icon-names.h>
-#include <libcaja-private/caja-autorun.h>
-#include <libcaja-private/caja-window-info.h>
-#include <libcaja-private/caja-window-slot-info.h>
 #include <gio/gio.h>
 #include <libnotify/notify.h>
-#include <cairo-gobject.h>
+
+#include "../eel/eel-debug.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-graphic-effects.h"
+#include "../eel/eel-string.h"
+#include "../eel/eel-stock-dialogs.h"
+
+#include "../libcaja-private/caja-debug-log.h"
+#include "../libcaja-private/caja-dnd.h"
+#include "../libcaja-private/caja-bookmark.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-sidebar-provider.h"
+#include "../libcaja-private/caja-module.h"
+#include "../libcaja-private/caja-file.h"
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-file-operations.h"
+#include "../libcaja-private/caja-trash-monitor.h"
+#include "../libcaja-private/caja-icon-names.h"
+#include "../libcaja-private/caja-autorun.h"
+#include "../libcaja-private/caja-window-info.h"
+#include "../libcaja-private/caja-window-slot-info.h"
 
 #include "caja-bookmark-list.h"
 #include "caja-places-sidebar.h"
 #include "caja-window.h"
+
 #define EJECT_BUTTON_XPAD 6
 #define ICON_CELL_XPAD 6
 
diff --git a/src/caja-places-sidebar.h b/src/caja-places-sidebar.h
index e4d36a9f..25ee8a7e 100644
--- a/src/caja-places-sidebar.h
+++ b/src/caja-places-sidebar.h
@@ -24,10 +24,11 @@
 #ifndef _CAJA_PLACES_SIDEBAR_H
 #define _CAJA_PLACES_SIDEBAR_H
 
-#include <libcaja-private/caja-view.h>
-#include <libcaja-private/caja-window-info.h>
 #include <gtk/gtk.h>
 
+#include "../libcaja-private/caja-view.h"
+#include "../libcaja-private/caja-window-info.h"
+
 #define CAJA_PLACES_SIDEBAR_ID    "places"
 
 #define CAJA_TYPE_PLACES_SIDEBAR caja_places_sidebar_get_type()
diff --git a/src/caja-property-browser.c b/src/caja-property-browser.c
index ebb1e5e2..bc5d1d22 100644
--- a/src/caja-property-browser.c
+++ b/src/caja-property-browser.c
@@ -30,32 +30,35 @@
 
 #include <config.h>
 #include <math.h>
-#include "caja-property-browser.h"
 
-#include <eel/eel-gdk-extensions.h>
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-image-table.h>
-#include <eel/eel-labeled-image.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-vfs-extensions.h>
-#include <eel/eel-xml-extensions.h>
 #include <libxml/parser.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <gio/gio.h>
-#include <libcaja-private/caja-customization-data.h>
-#include <libcaja-private/caja-directory.h>
-#include <libcaja-private/caja-emblem-utils.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-metadata.h>
-#include <libcaja-private/caja-signaller.h>
 #include <atk/atkrelationset.h>
 
+#include "../eel/eel-gdk-extensions.h"
+#include "../eel/eel-gdk-pixbuf-extensions.h"
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-image-table.h"
+#include "../eel/eel-labeled-image.h"
+#include "../eel/eel-stock-dialogs.h"
+#include "../eel/eel-vfs-extensions.h"
+#include "../eel/eel-xml-extensions.h"
+
+#include "../libcaja-private/caja-customization-data.h"
+#include "../libcaja-private/caja-directory.h"
+#include "../libcaja-private/caja-emblem-utils.h"
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-file.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-metadata.h"
+#include "../libcaja-private/caja-signaller.h"
+
+#include "caja-property-browser.h"
+
 /* property types */
 
 typedef enum
diff --git a/src/caja-query-editor.c b/src/caja-query-editor.c
index ce4120c2..945c0cf8 100644
--- a/src/caja-query-editor.c
+++ b/src/caja-query-editor.c
@@ -22,19 +22,22 @@
  */
 
 #include <config.h>
-#include "caja-query-editor.h"
-#include "caja-src-marshal.h"
-#include "caja-window-slot.h"
-
 #include <string.h>
+
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-stock-dialogs.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-global-preferences.h>
+
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-stock-dialogs.h"
+
+#include "../libcaja-private/caja-global-preferences.h"
+
+#include "caja-query-editor.h"
+#include "caja-src-marshal.h"
+#include "caja-window-slot.h"
 
 enum
 {
diff --git a/src/caja-query-editor.h b/src/caja-query-editor.h
index 63df2b95..243d40b9 100644
--- a/src/caja-query-editor.h
+++ b/src/caja-query-editor.h
@@ -24,11 +24,12 @@
 #ifndef CAJA_QUERY_EDITOR_H
 #define CAJA_QUERY_EDITOR_H
 
-#include "caja-search-bar.h"
-
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-query.h>
-#include <libcaja-private/caja-window-info.h>
+
+#include "../libcaja-private/caja-query.h"
+#include "../libcaja-private/caja-window-info.h"
+
+#include "caja-search-bar.h"
 
 #define CAJA_TYPE_QUERY_EDITOR caja_query_editor_get_type()
 #define CAJA_QUERY_EDITOR(obj) \
diff --git a/src/caja-search-bar.c b/src/caja-search-bar.c
index a0867ffc..c48dfe9a 100644
--- a/src/caja-search-bar.c
+++ b/src/caja-search-bar.c
@@ -22,13 +22,16 @@
  */
 
 #include <config.h>
-#include "caja-search-bar.h"
 
 #include <glib/gi18n.h>
-#include <eel/eel-gtk-macros.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-clipboard.h>
+
+#include "../eel/eel-gtk-macros.h"
+
+#include "../libcaja-private/caja-clipboard.h"
+
+#include "caja-search-bar.h"
 
 struct CajaSearchBarDetails
 {
diff --git a/src/caja-search-bar.h b/src/caja-search-bar.h
index 81af49cc..d5797e6b 100644
--- a/src/caja-search-bar.h
+++ b/src/caja-search-bar.h
@@ -25,7 +25,9 @@
 #define CAJA_SEARCH_BAR_H
 
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-query.h>
+
+#include "../libcaja-private/caja-query.h"
+
 #include "caja-window.h"
 
 #define CAJA_TYPE_SEARCH_BAR caja_search_bar_get_type()
diff --git a/src/caja-side-pane.c b/src/caja-side-pane.c
index 892e34f0..93b6972c 100644
--- a/src/caja-side-pane.c
+++ b/src/caja-side-pane.c
@@ -22,15 +22,17 @@
  */
 
 #include <config.h>
-#include "caja-side-pane.h"
 
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-gtk-macros.h"
+
+#include "caja-side-pane.h"
+
 typedef struct
 {
     char *title;
diff --git a/src/caja-sidebar-title.c b/src/caja-sidebar-title.c
index 441e0056..c1026151 100644
--- a/src/caja-sidebar-title.c
+++ b/src/caja-sidebar-title.c
@@ -26,24 +26,26 @@
 
 #include <config.h>
 #include <math.h>
-#include "caja-sidebar-title.h"
-
-#include "caja-window.h"
+#include <string.h>
+#include <stdlib.h>
 
-#include <eel/eel-background.h>
-#include <eel/eel-gdk-extensions.h>
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-extensions.h>
 #include <gtk/gtk.h>
 #include <pango/pango.h>
 #include <glib/gi18n.h>
-#include <libcaja-private/caja-file-attributes.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-metadata.h>
-#include <libcaja-private/caja-sidebar.h>
-#include <string.h>
-#include <stdlib.h>
+
+#include "../eel/eel-background.h"
+#include "../eel/eel-gdk-extensions.h"
+#include "../eel/eel-gdk-pixbuf-extensions.h"
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+
+#include "../libcaja-private/caja-file-attributes.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-metadata.h"
+#include "../libcaja-private/caja-sidebar.h"
+
+#include "caja-sidebar-title.h"
+#include "caja-window.h"
 
 /* maximum allowable size to be displayed as the title */
 #define MAX_TITLE_SIZE 		256
diff --git a/src/caja-sidebar-title.h b/src/caja-sidebar-title.h
index 02d56016..2568b3c2 100644
--- a/src/caja-sidebar-title.h
+++ b/src/caja-sidebar-title.h
@@ -30,8 +30,10 @@
 #define CAJA_SIDEBAR_TITLE_H
 
 #include <gtk/gtk.h>
-#include <eel/eel-background.h>
-#include <libcaja-private/caja-file.h>
+
+#include "../eel/eel-background.h"
+
+#include "../libcaja-private/caja-file.h"
 
 #define CAJA_TYPE_SIDEBAR_TITLE caja_sidebar_title_get_type()
 #define CAJA_SIDEBAR_TITLE(obj) \
diff --git a/src/caja-spatial-window.c b/src/caja-spatial-window.c
index 1013eb75..8d9f733b 100644
--- a/src/caja-spatial-window.c
+++ b/src/caja-spatial-window.c
@@ -28,10 +28,32 @@
 /* caja-window.c: Implementation of the main window object */
 
 #include <config.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdkkeysyms.h>
+#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-string.h"
+
+#include "../libcaja-private/caja-dnd.h"
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-ui-utilities.h"
+#include "../libcaja-private/caja-file-attributes.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-metadata.h"
+#include "../libcaja-private/caja-mime-actions.h"
+#include "../libcaja-private/caja-program-choosing.h"
+#include "../libcaja-private/caja-search-directory.h"
+#include "../libcaja-private/caja-search-engine.h"
+#include "../libcaja-private/caja-signaller.h"
+
 #include "caja-spatial-window.h"
 #include "caja-window-private.h"
 #include "caja-window-bookmarks.h"
-
 #include "caja-actions.h"
 #include "caja-application.h"
 #include "caja-desktop-window.h"
@@ -40,25 +62,6 @@
 #include "caja-query-editor.h"
 #include "caja-search-bar.h"
 #include "caja-window-manage-views.h"
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-string.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk/gdkkeysyms.h>
-#include <gdk/gdkx.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <libcaja-private/caja-dnd.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-ui-utilities.h>
-#include <libcaja-private/caja-file-attributes.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-metadata.h>
-#include <libcaja-private/caja-mime-actions.h>
-#include <libcaja-private/caja-program-choosing.h>
-#include <libcaja-private/caja-search-directory.h>
-#include <libcaja-private/caja-search-engine.h>
-#include <libcaja-private/caja-signaller.h>
 
 #define MAX_TITLE_LENGTH 180
 #define MAX_SHORTNAME_PATH 16
diff --git a/src/caja-trash-bar.c b/src/caja-trash-bar.c
index 8d5535bb..bcff94ae 100644
--- a/src/caja-trash-bar.c
+++ b/src/caja-trash-bar.c
@@ -20,18 +20,18 @@
  *
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
-#include "caja-trash-bar.h"
+#include "../libcaja-private/caja-file-operations.h"
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-file.h"
+#include "../libcaja-private/caja-trash-monitor.h"
 
+#include "caja-trash-bar.h"
 #include "caja-window.h"
-#include <libcaja-private/caja-file-operations.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-trash-monitor.h>
 
 #define CAJA_TRASH_BAR_GET_PRIVATE(o)\
 	(G_TYPE_INSTANCE_GET_PRIVATE ((o), CAJA_TYPE_TRASH_BAR, CajaTrashBarPrivate))
diff --git a/src/caja-view-as-action.c b/src/caja-view-as-action.c
index ee30ddc8..a38ebca2 100644
--- a/src/caja-view-as-action.c
+++ b/src/caja-view-as-action.c
@@ -25,13 +25,16 @@
 
 #include <config.h>
 
+#include <gtk/gtk.h>
+
+#include "../eel/eel-gtk-extensions.h"
+
+#include "../libcaja-private/caja-view-factory.h"
+
 #include "caja-view-as-action.h"
 #include "caja-navigation-window.h"
 #include "caja-window-private.h"
 #include "caja-navigation-window-slot.h"
-#include <gtk/gtk.h>
-#include <eel/eel-gtk-extensions.h>
-#include <libcaja-private/caja-view-factory.h>
 
 static void caja_view_as_action_init       (CajaViewAsAction *action);
 static void caja_view_as_action_class_init (CajaViewAsActionClass *class);
diff --git a/src/caja-window-bookmarks.c b/src/caja-window-bookmarks.c
index 5ca8c45a..4300b719 100644
--- a/src/caja-window-bookmarks.c
+++ b/src/caja-window-bookmarks.c
@@ -25,19 +25,20 @@
  */
 
 #include <config.h>
-
 #include <locale.h>
 
+#include <glib/gi18n.h>
+
+#include "../eel/eel-debug.h"
+#include "../eel/eel-stock-dialogs.h"
+#include "../eel/eel-vfs-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+
 #include "caja-actions.h"
 #include "caja-bookmark-list.h"
 #include "caja-bookmarks-window.h"
 #include "caja-window-bookmarks.h"
 #include "caja-window-private.h"
-#include <eel/eel-debug.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-vfs-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <glib/gi18n.h>
 
 #define MENU_ITEM_MAX_WIDTH_CHARS 32
 
diff --git a/src/caja-window-bookmarks.h b/src/caja-window-bookmarks.h
index c84b7dd6..a28e53bb 100644
--- a/src/caja-window-bookmarks.h
+++ b/src/caja-window-bookmarks.h
@@ -25,11 +25,11 @@
 #ifndef CAJA_WINDOW_BOOKMARKS_H
 #define CAJA_WINDOW_BOOKMARKS_H
 
+#include "../libcaja-private/caja-bookmark.h"
+
 #include "caja-bookmark-list.h"
 #include "caja-window.h"
 
-#include <libcaja-private/caja-bookmark.h>
-
 void                  caja_bookmarks_exiting                        (void);
 void                  caja_window_add_bookmark_for_current_location (CajaWindow *window);
 void                  caja_window_edit_bookmarks                    (CajaWindow *window);
diff --git a/src/caja-window-manage-views.c b/src/caja-window-manage-views.c
index e44240af..59bb4f07 100644
--- a/src/caja-window-manage-views.c
+++ b/src/caja-window-manage-views.c
@@ -26,8 +26,40 @@
  */
 
 #include <config.h>
-#include "caja-window-manage-views.h"
 
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+#include <glib/gi18n.h>
+
+#include "../eel/eel-accessibility.h"
+#include "../eel/eel-debug.h"
+#include "../eel/eel-gdk-extensions.h"
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-stock-dialogs.h"
+#include "../eel/eel-string.h"
+#include "../eel/eel-vfs-extensions.h"
+
+#include "../libcaja-private/caja-debug-log.h"
+#include "../libcaja-private/caja-extensions.h"
+#include "../libcaja-private/caja-file-attributes.h"
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-file.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-metadata.h"
+#include "../libcaja-private/caja-mime-actions.h"
+#include "../libcaja-private/caja-module.h"
+#include "../libcaja-private/caja-monitor.h"
+#include "../libcaja-private/caja-search-directory.h"
+#include "../libcaja-private/caja-view-factory.h"
+#include "../libcaja-private/caja-window-info.h"
+#include "../libcaja-private/caja-window-slot-info.h"
+#include "../libcaja-private/caja-autorun.h"
+
+#include "../libcaja-extension/caja-location-widget-provider.h"
+
+#include "caja-window-manage-views.h"
 #include "caja-actions.h"
 #include "caja-application.h"
 #include "caja-location-bar.h"
@@ -39,34 +71,6 @@
 #include "caja-trash-bar.h"
 #include "caja-x-content-bar.h"
 #include "caja-navigation-window-pane.h"
-#include <eel/eel-accessibility.h>
-#include <eel/eel-debug.h>
-#include <eel/eel-gdk-extensions.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
-#include <eel/eel-vfs-extensions.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-#include <glib/gi18n.h>
-#include <libcaja-extension/caja-location-widget-provider.h>
-#include <libcaja-private/caja-debug-log.h>
-#include <libcaja-private/caja-extensions.h>
-#include <libcaja-private/caja-file-attributes.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-metadata.h>
-#include <libcaja-private/caja-mime-actions.h>
-#include <libcaja-private/caja-module.h>
-#include <libcaja-private/caja-monitor.h>
-#include <libcaja-private/caja-search-directory.h>
-#include <libcaja-private/caja-view-factory.h>
-#include <libcaja-private/caja-window-info.h>
-#include <libcaja-private/caja-window-slot-info.h>
-#include <libcaja-private/caja-autorun.h>
 
 /* FIXME bugzilla.gnome.org 41243:
  * We should use inheritance instead of these special cases
diff --git a/src/caja-window-menus.c b/src/caja-window-menus.c
index b82059fd..14676b7c 100644
--- a/src/caja-window-menus.c
+++ b/src/caja-window-menus.c
@@ -26,8 +26,26 @@
  *                           split into separate file just for convenience.
  */
 #include <config.h>
-
 #include <locale.h>
+#include <string.h>
+
+#include <gtk/gtk.h>
+#include <gio/gio.h>
+#include <glib/gi18n.h>
+
+#include "../eel/eel-gtk-extensions.h"
+
+#include "../libcaja-extension/caja-menu-provider.h"
+#include "../libcaja-private/caja-extensions.h"
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-icon-names.h"
+#include "../libcaja-private/caja-ui-utilities.h"
+#include "../libcaja-private/caja-module.h"
+#include "../libcaja-private/caja-search-directory.h"
+#include "../libcaja-private/caja-search-engine.h"
+#include "../libcaja-private/caja-signaller.h"
+#include "../libcaja-private/caja-trash-monitor.h"
 
 #include "caja-actions.h"
 #include "caja-application.h"
@@ -39,22 +57,6 @@
 #include "caja-window-private.h"
 #include "caja-desktop-window.h"
 #include "caja-search-bar.h"
-#include <gtk/gtk.h>
-#include <gio/gio.h>
-#include <glib/gi18n.h>
-#include <eel/eel-gtk-extensions.h>
-#include <libcaja-extension/caja-menu-provider.h>
-#include <libcaja-private/caja-extensions.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-icon-names.h>
-#include <libcaja-private/caja-ui-utilities.h>
-#include <libcaja-private/caja-module.h>
-#include <libcaja-private/caja-search-directory.h>
-#include <libcaja-private/caja-search-engine.h>
-#include <libcaja-private/caja-signaller.h>
-#include <libcaja-private/caja-trash-monitor.h>
-#include <string.h>
 
 #define MENU_PATH_EXTENSION_ACTIONS                     "/MenuBar/File/Extension Actions"
 #define POPUP_PATH_EXTENSION_ACTIONS                     "/background/Before Zoom Items/Extension Actions"
diff --git a/src/caja-window-pane.c b/src/caja-window-pane.c
index 0d2ddae8..452f648e 100644
--- a/src/caja-window-pane.c
+++ b/src/caja-window-pane.c
@@ -22,11 +22,12 @@
    Author: Holger Berndt <[email protected]>
 */
 
+#include "../eel/eel-gtk-macros.h"
+
 #include "caja-window-pane.h"
 #include "caja-window-private.h"
 #include "caja-navigation-window-pane.h"
 #include "caja-window-manage-views.h"
-#include <eel/eel-gtk-macros.h>
 
 static void caja_window_pane_init       (CajaWindowPane *pane);
 static void caja_window_pane_class_init (CajaWindowPaneClass *class);
diff --git a/src/caja-window-private.h b/src/caja-window-private.h
index 83cce1df..3cf29a37 100644
--- a/src/caja-window-private.h
+++ b/src/caja-window-private.h
@@ -28,6 +28,8 @@
 #ifndef CAJA_WINDOW_PRIVATE_H
 #define CAJA_WINDOW_PRIVATE_H
 
+#include "../libcaja-private/caja-directory.h"
+
 #include "caja-window.h"
 #include "caja-window-slot.h"
 #include "caja-window-pane.h"
@@ -35,8 +37,6 @@
 #include "caja-navigation-window.h"
 #include "caja-bookmark-list.h"
 
-#include <libcaja-private/caja-directory.h>
-
 struct _CajaNavigationWindowPane;
 
 /* FIXME bugzilla.gnome.org 42575: Migrate more fields into here. */
diff --git a/src/caja-window-slot.c b/src/caja-window-slot.c
index 2f3c39cb..affb64a7 100644
--- a/src/caja-window-slot.c
+++ b/src/caja-window-slot.c
@@ -21,17 +21,19 @@
 
    Author: Christian Neumair <[email protected]>
 */
+
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-string.h"
+
+#include "../libcaja-private/caja-file.h"
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-window-slot-info.h"
+
 #include "caja-window-slot.h"
 #include "caja-navigation-window-slot.h"
-
 #include "caja-desktop-window.h"
 #include "caja-window-private.h"
 #include "caja-window-manage-views.h"
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-window-slot-info.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-string.h>
 
 static void caja_window_slot_init       (CajaWindowSlot *slot);
 static void caja_window_slot_class_init (CajaWindowSlotClass *class);
diff --git a/src/caja-window-toolbars.c b/src/caja-window-toolbars.c
index 1611e16e..d1112073 100644
--- a/src/caja-window-toolbars.c
+++ b/src/caja-window-toolbars.c
@@ -27,25 +27,28 @@
  */
 
 #include <config.h>
-
 #include <unistd.h>
+
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
+
+#include "../eel/eel-mate-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-string.h"
+
+#include "../libcaja-extension/caja-menu-provider.h"
+#include "../libcaja-private/caja-bookmark.h"
+#include "../libcaja-private/caja-extensions.h"
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-ui-utilities.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-module.h"
+
 #include "caja-application.h"
 #include "caja-window-manage-views.h"
 #include "caja-window-private.h"
 #include "caja-window.h"
-#include <eel/eel-mate-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-string.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#include <glib/gi18n.h>
-#include <libcaja-extension/caja-menu-provider.h>
-#include <libcaja-private/caja-bookmark.h>
-#include <libcaja-private/caja-extensions.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-ui-utilities.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-module.h>
 
 /* FIXME bugzilla.gnome.org 41243:
  * We should use inheritance instead of these special cases
diff --git a/src/caja-window.c b/src/caja-window.c
index 0cdb2aaf..5f29cbbe 100644
--- a/src/caja-window.c
+++ b/src/caja-window.c
@@ -26,8 +26,32 @@
 /* caja-window.c: Implementation of the main window object */
 
 #include <config.h>
-#include "caja-window-private.h"
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdkx.h>
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#ifdef HAVE_X11_XF86KEYSYM_H
+#include <X11/XF86keysym.h>
+#endif
+
+#include "../eel/eel-debug.h"
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-string.h"
+
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-file-attributes.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-metadata.h"
+#include "../libcaja-private/caja-mime-actions.h"
+#include "../libcaja-private/caja-program-choosing.h"
+#include "../libcaja-private/caja-view-factory.h"
+#include "../libcaja-private/caja-clipboard.h"
+#include "../libcaja-private/caja-search-directory.h"
+#include "../libcaja-private/caja-signaller.h"
+
+#include "caja-window-private.h"
 #include "caja-actions.h"
 #include "caja-application.h"
 #include "caja-bookmarks-window.h"
@@ -39,27 +63,6 @@
 #include "caja-search-bar.h"
 #include "caja-navigation-window-pane.h"
 #include "caja-src-marshal.h"
-#include <eel/eel-debug.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-string.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk/gdkx.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#ifdef HAVE_X11_XF86KEYSYM_H
-#include <X11/XF86keysym.h>
-#endif
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-file-attributes.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-metadata.h>
-#include <libcaja-private/caja-mime-actions.h>
-#include <libcaja-private/caja-program-choosing.h>
-#include <libcaja-private/caja-view-factory.h>
-#include <libcaja-private/caja-clipboard.h>
-#include <libcaja-private/caja-search-directory.h>
-#include <libcaja-private/caja-signaller.h>
 
 #define MAX_HISTORY_ITEMS 50
 
diff --git a/src/caja-window.h b/src/caja-window.h
index 59410a2c..137891a1 100644
--- a/src/caja-window.h
+++ b/src/caja-window.h
@@ -28,11 +28,14 @@
 #define CAJA_WINDOW_H
 
 #include <gtk/gtk.h>
-#include <eel/eel-glib-extensions.h>
-#include <libcaja-private/caja-bookmark.h>
-#include <libcaja-private/caja-entry.h>
-#include <libcaja-private/caja-window-info.h>
-#include <libcaja-private/caja-search-directory.h>
+
+#include "../eel/eel-glib-extensions.h"
+
+#include "../libcaja-private/caja-bookmark.h"
+#include "../libcaja-private/caja-entry.h"
+#include "../libcaja-private/caja-window-info.h"
+#include "../libcaja-private/caja-search-directory.h"
+
 #include "caja-application.h"
 #include "caja-information-panel.h"
 #include "caja-side-pane.h"
diff --git a/src/caja-x-content-bar.c b/src/caja-x-content-bar.c
index 73a58b70..43f9a23c 100644
--- a/src/caja-x-content-bar.c
+++ b/src/caja-x-content-bar.c
@@ -22,15 +22,16 @@
  *
  */
 
-#include "config.h"
+#include <config.h>
+#include <string.h>
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
-#include <string.h>
+
+#include "../libcaja-private/caja-autorun.h"
+#include "../libcaja-private/caja-icon-info.h"
 
 #include "caja-x-content-bar.h"
-#include <libcaja-private/caja-autorun.h>
-#include <libcaja-private/caja-icon-info.h>
 
 struct _CajaXContentBarPrivate
 {
diff --git a/src/caja-zoom-action.c b/src/caja-zoom-action.c
index 50401d59..e8d60e17 100644
--- a/src/caja-zoom-action.c
+++ b/src/caja-zoom-action.c
@@ -25,13 +25,15 @@
 
 #include <config.h>
 
+#include <gtk/gtk.h>
+
+#include "../eel/eel-gtk-extensions.h"
+
 #include "caja-zoom-action.h"
 #include "caja-zoom-control.h"
 #include "caja-navigation-window.h"
 #include "caja-window-private.h"
 #include "caja-navigation-window-slot.h"
-#include <gtk/gtk.h>
-#include <eel/eel-gtk-extensions.h>
 
 static void caja_zoom_action_init       (CajaZoomAction *action);
 static void caja_zoom_action_class_init (CajaZoomActionClass *class);
diff --git a/src/caja-zoom-control.c b/src/caja-zoom-control.c
index 080e703d..49f4abd7 100644
--- a/src/caja-zoom-control.c
+++ b/src/caja-zoom-control.c
@@ -28,22 +28,25 @@
  */
 
 #include <config.h>
-#include "caja-zoom-control.h"
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include <atk/atkaction.h>
 #include <glib/gi18n.h>
-#include <eel/eel-accessibility.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-graphic-effects.h>
-#include <eel/eel-gtk-extensions.h>
 #include <gtk/gtk.h>
 #include <gtk/gtk-a11y.h>
 #include <gdk/gdkkeysyms.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+
+#include "../eel/eel-accessibility.h"
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-graphic-effects.h"
+#include "../eel/eel-gtk-extensions.h"
+
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-global-preferences.h"
+
+#include "caja-zoom-control.h"
 
 enum
 {
diff --git a/src/caja-zoom-control.h b/src/caja-zoom-control.h
index f5aec1ea..8e02a38a 100644
--- a/src/caja-zoom-control.h
+++ b/src/caja-zoom-control.h
@@ -29,7 +29,8 @@
 #define CAJA_ZOOM_CONTROL_H
 
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-icon-info.h> /* For CajaZoomLevel */
+
+#include "../libcaja-private/caja-icon-info.h" /* For CajaZoomLevel */
 
 #define CAJA_TYPE_ZOOM_CONTROL caja_zoom_control_get_type()
 #define CAJA_ZOOM_CONTROL(obj) \
diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c
index 11f60aa8..72d64a84 100644
--- a/src/file-manager/fm-desktop-icon-view.c
+++ b/src/file-manager/fm-desktop-icon-view.c
@@ -25,39 +25,42 @@
 */
 
 #include <config.h>
-#include "fm-icon-container.h"
-#include "fm-desktop-icon-view.h"
-#include "fm-actions.h"
-
-#include <X11/Xatom.h>
-#include <gtk/gtk.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-vfs-extensions.h>
 #include <fcntl.h>
-#include <gdk/gdkx.h>
-#include <glib/gi18n.h>
-#include <libcaja-private/caja-desktop-icon-file.h>
-#include <libcaja-private/caja-directory-background.h>
-#include <libcaja-private/caja-directory-notify.h>
-#include <libcaja-private/caja-file-changes-queue.h>
-#include <libcaja-private/caja-file-operations.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-ui-utilities.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-view-factory.h>
-#include <libcaja-private/caja-link.h>
-#include <libcaja-private/caja-metadata.h>
-#include <libcaja-private/caja-monitor.h>
-#include <libcaja-private/caja-program-choosing.h>
-#include <libcaja-private/caja-trash-monitor.h>
 #include <limits.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
+
+#include <X11/Xatom.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+#include <glib/gi18n.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <unistd.h>
+
+#include "../../eel/eel-glib-extensions.h"
+#include "../../eel/eel-gtk-extensions.h"
+#include "../../eel/eel-vfs-extensions.h"
+
+#include "../../libcaja-private/caja-desktop-icon-file.h"
+#include "../../libcaja-private/caja-directory-background.h"
+#include "../../libcaja-private/caja-directory-notify.h"
+#include "../../libcaja-private/caja-file-changes-queue.h"
+#include "../../libcaja-private/caja-file-operations.h"
+#include "../../libcaja-private/caja-file-utilities.h"
+#include "../../libcaja-private/caja-ui-utilities.h"
+#include "../../libcaja-private/caja-global-preferences.h"
+#include "../../libcaja-private/caja-view-factory.h"
+#include "../../libcaja-private/caja-link.h"
+#include "../../libcaja-private/caja-metadata.h"
+#include "../../libcaja-private/caja-monitor.h"
+#include "../../libcaja-private/caja-program-choosing.h"
+#include "../../libcaja-private/caja-trash-monitor.h"
+
+#include "fm-icon-container.h"
+#include "fm-desktop-icon-view.h"
+#include "fm-actions.h"
 
 /* Timeout to check the desktop directory for updates */
 #define RESCAN_TIMEOUT 4
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 49072404..fcb68695 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -29,64 +29,66 @@
 
 #include <config.h>
 #include <math.h>
-#include "fm-directory-view.h"
-#include "fm-list-view.h"
-#include "fm-desktop-icon-view.h"
-
-#include "fm-actions.h"
-#include "fm-error-reporting.h"
-#include "fm-marshal.h"
-#include "fm-properties-window.h"
-#include "libcaja-private/caja-open-with-dialog.h"
 
-#include <eel/eel-background.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-mate-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
-#include <eel/eel-vfs-extensions.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <gio/gio.h>
-#include <libcaja-private/caja-recent.h>
-#include <libcaja-extension/caja-menu-provider.h>
-#include <libcaja-private/caja-clipboard.h>
-#include <libcaja-private/caja-clipboard-monitor.h>
-#include <libcaja-private/caja-debug-log.h>
-#include <libcaja-private/caja-desktop-icon-file.h>
-#include <libcaja-private/caja-desktop-directory.h>
-#include <libcaja-private/caja-extensions.h>
-#include <libcaja-private/caja-search-directory.h>
-#include <libcaja-private/caja-directory-background.h>
-#include <libcaja-private/caja-directory.h>
-#include <libcaja-private/caja-dnd.h>
-#include <libcaja-private/caja-file-attributes.h>
-#include <libcaja-private/caja-file-changes-queue.h>
-#include <libcaja-private/caja-file-dnd.h>
-#include <libcaja-private/caja-file-operations.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-file-private.h> /* for caja_file_get_existing_by_uri */
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-link.h>
-#include <libcaja-private/caja-metadata.h>
-#include <libcaja-private/caja-mime-actions.h>
-#include <libcaja-private/caja-module.h>
-#include <libcaja-private/caja-program-choosing.h>
-#include <libcaja-private/caja-trash-monitor.h>
-#include <libcaja-private/caja-ui-utilities.h>
-#include <libcaja-private/caja-signaller.h>
-#include <libcaja-private/caja-autorun.h>
-#include <libcaja-private/caja-icon-names.h>
-#include <libcaja-private/caja-undostack-manager.h>
 
 #define MATE_DESKTOP_USE_UNSTABLE_API
 #include <libmate-desktop/mate-desktop-utils.h>
 
+#include "../../eel/eel-background.h"
+#include "../../eel/eel-glib-extensions.h"
+#include "../../eel/eel-mate-extensions.h"
+#include "../../eel/eel-gtk-extensions.h"
+#include "../../eel/eel-gtk-macros.h"
+#include "../../eel/eel-stock-dialogs.h"
+#include "../../eel/eel-string.h"
+#include "../../eel/eel-vfs-extensions.h"
+
+#include "../../libcaja-private/caja-recent.h"
+#include "../../libcaja-extension/caja-menu-provider.h"
+#include "../../libcaja-private/caja-clipboard.h"
+#include "../../libcaja-private/caja-clipboard-monitor.h"
+#include "../../libcaja-private/caja-debug-log.h"
+#include "../../libcaja-private/caja-desktop-icon-file.h"
+#include "../../libcaja-private/caja-desktop-directory.h"
+#include "../../libcaja-private/caja-extensions.h"
+#include "../../libcaja-private/caja-search-directory.h"
+#include "../../libcaja-private/caja-directory-background.h"
+#include "../../libcaja-private/caja-directory.h"
+#include "../../libcaja-private/caja-dnd.h"
+#include "../../libcaja-private/caja-file-attributes.h"
+#include "../../libcaja-private/caja-file-changes-queue.h"
+#include "../../libcaja-private/caja-file-dnd.h"
+#include "../../libcaja-private/caja-file-operations.h"
+#include "../../libcaja-private/caja-file-utilities.h"
+#include "../../libcaja-private/caja-file-private.h" /* for caja_file_get_existing_by_uri */
+#include "../../libcaja-private/caja-global-preferences.h"
+#include "../../libcaja-private/caja-link.h"
+#include "../../libcaja-private/caja-metadata.h"
+#include "../../libcaja-private/caja-mime-actions.h"
+#include "../../libcaja-private/caja-module.h"
+#include "../../libcaja-private/caja-program-choosing.h"
+#include "../../libcaja-private/caja-trash-monitor.h"
+#include "../../libcaja-private/caja-ui-utilities.h"
+#include "../../libcaja-private/caja-signaller.h"
+#include "../../libcaja-private/caja-autorun.h"
+#include "../../libcaja-private/caja-icon-names.h"
+#include "../../libcaja-private/caja-undostack-manager.h"
+
+#include "fm-directory-view.h"
+#include "fm-list-view.h"
+#include "fm-desktop-icon-view.h"
+#include "fm-actions.h"
+#include "fm-error-reporting.h"
+#include "fm-marshal.h"
+#include "fm-properties-window.h"
+#include "libcaja-private/caja-open-with-dialog.h"
+
 /* Minimum starting update inverval */
 #define UPDATE_INTERVAL_MIN 100
 /* Maximum update interval */
diff --git a/src/file-manager/fm-directory-view.h b/src/file-manager/fm-directory-view.h
index 91c0164d..1f4fb878 100644
--- a/src/file-manager/fm-directory-view.h
+++ b/src/file-manager/fm-directory-view.h
@@ -29,16 +29,18 @@
 #define FM_DIRECTORY_VIEW_H
 
 #include <gtk/gtk.h>
-#include <eel/eel-background.h>
-#include <libcaja-private/caja-directory.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-icon-container.h>
-#include <libcaja-private/caja-link.h>
-#include <libcaja-private/caja-view.h>
-#include <libcaja-private/caja-window-info.h>
-#include <libcaja-private/caja-window-slot-info.h>
 #include <gio/gio.h>
 
+#include "../../eel/eel-background.h"
+
+#include "../../libcaja-private/caja-directory.h"
+#include "../../libcaja-private/caja-file.h"
+#include "../../libcaja-private/caja-icon-container.h"
+#include "../../libcaja-private/caja-link.h"
+#include "../../libcaja-private/caja-view.h"
+#include "../../libcaja-private/caja-window-info.h"
+#include "../../libcaja-private/caja-window-slot-info.h"
+
 typedef struct FMDirectoryView FMDirectoryView;
 typedef struct FMDirectoryViewClass FMDirectoryViewClass;
 
diff --git a/src/file-manager/fm-ditem-page.c b/src/file-manager/fm-ditem-page.c
index cdcf4fd0..c95aba3f 100644
--- a/src/file-manager/fm-ditem-page.c
+++ b/src/file-manager/fm-ditem-page.c
@@ -22,17 +22,19 @@
  */
 
 #include <config.h>
-#include "fm-ditem-page.h"
-
 #include <string.h>
 
-#include <eel/eel-glib-extensions.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libcaja-extension/caja-extension-types.h>
-#include <libcaja-extension/caja-file-info.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-file-attributes.h>
+
+#include "../../eel/eel-glib-extensions.h"
+
+#include "../../libcaja-extension/caja-extension-types.h"
+#include "../../libcaja-extension/caja-file-info.h"
+#include "../../libcaja-private/caja-file.h"
+#include "../../libcaja-private/caja-file-attributes.h"
+
+#include "fm-ditem-page.h"
 
 #define MAIN_GROUP "Desktop Entry"
 
diff --git a/src/file-manager/fm-empty-view.c b/src/file-manager/fm-empty-view.c
index 36d76d9d..9380a6b1 100644
--- a/src/file-manager/fm-empty-view.c
+++ b/src/file-manager/fm-empty-view.c
@@ -23,15 +23,17 @@
 */
 
 #include <config.h>
-#include "fm-empty-view.h"
-
 #include <string.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-view.h>
-#include <libcaja-private/caja-view-factory.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-vfs-extensions.h>
+
+#include "../../eel/eel-glib-extensions.h"
+#include "../../eel/eel-gtk-macros.h"
+#include "../../eel/eel-vfs-extensions.h"
+
+#include "../../libcaja-private/caja-file-utilities.h"
+#include "../../libcaja-private/caja-view.h"
+#include "../../libcaja-private/caja-view-factory.h"
+
+#include "fm-empty-view.h"
 
 struct FMEmptyViewDetails
 {
diff --git a/src/file-manager/fm-error-reporting.c b/src/file-manager/fm-error-reporting.c
index db950307..7bfc3b86 100644
--- a/src/file-manager/fm-error-reporting.c
+++ b/src/file-manager/fm-error-reporting.c
@@ -24,14 +24,17 @@
 */
 
 #include <config.h>
-#include "fm-error-reporting.h"
-
 #include <string.h>
+
 #include <glib/gi18n.h>
-#include <libcaja-private/caja-debug-log.h>
-#include <libcaja-private/caja-file.h>
-#include <eel/eel-string.h>
-#include <eel/eel-stock-dialogs.h>
+
+#include "../../eel/eel-string.h"
+#include "../../eel/eel-stock-dialogs.h"
+
+#include "../../libcaja-private/caja-debug-log.h"
+#include "../../libcaja-private/caja-file.h"
+
+#include "fm-error-reporting.h"
 
 #define NEW_NAME_TAG "Caja: new name"
 #define MAXIMUM_DISPLAYED_FILE_NAME_LENGTH	50
diff --git a/src/file-manager/fm-error-reporting.h b/src/file-manager/fm-error-reporting.h
index ed1b371c..a0eb6e4e 100644
--- a/src/file-manager/fm-error-reporting.h
+++ b/src/file-manager/fm-error-reporting.h
@@ -27,7 +27,8 @@
 #define FM_ERROR_REPORTING_H
 
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-file.h>
+
+#include "../../libcaja-private/caja-file.h"
 
 void fm_report_error_loading_directory	 (CajaFile   *file,
         GError         *error,
diff --git a/src/file-manager/fm-icon-container.c b/src/file-manager/fm-icon-container.c
index f744d65a..c7db54fa 100644
--- a/src/file-manager/fm-icon-container.c
+++ b/src/file-manager/fm-icon-container.c
@@ -22,15 +22,17 @@
    Author: Michael Meeks <[email protected]>
 */
 #include <config.h>
-
 #include <string.h>
+
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include <eel/eel-glib-extensions.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-file-attributes.h>
-#include <libcaja-private/caja-thumbnails.h>
-#include <libcaja-private/caja-desktop-icon-file.h>
+
+#include "../../eel/eel-glib-extensions.h"
+
+#include "../../libcaja-private/caja-global-preferences.h"
+#include "../../libcaja-private/caja-file-attributes.h"
+#include "../../libcaja-private/caja-thumbnails.h"
+#include "../../libcaja-private/caja-desktop-icon-file.h"
 
 #include "fm-icon-container.h"
 
diff --git a/src/file-manager/fm-icon-container.h b/src/file-manager/fm-icon-container.h
index 9d8e90a5..3a448f10 100644
--- a/src/file-manager/fm-icon-container.h
+++ b/src/file-manager/fm-icon-container.h
@@ -25,7 +25,8 @@
 #ifndef FM_ICON_CONTAINER_H
 #define FM_ICON_CONTAINER_H
 
-#include <libcaja-private/caja-icon-container.h>
+#include "../../libcaja-private/caja-icon-container.h"
+
 #include "fm-icon-view.h"
 
 typedef struct FMIconContainer FMIconContainer;
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index 110ed58c..baa4394d 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -23,46 +23,48 @@
 */
 
 #include <config.h>
-#include "fm-icon-view.h"
-
-#include "fm-actions.h"
-#include "fm-icon-container.h"
-#include "fm-desktop-icon-view.h"
-#include "fm-error-reporting.h"
 #include <stdlib.h>
-#include <eel/eel-background.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
-#include <eel/eel-vfs-extensions.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <gio/gio.h>
-#include <libcaja-private/caja-clipboard-monitor.h>
-#include <libcaja-private/caja-directory-background.h>
-#include <libcaja-private/caja-directory.h>
-#include <libcaja-private/caja-dnd.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-ui-utilities.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-icon-container.h>
-#include <libcaja-private/caja-icon-dnd.h>
-#include <libcaja-private/caja-link.h>
-#include <libcaja-private/caja-metadata.h>
-#include <libcaja-private/caja-view-factory.h>
-#include <libcaja-private/caja-clipboard.h>
-#include <libcaja-private/caja-desktop-icon-file.h>
 #include <locale.h>
 #include <signal.h>
 #include <stdio.h>
+#include <unistd.h>
+
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <gio/gio.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <unistd.h>
 
+#include "../../eel/eel-background.h"
+#include "../../eel/eel-glib-extensions.h"
+#include "../../eel/eel-gtk-extensions.h"
+#include "../../eel/eel-gtk-macros.h"
+#include "../../eel/eel-stock-dialogs.h"
+#include "../../eel/eel-string.h"
+#include "../../eel/eel-vfs-extensions.h"
+
+#include "../../libcaja-private/caja-clipboard-monitor.h"
+#include "../../libcaja-private/caja-directory-background.h"
+#include "../../libcaja-private/caja-directory.h"
+#include "../../libcaja-private/caja-dnd.h"
+#include "../../libcaja-private/caja-file-utilities.h"
+#include "../../libcaja-private/caja-ui-utilities.h"
+#include "../../libcaja-private/caja-global-preferences.h"
+#include "../../libcaja-private/caja-icon-container.h"
+#include "../../libcaja-private/caja-icon-dnd.h"
+#include "../../libcaja-private/caja-link.h"
+#include "../../libcaja-private/caja-metadata.h"
+#include "../../libcaja-private/caja-view-factory.h"
+#include "../../libcaja-private/caja-clipboard.h"
+#include "../../libcaja-private/caja-desktop-icon-file.h"
+
+#include "fm-icon-view.h"
+#include "fm-actions.h"
+#include "fm-icon-container.h"
+#include "fm-desktop-icon-view.h"
+#include "fm-error-reporting.h"
 #include "caja-audio-mime-types.h"
 
 #define POPUP_PATH_ICON_APPEARANCE		"/selection/Icon Appearance Items"
diff --git a/src/file-manager/fm-list-model.c b/src/file-manager/fm-list-model.c
index 641a3fcf..f8f053c1 100644
--- a/src/file-manager/fm-list-model.c
+++ b/src/file-manager/fm-list-model.c
@@ -25,16 +25,20 @@
 */
 
 #include <config.h>
-#include "fm-list-model.h"
-#include <libegg/eggtreemultidnd.h>
-
+#include <glib.h>
 #include <string.h>
-#include <eel/eel-graphic-effects.h>
+#include <cairo-gobject.h>
+
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libcaja-private/caja-dnd.h>
-#include <glib.h>
-#include <cairo-gobject.h>
+
+#include "../../libegg/eggtreemultidnd.h"
+
+#include "../../eel/eel-graphic-effects.h"
+
+#include "../../libcaja-private/caja-dnd.h"
+
+#include "fm-list-model.h"
 
 enum
 {
diff --git a/src/file-manager/fm-list-model.h b/src/file-manager/fm-list-model.h
index 33b5add7..2d8f3cb1 100644
--- a/src/file-manager/fm-list-model.h
+++ b/src/file-manager/fm-list-model.h
@@ -24,9 +24,11 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-directory.h>
-#include <libcaja-extension/caja-column.h>
+
+#include "../../libcaja-private/caja-file.h"
+#include "../../libcaja-private/caja-directory.h"
+
+#include "../../libcaja-extension/caja-column.h"
 
 #ifndef FM_LIST_MODEL_H
 #define FM_LIST_MODEL_H
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index fe16fe44..3c616fa1 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -26,41 +26,44 @@
 */
 
 #include <config.h>
-#include "fm-list-view.h"
-
-#include <string.h>
-#include "fm-error-reporting.h"
-#include "fm-list-model.h"
 #include <string.h>
-#include <eel/eel-vfs-extensions.h>
-#include <eel/eel-gdk-extensions.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-stock-dialogs.h>
+
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <libegg/eggtreemultidnd.h>
 #include <glib/gi18n.h>
 #include <glib-object.h>
-#include <libcaja-extension/caja-column-provider.h>
-#include <libcaja-private/caja-clipboard-monitor.h>
-#include <libcaja-private/caja-column-chooser.h>
-#include <libcaja-private/caja-column-utilities.h>
-#include <libcaja-private/caja-debug-log.h>
-#include <libcaja-private/caja-directory-background.h>
-#include <libcaja-private/caja-dnd.h>
-#include <libcaja-private/caja-file-dnd.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-ui-utilities.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-icon-dnd.h>
-#include <libcaja-private/caja-metadata.h>
-#include <libcaja-private/caja-module.h>
-#include <libcaja-private/caja-tree-view-drag-dest.h>
-#include <libcaja-private/caja-view-factory.h>
-#include <libcaja-private/caja-clipboard.h>
-#include <libcaja-private/caja-cell-renderer-text-ellipsized.h>
+
+#include "../../eel/eel-vfs-extensions.h"
+#include "../../eel/eel-gdk-extensions.h"
+#include "../../eel/eel-glib-extensions.h"
+#include "../../eel/eel-gtk-macros.h"
+#include "../../eel/eel-stock-dialogs.h"
+
+#include "../../libegg/eggtreemultidnd.h"
+
+#include "../../libcaja-extension/caja-column-provider.h"
+#include "../../libcaja-private/caja-clipboard-monitor.h"
+#include "../../libcaja-private/caja-column-chooser.h"
+#include "../../libcaja-private/caja-column-utilities.h"
+#include "../../libcaja-private/caja-debug-log.h"
+#include "../../libcaja-private/caja-directory-background.h"
+#include "../../libcaja-private/caja-dnd.h"
+#include "../../libcaja-private/caja-file-dnd.h"
+#include "../../libcaja-private/caja-file-utilities.h"
+#include "../../libcaja-private/caja-ui-utilities.h"
+#include "../../libcaja-private/caja-global-preferences.h"
+#include "../../libcaja-private/caja-icon-dnd.h"
+#include "../../libcaja-private/caja-metadata.h"
+#include "../../libcaja-private/caja-module.h"
+#include "../../libcaja-private/caja-tree-view-drag-dest.h"
+#include "../../libcaja-private/caja-view-factory.h"
+#include "../../libcaja-private/caja-clipboard.h"
+#include "../../libcaja-private/caja-cell-renderer-text-ellipsized.h"
+
+#include "fm-list-view.h"
+#include "fm-error-reporting.h"
+#include "fm-list-model.h"
 
 struct FMListViewDetails
 {
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index 7eafb9a5..fced94da 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -23,41 +23,45 @@
 */
 
 #include <config.h>
-#include "fm-properties-window.h"
-#include "fm-ditem-page.h"
-
-#define MATE_DESKTOP_USE_UNSTABLE_API
+#include <string.h>
+#include <cairo.h>
 
-#include "fm-error-reporting.h"
-#include "libcaja-private/caja-mime-application-chooser.h"
-#include <eel/eel-accessibility.h>
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-mate-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-labeled-image.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-vfs-extensions.h>
-#include <eel/eel-wrap-table.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
-#include <libmate-desktop/mate-desktop-thumbnail.h>
-#include <libcaja-extension/caja-property-page-provider.h>
-#include <libcaja-private/caja-entry.h>
-#include <libcaja-private/caja-extensions.h>
-#include <libcaja-private/caja-file-attributes.h>
-#include <libcaja-private/caja-file-operations.h>
-#include <libcaja-private/caja-desktop-icon-file.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-emblem-utils.h>
-#include <libcaja-private/caja-link.h>
-#include <libcaja-private/caja-metadata.h>
-#include <libcaja-private/caja-module.h>
-#include <libcaja-private/caja-mime-actions.h>
-#include <string.h>
 #include <sys/stat.h>
-#include <cairo.h>
+
+#define MATE_DESKTOP_USE_UNSTABLE_API
+#include <libmate-desktop/mate-desktop-thumbnail.h>
+
+#include "../../eel/eel-accessibility.h"
+#include "../../eel/eel-gdk-pixbuf-extensions.h"
+#include "../../eel/eel-glib-extensions.h"
+#include "../../eel/eel-mate-extensions.h"
+#include "../../eel/eel-gtk-extensions.h"
+#include "../../eel/eel-labeled-image.h"
+#include "../../eel/eel-stock-dialogs.h"
+#include "../../eel/eel-vfs-extensions.h"
+#include "../../eel/eel-wrap-table.h"
+
+#include "../../libcaja-extension/caja-property-page-provider.h"
+
+#include "../../libcaja-private/caja-mime-application-chooser.h"
+#include "../../libcaja-private/caja-entry.h"
+#include "../../libcaja-private/caja-extensions.h"
+#include "../../libcaja-private/caja-file-attributes.h"
+#include "../../libcaja-private/caja-file-operations.h"
+#include "../../libcaja-private/caja-desktop-icon-file.h"
+#include "../../libcaja-private/caja-global-preferences.h"
+#include "../../libcaja-private/caja-emblem-utils.h"
+#include "../../libcaja-private/caja-link.h"
+#include "../../libcaja-private/caja-metadata.h"
+#include "../../libcaja-private/caja-module.h"
+#include "../../libcaja-private/caja-mime-actions.h"
+
+#include "fm-properties-window.h"
+#include "fm-ditem-page.h"
+#include "fm-error-reporting.h"
 
 #if HAVE_SYS_VFS_H
 #include <sys/vfs.h>
diff --git a/src/file-manager/fm-properties-window.h b/src/file-manager/fm-properties-window.h
index 860b76bb..c4415aaf 100644
--- a/src/file-manager/fm-properties-window.h
+++ b/src/file-manager/fm-properties-window.h
@@ -27,7 +27,8 @@
 #define FM_PROPERTIES_WINDOW_H
 
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-file.h>
+
+#include "../../libcaja-private/caja-file.h"
 
 typedef struct FMPropertiesWindow FMPropertiesWindow;
 
diff --git a/src/file-manager/fm-tree-model.c b/src/file-manager/fm-tree-model.c
index ed4fc6e7..b512d622 100644
--- a/src/file-manager/fm-tree-model.c
+++ b/src/file-manager/fm-tree-model.c
@@ -27,16 +27,19 @@
 /* fm-tree-model.c - model for the tree view */
 
 #include <config.h>
-#include "fm-tree-model.h"
+#include <string.h>
+#include <cairo-gobject.h>
 
-#include <eel/eel-graphic-effects.h>
 #include <glib/gi18n.h>
-#include <libcaja-private/caja-directory.h>
-#include <libcaja-private/caja-file-attributes.h>
-#include <libcaja-private/caja-file.h>
 #include <gtk/gtk.h>
-#include <string.h>
-#include <cairo-gobject.h>
+
+#include "../../eel/eel-graphic-effects.h"
+
+#include "../../libcaja-private/caja-directory.h"
+#include "../../libcaja-private/caja-file-attributes.h"
+#include "../../libcaja-private/caja-file.h"
+
+#include "fm-tree-model.h"
 
 enum
 {
diff --git a/src/file-manager/fm-tree-model.h b/src/file-manager/fm-tree-model.h
index a5d05862..38f02902 100644
--- a/src/file-manager/fm-tree-model.h
+++ b/src/file-manager/fm-tree-model.h
@@ -28,9 +28,11 @@
 #define FM_TREE_MODEL_H
 
 #include <glib-object.h>
+
 #include <gtk/gtk.h>
 #include <gio/gio.h>
-#include <libcaja-private/caja-file.h>
+
+#include "../../libcaja-private/caja-file.h"
 
 #define FM_TYPE_TREE_MODEL fm_tree_model_get_type()
 #define FM_TREE_MODEL(obj) \
diff --git a/src/file-manager/fm-tree-view.c b/src/file-manager/fm-tree-view.c
index 5f23b045..476ce85a 100644
--- a/src/file-manager/fm-tree-view.c
+++ b/src/file-manager/fm-tree-view.c
@@ -30,36 +30,39 @@
  */
 
 #include <config.h>
-#include "fm-tree-view.h"
-
-#include "fm-tree-model.h"
-#include "fm-properties-window.h"
 #include <string.h>
-#include <eel/eel-gtk-extensions.h>
+#include <cairo-gobject.h>
+
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include <cairo-gobject.h>
-#include <libcaja-private/caja-clipboard.h>
-#include <libcaja-private/caja-clipboard-monitor.h>
-#include <libcaja-private/caja-desktop-icon-file.h>
-#include <libcaja-private/caja-debug-log.h>
-#include <libcaja-private/caja-file-attributes.h>
-#include <libcaja-private/caja-file-operations.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-icon-names.h>
-#include <libcaja-private/caja-mime-actions.h>
-#include <libcaja-private/caja-program-choosing.h>
-#include <libcaja-private/caja-tree-view-drag-dest.h>
-#include <libcaja-private/caja-sidebar-provider.h>
-#include <libcaja-private/caja-module.h>
-#include <libcaja-private/caja-window-info.h>
-#include <libcaja-private/caja-window-slot-info.h>
-#include <libcaja-private/caja-directory.h>
-#include <libcaja-private/caja-directory-private.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-file-private.h>
+
+#include "../../eel/eel-gtk-extensions.h"
+
+#include "../../libcaja-private/caja-clipboard.h"
+#include "../../libcaja-private/caja-clipboard-monitor.h"
+#include "../../libcaja-private/caja-desktop-icon-file.h"
+#include "../../libcaja-private/caja-debug-log.h"
+#include "../../libcaja-private/caja-file-attributes.h"
+#include "../../libcaja-private/caja-file-operations.h"
+#include "../../libcaja-private/caja-file-utilities.h"
+#include "../../libcaja-private/caja-global-preferences.h"
+#include "../../libcaja-private/caja-icon-names.h"
+#include "../../libcaja-private/caja-mime-actions.h"
+#include "../../libcaja-private/caja-program-choosing.h"
+#include "../../libcaja-private/caja-tree-view-drag-dest.h"
+#include "../../libcaja-private/caja-sidebar-provider.h"
+#include "../../libcaja-private/caja-module.h"
+#include "../../libcaja-private/caja-window-info.h"
+#include "../../libcaja-private/caja-window-slot-info.h"
+#include "../../libcaja-private/caja-directory.h"
+#include "../../libcaja-private/caja-directory-private.h"
+#include "../../libcaja-private/caja-file.h"
+#include "../../libcaja-private/caja-file-private.h"
+
+#include "fm-tree-view.h"
+#include "fm-tree-model.h"
+#include "fm-properties-window.h"
 
 typedef struct
 {
diff --git a/test/test-caja-directory-async.c b/test/test-caja-directory-async.c
index e6a0c52e..6481ca57 100644
--- a/test/test-caja-directory-async.c
+++ b/test/test-caja-directory-async.c
@@ -1,9 +1,10 @@
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-directory.h>
-#include <libcaja-private/caja-search-directory.h>
-#include <libcaja-private/caja-file.h>
 #include <unistd.h>
 
+#include "../libcaja-private/caja-directory.h"
+#include "../libcaja-private/caja-search-directory.h"
+#include "../libcaja-private/caja-file.h"
+
 void *client1, *client2;
 
 #if 0
diff --git a/test/test-caja-search-engine.c b/test/test-caja-search-engine.c
index 8a6f6937..49c949ce 100644
--- a/test/test-caja-search-engine.c
+++ b/test/test-caja-search-engine.c
@@ -1,6 +1,7 @@
-#include <libcaja-private/caja-search-engine.h>
 #include <gtk/gtk.h>
 
+#include "../libcaja-private/caja-search-engine.h"
+
 static void
 hits_added_cb (CajaSearchEngine *engine, GSList *hits)
 {      
diff --git a/test/test-caja-wrap-table.c b/test/test-caja-wrap-table.c
index 184e7475..43dfe632 100644
--- a/test/test-caja-wrap-table.c
+++ b/test/test-caja-wrap-table.c
@@ -1,10 +1,10 @@
-#include "test.h"
+#include "../eel/eel-wrap-table.h"
+#include "../eel/eel-labeled-image.h"
+#include "../eel/eel-vfs-extensions.h"
+#include "../libcaja-private/caja-customization-data.h"
+#include "../libcaja-private/caja-icon-info.h"
 
-#include <eel/eel-wrap-table.h>
-#include <eel/eel-labeled-image.h>
-#include <eel/eel-vfs-extensions.h>
-#include <libcaja-private/caja-customization-data.h>
-#include <libcaja-private/caja-icon-info.h>
+#include "test.h"
 
 int 
 main (int argc, char* argv[])
diff --git a/test/test-copy.c b/test/test-copy.c
index b87f3232..fabd7673 100644
--- a/test/test-copy.c
+++ b/test/test-copy.c
@@ -1,7 +1,7 @@
-#include "test.h"
+#include "../libcaja-private/caja-file-operations.h"
+#include "../libcaja-private/caja-progress-info.h"
 
-#include <libcaja-private/caja-file-operations.h>
-#include <libcaja-private/caja-progress-info.h>
+#include "test.h"
 
 static void
 copy_done (GHashTable *debuting_uris, gpointer data)
diff --git a/test/test-eel-background.c b/test/test-eel-background.c
index 6f5bba23..72e09d9a 100644
--- a/test/test-eel-background.c
+++ b/test/test-eel-background.c
@@ -1,8 +1,9 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 
-#include <eel/eel-background.h>
 #include <gtk/gtk.h>
 
+#include "../eel/eel-background.h"
+
 #define PATTERNS_DIR "/mate-source/eel/data/patterns"
 
 int
diff --git a/test/test-eel-editable-label.c b/test/test-eel-editable-label.c
index 2f878fa9..154a1a4e 100644
--- a/test/test-eel-editable-label.c
+++ b/test/test-eel-editable-label.c
@@ -4,7 +4,7 @@
 
 #include <gtk/gtk.h>
 
-#include <eel/eel-editable-label.h>
+#include "../eel/eel-editable-label.h"
 
 static void
 quit (GtkWidget *widget, gpointer data)
diff --git a/test/test-eel-image-table.c b/test/test-eel-image-table.c
index 9677537a..3595cd7c 100644
--- a/test/test-eel-image-table.c
+++ b/test/test-eel-image-table.c
@@ -1,8 +1,9 @@
-#include "test.h"
-
-#include <eel/eel-image-table.h>
-#include <gtk/gtk.h>
 #include <stdlib.h>
+#include <gtk/gtk.h>
+
+#include "../eel/eel-image-table.h"
+
+#include "test.h"
 
 static const char pixbuf_name[] = "/usr/share/pixmaps/mate-about-logo.png";
 
diff --git a/test/test-eel-labeled-image.c b/test/test-eel-labeled-image.c
index a7e51640..b9dd9cd7 100644
--- a/test/test-eel-labeled-image.c
+++ b/test/test-eel-labeled-image.c
@@ -1,6 +1,6 @@
-#include "test.h"
+#include "../eel/eel-labeled-image.h"
 
-#include <eel/eel-labeled-image.h>
+#include "test.h"
 
 static const char pixbuf_name[] = "/usr/share/pixmaps/mate-globe.png";
 
diff --git a/test/test-eel-pixbuf-scale.c b/test/test-eel-pixbuf-scale.c
index 485c922f..22999f03 100644
--- a/test/test-eel-pixbuf-scale.c
+++ b/test/test-eel-pixbuf-scale.c
@@ -1,9 +1,8 @@
-#include "test.h"
-
-#include <eel/eel-gdk-pixbuf-extensions.h>
-
 #include <sys/time.h>
 
+#include "../eel/eel-gdk-pixbuf-extensions.h"
+
+#include "test.h"
 
 #define N_SCALES 100
 
diff --git a/test/test.h b/test/test.h
index 45e3d45c..d9191ff9 100644
--- a/test/test.h
+++ b/test/test.h
@@ -2,11 +2,12 @@
 #define TEST_H
 
 #include <config.h>
+
 #include <gtk/gtk.h>
 
-#include <eel/eel-debug.h>
-#include <eel/eel.h>
-#include <libcaja-private/caja-file-utilities.h>
+#include "../eel/eel-debug.h"
+#include "../eel/eel.h"
+#include "../libcaja-private/caja-file-utilities.h"
 
 void       test_init                            (int                         *argc,
 						 char                      ***argv);
author	Pablo Barciela <[email protected]>	2019-04-07 21:47:17 +0200
committer	raveit65 <[email protected]>	2022-07-19 23:18:58 +0200
commit	a9a7eb57df62a6f4a8dbbba161dc3c8ed2c57f7d (patch)
tree	f69fc5590238539a38cc9dfe2a8189cb7e17cc93
parent	d0034595d42dc8db1abff7dd8c29d0b5c2dbc299 (diff)
download	caja-a9a7eb57df62a6f4a8dbbba161dc3c8ed2c57f7d.tar.bz2 caja-a9a7eb57df62a6f4a8dbbba161dc3c8ed2c57f7d.tar.xz