summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/caja-application.c30
-rw-r--r--src/caja-application.h2
-rw-r--r--src/caja-autorun-software.c4
-rw-r--r--src/caja-bookmark-list.c6
-rw-r--r--src/caja-bookmark-list.h2
-rw-r--r--src/caja-bookmarks-window.c6
-rw-r--r--src/caja-connect-server-dialog-main.c6
-rw-r--r--src/caja-connect-server-dialog-nonmain.c2
-rw-r--r--src/caja-connect-server-dialog.c6
-rw-r--r--src/caja-desktop-window.c8
-rw-r--r--src/caja-emblem-sidebar.c26
-rw-r--r--src/caja-file-management-properties-main.c4
-rw-r--r--src/caja-file-management-properties.c16
-rw-r--r--src/caja-freedesktop-dbus.c2
-rw-r--r--src/caja-history-sidebar.c18
-rw-r--r--src/caja-history-sidebar.h4
-rw-r--r--src/caja-image-properties-page.c6
-rw-r--r--src/caja-information-panel.c36
-rw-r--r--src/caja-information-panel.h2
-rw-r--r--src/caja-location-bar.c18
-rw-r--r--src/caja-location-bar.h2
-rw-r--r--src/caja-location-dialog.c6
-rw-r--r--src/caja-location-entry.c18
-rw-r--r--src/caja-location-entry.h2
-rw-r--r--src/caja-main.c14
-rw-r--r--src/caja-navigation-action.c2
-rw-r--r--src/caja-navigation-window-menus.c20
-rw-r--r--src/caja-navigation-window-pane.c10
-rw-r--r--src/caja-navigation-window-slot.c6
-rw-r--r--src/caja-navigation-window.c36
-rw-r--r--src/caja-navigation-window.h6
-rw-r--r--src/caja-notebook.c2
-rw-r--r--src/caja-notes-viewer.c28
-rw-r--r--src/caja-notes-viewer.h4
-rw-r--r--src/caja-pathbar.c14
-rw-r--r--src/caja-places-sidebar.c42
-rw-r--r--src/caja-places-sidebar.h4
-rw-r--r--src/caja-property-browser.c36
-rw-r--r--src/caja-query-editor.c8
-rw-r--r--src/caja-query-editor.h4
-rw-r--r--src/caja-search-bar.c4
-rw-r--r--src/caja-search-bar.h2
-rw-r--r--src/caja-side-pane.c6
-rw-r--r--src/caja-sidebar-title.c20
-rw-r--r--src/caja-sidebar-title.h4
-rw-r--r--src/caja-spatial-window.c30
-rw-r--r--src/caja-trash-bar.c8
-rw-r--r--src/caja-view-as-action.c4
-rw-r--r--src/caja-window-bookmarks.c8
-rw-r--r--src/caja-window-bookmarks.h2
-rw-r--r--src/caja-window-manage-views.c54
-rw-r--r--src/caja-window-menus.c26
-rw-r--r--src/caja-window-pane.c2
-rw-r--r--src/caja-window-private.h2
-rw-r--r--src/caja-window-slot.c10
-rw-r--r--src/caja-window-toolbars.c22
-rw-r--r--src/caja-window.c28
-rw-r--r--src/caja-window.h10
-rw-r--r--src/caja-x-content-bar.c4
-rw-r--r--src/caja-zoom-action.c2
-rw-r--r--src/caja-zoom-control.c12
-rw-r--r--src/caja-zoom-control.h2
-rw-r--r--src/file-manager/fm-desktop-icon-view.c36
-rw-r--r--src/file-manager/fm-directory-view.c78
-rw-r--r--src/file-manager/fm-directory-view.h18
-rw-r--r--src/file-manager/fm-ditem-page.c10
-rw-r--r--src/file-manager/fm-empty-view.c12
-rw-r--r--src/file-manager/fm-error-reporting.c8
-rw-r--r--src/file-manager/fm-error-reporting.h2
-rw-r--r--src/file-manager/fm-icon-container.c10
-rw-r--r--src/file-manager/fm-icon-container.h2
-rw-r--r--src/file-manager/fm-icon-view.c44
-rw-r--r--src/file-manager/fm-list-model.c6
-rw-r--r--src/file-manager/fm-list-model.h6
-rw-r--r--src/file-manager/fm-list-view.c52
-rw-r--r--src/file-manager/fm-properties-window.c48
-rw-r--r--src/file-manager/fm-properties-window.h2
-rw-r--r--src/file-manager/fm-tree-model.c8
-rw-r--r--src/file-manager/fm-tree-model.h2
-rw-r--r--src/file-manager/fm-tree-view.c44
80 files changed, 559 insertions, 559 deletions
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"