18 files changed, 194 insertions, 194 deletions

diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c
index 72d64a84..b1b91499 100644
--- a/src/file-manager/fm-desktop-icon-view.c
+++ b/src/file-manager/fm-desktop-icon-view.c
@@ -39,24 +39,24 @@
 #include <sys/stat.h>
 #include <sys/types.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 <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"
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index fcb68695..dce96c56 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -40,45 +40,45 @@
 #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 <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"
diff --git a/src/file-manager/fm-directory-view.h b/src/file-manager/fm-directory-view.h
index 1f4fb878..bf10c4da 100644
--- a/src/file-manager/fm-directory-view.h
+++ b/src/file-manager/fm-directory-view.h
@@ -31,15 +31,15 @@
 #include <gtk/gtk.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"
+#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 c95aba3f..71967a6b 100644
--- a/src/file-manager/fm-ditem-page.c
+++ b/src/file-manager/fm-ditem-page.c
@@ -27,12 +27,12 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include "../../eel/eel-glib-extensions.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 <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"
 
diff --git a/src/file-manager/fm-empty-view.c b/src/file-manager/fm-empty-view.c
index 9380a6b1..44af4a85 100644
--- a/src/file-manager/fm-empty-view.c
+++ b/src/file-manager/fm-empty-view.c
@@ -25,13 +25,13 @@
 #include <config.h>
 #include <string.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 <libcaja-private/caja-file-utilities.h>
+#include <libcaja-private/caja-view.h>
+#include <libcaja-private/caja-view-factory.h>
 
 #include "fm-empty-view.h"
 
diff --git a/src/file-manager/fm-error-reporting.c b/src/file-manager/fm-error-reporting.c
index 7bfc3b86..93cf77f4 100644
--- a/src/file-manager/fm-error-reporting.c
+++ b/src/file-manager/fm-error-reporting.c
@@ -28,11 +28,11 @@
 
 #include <glib/gi18n.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 <libcaja-private/caja-debug-log.h>
+#include <libcaja-private/caja-file.h>
 
 #include "fm-error-reporting.h"
 
diff --git a/src/file-manager/fm-error-reporting.h b/src/file-manager/fm-error-reporting.h
index a0eb6e4e..2562a22f 100644
--- a/src/file-manager/fm-error-reporting.h
+++ b/src/file-manager/fm-error-reporting.h
@@ -28,7 +28,7 @@
 
 #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 c7db54fa..1c252af4 100644
--- a/src/file-manager/fm-icon-container.c
+++ b/src/file-manager/fm-icon-container.c
@@ -27,12 +27,12 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 
-#include "../../eel/eel-glib-extensions.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 <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 3a448f10..71cc3a84 100644
--- a/src/file-manager/fm-icon-container.h
+++ b/src/file-manager/fm-icon-container.h
@@ -25,7 +25,7 @@
 #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"
 
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index baa4394d..497dd543 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -37,28 +37,28 @@
 #include <sys/types.h>
 #include <sys/wait.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 <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"
diff --git a/src/file-manager/fm-list-model.c b/src/file-manager/fm-list-model.c
index f8f053c1..8aa58896 100644
--- a/src/file-manager/fm-list-model.c
+++ b/src/file-manager/fm-list-model.c
@@ -32,11 +32,11 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include "../../libegg/eggtreemultidnd.h"
+#include <libegg/eggtreemultidnd.h>
 
-#include "../../eel/eel-graphic-effects.h"
+#include <eel/eel-graphic-effects.h>
 
-#include "../../libcaja-private/caja-dnd.h"
+#include <libcaja-private/caja-dnd.h>
 
 #include "fm-list-model.h"
 
diff --git a/src/file-manager/fm-list-model.h b/src/file-manager/fm-list-model.h
index 2d8f3cb1..b63f8ae4 100644
--- a/src/file-manager/fm-list-model.h
+++ b/src/file-manager/fm-list-model.h
@@ -25,10 +25,10 @@
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 
-#include "../../libcaja-private/caja-file.h"
-#include "../../libcaja-private/caja-directory.h"
+#include <libcaja-private/caja-file.h>
+#include <libcaja-private/caja-directory.h>
 
-#include "../../libcaja-extension/caja-column.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 3c616fa1..d1b9cb89 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -34,32 +34,32 @@
 #include <glib/gi18n.h>
 #include <glib-object.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 <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"
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index fced94da..610d9ab5 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -34,30 +34,30 @@
 #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 <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"
diff --git a/src/file-manager/fm-properties-window.h b/src/file-manager/fm-properties-window.h
index c4415aaf..47c8f9e9 100644
--- a/src/file-manager/fm-properties-window.h
+++ b/src/file-manager/fm-properties-window.h
@@ -28,7 +28,7 @@
 
 #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 b512d622..6a0768bd 100644
--- a/src/file-manager/fm-tree-model.c
+++ b/src/file-manager/fm-tree-model.c
@@ -33,11 +33,11 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "../../eel/eel-graphic-effects.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 <libcaja-private/caja-directory.h>
+#include <libcaja-private/caja-file-attributes.h>
+#include <libcaja-private/caja-file.h>
 
 #include "fm-tree-model.h"
 
diff --git a/src/file-manager/fm-tree-model.h b/src/file-manager/fm-tree-model.h
index 38f02902..0c18daa4 100644
--- a/src/file-manager/fm-tree-model.h
+++ b/src/file-manager/fm-tree-model.h
@@ -32,7 +32,7 @@
 #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 476ce85a..6f8f776c 100644
--- a/src/file-manager/fm-tree-view.c
+++ b/src/file-manager/fm-tree-view.c
@@ -37,28 +37,28 @@
 #include <glib/gi18n.h>
 #include <gio/gio.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 <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"