local #include files who are libraries inside <> instead ""

147 files changed, 727 insertions, 725 deletions

diff --git a/eel/check-program.c b/eel/check-program.c
index 66df7c00..b82858c7 100644
--- a/eel/check-program.c
+++ b/eel/check-program.c
@@ -28,10 +28,10 @@
 #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"
+#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>
 
 int
 main (int argc, char *argv[])
diff --git a/eel/eel-background.c b/eel/eel-background.c
index d419af3d..2343d1f4 100644
--- a/eel/eel-background.c
+++ b/eel/eel-background.c
@@ -32,14 +32,14 @@
 #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
 {
     APPEARANCE_CHANGED,
diff --git a/libcaja-private/caja-autorun.c b/libcaja-private/caja-autorun.c
index 339f49bc..04033445 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 8e45af0e..00088f1c 100644
--- a/libcaja-private/caja-autorun.h
+++ b/libcaja-private/caja-autorun.h
@@ -42,7 +42,7 @@
 
 #include <gtk/gtk.h>
 
-#include "../eel/eel-background.h"
+#include <eel/eel-background.h>
 
 #include "caja-file.h"
 
diff --git a/libcaja-private/caja-bookmark.c b/libcaja-private/caja-bookmark.c
index 1017508c..ea0eb253 100644
--- a/libcaja-private/caja-bookmark.c
+++ b/libcaja-private/caja-bookmark.c
@@ -26,10 +26,10 @@
 #include <gtk/gtk.h>
 #include <gio/gio.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 <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"
diff --git a/libcaja-private/caja-clipboard-monitor.c b/libcaja-private/caja-clipboard-monitor.c
index 94c58759..ce8069f7 100644
--- a/libcaja-private/caja-clipboard-monitor.c
+++ b/libcaja-private/caja-clipboard-monitor.c
@@ -25,9 +25,9 @@
 #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 <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"
diff --git a/libcaja-private/caja-column-utilities.c b/libcaja-private/caja-column-utilities.c
index e4aba54a..d8b6a406 100644
--- a/libcaja-private/caja-column-utilities.c
+++ b/libcaja-private/caja-column-utilities.c
@@ -26,8 +26,9 @@
 #include <string.h>
 #include <glib/gi18n.h>
 
-#include "../eel/eel-glib-extensions.h"
-#include "../libcaja-extension/caja-column-provider.h"
+#include <eel/eel-glib-extensions.h>
+
+#include <libcaja-extension/caja-column-provider.h>
 
 #include "caja-column-utilities.h"
 #include "caja-extensions.h"
diff --git a/libcaja-private/caja-column-utilities.h b/libcaja-private/caja-column-utilities.h
index 8bd4c825..b78c80b8 100644
--- a/libcaja-private/caja-column-utilities.h
+++ b/libcaja-private/caja-column-utilities.h
@@ -25,7 +25,7 @@
 #ifndef CAJA_COLUMN_UTILITIES_H
 #define CAJA_COLUMN_UTILITIES_H
 
-#include "../libcaja-extension/caja-column.h"
+#include <libcaja-extension/caja-column.h>
 
 #include "caja-file.h"
 
diff --git a/libcaja-private/caja-customization-data.c b/libcaja-private/caja-customization-data.c
index eb4b7d12..de516d5a 100644
--- a/libcaja-private/caja-customization-data.c
+++ b/libcaja-private/caja-customization-data.c
@@ -34,13 +34,13 @@
 #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 <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"
diff --git a/libcaja-private/caja-desktop-directory-file.c b/libcaja-private/caja-desktop-directory-file.c
index 8775e607..2c9faba8 100644
--- a/libcaja-private/caja-desktop-directory-file.c
+++ b/libcaja-private/caja-desktop-directory-file.c
@@ -28,8 +28,8 @@
 #include <glib/gi18n.h>
 #include <string.h>
 
-#include "../eel/eel-glib-extensions.h"
-#include "../eel/eel-gtk-macros.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
 
 #include "caja-desktop-directory-file.h"
 #include "caja-desktop-metadata.h"
diff --git a/libcaja-private/caja-desktop-directory.c b/libcaja-private/caja-desktop-directory.c
index 9a0d3ca3..1c602e80 100644
--- a/libcaja-private/caja-desktop-directory.c
+++ b/libcaja-private/caja-desktop-directory.c
@@ -27,8 +27,8 @@
 #include <config.h>
 #include <gtk/gtk.h>
 
-#include "../eel/eel-glib-extensions.h"
-#include "../eel/eel-gtk-macros.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
 
 #include "caja-desktop-directory.h"
 #include "caja-directory-private.h"
diff --git a/libcaja-private/caja-desktop-icon-file.c b/libcaja-private/caja-desktop-icon-file.c
index ecd360c8..c9eccc91 100644
--- a/libcaja-private/caja-desktop-icon-file.c
+++ b/libcaja-private/caja-desktop-icon-file.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <gio/gio.h>
 
-#include "../eel/eel-glib-extensions.h"
+#include <eel/eel-glib-extensions.h>
 
 #include "caja-desktop-icon-file.h"
 #include "caja-desktop-metadata.h"
diff --git a/libcaja-private/caja-desktop-link-monitor.c b/libcaja-private/caja-desktop-link-monitor.c
index d76b393a..a427ba5c 100644
--- a/libcaja-private/caja-desktop-link-monitor.c
+++ b/libcaja-private/caja-desktop-link-monitor.c
@@ -28,11 +28,11 @@
 #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 <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"
diff --git a/libcaja-private/caja-directory-async.c b/libcaja-private/caja-directory-async.c
index 0a1f2cb5..3915adcb 100644
--- a/libcaja-private/caja-directory-async.c
+++ b/libcaja-private/caja-directory-async.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "../eel/eel-glib-extensions.h"
+#include <eel/eel-glib-extensions.h>
 
 #include "caja-directory-notify.h"
 #include "caja-directory-private.h"
diff --git a/libcaja-private/caja-directory-background.c b/libcaja-private/caja-directory-background.c
index c577c332..9f0ddbf9 100644
--- a/libcaja-private/caja-directory-background.c
+++ b/libcaja-private/caja-directory-background.c
@@ -30,9 +30,9 @@
 #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"
diff --git a/libcaja-private/caja-directory-background.h b/libcaja-private/caja-directory-background.h
index e92b40ba..64151073 100644
--- a/libcaja-private/caja-directory-background.h
+++ b/libcaja-private/caja-directory-background.h
@@ -26,7 +26,7 @@
             Jasmine Hassan <[email protected]>
 */
 
-#include "../eel/eel-background.h"
+#include <eel/eel-background.h>
 
 #include "caja-file.h"
 #include "caja-icon-container.h"
diff --git a/libcaja-private/caja-directory-private.h b/libcaja-private/caja-directory-private.h
index 7fb36c09..5e7b7d68 100644
--- a/libcaja-private/caja-directory-private.h
+++ b/libcaja-private/caja-directory-private.h
@@ -25,8 +25,9 @@
 #include <gio/gio.h>
 #include <libxml/tree.h>
 
-#include "../eel/eel-vfs-extensions.h"
-#include "../libcaja-extension/caja-info-provider.h"
+#include <eel/eel-vfs-extensions.h>
+
+#include <libcaja-extension/caja-info-provider.h>
 
 #include "caja-directory.h"
 #include "caja-file-queue.h"
diff --git a/libcaja-private/caja-directory.c b/libcaja-private/caja-directory.c
index d4881d44..8e05234c 100644
--- a/libcaja-private/caja-directory.c
+++ b/libcaja-private/caja-directory.c
@@ -26,8 +26,8 @@
 #include <gtk/gtk.h>
 #include <string.h>
 
-#include "../eel/eel-glib-extensions.h"
-#include "../eel/eel-gtk-macros.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
 
 #include "caja-directory-private.h"
 #include "caja-directory-notify.h"
diff --git a/libcaja-private/caja-dnd.c b/libcaja-private/caja-dnd.c
index 9e6d09bc..584af6ed 100644
--- a/libcaja-private/caja-dnd.c
+++ b/libcaja-private/caja-dnd.c
@@ -32,10 +32,10 @@
 #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 <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"
diff --git a/libcaja-private/caja-emblem-utils.c b/libcaja-private/caja-emblem-utils.c
index e9e8f48a..2f4aa054 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 c0a85b2c..d8e90438 100644
--- a/libcaja-private/caja-entry.c
+++ b/libcaja-private/caja-entry.c
@@ -30,8 +30,8 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include "../eel/eel-gdk-extensions.h"
-#include "../eel/eel-gtk-macros.h"
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 
 #include "caja-entry.h"
 #include "caja-global-preferences.h"
diff --git a/libcaja-private/caja-file-conflict-dialog.c b/libcaja-private/caja-file-conflict-dialog.c
index dbd75a2e..163d877f 100644
--- a/libcaja-private/caja-file-conflict-dialog.c
+++ b/libcaja-private/caja-file-conflict-dialog.c
@@ -30,8 +30,8 @@
 #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"
diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c
index f563f2a8..eb62c7b0 100644
--- a/libcaja-private/caja-file-operations.c
+++ b/libcaja-private/caja-file-operations.c
@@ -44,10 +44,10 @@
 #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 <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"
diff --git a/libcaja-private/caja-file-private.h b/libcaja-private/caja-file-private.h
index 2e1d0920..7642029e 100644
--- a/libcaja-private/caja-file-private.h
+++ b/libcaja-private/caja-file-private.h
@@ -25,8 +25,8 @@
 #ifndef CAJA_FILE_PRIVATE_H
 #define CAJA_FILE_PRIVATE_H
 
-#include "../eel/eel-glib-extensions.h"
-#include "../eel/eel-string.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-string.h>
 
 #include "caja-directory.h"
 #include "caja-file.h"
diff --git a/libcaja-private/caja-file-utilities.c b/libcaja-private/caja-file-utilities.c
index 355bb82e..2b4914be 100644
--- a/libcaja-private/caja-file-utilities.c
+++ b/libcaja-private/caja-file-utilities.c
@@ -29,10 +29,10 @@
 #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 <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"
diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c
index a7d848ab..9a7d8719 100644
--- a/libcaja-private/caja-file.c
+++ b/libcaja-private/caja-file.c
@@ -38,16 +38,16 @@
 #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 <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"
diff --git a/libcaja-private/caja-global-preferences.c b/libcaja-private/caja-global-preferences.c
index 36783dc9..68ba38c5 100644
--- a/libcaja-private/caja-global-preferences.c
+++ b/libcaja-private/caja-global-preferences.c
@@ -26,10 +26,10 @@
 #include <config.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 <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"
diff --git a/libcaja-private/caja-icon-canvas-item.c b/libcaja-private/caja-icon-canvas-item.c
index 044214d3..2c49045b 100644
--- a/libcaja-private/caja-icon-canvas-item.c
+++ b/libcaja-private/caja-icon-canvas-item.c
@@ -35,14 +35,14 @@
 #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 <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"
diff --git a/libcaja-private/caja-icon-canvas-item.h b/libcaja-private/caja-icon-canvas-item.h
index 58215412..507fd8ad 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 3a376faf..1d24eba0 100644
--- a/libcaja-private/caja-icon-container.c
+++ b/libcaja-private/caja-icon-container.c
@@ -35,17 +35,17 @@
 #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 <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"
diff --git a/libcaja-private/caja-icon-container.h b/libcaja-private/caja-icon-container.h
index 2bc03818..74914b56 100644
--- a/libcaja-private/caja-icon-container.h
+++ b/libcaja-private/caja-icon-container.h
@@ -26,7 +26,7 @@
 #ifndef CAJA_ICON_CONTAINER_H
 #define CAJA_ICON_CONTAINER_H
 
-#include "../eel/eel-canvas.h"
+#include <eel/eel-canvas.h>
 
 #include "caja-icon-info.h"
 
diff --git a/libcaja-private/caja-icon-dnd.c b/libcaja-private/caja-icon-dnd.c
index 0215a98f..7c03cd2b 100644
--- a/libcaja-private/caja-icon-dnd.c
+++ b/libcaja-private/caja-icon-dnd.c
@@ -41,17 +41,17 @@
 #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 <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"
diff --git a/libcaja-private/caja-icon-private.h b/libcaja-private/caja-icon-private.h
index 6d1657d5..596148b1 100644
--- a/libcaja-private/caja-icon-private.h
+++ b/libcaja-private/caja-icon-private.h
@@ -25,7 +25,7 @@
 #ifndef CAJA_ICON_CONTAINER_PRIVATE_H
 #define CAJA_ICON_CONTAINER_PRIVATE_H
 
-#include "../eel/eel-glib-extensions.h"
+#include <eel/eel-glib-extensions.h>
 
 #include "caja-icon-canvas-item.h"
 #include "caja-icon-container.h"
diff --git a/libcaja-private/caja-lib-self-check-functions.h b/libcaja-private/caja-lib-self-check-functions.h
index 4e9a2de0..4fa973e3 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 733cae22..8c2902b5 100644
--- a/libcaja-private/caja-link.c
+++ b/libcaja-private/caja-link.c
@@ -30,7 +30,7 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 
-#include "../eel/eel-vfs-extensions.h"
+#include <eel/eel-vfs-extensions.h>
 
 #include "caja-link.h"
 #include "caja-directory-notify.h"
diff --git a/libcaja-private/caja-mime-actions.c b/libcaja-private/caja-mime-actions.c
index 789086e1..e9edd2ba 100644
--- a/libcaja-private/caja-mime-actions.c
+++ b/libcaja-private/caja-mime-actions.c
@@ -29,9 +29,9 @@
 #include <glib/gstdio.h>
 #include <gdk/gdkx.h>
 
-#include "../eel/eel-glib-extensions.h"
-#include "../eel/eel-stock-dialogs.h"
-#include "../eel/eel-string.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"
diff --git a/libcaja-private/caja-mime-application-chooser.c b/libcaja-private/caja-mime-application-chooser.c
index d043b22a..3e9c1812 100644
--- a/libcaja-private/caja-mime-application-chooser.c
+++ b/libcaja-private/caja-mime-application-chooser.c
@@ -33,7 +33,7 @@
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 
-#include "../eel/eel-stock-dialogs.h"
+#include <eel/eel-stock-dialogs.h>
 
 #include "caja-mime-application-chooser.h"
 #include "caja-open-with-dialog.h"
diff --git a/libcaja-private/caja-module.c b/libcaja-private/caja-module.c
index d7405d4d..d54d7cf1 100644
--- a/libcaja-private/caja-module.c
+++ b/libcaja-private/caja-module.c
@@ -24,8 +24,8 @@
 #include <config.h>
 #include <gmodule.h>
 
-#include "../eel/eel-gtk-macros.h"
-#include "../eel/eel-debug.h"
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-debug.h>
 
 #include "caja-module.h"
 #include "caja-extensions.h"
diff --git a/libcaja-private/caja-open-with-dialog.c b/libcaja-private/caja-open-with-dialog.c
index f12775d7..1c4e285b 100644
--- a/libcaja-private/caja-open-with-dialog.c
+++ b/libcaja-private/caja-open-with-dialog.c
@@ -33,7 +33,7 @@
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 
-#include "../eel/eel-stock-dialogs.h"
+#include <eel/eel-stock-dialogs.h>
 
 #include "caja-open-with-dialog.h"
 #include "caja-signaller.h"
diff --git a/libcaja-private/caja-program-choosing.c b/libcaja-private/caja-program-choosing.c
index 13a0fbad..05e1c182 100644
--- a/libcaja-private/caja-program-choosing.c
+++ b/libcaja-private/caja-program-choosing.c
@@ -33,8 +33,8 @@
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 
-#include "../eel/eel-mate-extensions.h"
-#include "../eel/eel-stock-dialogs.h"
+#include <eel/eel-mate-extensions.h>
+#include <eel/eel-stock-dialogs.h>
 
 #include "caja-program-choosing.h"
 #include "caja-mime-actions.h"
diff --git a/libcaja-private/caja-progress-info.c b/libcaja-private/caja-progress-info.c
index d11cf69a..590fae13 100644
--- a/libcaja-private/caja-progress-info.c
+++ b/libcaja-private/caja-progress-info.c
@@ -29,7 +29,7 @@
 #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"
diff --git a/libcaja-private/caja-query.c b/libcaja-private/caja-query.c
index 023231d8..63c71372 100644
--- a/libcaja-private/caja-query.c
+++ b/libcaja-private/caja-query.c
@@ -25,8 +25,8 @@
 #include <string.h>
 #include <glib/gi18n.h>
 
-#include "../eel/eel-gtk-macros.h"
-#include "../eel/eel-glib-extensions.h"
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-glib-extensions.h>
 
 #include "caja-query.h"
 #include "caja-file-utilities.h"
diff --git a/libcaja-private/caja-recent.c b/libcaja-private/caja-recent.c
index 9b8d0e9c..ec579255 100644
--- a/libcaja-private/caja-recent.c
+++ b/libcaja-private/caja-recent.c
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "../eel/eel-vfs-extensions.h"
+#include <eel/eel-vfs-extensions.h>
 
 #include "caja-recent.h"
 
diff --git a/libcaja-private/caja-search-directory-file.c b/libcaja-private/caja-search-directory-file.c
index dfd21c09..3ff83a7f 100644
--- a/libcaja-private/caja-search-directory-file.c
+++ b/libcaja-private/caja-search-directory-file.c
@@ -29,7 +29,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include "../eel/eel-glib-extensions.h"
+#include <eel/eel-glib-extensions.h>
 
 #include "caja-search-directory-file.h"
 #include "caja-directory-notify.h"
diff --git a/libcaja-private/caja-search-directory.c b/libcaja-private/caja-search-directory.c
index befc4aca..effab562 100644
--- a/libcaja-private/caja-search-directory.c
+++ b/libcaja-private/caja-search-directory.c
@@ -27,7 +27,7 @@
 #include <gio/gio.h>
 #include <sys/time.h>
 
-#include "../eel/eel-glib-extensions.h"
+#include <eel/eel-glib-extensions.h>
 
 #include "caja-search-directory.h"
 #include "caja-search-directory-file.h"
diff --git a/libcaja-private/caja-search-engine-beagle.c b/libcaja-private/caja-search-engine-beagle.c
index 4b546898..b891fdbb 100644
--- a/libcaja-private/caja-search-engine-beagle.c
+++ b/libcaja-private/caja-search-engine-beagle.c
@@ -24,7 +24,7 @@
 #include <config.h>
 #include <gmodule.h>
 
-#include "../eel/eel-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 
 #include "caja-search-engine-beagle.h"
 
diff --git a/libcaja-private/caja-search-engine-simple.c b/libcaja-private/caja-search-engine-simple.c
index bb03054a..c8d4939d 100644
--- a/libcaja-private/caja-search-engine-simple.c
+++ b/libcaja-private/caja-search-engine-simple.c
@@ -27,7 +27,7 @@
 
 #include <gio/gio.h>
 
-#include "../eel/eel-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 
 #include "caja-search-engine-simple.h"
 
diff --git a/libcaja-private/caja-search-engine-tracker.c b/libcaja-private/caja-search-engine-tracker.c
index b7a97508..f1ec2bfe 100644
--- a/libcaja-private/caja-search-engine-tracker.c
+++ b/libcaja-private/caja-search-engine-tracker.c
@@ -25,7 +25,7 @@
 #include <gmodule.h>
 #include <string.h>
 
-#include "../eel/eel-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 
 #include "caja-search-engine-tracker.h"
 
diff --git a/libcaja-private/caja-search-engine.c b/libcaja-private/caja-search-engine.c
index e7cca500..74782aa6 100644
--- a/libcaja-private/caja-search-engine.c
+++ b/libcaja-private/caja-search-engine.c
@@ -23,7 +23,7 @@
 
 #include <config.h>
 
-#include "../eel/eel-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 
 #include "caja-search-engine.h"
 #include "caja-search-engine-beagle.h"
diff --git a/libcaja-private/caja-signaller.c b/libcaja-private/caja-signaller.c
index 3e7a53cd..b2261bb3 100644
--- a/libcaja-private/caja-signaller.c
+++ b/libcaja-private/caja-signaller.c
@@ -28,7 +28,7 @@
 
 #include <config.h>
 
-#include "../eel/eel-debug.h"
+#include <eel/eel-debug.h>
 
 #include "caja-signaller.h"
 
diff --git a/libcaja-private/caja-thumbnails.c b/libcaja-private/caja-thumbnails.c
index 62d36648..dedb08ea 100644
--- a/libcaja-private/caja-thumbnails.c
+++ b/libcaja-private/caja-thumbnails.c
@@ -37,11 +37,11 @@
 #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 <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"
diff --git a/libcaja-private/caja-trash-monitor.c b/libcaja-private/caja-trash-monitor.c
index a48feb70..678b506a 100644
--- a/libcaja-private/caja-trash-monitor.c
+++ b/libcaja-private/caja-trash-monitor.c
@@ -28,7 +28,7 @@
 #include <gio/gio.h>
 #include <string.h>
 
-#include "../eel/eel-debug.h"
+#include <eel/eel-debug.h>
 
 #include "caja-trash-monitor.h"
 #include "caja-directory-notify.h"
diff --git a/libcaja-private/caja-tree-view-drag-dest.c b/libcaja-private/caja-tree-view-drag-dest.c
index 4698c1e6..c05acafb 100644
--- a/libcaja-private/caja-tree-view-drag-dest.c
+++ b/libcaja-private/caja-tree-view-drag-dest.c
@@ -34,7 +34,7 @@
 
 #include <gtk/gtk.h>
 
-#include "../eel/eel-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 
 #include "caja-tree-view-drag-dest.h"
 #include "caja-file-dnd.h"
diff --git a/libcaja-private/caja-ui-utilities.c b/libcaja-private/caja-ui-utilities.c
index 69d963f3..0f9da559 100644
--- a/libcaja-private/caja-ui-utilities.c
+++ b/libcaja-private/caja-ui-utilities.c
@@ -28,8 +28,8 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gio/gio.h>
 
-#include "../eel/eel-debug.h"
-#include "../eel/eel-graphic-effects.h"
+#include <eel/eel-debug.h>
+#include <eel/eel-graphic-effects.h>
 
 #include "caja-ui-utilities.h"
 #include "caja-file-utilities.h"
diff --git a/libcaja-private/caja-ui-utilities.h b/libcaja-private/caja-ui-utilities.h
index e51c2487..e1e3cef5 100644
--- a/libcaja-private/caja-ui-utilities.h
+++ b/libcaja-private/caja-ui-utilities.h
@@ -26,7 +26,7 @@
 
 #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 0698afd3..cb9a5586 100644
--- a/libcaja-private/caja-vfs-directory.c
+++ b/libcaja-private/caja-vfs-directory.c
@@ -25,7 +25,7 @@
 
 #include <config.h>
 
-#include "../eel/eel-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 
 #include "caja-vfs-directory.h"
 #include "caja-directory-private.h"
diff --git a/libcaja-private/caja-vfs-file.c b/libcaja-private/caja-vfs-file.c
index f2908a26..f876a402 100644
--- a/libcaja-private/caja-vfs-file.c
+++ b/libcaja-private/caja-vfs-file.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include "../eel/eel-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 
 #include "caja-vfs-file.h"
 #include "caja-directory-notify.h"
diff --git a/src/caja-application.c b/src/caja-application.c
index 62873184..0acb4796 100644
--- a/src/caja-application.c
+++ b/src/caja-application.c
@@ -44,21 +44,21 @@
 #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"
+#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"
diff --git a/src/caja-application.h b/src/caja-application.h
index feb0fb98..7c72bb61 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 019cb5c6..b47fdfc4 100644
--- a/src/caja-autorun-software.c
+++ b/src/caja-autorun-software.c
@@ -33,8 +33,8 @@
 #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 33beaef9..2eb69edc 100644
--- a/src/caja-bookmark-list.c
+++ b/src/caja-bookmark-list.c
@@ -30,9 +30,9 @@
 
 #include <gio/gio.h>
 
-#include "../libcaja-private/caja-file-utilities.h"
-#include "../libcaja-private/caja-file.h"
-#include "../libcaja-private/caja-icon-names.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"
 
diff --git a/src/caja-bookmark-list.h b/src/caja-bookmark-list.h
index fe232bde..995928be 100644
--- a/src/caja-bookmark-list.h
+++ b/src/caja-bookmark-list.h
@@ -30,7 +30,7 @@
 
 #include <gio/gio.h>
 
-#include "../libcaja-private/caja-bookmark.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 1bc023e8..b3bd4d06 100644
--- a/src/caja-bookmarks-window.c
+++ b/src/caja-bookmarks-window.c
@@ -31,10 +31,10 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "../eel/eel-gtk-extensions.h"
-#include "../eel/eel-mate-extensions.h"
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-mate-extensions.h>
 
-#include "../libcaja-private/caja-global-preferences.h"
+#include <libcaja-private/caja-global-preferences.h>
 
 #include "caja-bookmarks-window.h"
 #include "caja-window.h"
diff --git a/src/caja-connect-server-dialog-main.c b/src/caja-connect-server-dialog-main.c
index 2d646c67..9a9b3cf7 100644
--- a/src/caja-connect-server-dialog-main.c
+++ b/src/caja-connect-server-dialog-main.c
@@ -32,10 +32,10 @@
 #include <gtk/gtk.h>
 #include <gdk/gdk.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 3948baba..24411240 100644
--- a/src/caja-connect-server-dialog-nonmain.c
+++ b/src/caja-connect-server-dialog-nonmain.c
@@ -25,7 +25,7 @@
 
 #include <gio/gio.h>
 
-#include "../libcaja-private/caja-global-preferences.h"
+#include <libcaja-private/caja-global-preferences.h>
 
 #include "caja-connect-server-dialog.h"
 
diff --git a/src/caja-connect-server-dialog.c b/src/caja-connect-server-dialog.c
index 6e36e3d0..9b3b847e 100644
--- a/src/caja-connect-server-dialog.c
+++ b/src/caja-connect-server-dialog.c
@@ -29,10 +29,10 @@
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
-#include "../eel/eel-stock-dialogs.h"
+#include <eel/eel-stock-dialogs.h>
 
-#include "../libcaja-private/caja-global-preferences.h"
-#include "../libcaja-private/caja-icon-names.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"
diff --git a/src/caja-desktop-window.c b/src/caja-desktop-window.c
index 6b4af389..369f03d5 100644
--- a/src/caja-desktop-window.c
+++ b/src/caja-desktop-window.c
@@ -30,11 +30,11 @@
 #include <gio/gio.h>
 #include <glib/gi18n.h>
 
-#include "../eel/eel-background.h"
-#include "../eel/eel-vfs-extensions.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 <libcaja-private/caja-file-utilities.h>
+#include <libcaja-private/caja-icon-names.h>
 
 #include "caja-desktop-window.h"
 #include "caja-window-private.h"
diff --git a/src/caja-emblem-sidebar.c b/src/caja-emblem-sidebar.c
index 8c05963e..8a2c53f8 100644
--- a/src/caja-emblem-sidebar.c
+++ b/src/caja-emblem-sidebar.c
@@ -35,19 +35,19 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.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 <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"
 
diff --git a/src/caja-file-management-properties-main.c b/src/caja-file-management-properties-main.c
index 5cdebdcf..b2b79552 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 430642e7..4a895962 100644
--- a/src/caja-file-management-properties.c
+++ b/src/caja-file-management-properties.c
@@ -30,16 +30,16 @@
 #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-autorun.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-extension/caja-configurable.h"
+#include <libcaja-extension/caja-configurable.h>
 
 #include "caja-file-management-properties.h"
 
diff --git a/src/caja-freedesktop-dbus.c b/src/caja-freedesktop-dbus.c
index 849e0a66..223f2758 100644
--- a/src/caja-freedesktop-dbus.c
+++ b/src/caja-freedesktop-dbus.c
@@ -25,7 +25,7 @@
 
 #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"
 
diff --git a/src/caja-history-sidebar.c b/src/caja-history-sidebar.c
index fe224ed6..2b68c17c 100644
--- a/src/caja-history-sidebar.c
+++ b/src/caja-history-sidebar.c
@@ -31,15 +31,15 @@
 #include <glib/gi18n.h>
 #include <cairo-gobject.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 <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 3c09564a..b1ea567b 100644
--- a/src/caja-history-sidebar.h
+++ b/src/caja-history-sidebar.h
@@ -29,8 +29,8 @@
 
 #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 0234cedc..6ab47019 100644
--- a/src/caja-image-properties-page.c
+++ b/src/caja-image-properties-page.c
@@ -39,10 +39,10 @@
 #include <exempi/xmpconsts.h>
 #endif /*HAVE_EXEMPI*/
 
-#include "../eel/eel-vfs-extensions.h"
+#include <eel/eel-vfs-extensions.h>
 
-#include "../libcaja-extension/caja-property-page-provider.h"
-#include "../libcaja-private/caja-module.h"
+#include <libcaja-extension/caja-property-page-provider.h>
+#include <libcaja-private/caja-module.h>
 
 #include "caja-image-properties-page.h"
 
diff --git a/src/caja-information-panel.c b/src/caja-information-panel.c
index 2beae1c9..e28c5154 100644
--- a/src/caja-information-panel.c
+++ b/src/caja-information-panel.c
@@ -29,24 +29,24 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.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 <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"
diff --git a/src/caja-information-panel.h b/src/caja-information-panel.h
index 94d605d3..5ccdd9d6 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 a0f9500a..5016677f 100644
--- a/src/caja-location-bar.c
+++ b/src/caja-location-bar.c
@@ -38,15 +38,15 @@
 #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 <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"
diff --git a/src/caja-location-bar.h b/src/caja-location-bar.h
index 5b6b56e0..89862571 100644
--- a/src/caja-location-bar.h
+++ b/src/caja-location-bar.h
@@ -32,7 +32,7 @@
 
 #include <gtk/gtk.h>
 
-#include "../libcaja-private/caja-entry.h"
+#include <libcaja-private/caja-entry.h>
 
 #include "caja-navigation-window.h"
 #include "caja-navigation-window-pane.h"
diff --git a/src/caja-location-dialog.c b/src/caja-location-dialog.c
index a341b48b..fadeb5a1 100644
--- a/src/caja-location-dialog.c
+++ b/src/caja-location-dialog.c
@@ -26,10 +26,10 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include "../eel/eel-gtk-macros.h"
-#include "../eel/eel-stock-dialogs.h"
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-stock-dialogs.h>
 
-#include "../libcaja-private/caja-file-utilities.h"
+#include <libcaja-private/caja-file-utilities.h>
 
 #include "caja-location-dialog.h"
 #include "caja-location-entry.h"
diff --git a/src/caja-location-entry.c b/src/caja-location-entry.c
index 4cfa7c22..0a288408 100644
--- a/src/caja-location-entry.c
+++ b/src/caja-location-entry.c
@@ -39,15 +39,15 @@
 #include <glib/gi18n.h>
 #include <gio/gio.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 <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"
diff --git a/src/caja-location-entry.h b/src/caja-location-entry.h
index 3d0aad56..cac45553 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 8d6c24dd..48b575df 100644
--- a/src/caja-main.c
+++ b/src/caja-main.c
@@ -49,15 +49,15 @@
 #include <exempi/xmp.h>
 #endif
 
-#include "../eel/eel-debug.h"
-#include "../eel/eel-glib-extensions.h"
-#include "../eel/eel-self-checks.h"
+#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 <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 <libegg/eggdesktopfile.h>
 
 #include "caja-window.h"
 
diff --git a/src/caja-navigation-action.c b/src/caja-navigation-action.c
index fe7719b6..9f9c2816 100644
--- a/src/caja-navigation-action.c
+++ b/src/caja-navigation-action.c
@@ -31,7 +31,7 @@
 
 #include <gtk/gtk.h>
 
-#include "../eel/eel-gtk-extensions.h"
+#include <eel/eel-gtk-extensions.h>
 
 #include "caja-navigation-action.h"
 #include "caja-navigation-window.h"
diff --git a/src/caja-navigation-window-menus.c b/src/caja-navigation-window-menus.c
index e9d822c0..707bf2d1 100644
--- a/src/caja-navigation-window-menus.c
+++ b/src/caja-navigation-window-menus.c
@@ -32,16 +32,16 @@
 #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 <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"
diff --git a/src/caja-navigation-window-pane.c b/src/caja-navigation-window-pane.c
index 8c9c97be..0cd765d9 100644
--- a/src/caja-navigation-window-pane.c
+++ b/src/caja-navigation-window-pane.c
@@ -22,12 +22,12 @@
    Author: Holger Berndt <[email protected]>
 */
 
-#include "../eel/eel-gtk-extensions.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"
+#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"
diff --git a/src/caja-navigation-window-slot.c b/src/caja-navigation-window-slot.c
index d38b4ed0..f808accf 100644
--- a/src/caja-navigation-window-slot.c
+++ b/src/caja-navigation-window-slot.c
@@ -22,10 +22,10 @@
    Author: Christian Neumair <[email protected]>
 */
 
-#include "../eel/eel-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 
-#include "../libcaja-private/caja-window-slot-info.h"
-#include "../libcaja-private/caja-file.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"
diff --git a/src/caja-navigation-window.c b/src/caja-navigation-window.c
index b0d3dd00..9d440320 100644
--- a/src/caja-navigation-window.c
+++ b/src/caja-navigation-window.c
@@ -40,24 +40,24 @@
 #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 <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"
diff --git a/src/caja-navigation-window.h b/src/caja-navigation-window.h
index 6bd3ce45..fb9d7bbe 100644
--- a/src/caja-navigation-window.h
+++ b/src/caja-navigation-window.h
@@ -32,10 +32,10 @@
 
 #include <gtk/gtk.h>
 
-#include "../eel/eel-glib-extensions.h"
+#include <eel/eel-glib-extensions.h>
 
-#include "../libcaja-private/caja-bookmark.h"
-#include "../libcaja-private/caja-sidebar.h"
+#include <libcaja-private/caja-bookmark.h>
+#include <libcaja-private/caja-sidebar.h>
 
 #include "caja-application.h"
 #include "caja-information-panel.h"
diff --git a/src/caja-notebook.c b/src/caja-notebook.c
index ac6727f4..3f8d39f9 100644
--- a/src/caja-notebook.c
+++ b/src/caja-notebook.c
@@ -30,7 +30,7 @@
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
-#include "../libcaja-private/caja-dnd.h"
+#include <libcaja-private/caja-dnd.h>
 
 #include "caja-notebook.h"
 #include "caja-navigation-window.h"
diff --git a/src/caja-notes-viewer.c b/src/caja-notes-viewer.c
index 842a6fed..65916f9e 100644
--- a/src/caja-notes-viewer.c
+++ b/src/caja-notes-viewer.c
@@ -30,20 +30,20 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.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 <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"
 
diff --git a/src/caja-notes-viewer.h b/src/caja-notes-viewer.h
index 225d884c..e3168ca6 100644
--- a/src/caja-notes-viewer.h
+++ b/src/caja-notes-viewer.h
@@ -28,8 +28,8 @@
 
 #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 fb640f47..6f7d9586 100644
--- a/src/caja-pathbar.c
+++ b/src/caja-pathbar.c
@@ -25,13 +25,13 @@
 #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"
 
diff --git a/src/caja-places-sidebar.c b/src/caja-places-sidebar.c
index 92ad68d0..5baf53e9 100644
--- a/src/caja-places-sidebar.c
+++ b/src/caja-places-sidebar.c
@@ -31,27 +31,27 @@
 #include <gio/gio.h>
 #include <libnotify/notify.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 <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"
diff --git a/src/caja-places-sidebar.h b/src/caja-places-sidebar.h
index 25ee8a7e..016f7573 100644
--- a/src/caja-places-sidebar.h
+++ b/src/caja-places-sidebar.h
@@ -26,8 +26,8 @@
 
 #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_PLACES_SIDEBAR_ID    "places"
 
diff --git a/src/caja-property-browser.c b/src/caja-property-browser.c
index bc5d1d22..ec838769 100644
--- a/src/caja-property-browser.c
+++ b/src/caja-property-browser.c
@@ -38,24 +38,24 @@
 #include <gio/gio.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 <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"
 
diff --git a/src/caja-query-editor.c b/src/caja-query-editor.c
index 945c0cf8..b6fd40f4 100644
--- a/src/caja-query-editor.c
+++ b/src/caja-query-editor.c
@@ -29,11 +29,11 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include "../eel/eel-gtk-macros.h"
-#include "../eel/eel-glib-extensions.h"
-#include "../eel/eel-stock-dialogs.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 <libcaja-private/caja-global-preferences.h>
 
 #include "caja-query-editor.h"
 #include "caja-src-marshal.h"
diff --git a/src/caja-query-editor.h b/src/caja-query-editor.h
index 243d40b9..e286acfc 100644
--- a/src/caja-query-editor.h
+++ b/src/caja-query-editor.h
@@ -26,8 +26,8 @@
 
 #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"
 
diff --git a/src/caja-search-bar.c b/src/caja-search-bar.c
index c48dfe9a..9ae868c6 100644
--- a/src/caja-search-bar.c
+++ b/src/caja-search-bar.c
@@ -27,9 +27,9 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include "../eel/eel-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 
-#include "../libcaja-private/caja-clipboard.h"
+#include <libcaja-private/caja-clipboard.h>
 
 #include "caja-search-bar.h"
 
diff --git a/src/caja-search-bar.h b/src/caja-search-bar.h
index d5797e6b..ae1aa6d9 100644
--- a/src/caja-search-bar.h
+++ b/src/caja-search-bar.h
@@ -26,7 +26,7 @@
 
 #include <gtk/gtk.h>
 
-#include "../libcaja-private/caja-query.h"
+#include <libcaja-private/caja-query.h>
 
 #include "caja-window.h"
 
diff --git a/src/caja-side-pane.c b/src/caja-side-pane.c
index 93b6972c..5c8abdab 100644
--- a/src/caja-side-pane.c
+++ b/src/caja-side-pane.c
@@ -27,9 +27,9 @@
 #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 <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 
 #include "caja-side-pane.h"
 
diff --git a/src/caja-sidebar-title.c b/src/caja-sidebar-title.c
index c1026151..1652767d 100644
--- a/src/caja-sidebar-title.c
+++ b/src/caja-sidebar-title.c
@@ -33,16 +33,16 @@
 #include <pango/pango.h>
 #include <glib/gi18n.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 <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"
diff --git a/src/caja-sidebar-title.h b/src/caja-sidebar-title.h
index 2568b3c2..e86349d6 100644
--- a/src/caja-sidebar-title.h
+++ b/src/caja-sidebar-title.h
@@ -31,9 +31,9 @@
 
 #include <gtk/gtk.h>
 
-#include "../eel/eel-background.h"
+#include <eel/eel-background.h>
 
-#include "../libcaja-private/caja-file.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 8d9f733b..b866c54f 100644
--- a/src/caja-spatial-window.c
+++ b/src/caja-spatial-window.c
@@ -35,21 +35,21 @@
 #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 <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"
diff --git a/src/caja-trash-bar.c b/src/caja-trash-bar.c
index bcff94ae..d9ac20ea 100644
--- a/src/caja-trash-bar.c
+++ b/src/caja-trash-bar.c
@@ -25,10 +25,10 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.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 <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"
diff --git a/src/caja-view-as-action.c b/src/caja-view-as-action.c
index a38ebca2..2cfe6455 100644
--- a/src/caja-view-as-action.c
+++ b/src/caja-view-as-action.c
@@ -27,9 +27,9 @@
 
 #include <gtk/gtk.h>
 
-#include "../eel/eel-gtk-extensions.h"
+#include <eel/eel-gtk-extensions.h>
 
-#include "../libcaja-private/caja-view-factory.h"
+#include <libcaja-private/caja-view-factory.h>
 
 #include "caja-view-as-action.h"
 #include "caja-navigation-window.h"
diff --git a/src/caja-window-bookmarks.c b/src/caja-window-bookmarks.c
index 4300b719..fde9c9d9 100644
--- a/src/caja-window-bookmarks.c
+++ b/src/caja-window-bookmarks.c
@@ -29,10 +29,10 @@
 
 #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 <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"
diff --git a/src/caja-window-bookmarks.h b/src/caja-window-bookmarks.h
index a28e53bb..51a37e8a 100644
--- a/src/caja-window-bookmarks.h
+++ b/src/caja-window-bookmarks.h
@@ -25,7 +25,7 @@
 #ifndef CAJA_WINDOW_BOOKMARKS_H
 #define CAJA_WINDOW_BOOKMARKS_H
 
-#include "../libcaja-private/caja-bookmark.h"
+#include <libcaja-private/caja-bookmark.h>
 
 #include "caja-bookmark-list.h"
 #include "caja-window.h"
diff --git a/src/caja-window-manage-views.c b/src/caja-window-manage-views.c
index 59bb4f07..41d32221 100644
--- a/src/caja-window-manage-views.c
+++ b/src/caja-window-manage-views.c
@@ -31,33 +31,33 @@
 #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 <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"
diff --git a/src/caja-window-menus.c b/src/caja-window-menus.c
index 14676b7c..0fc7ca02 100644
--- a/src/caja-window-menus.c
+++ b/src/caja-window-menus.c
@@ -33,19 +33,19 @@
 #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 <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"
diff --git a/src/caja-window-pane.c b/src/caja-window-pane.c
index 452f648e..851e1795 100644
--- a/src/caja-window-pane.c
+++ b/src/caja-window-pane.c
@@ -22,7 +22,7 @@
    Author: Holger Berndt <[email protected]>
 */
 
-#include "../eel/eel-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 
 #include "caja-window-pane.h"
 #include "caja-window-private.h"
diff --git a/src/caja-window-private.h b/src/caja-window-private.h
index 3cf29a37..72e60b75 100644
--- a/src/caja-window-private.h
+++ b/src/caja-window-private.h
@@ -28,7 +28,7 @@
 #ifndef CAJA_WINDOW_PRIVATE_H
 #define CAJA_WINDOW_PRIVATE_H
 
-#include "../libcaja-private/caja-directory.h"
+#include <libcaja-private/caja-directory.h>
 
 #include "caja-window.h"
 #include "caja-window-slot.h"
diff --git a/src/caja-window-slot.c b/src/caja-window-slot.c
index affb64a7..a6e46017 100644
--- a/src/caja-window-slot.c
+++ b/src/caja-window-slot.c
@@ -22,12 +22,12 @@
    Author: Christian Neumair <[email protected]>
 */
 
-#include "../eel/eel-gtk-macros.h"
-#include "../eel/eel-string.h"
+#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 <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"
diff --git a/src/caja-window-toolbars.c b/src/caja-window-toolbars.c
index d1112073..d97a3647 100644
--- a/src/caja-window-toolbars.c
+++ b/src/caja-window-toolbars.c
@@ -33,17 +33,17 @@
 #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 <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"
diff --git a/src/caja-window.c b/src/caja-window.c
index c95870f9..f8a07fc8 100644
--- a/src/caja-window.c
+++ b/src/caja-window.c
@@ -36,20 +36,20 @@
 #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 <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"
diff --git a/src/caja-window.h b/src/caja-window.h
index 137891a1..3f012db0 100644
--- a/src/caja-window.h
+++ b/src/caja-window.h
@@ -29,12 +29,12 @@
 
 #include <gtk/gtk.h>
 
-#include "../eel/eel-glib-extensions.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 <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"
diff --git a/src/caja-x-content-bar.c b/src/caja-x-content-bar.c
index 43f9a23c..c4b822f0 100644
--- a/src/caja-x-content-bar.c
+++ b/src/caja-x-content-bar.c
@@ -28,8 +28,8 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
-#include "../libcaja-private/caja-autorun.h"
-#include "../libcaja-private/caja-icon-info.h"
+#include <libcaja-private/caja-autorun.h>
+#include <libcaja-private/caja-icon-info.h>
 
 #include "caja-x-content-bar.h"
 
diff --git a/src/caja-zoom-action.c b/src/caja-zoom-action.c
index e8d60e17..99c29860 100644
--- a/src/caja-zoom-action.c
+++ b/src/caja-zoom-action.c
@@ -27,7 +27,7 @@
 
 #include <gtk/gtk.h>
 
-#include "../eel/eel-gtk-extensions.h"
+#include <eel/eel-gtk-extensions.h>
 
 #include "caja-zoom-action.h"
 #include "caja-zoom-control.h"
diff --git a/src/caja-zoom-control.c b/src/caja-zoom-control.c
index 49f4abd7..ebe0e31b 100644
--- a/src/caja-zoom-control.c
+++ b/src/caja-zoom-control.c
@@ -38,13 +38,13 @@
 #include <gtk/gtk-a11y.h>
 #include <gdk/gdkkeysyms.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 <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 <libcaja-private/caja-file-utilities.h>
+#include <libcaja-private/caja-global-preferences.h>
 
 #include "caja-zoom-control.h"
 
diff --git a/src/caja-zoom-control.h b/src/caja-zoom-control.h
index 8e02a38a..cc4fe05f 100644
--- a/src/caja-zoom-control.h
+++ b/src/caja-zoom-control.h
@@ -30,7 +30,7 @@
 
 #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 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"
diff --git a/test/test-caja-directory-async.c b/test/test-caja-directory-async.c
index 6481ca57..8c3c58f9 100644
--- a/test/test-caja-directory-async.c
+++ b/test/test-caja-directory-async.c
@@ -1,9 +1,9 @@
 #include <gtk/gtk.h>
 #include <unistd.h>
 
-#include "../libcaja-private/caja-directory.h"
-#include "../libcaja-private/caja-search-directory.h"
-#include "../libcaja-private/caja-file.h"
+#include <libcaja-private/caja-directory.h>
+#include <libcaja-private/caja-search-directory.h>
+#include <libcaja-private/caja-file.h>
 
 void *client1, *client2;
 
diff --git a/test/test-caja-search-engine.c b/test/test-caja-search-engine.c
index 49c949ce..03201dc5 100644
--- a/test/test-caja-search-engine.c
+++ b/test/test-caja-search-engine.c
@@ -1,6 +1,6 @@
 #include <gtk/gtk.h>
 
-#include "../libcaja-private/caja-search-engine.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 43dfe632..d0a66079 100644
--- a/test/test-caja-wrap-table.c
+++ b/test/test-caja-wrap-table.c
@@ -1,8 +1,8 @@
-#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"
 
diff --git a/test/test-copy.c b/test/test-copy.c
index fabd7673..520e929d 100644
--- a/test/test-copy.c
+++ b/test/test-copy.c
@@ -1,5 +1,5 @@
-#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"
 
diff --git a/test/test-eel-background.c b/test/test-eel-background.c
index 72e09d9a..53fed701 100644
--- a/test/test-eel-background.c
+++ b/test/test-eel-background.c
@@ -2,7 +2,7 @@
 
 #include <gtk/gtk.h>
 
-#include "../eel/eel-background.h"
+#include <eel/eel-background.h>
 
 #define PATTERNS_DIR "/mate-source/eel/data/patterns"
 
diff --git a/test/test-eel-editable-label.c b/test/test-eel-editable-label.c
index 154a1a4e..2f878fa9 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 3595cd7c..7f5e330c 100644
--- a/test/test-eel-image-table.c
+++ b/test/test-eel-image-table.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <gtk/gtk.h>
 
-#include "../eel/eel-image-table.h"
+#include <eel/eel-image-table.h>
 
 #include "test.h"
 
diff --git a/test/test-eel-labeled-image.c b/test/test-eel-labeled-image.c
index b9dd9cd7..22e66a00 100644
--- a/test/test-eel-labeled-image.c
+++ b/test/test-eel-labeled-image.c
@@ -1,4 +1,4 @@
-#include "../eel/eel-labeled-image.h"
+#include <eel/eel-labeled-image.h>
 
 #include "test.h"
 
diff --git a/test/test-eel-pixbuf-scale.c b/test/test-eel-pixbuf-scale.c
index 22999f03..c2abe307 100644
--- a/test/test-eel-pixbuf-scale.c
+++ b/test/test-eel-pixbuf-scale.c
@@ -1,6 +1,6 @@
 #include <sys/time.h>
 
-#include "../eel/eel-gdk-pixbuf-extensions.h"
+#include <eel/eel-gdk-pixbuf-extensions.h>
 
 #include "test.h"
 
diff --git a/test/test.h b/test/test.h
index d9191ff9..2dbe3ae6 100644
--- a/test/test.h
+++ b/test/test.h
@@ -5,9 +5,9 @@
 
 #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);