18 files changed, 287 insertions, 245 deletions
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
 {