local #include files inside "" instead <>

80 files changed, 902 insertions, 753 deletions

diff --git a/src/caja-application.c b/src/caja-application.c
index 666bb9ed..85285304 100644
--- a/src/caja-application.c
+++ b/src/caja-application.c
@@ -27,15 +27,48 @@
  */
 
 #include <config.h>
-#include "caja-application.h"
+#include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
 
+#include <libxml/xmlsave.h>
+#include <glib/gstdio.h>
+#include <glib/gi18n.h>
+#include <gio/gio.h>
+#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
+#include <libnotify/notify.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#define MATE_DESKTOP_USE_UNSTABLE_API
+#include <libmate-desktop/mate-bg.h>
+
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-stock-dialogs.h"
+
+#include "../libcaja-private/caja-debug-log.h"
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-lib-self-check-functions.h"
+#include "../libcaja-private/caja-extensions.h"
+#include "../libcaja-private/caja-module.h"
+#include "../libcaja-private/caja-desktop-link-monitor.h"
+#include "../libcaja-private/caja-directory-private.h"
+#include "../libcaja-private/caja-signaller.h"
+#include "../libcaja-extension/caja-menu-provider.h"
+#include "../libcaja-private/caja-autorun.h"
+
+#if ENABLE_EMPTY_VIEW
+#include "file-manager/fm-empty-view.h"
+#endif /* ENABLE_EMPTY_VIEW */
 #include "file-manager/fm-desktop-icon-view.h"
 #include "file-manager/fm-icon-view.h"
 #include "file-manager/fm-list-view.h"
 #include "file-manager/fm-tree-view.h"
-#if ENABLE_EMPTY_VIEW
-#include "file-manager/fm-empty-view.h"
-#endif /* ENABLE_EMPTY_VIEW */
+
+#include "caja-application.h"
 #include "caja-information-panel.h"
 #include "caja-history-sidebar.h"
 #include "caja-places-sidebar.h"
@@ -43,9 +76,6 @@
 #include "caja-notes-viewer.h"
 #include "caja-emblem-sidebar.h"
 #include "caja-image-properties-page.h"
-#include <fcntl.h>
-#include <string.h>
-#include <unistd.h>
 #include "caja-desktop-window.h"
 #include "caja-spatial-window.h"
 #include "caja-navigation-window.h"
@@ -56,33 +86,6 @@
 #include "caja-window-private.h"
 #include "caja-window-manage-views.h"
 #include "caja-freedesktop-dbus.h"
-#include <libxml/xmlsave.h>
-#include <glib/gstdio.h>
-#include <glib/gi18n.h>
-#include <gio/gio.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-stock-dialogs.h>
-#include <gdk/gdkx.h>
-#include <gtk/gtk.h>
-#include <libnotify/notify.h>
-#include <libcaja-private/caja-debug-log.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-lib-self-check-functions.h>
-#include <libcaja-private/caja-extensions.h>
-#include <libcaja-private/caja-module.h>
-#include <libcaja-private/caja-desktop-link-monitor.h>
-#include <libcaja-private/caja-directory-private.h>
-#include <libcaja-private/caja-signaller.h>
-#include <libcaja-extension/caja-menu-provider.h>
-#include <libcaja-private/caja-autorun.h>
-#define MATE_DESKTOP_USE_UNSTABLE_API
-#include <libmate-desktop/mate-bg.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 
 /* Keep window from shrinking down ridiculously small; numbers are somewhat arbitrary */
 #define APPLICATION_WINDOW_MIN_WIDTH	300
diff --git a/src/caja-application.h b/src/caja-application.h
index 7c72bb61..feb0fb98 100644
--- a/src/caja-application.h
+++ b/src/caja-application.h
@@ -32,7 +32,7 @@
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
-#include <libegg/eggsmclient.h>
+#include "../libegg/eggsmclient.h"
 
 #define CAJA_DESKTOP_ICON_VIEW_IID "OAFIID:Caja_File_Manager_Desktop_Icon_View"
 
diff --git a/src/caja-autorun-software.c b/src/caja-autorun-software.c
index 4e24fa80..019cb5c6 100644
--- a/src/caja-autorun-software.c
+++ b/src/caja-autorun-software.c
@@ -24,18 +24,17 @@
 
 
 #include <config.h>
-
 #include <unistd.h>
 #include <string.h>
 #include <time.h>
 #include <errno.h>
+
 #include <gtk/gtk.h>
 #include <gio/gio.h>
-
 #include <glib/gi18n.h>
 
-#include <libcaja-private/caja-module.h>
-#include <libcaja-private/caja-icon-info.h>
+#include "../libcaja-private/caja-module.h"
+#include "../libcaja-private/caja-icon-info.h"
 
 typedef struct
 {
diff --git a/src/caja-bookmark-list.c b/src/caja-bookmark-list.c
index a8a2adb2..33beaef9 100644
--- a/src/caja-bookmark-list.c
+++ b/src/caja-bookmark-list.c
@@ -26,14 +26,15 @@
  */
 
 #include <config.h>
-#include "caja-bookmark-list.h"
-
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-icon-names.h>
+#include <string.h>
 
 #include <gio/gio.h>
-#include <string.h>
+
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-file.h"
+#include "../libcaja-private/caja-icon-names.h"
+
+#include "caja-bookmark-list.h"
 
 #define LOAD_JOB 1
 #define SAVE_JOB 2
diff --git a/src/caja-bookmark-list.h b/src/caja-bookmark-list.h
index abe420a3..fe232bde 100644
--- a/src/caja-bookmark-list.h
+++ b/src/caja-bookmark-list.h
@@ -28,9 +28,10 @@
 #ifndef CAJA_BOOKMARK_LIST_H
 #define CAJA_BOOKMARK_LIST_H
 
-#include <libcaja-private/caja-bookmark.h>
 #include <gio/gio.h>
 
+#include "../libcaja-private/caja-bookmark.h"
+
 typedef struct CajaBookmarkList CajaBookmarkList;
 typedef struct CajaBookmarkListClass CajaBookmarkListClass;
 
diff --git a/src/caja-bookmarks-window.c b/src/caja-bookmarks-window.c
index b5ac38b8..1bc023e8 100644
--- a/src/caja-bookmarks-window.c
+++ b/src/caja-bookmarks-window.c
@@ -26,16 +26,20 @@
  */
 
 #include <config.h>
+#include <cairo-gobject.h>
+
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-mate-extensions.h"
+
+#include "../libcaja-private/caja-global-preferences.h"
+
 #include "caja-bookmarks-window.h"
 #include "caja-window.h"
 #include "caja-navigation-window.h"
 #include "caja-spatial-window.h"
-#include <libcaja-private/caja-global-preferences.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-mate-extensions.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#include <cairo-gobject.h>
 
 /* Static variables to keep track of window state. If there were
  * more than one bookmark-editing window, these would be struct or
diff --git a/src/caja-connect-server-dialog-main.c b/src/caja-connect-server-dialog-main.c
index c2936747..2d646c67 100644
--- a/src/caja-connect-server-dialog-main.c
+++ b/src/caja-connect-server-dialog-main.c
@@ -26,18 +26,16 @@
  */
 
 #include <config.h>
+#include <stdlib.h>
 
 #include <glib/gi18n.h>
-
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 
-#include <stdlib.h>
-
-#include <eel/eel-stock-dialogs.h>
+#include "../eel/eel-stock-dialogs.h"
 
-#include <libcaja-private/caja-icon-names.h>
-#include <libcaja-private/caja-global-preferences.h>
+#include "../libcaja-private/caja-icon-names.h"
+#include "../libcaja-private/caja-global-preferences.h"
 
 #include "caja-connect-server-dialog.h"
 
diff --git a/src/caja-connect-server-dialog-nonmain.c b/src/caja-connect-server-dialog-nonmain.c
index e08dfd3d..3948baba 100644
--- a/src/caja-connect-server-dialog-nonmain.c
+++ b/src/caja-connect-server-dialog-nonmain.c
@@ -22,9 +22,12 @@
  */
 
 #include <config.h>
+
 #include <gio/gio.h>
+
+#include "../libcaja-private/caja-global-preferences.h"
+
 #include "caja-connect-server-dialog.h"
-#include <libcaja-private/caja-global-preferences.h>
 
 /* This file contains the glue for the calls from the connect to server dialog
  * to the main caja binary. A different version of this glue is in
diff --git a/src/caja-connect-server-dialog.c b/src/caja-connect-server-dialog.c
index c08ae9d2..6e36e3d0 100644
--- a/src/caja-connect-server-dialog.c
+++ b/src/caja-connect-server-dialog.c
@@ -23,23 +23,23 @@
  */
 
 #include <config.h>
-
-#include "caja-connect-server-dialog.h"
-
 #include <string.h>
-#include <eel/eel-stock-dialogs.h>
+
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
+#include "../eel/eel-stock-dialogs.h"
+
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-icon-names.h"
+
+#include "caja-connect-server-dialog.h"
 #include "caja-application.h"
 #include "caja-bookmark-list.h"
 #include "caja-connect-server-operation.h"
 #include "caja-window.h"
 
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-icon-names.h>
-
 /* TODO:
  * - name entry + pre-fill
  * - NetworkManager integration
diff --git a/src/caja-desktop-window.c b/src/caja-desktop-window.c
index 50305b97..6b4af389 100644
--- a/src/caja-desktop-window.c
+++ b/src/caja-desktop-window.c
@@ -23,19 +23,22 @@
  */
 
 #include <config.h>
-#include "caja-desktop-window.h"
-#include "caja-window-private.h"
-#include "caja-actions.h"
 
 #include <X11/Xatom.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
-#include <eel/eel-background.h>
-#include <eel/eel-vfs-extensions.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-icon-names.h>
 #include <gio/gio.h>
-#include <glib/gi18n.h>    
+#include <glib/gi18n.h>
+
+#include "../eel/eel-background.h"
+#include "../eel/eel-vfs-extensions.h"
+
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-icon-names.h"
+
+#include "caja-desktop-window.h"
+#include "caja-window-private.h"
+#include "caja-actions.h"
 
 /* Tell screen readers that this is a desktop window */
 
diff --git a/src/caja-emblem-sidebar.c b/src/caja-emblem-sidebar.c
index 03767d54..8c05963e 100644
--- a/src/caja-emblem-sidebar.c
+++ b/src/caja-emblem-sidebar.c
@@ -29,24 +29,27 @@
  */
 
 #include <config.h>
-#include "caja-emblem-sidebar.h"
-
 #include <stdio.h>
-#include <eel/eel-wrap-table.h>
-#include <eel/eel-labeled-image.h>
-#include <eel/eel-graphic-effects.h>
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-gtk-extensions.h>
+
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libcaja-private/caja-icon-dnd.h>
-#include <libcaja-private/caja-emblem-utils.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-sidebar-provider.h>
-#include <libcaja-private/caja-module.h>
-#include <libcaja-private/caja-signaller.h>
+
+#include "../eel/eel-wrap-table.h"
+#include "../eel/eel-labeled-image.h"
+#include "../eel/eel-graphic-effects.h"
+#include "../eel/eel-gdk-pixbuf-extensions.h"
+#include "../eel/eel-stock-dialogs.h"
+#include "../eel/eel-gtk-extensions.h"
+
+#include "../libcaja-private/caja-icon-dnd.h"
+#include "../libcaja-private/caja-emblem-utils.h"
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-sidebar-provider.h"
+#include "../libcaja-private/caja-module.h"
+#include "../libcaja-private/caja-signaller.h"
+
+#include "caja-emblem-sidebar.h"
 
 struct CajaEmblemSidebarDetails
 {
diff --git a/src/caja-file-management-properties-main.c b/src/caja-file-management-properties-main.c
index b2b79552..5cdebdcf 100644
--- a/src/caja-file-management-properties-main.c
+++ b/src/caja-file-management-properties-main.c
@@ -27,8 +27,8 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-module.h>
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-module.h"
 
 #include "caja-file-management-properties.h"
 
diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c
index 7f540707..430642e7 100644
--- a/src/caja-file-management-properties.c
+++ b/src/caja-file-management-properties.c
@@ -23,27 +23,25 @@
 */
 
 #include <config.h>
-
-#include "caja-file-management-properties.h"
-
 #include <string.h>
 #include <time.h>
+
 #include <gtk/gtk.h>
 #include <gio/gio.h>
-
 #include <glib/gi18n.h>
 
-#include <eel/eel-glib-extensions.h>
+#include "../eel/eel-glib-extensions.h"
 
-#include <libcaja-private/caja-column-chooser.h>
-#include <libcaja-private/caja-column-utilities.h>
-#include <libcaja-private/caja-extensions.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-module.h>
+#include "../libcaja-private/caja-column-chooser.h"
+#include "../libcaja-private/caja-column-utilities.h"
+#include "../libcaja-private/caja-extensions.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-module.h"
+#include "../libcaja-private/caja-autorun.h"
 
-#include <libcaja-private/caja-autorun.h>
+#include "../libcaja-extension/caja-configurable.h"
 
-#include <libcaja-extension/caja-configurable.h>
+#include "caja-file-management-properties.h"
 
 /* string enum preferences */
 #define CAJA_FILE_MANAGEMENT_PROPERTIES_DEFAULT_VIEW_WIDGET "default_view_combobox"
diff --git a/src/caja-freedesktop-dbus.c b/src/caja-freedesktop-dbus.c
index 28544f63..849e0a66 100644
--- a/src/caja-freedesktop-dbus.c
+++ b/src/caja-freedesktop-dbus.c
@@ -23,15 +23,15 @@
 
 #include <config.h>
 
-#include "caja-application.h"
-#include "caja-freedesktop-dbus.h"
-#include "caja-freedesktop-generated.h"
+#include <gio/gio.h>
 
-#include <libcaja-private/caja-debug-log.h>
+#include "../libcaja-private/caja-debug-log.h"
 
 #include "file-manager/fm-properties-window.h"
 
-#include <gio/gio.h>
+#include "caja-application.h"
+#include "caja-freedesktop-dbus.h"
+#include "caja-freedesktop-generated.h"
 
 struct _CajaFreedesktopDBus {
     GObject parent;
diff --git a/src/caja-history-sidebar.c b/src/caja-history-sidebar.c
index 2b6ddd92..fe224ed6 100644
--- a/src/caja-history-sidebar.c
+++ b/src/caja-history-sidebar.c
@@ -27,17 +27,19 @@
 
 #include <config.h>
 
-#include <eel/eel-gtk-extensions.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <cairo-gobject.h>
-#include <libcaja-private/caja-bookmark.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-sidebar-provider.h>
-#include <libcaja-private/caja-module.h>
-#include <libcaja-private/caja-signaller.h>
-#include <libcaja-private/caja-window-info.h>
-#include <libcaja-private/caja-window-slot-info.h>
+
+#include "../eel/eel-gtk-extensions.h"
+
+#include "../libcaja-private/caja-bookmark.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-sidebar-provider.h"
+#include "../libcaja-private/caja-module.h"
+#include "../libcaja-private/caja-signaller.h"
+#include "../libcaja-private/caja-window-info.h"
+#include "../libcaja-private/caja-window-slot-info.h"
 
 #include "caja-history-sidebar.h"
 
diff --git a/src/caja-history-sidebar.h b/src/caja-history-sidebar.h
index 45740e24..3c09564a 100644
--- a/src/caja-history-sidebar.h
+++ b/src/caja-history-sidebar.h
@@ -28,8 +28,9 @@
 #define _CAJA_HISTORY_SIDEBAR_H
 
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-view.h>
-#include <libcaja-private/caja-window-info.h>
+
+#include "../libcaja-private/caja-view.h"
+#include "../libcaja-private/caja-window-info.h"
 
 #define CAJA_HISTORY_SIDEBAR_ID    "history"
 
diff --git a/src/caja-image-properties-page.c b/src/caja-image-properties-page.c
index 8a6078e2..0234cedc 100644
--- a/src/caja-image-properties-page.c
+++ b/src/caja-image-properties-page.c
@@ -24,16 +24,11 @@
  */
 
 #include <config.h>
-#include "caja-image-properties-page.h"
+#include <string.h>
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include <eel/eel-vfs-extensions.h>
-#include <libcaja-extension/caja-property-page-provider.h>
-#include <libcaja-private/caja-module.h>
-#include <string.h>
-
 #ifdef HAVE_EXIF
 #include <libexif/exif-data.h>
 #include <libexif/exif-ifd.h>
@@ -44,6 +39,13 @@
 #include <exempi/xmpconsts.h>
 #endif /*HAVE_EXEMPI*/
 
+#include "../eel/eel-vfs-extensions.h"
+
+#include "../libcaja-extension/caja-property-page-provider.h"
+#include "../libcaja-private/caja-module.h"
+
+#include "caja-image-properties-page.h"
+
 #define LOAD_BUFFER_SIZE 8192
 
 struct _CajaImagePropertiesPagePrivate
diff --git a/src/caja-information-panel.c b/src/caja-information-panel.c
index d4a22df4..e1d0fe73 100644
--- a/src/caja-information-panel.c
+++ b/src/caja-information-panel.c
@@ -24,30 +24,32 @@
  */
 
 #include <config.h>
-#include "caja-information-panel.h"
-
-#include "caja-sidebar-title.h"
 
-#include <eel/eel-background.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
-#include <eel/eel-vfs-extensions.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libcaja-private/caja-dnd.h>
-#include <libcaja-private/caja-directory.h>
-#include <libcaja-private/caja-file-dnd.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-keep-last-vertical-box.h>
-#include <libcaja-private/caja-metadata.h>
-#include <libcaja-private/caja-mime-actions.h>
-#include <libcaja-private/caja-program-choosing.h>
-#include <libcaja-private/caja-sidebar-provider.h>
-#include <libcaja-private/caja-module.h>
+
+#include "../eel/eel-background.h"
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-stock-dialogs.h"
+#include "../eel/eel-string.h"
+#include "../eel/eel-vfs-extensions.h"
+
+#include "../libcaja-private/caja-dnd.h"
+#include "../libcaja-private/caja-directory.h"
+#include "../libcaja-private/caja-file-dnd.h"
+#include "../libcaja-private/caja-file.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-keep-last-vertical-box.h"
+#include "../libcaja-private/caja-metadata.h"
+#include "../libcaja-private/caja-mime-actions.h"
+#include "../libcaja-private/caja-program-choosing.h"
+#include "../libcaja-private/caja-sidebar-provider.h"
+#include "../libcaja-private/caja-module.h"
+
+#include "caja-information-panel.h"
+#include "caja-sidebar-title.h"
 
 struct _CajaInformationPanelPrivate
 {
diff --git a/src/caja-information-panel.h b/src/caja-information-panel.h
index 5ccdd9d6..94d605d3 100644
--- a/src/caja-information-panel.h
+++ b/src/caja-information-panel.h
@@ -28,7 +28,7 @@
 #ifndef CAJA_INFORMATION_PANEL_H
 #define CAJA_INFORMATION_PANEL_H
 
-#include <eel/eel-background-box.h>
+#include "../eel/eel-background-box.h"
 
 #define CAJA_TYPE_INFORMATION_PANEL caja_information_panel_get_type()
 #define CAJA_INFORMATION_PANEL(obj) \
diff --git a/src/caja-location-bar.c b/src/caja-location-bar.c
index 7763f40b..a0f9500a 100644
--- a/src/caja-location-bar.c
+++ b/src/caja-location-bar.c
@@ -31,25 +31,28 @@
  */
 
 #include <config.h>
-#include "caja-location-bar.h"
+#include <stdio.h>
+#include <string.h>
+
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+
+#include "../eel/eel-accessibility.h"
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-stock-dialogs.h"
+#include "../eel/eel-string.h"
+#include "../eel/eel-vfs-extensions.h"
 
+#include "../libcaja-private/caja-icon-dnd.h"
+#include "../libcaja-private/caja-clipboard.h"
+
+#include "caja-location-bar.h"
 #include "caja-location-entry.h"
 #include "caja-window-private.h"
 #include "caja-window.h"
 #include "caja-navigation-window-pane.h"
-#include <eel/eel-accessibility.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
-#include <eel/eel-vfs-extensions.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <libcaja-private/caja-icon-dnd.h>
-#include <libcaja-private/caja-clipboard.h>
-#include <stdio.h>
-#include <string.h>
 
 #define CAJA_DND_URI_LIST_TYPE 	  "text/uri-list"
 #define CAJA_DND_TEXT_PLAIN_TYPE 	  "text/plain"
diff --git a/src/caja-location-bar.h b/src/caja-location-bar.h
index 628f2f4b..5b6b56e0 100644
--- a/src/caja-location-bar.h
+++ b/src/caja-location-bar.h
@@ -30,10 +30,12 @@
 #ifndef CAJA_LOCATION_BAR_H
 #define CAJA_LOCATION_BAR_H
 
+#include <gtk/gtk.h>
+
+#include "../libcaja-private/caja-entry.h"
+
 #include "caja-navigation-window.h"
 #include "caja-navigation-window-pane.h"
-#include <libcaja-private/caja-entry.h>
-#include <gtk/gtk.h>
 
 #define CAJA_TYPE_LOCATION_BAR caja_location_bar_get_type()
 #define CAJA_LOCATION_BAR(obj) \
diff --git a/src/caja-location-dialog.c b/src/caja-location-dialog.c
index e207a1ef..a341b48b 100644
--- a/src/caja-location-dialog.c
+++ b/src/caja-location-dialog.c
@@ -22,15 +22,18 @@
  */
 
 #include <config.h>
-#include "caja-location-dialog.h"
 
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-stock-dialogs.h>
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-file-utilities.h>
+#include <glib/gi18n.h>
+
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-stock-dialogs.h"
+
+#include "../libcaja-private/caja-file-utilities.h"
+
+#include "caja-location-dialog.h"
 #include "caja-location-entry.h"
 #include "caja-desktop-window.h"
-#include <glib/gi18n.h>
 
 struct _CajaLocationDialogDetails
 {
diff --git a/src/caja-location-entry.c b/src/caja-location-entry.c
index fef9902c..4cfa7c22 100644
--- a/src/caja-location-entry.c
+++ b/src/caja-location-entry.c
@@ -31,24 +31,27 @@
  */
 
 #include <config.h>
-#include "caja-location-entry.h"
+#include <stdio.h>
+#include <string.h>
 
-#include "caja-window-private.h"
-#include "caja-window.h"
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-entry.h>
-#include <libcaja-private/caja-icon-dnd.h>
-#include <libcaja-private/caja-clipboard.h>
-#include <stdio.h>
-#include <string.h>
+
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-stock-dialogs.h"
+#include "../eel/eel-string.h"
+
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-entry.h"
+#include "../libcaja-private/caja-icon-dnd.h"
+#include "../libcaja-private/caja-clipboard.h"
+
+#include "caja-location-entry.h"
+#include "caja-window-private.h"
+#include "caja-window.h"
 
 struct CajaLocationEntryDetails
 {
diff --git a/src/caja-location-entry.h b/src/caja-location-entry.h
index cac45553..3d0aad56 100644
--- a/src/caja-location-entry.h
+++ b/src/caja-location-entry.h
@@ -27,7 +27,7 @@
 #ifndef CAJA_LOCATION_ENTRY_H
 #define CAJA_LOCATION_ENTRY_H
 
-#include <libcaja-private/caja-entry.h>
+#include "../libcaja-private/caja-entry.h"
 
 #define CAJA_TYPE_LOCATION_ENTRY caja_location_entry_get_type()
 #define CAJA_LOCATION_ENTRY(obj) \
diff --git a/src/caja-main.c b/src/caja-main.c
index a6e296ff..10914246 100644
--- a/src/caja-main.c
+++ b/src/caja-main.c
@@ -28,35 +28,38 @@
 /* caja-main.c: Implementation of the routines that drive program lifecycle and main window creation/destruction. */
 
 #include <config.h>
-#include "caja-window.h"
 #include <dlfcn.h>
 #include <signal.h>
-#include <eel/eel-debug.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-self-checks.h>
-#include <libegg/eggdesktopfile.h>
-#include <gdk/gdkx.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <gio/gdesktopappinfo.h>
-#include <libcaja-private/caja-debug-log.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-icon-names.h>
-#include <libxml/parser.h>
 #ifdef HAVE_LOCALE_H
-	#include <locale.h>
+#include <locale.h>
 #endif
 #ifdef HAVE_MALLOC_H
-	#include <malloc.h>
+#include <malloc.h>
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <gio/gdesktopappinfo.h>
+#include <libxml/parser.h>
 #ifdef HAVE_EXEMPI
-	#include <exempi/xmp.h>
+#include <exempi/xmp.h>
 #endif
 
+#include "../eel/eel-debug.h"
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-self-checks.h"
+
+#include "../libcaja-private/caja-debug-log.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-icon-names.h"
+
+#include "../libegg/eggdesktopfile.h"
+
+#include "caja-window.h"
 
 static void dump_debug_log (void)
 {
diff --git a/src/caja-navigation-action.c b/src/caja-navigation-action.c
index 6acc8eac..fe7719b6 100644
--- a/src/caja-navigation-action.c
+++ b/src/caja-navigation-action.c
@@ -29,12 +29,14 @@
 
 #include <config.h>
 
+#include <gtk/gtk.h>
+
+#include "../eel/eel-gtk-extensions.h"
+
 #include "caja-navigation-action.h"
 #include "caja-navigation-window.h"
 #include "caja-window-private.h"
 #include "caja-navigation-window-slot.h"
-#include <gtk/gtk.h>
-#include <eel/eel-gtk-extensions.h>
 
 static void caja_navigation_action_init       (CajaNavigationAction *action);
 static void caja_navigation_action_class_init (CajaNavigationActionClass *class);
diff --git a/src/caja-navigation-window-menus.c b/src/caja-navigation-window-menus.c
index abf59b1f..0769119c 100644
--- a/src/caja-navigation-window-menus.c
+++ b/src/caja-navigation-window-menus.c
@@ -26,9 +26,23 @@
  *                           split into separate file just for convenience.
  */
 #include <config.h>
-
 #include <locale.h>
 
+#include <libxml/parser.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-mate-extensions.h"
+#include "../eel/eel-stock-dialogs.h"
+#include "../eel/eel-string.h"
+
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-ui-utilities.h"
+#include "../libcaja-private/caja-search-engine.h"
+#include "../libcaja-private/caja-signaller.h"
+
 #include "caja-actions.h"
 #include "caja-notebook.h"
 #include "caja-navigation-action.h"
@@ -43,18 +57,6 @@
 #include "caja-window-private.h"
 #include "caja-window-bookmarks.h"
 #include "caja-navigation-window-pane.h"
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-mate-extensions.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
-#include <libxml/parser.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-ui-utilities.h>
-#include <libcaja-private/caja-search-engine.h>
-#include <libcaja-private/caja-signaller.h>
 
 #define MENU_PATH_HISTORY_PLACEHOLDER			"/MenuBar/Other Menus/Go/History Placeholder"
 
diff --git a/src/caja-navigation-window-pane.c b/src/caja-navigation-window-pane.c
index 71d666a5..8c9c97be 100644
--- a/src/caja-navigation-window-pane.c
+++ b/src/caja-navigation-window-pane.c
@@ -22,6 +22,13 @@
    Author: Holger Berndt <[email protected]>
 */
 
+#include "../eel/eel-gtk-extensions.h"
+
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-window-slot-info.h"
+#include "../libcaja-private/caja-view-factory.h"
+#include "../libcaja-private/caja-entry.h"
+
 #include "caja-navigation-window-pane.h"
 #include "caja-window-private.h"
 #include "caja-window-manage-views.h"
@@ -30,14 +37,6 @@
 #include "caja-notebook.h"
 #include "caja-window-slot.h"
 
-#include <eel/eel-gtk-extensions.h>
-
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-window-slot-info.h>
-#include <libcaja-private/caja-view-factory.h>
-#include <libcaja-private/caja-entry.h>
-
-
 static void caja_navigation_window_pane_init       (CajaNavigationWindowPane *pane);
 static void caja_navigation_window_pane_class_init (CajaNavigationWindowPaneClass *class);
 static void caja_navigation_window_pane_dispose    (GObject *object);
diff --git a/src/caja-navigation-window-slot.c b/src/caja-navigation-window-slot.c
index 4b3cb461..d38b4ed0 100644
--- a/src/caja-navigation-window-slot.c
+++ b/src/caja-navigation-window-slot.c
@@ -22,14 +22,16 @@
    Author: Christian Neumair <[email protected]>
 */
 
+#include "../eel/eel-gtk-macros.h"
+
+#include "../libcaja-private/caja-window-slot-info.h"
+#include "../libcaja-private/caja-file.h"
+
 #include "caja-window-slot.h"
 #include "caja-navigation-window-slot.h"
 #include "caja-window-private.h"
 #include "caja-search-bar.h"
 #include "caja-navigation-window-pane.h"
-#include <libcaja-private/caja-window-slot-info.h>
-#include <libcaja-private/caja-file.h>
-#include <eel/eel-gtk-macros.h>
 
 static void caja_navigation_window_slot_init       (CajaNavigationWindowSlot *slot);
 static void caja_navigation_window_slot_class_init (CajaNavigationWindowSlotClass *class);
diff --git a/src/caja-navigation-window.c b/src/caja-navigation-window.c
index 9bef3cc2..b0d3dd00 100644
--- a/src/caja-navigation-window.c
+++ b/src/caja-navigation-window.c
@@ -29,8 +29,38 @@
 /* caja-window.c: Implementation of the main window object */
 
 #include <config.h>
-#include "caja-window-private.h"
+#include <math.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#ifdef HAVE_X11_XF86KEYSYM_H
+#include <X11/XF86keysym.h>
+#endif
+#include <sys/time.h>
 
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-string.h"
+
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-file-attributes.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-icon-info.h"
+#include "../libcaja-private/caja-metadata.h"
+#include "../libcaja-private/caja-mime-actions.h"
+#include "../libcaja-private/caja-program-choosing.h"
+#include "../libcaja-private/caja-sidebar.h"
+#include "../libcaja-private/caja-view-factory.h"
+#include "../libcaja-private/caja-clipboard.h"
+#include "../libcaja-private/caja-module.h"
+#include "../libcaja-private/caja-sidebar-provider.h"
+#include "../libcaja-private/caja-search-directory.h"
+#include "../libcaja-private/caja-signaller.h"
+
+#include "caja-navigation-window.h"
+#include "caja-window-private.h"
 #include "caja-actions.h"
 #include "caja-application.h"
 #include "caja-bookmarks-window.h"
@@ -41,32 +71,6 @@
 #include "caja-notebook.h"
 #include "caja-window-manage-views.h"
 #include "caja-navigation-window-pane.h"
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-string.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk/gdkx.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#ifdef HAVE_X11_XF86KEYSYM_H
-#include <X11/XF86keysym.h>
-#endif
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-file-attributes.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-icon-info.h>
-#include <libcaja-private/caja-metadata.h>
-#include <libcaja-private/caja-mime-actions.h>
-#include <libcaja-private/caja-program-choosing.h>
-#include <libcaja-private/caja-sidebar.h>
-#include <libcaja-private/caja-view-factory.h>
-#include <libcaja-private/caja-clipboard.h>
-#include <libcaja-private/caja-module.h>
-#include <libcaja-private/caja-sidebar-provider.h>
-#include <libcaja-private/caja-search-directory.h>
-#include <libcaja-private/caja-signaller.h>
-#include <math.h>
-#include <sys/time.h>
 
 #define MAX_TITLE_LENGTH 180
 
diff --git a/src/caja-navigation-window.h b/src/caja-navigation-window.h
index abc2591d..6bd3ce45 100644
--- a/src/caja-navigation-window.h
+++ b/src/caja-navigation-window.h
@@ -31,9 +31,12 @@
 #define CAJA_NAVIGATION_WINDOW_H
 
 #include <gtk/gtk.h>
-#include <eel/eel-glib-extensions.h>
-#include <libcaja-private/caja-bookmark.h>
-#include <libcaja-private/caja-sidebar.h>
+
+#include "../eel/eel-glib-extensions.h"
+
+#include "../libcaja-private/caja-bookmark.h"
+#include "../libcaja-private/caja-sidebar.h"
+
 #include "caja-application.h"
 #include "caja-information-panel.h"
 #include "caja-side-pane.h"
diff --git a/src/caja-notebook.c b/src/caja-notebook.c
index 751e6161..8bdaab8e 100644
--- a/src/caja-notebook.c
+++ b/src/caja-notebook.c
@@ -24,7 +24,13 @@
  *
  */
 
-#include "config.h"
+#include <config.h>
+
+#include <glib/gi18n.h>
+#include <gio/gio.h>
+#include <gtk/gtk.h>
+
+#include "../libcaja-private/caja-dnd.h"
 
 #include "caja-notebook.h"
 #include "caja-navigation-window.h"
@@ -32,11 +38,6 @@
 #include "caja-window-private.h"
 #include "caja-window-slot.h"
 #include "caja-navigation-window-pane.h"
-#include <libcaja-private/caja-dnd.h>
-
-#include <glib/gi18n.h>
-#include <gio/gio.h>
-#include <gtk/gtk.h>
 
 #define AFTER_ALL_TABS -1
 
diff --git a/src/caja-notes-viewer.c b/src/caja-notes-viewer.c
index 46ffdeae..842a6fed 100644
--- a/src/caja-notes-viewer.c
+++ b/src/caja-notes-viewer.c
@@ -27,23 +27,25 @@
 
 #include <config.h>
 
-#include "caja-notes-viewer.h"
-
-#include <eel/eel-debug.h>
-#include <eel/eel-gtk-extensions.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libcaja-private/caja-file-attributes.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-metadata.h>
-#include <libcaja-private/caja-clipboard.h>
-#include <libcaja-private/caja-module.h>
-#include <libcaja-private/caja-sidebar-provider.h>
-#include <libcaja-private/caja-window-info.h>
-#include <libcaja-private/caja-window-slot-info.h>
-#include <libcaja-extension/caja-property-page-provider.h>
+
+#include "../eel/eel-debug.h"
+#include "../eel/eel-gtk-extensions.h"
+
+#include "../libcaja-private/caja-file-attributes.h"
+#include "../libcaja-private/caja-file.h"
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-metadata.h"
+#include "../libcaja-private/caja-clipboard.h"
+#include "../libcaja-private/caja-module.h"
+#include "../libcaja-private/caja-sidebar-provider.h"
+#include "../libcaja-private/caja-window-info.h"
+#include "../libcaja-private/caja-window-slot-info.h"
+#include "../libcaja-extension/caja-property-page-provider.h"
+
+#include "caja-notes-viewer.h"
 
 #define SAVE_TIMEOUT 3
 
diff --git a/src/caja-notes-viewer.h b/src/caja-notes-viewer.h
index ab5965f5..225d884c 100644
--- a/src/caja-notes-viewer.h
+++ b/src/caja-notes-viewer.h
@@ -27,8 +27,9 @@
 #define _CAJA_NOTES_VIEWER_H
 
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-view.h>
-#include <libcaja-private/caja-window-info.h>
+
+#include "../libcaja-private/caja-view.h"
+#include "../libcaja-private/caja-window-info.h"
 
 #define CAJA_NOTES_SIDEBAR_ID    "notes"
 
diff --git a/src/caja-pathbar.c b/src/caja-pathbar.c
index b5f7a526..fb640f47 100644
--- a/src/caja-pathbar.c
+++ b/src/caja-pathbar.c
@@ -20,16 +20,19 @@
 
 #include <config.h>
 #include <string.h>
+
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-icon-names.h>
-#include <libcaja-private/caja-trash-monitor.h>
-#include <libcaja-private/caja-dnd.h>
-#include <libcaja-private/caja-icon-dnd.h>
+
+#include "../libcaja-private/caja-file.h"
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-icon-names.h"
+#include "../libcaja-private/caja-trash-monitor.h"
+#include "../libcaja-private/caja-dnd.h"
+#include "../libcaja-private/caja-icon-dnd.h"
+
 #include "caja-pathbar.h"
 
 enum
diff --git a/src/caja-places-sidebar.c b/src/caja-places-sidebar.c
index 0a479095..92ad68d0 100644
--- a/src/caja-places-sidebar.c
+++ b/src/caja-places-sidebar.c
@@ -23,37 +23,40 @@
  */
 
 #include <config.h>
+#include <cairo-gobject.h>
 
-#include <eel/eel-debug.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-graphic-effects.h>
-#include <eel/eel-string.h>
-#include <eel/eel-stock-dialogs.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libcaja-private/caja-debug-log.h>
-#include <libcaja-private/caja-dnd.h>
-#include <libcaja-private/caja-bookmark.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-sidebar-provider.h>
-#include <libcaja-private/caja-module.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-file-operations.h>
-#include <libcaja-private/caja-trash-monitor.h>
-#include <libcaja-private/caja-icon-names.h>
-#include <libcaja-private/caja-autorun.h>
-#include <libcaja-private/caja-window-info.h>
-#include <libcaja-private/caja-window-slot-info.h>
 #include <gio/gio.h>
 #include <libnotify/notify.h>
-#include <cairo-gobject.h>
+
+#include "../eel/eel-debug.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-graphic-effects.h"
+#include "../eel/eel-string.h"
+#include "../eel/eel-stock-dialogs.h"
+
+#include "../libcaja-private/caja-debug-log.h"
+#include "../libcaja-private/caja-dnd.h"
+#include "../libcaja-private/caja-bookmark.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-sidebar-provider.h"
+#include "../libcaja-private/caja-module.h"
+#include "../libcaja-private/caja-file.h"
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-file-operations.h"
+#include "../libcaja-private/caja-trash-monitor.h"
+#include "../libcaja-private/caja-icon-names.h"
+#include "../libcaja-private/caja-autorun.h"
+#include "../libcaja-private/caja-window-info.h"
+#include "../libcaja-private/caja-window-slot-info.h"
 
 #include "caja-bookmark-list.h"
 #include "caja-places-sidebar.h"
 #include "caja-window.h"
+
 #define EJECT_BUTTON_XPAD 6
 #define ICON_CELL_XPAD 6
 
diff --git a/src/caja-places-sidebar.h b/src/caja-places-sidebar.h
index e4d36a9f..25ee8a7e 100644
--- a/src/caja-places-sidebar.h
+++ b/src/caja-places-sidebar.h
@@ -24,10 +24,11 @@
 #ifndef _CAJA_PLACES_SIDEBAR_H
 #define _CAJA_PLACES_SIDEBAR_H
 
-#include <libcaja-private/caja-view.h>
-#include <libcaja-private/caja-window-info.h>
 #include <gtk/gtk.h>
 
+#include "../libcaja-private/caja-view.h"
+#include "../libcaja-private/caja-window-info.h"
+
 #define CAJA_PLACES_SIDEBAR_ID    "places"
 
 #define CAJA_TYPE_PLACES_SIDEBAR caja_places_sidebar_get_type()
diff --git a/src/caja-property-browser.c b/src/caja-property-browser.c
index ebb1e5e2..bc5d1d22 100644
--- a/src/caja-property-browser.c
+++ b/src/caja-property-browser.c
@@ -30,32 +30,35 @@
 
 #include <config.h>
 #include <math.h>
-#include "caja-property-browser.h"
 
-#include <eel/eel-gdk-extensions.h>
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-image-table.h>
-#include <eel/eel-labeled-image.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-vfs-extensions.h>
-#include <eel/eel-xml-extensions.h>
 #include <libxml/parser.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <gio/gio.h>
-#include <libcaja-private/caja-customization-data.h>
-#include <libcaja-private/caja-directory.h>
-#include <libcaja-private/caja-emblem-utils.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-metadata.h>
-#include <libcaja-private/caja-signaller.h>
 #include <atk/atkrelationset.h>
 
+#include "../eel/eel-gdk-extensions.h"
+#include "../eel/eel-gdk-pixbuf-extensions.h"
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-image-table.h"
+#include "../eel/eel-labeled-image.h"
+#include "../eel/eel-stock-dialogs.h"
+#include "../eel/eel-vfs-extensions.h"
+#include "../eel/eel-xml-extensions.h"
+
+#include "../libcaja-private/caja-customization-data.h"
+#include "../libcaja-private/caja-directory.h"
+#include "../libcaja-private/caja-emblem-utils.h"
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-file.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-metadata.h"
+#include "../libcaja-private/caja-signaller.h"
+
+#include "caja-property-browser.h"
+
 /* property types */
 
 typedef enum
diff --git a/src/caja-query-editor.c b/src/caja-query-editor.c
index ce4120c2..945c0cf8 100644
--- a/src/caja-query-editor.c
+++ b/src/caja-query-editor.c
@@ -22,19 +22,22 @@
  */
 
 #include <config.h>
-#include "caja-query-editor.h"
-#include "caja-src-marshal.h"
-#include "caja-window-slot.h"
-
 #include <string.h>
+
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-stock-dialogs.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-global-preferences.h>
+
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-stock-dialogs.h"
+
+#include "../libcaja-private/caja-global-preferences.h"
+
+#include "caja-query-editor.h"
+#include "caja-src-marshal.h"
+#include "caja-window-slot.h"
 
 enum
 {
diff --git a/src/caja-query-editor.h b/src/caja-query-editor.h
index 63df2b95..243d40b9 100644
--- a/src/caja-query-editor.h
+++ b/src/caja-query-editor.h
@@ -24,11 +24,12 @@
 #ifndef CAJA_QUERY_EDITOR_H
 #define CAJA_QUERY_EDITOR_H
 
-#include "caja-search-bar.h"
-
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-query.h>
-#include <libcaja-private/caja-window-info.h>
+
+#include "../libcaja-private/caja-query.h"
+#include "../libcaja-private/caja-window-info.h"
+
+#include "caja-search-bar.h"
 
 #define CAJA_TYPE_QUERY_EDITOR caja_query_editor_get_type()
 #define CAJA_QUERY_EDITOR(obj) \
diff --git a/src/caja-search-bar.c b/src/caja-search-bar.c
index a0867ffc..c48dfe9a 100644
--- a/src/caja-search-bar.c
+++ b/src/caja-search-bar.c
@@ -22,13 +22,16 @@
  */
 
 #include <config.h>
-#include "caja-search-bar.h"
 
 #include <glib/gi18n.h>
-#include <eel/eel-gtk-macros.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-clipboard.h>
+
+#include "../eel/eel-gtk-macros.h"
+
+#include "../libcaja-private/caja-clipboard.h"
+
+#include "caja-search-bar.h"
 
 struct CajaSearchBarDetails
 {
diff --git a/src/caja-search-bar.h b/src/caja-search-bar.h
index 81af49cc..d5797e6b 100644
--- a/src/caja-search-bar.h
+++ b/src/caja-search-bar.h
@@ -25,7 +25,9 @@
 #define CAJA_SEARCH_BAR_H
 
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-query.h>
+
+#include "../libcaja-private/caja-query.h"
+
 #include "caja-window.h"
 
 #define CAJA_TYPE_SEARCH_BAR caja_search_bar_get_type()
diff --git a/src/caja-side-pane.c b/src/caja-side-pane.c
index 892e34f0..93b6972c 100644
--- a/src/caja-side-pane.c
+++ b/src/caja-side-pane.c
@@ -22,15 +22,17 @@
  */
 
 #include <config.h>
-#include "caja-side-pane.h"
 
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-gtk-macros.h"
+
+#include "caja-side-pane.h"
+
 typedef struct
 {
     char *title;
diff --git a/src/caja-sidebar-title.c b/src/caja-sidebar-title.c
index 441e0056..c1026151 100644
--- a/src/caja-sidebar-title.c
+++ b/src/caja-sidebar-title.c
@@ -26,24 +26,26 @@
 
 #include <config.h>
 #include <math.h>
-#include "caja-sidebar-title.h"
-
-#include "caja-window.h"
+#include <string.h>
+#include <stdlib.h>
 
-#include <eel/eel-background.h>
-#include <eel/eel-gdk-extensions.h>
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-extensions.h>
 #include <gtk/gtk.h>
 #include <pango/pango.h>
 #include <glib/gi18n.h>
-#include <libcaja-private/caja-file-attributes.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-metadata.h>
-#include <libcaja-private/caja-sidebar.h>
-#include <string.h>
-#include <stdlib.h>
+
+#include "../eel/eel-background.h"
+#include "../eel/eel-gdk-extensions.h"
+#include "../eel/eel-gdk-pixbuf-extensions.h"
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+
+#include "../libcaja-private/caja-file-attributes.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-metadata.h"
+#include "../libcaja-private/caja-sidebar.h"
+
+#include "caja-sidebar-title.h"
+#include "caja-window.h"
 
 /* maximum allowable size to be displayed as the title */
 #define MAX_TITLE_SIZE 		256
diff --git a/src/caja-sidebar-title.h b/src/caja-sidebar-title.h
index 02d56016..2568b3c2 100644
--- a/src/caja-sidebar-title.h
+++ b/src/caja-sidebar-title.h
@@ -30,8 +30,10 @@
 #define CAJA_SIDEBAR_TITLE_H
 
 #include <gtk/gtk.h>
-#include <eel/eel-background.h>
-#include <libcaja-private/caja-file.h>
+
+#include "../eel/eel-background.h"
+
+#include "../libcaja-private/caja-file.h"
 
 #define CAJA_TYPE_SIDEBAR_TITLE caja_sidebar_title_get_type()
 #define CAJA_SIDEBAR_TITLE(obj) \
diff --git a/src/caja-spatial-window.c b/src/caja-spatial-window.c
index 1013eb75..8d9f733b 100644
--- a/src/caja-spatial-window.c
+++ b/src/caja-spatial-window.c
@@ -28,10 +28,32 @@
 /* caja-window.c: Implementation of the main window object */
 
 #include <config.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdkkeysyms.h>
+#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-string.h"
+
+#include "../libcaja-private/caja-dnd.h"
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-ui-utilities.h"
+#include "../libcaja-private/caja-file-attributes.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-metadata.h"
+#include "../libcaja-private/caja-mime-actions.h"
+#include "../libcaja-private/caja-program-choosing.h"
+#include "../libcaja-private/caja-search-directory.h"
+#include "../libcaja-private/caja-search-engine.h"
+#include "../libcaja-private/caja-signaller.h"
+
 #include "caja-spatial-window.h"
 #include "caja-window-private.h"
 #include "caja-window-bookmarks.h"
-
 #include "caja-actions.h"
 #include "caja-application.h"
 #include "caja-desktop-window.h"
@@ -40,25 +62,6 @@
 #include "caja-query-editor.h"
 #include "caja-search-bar.h"
 #include "caja-window-manage-views.h"
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-string.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk/gdkkeysyms.h>
-#include <gdk/gdkx.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <libcaja-private/caja-dnd.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-ui-utilities.h>
-#include <libcaja-private/caja-file-attributes.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-metadata.h>
-#include <libcaja-private/caja-mime-actions.h>
-#include <libcaja-private/caja-program-choosing.h>
-#include <libcaja-private/caja-search-directory.h>
-#include <libcaja-private/caja-search-engine.h>
-#include <libcaja-private/caja-signaller.h>
 
 #define MAX_TITLE_LENGTH 180
 #define MAX_SHORTNAME_PATH 16
diff --git a/src/caja-trash-bar.c b/src/caja-trash-bar.c
index 8d5535bb..bcff94ae 100644
--- a/src/caja-trash-bar.c
+++ b/src/caja-trash-bar.c
@@ -20,18 +20,18 @@
  *
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
-#include "caja-trash-bar.h"
+#include "../libcaja-private/caja-file-operations.h"
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-file.h"
+#include "../libcaja-private/caja-trash-monitor.h"
 
+#include "caja-trash-bar.h"
 #include "caja-window.h"
-#include <libcaja-private/caja-file-operations.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-trash-monitor.h>
 
 #define CAJA_TRASH_BAR_GET_PRIVATE(o)\
 	(G_TYPE_INSTANCE_GET_PRIVATE ((o), CAJA_TYPE_TRASH_BAR, CajaTrashBarPrivate))
diff --git a/src/caja-view-as-action.c b/src/caja-view-as-action.c
index ee30ddc8..a38ebca2 100644
--- a/src/caja-view-as-action.c
+++ b/src/caja-view-as-action.c
@@ -25,13 +25,16 @@
 
 #include <config.h>
 
+#include <gtk/gtk.h>
+
+#include "../eel/eel-gtk-extensions.h"
+
+#include "../libcaja-private/caja-view-factory.h"
+
 #include "caja-view-as-action.h"
 #include "caja-navigation-window.h"
 #include "caja-window-private.h"
 #include "caja-navigation-window-slot.h"
-#include <gtk/gtk.h>
-#include <eel/eel-gtk-extensions.h>
-#include <libcaja-private/caja-view-factory.h>
 
 static void caja_view_as_action_init       (CajaViewAsAction *action);
 static void caja_view_as_action_class_init (CajaViewAsActionClass *class);
diff --git a/src/caja-window-bookmarks.c b/src/caja-window-bookmarks.c
index 5ca8c45a..4300b719 100644
--- a/src/caja-window-bookmarks.c
+++ b/src/caja-window-bookmarks.c
@@ -25,19 +25,20 @@
  */
 
 #include <config.h>
-
 #include <locale.h>
 
+#include <glib/gi18n.h>
+
+#include "../eel/eel-debug.h"
+#include "../eel/eel-stock-dialogs.h"
+#include "../eel/eel-vfs-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+
 #include "caja-actions.h"
 #include "caja-bookmark-list.h"
 #include "caja-bookmarks-window.h"
 #include "caja-window-bookmarks.h"
 #include "caja-window-private.h"
-#include <eel/eel-debug.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-vfs-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <glib/gi18n.h>
 
 #define MENU_ITEM_MAX_WIDTH_CHARS 32
 
diff --git a/src/caja-window-bookmarks.h b/src/caja-window-bookmarks.h
index c84b7dd6..a28e53bb 100644
--- a/src/caja-window-bookmarks.h
+++ b/src/caja-window-bookmarks.h
@@ -25,11 +25,11 @@
 #ifndef CAJA_WINDOW_BOOKMARKS_H
 #define CAJA_WINDOW_BOOKMARKS_H
 
+#include "../libcaja-private/caja-bookmark.h"
+
 #include "caja-bookmark-list.h"
 #include "caja-window.h"
 
-#include <libcaja-private/caja-bookmark.h>
-
 void                  caja_bookmarks_exiting                        (void);
 void                  caja_window_add_bookmark_for_current_location (CajaWindow *window);
 void                  caja_window_edit_bookmarks                    (CajaWindow *window);
diff --git a/src/caja-window-manage-views.c b/src/caja-window-manage-views.c
index e44240af..59bb4f07 100644
--- a/src/caja-window-manage-views.c
+++ b/src/caja-window-manage-views.c
@@ -26,8 +26,40 @@
  */
 
 #include <config.h>
-#include "caja-window-manage-views.h"
 
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+#include <glib/gi18n.h>
+
+#include "../eel/eel-accessibility.h"
+#include "../eel/eel-debug.h"
+#include "../eel/eel-gdk-extensions.h"
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-stock-dialogs.h"
+#include "../eel/eel-string.h"
+#include "../eel/eel-vfs-extensions.h"
+
+#include "../libcaja-private/caja-debug-log.h"
+#include "../libcaja-private/caja-extensions.h"
+#include "../libcaja-private/caja-file-attributes.h"
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-file.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-metadata.h"
+#include "../libcaja-private/caja-mime-actions.h"
+#include "../libcaja-private/caja-module.h"
+#include "../libcaja-private/caja-monitor.h"
+#include "../libcaja-private/caja-search-directory.h"
+#include "../libcaja-private/caja-view-factory.h"
+#include "../libcaja-private/caja-window-info.h"
+#include "../libcaja-private/caja-window-slot-info.h"
+#include "../libcaja-private/caja-autorun.h"
+
+#include "../libcaja-extension/caja-location-widget-provider.h"
+
+#include "caja-window-manage-views.h"
 #include "caja-actions.h"
 #include "caja-application.h"
 #include "caja-location-bar.h"
@@ -39,34 +71,6 @@
 #include "caja-trash-bar.h"
 #include "caja-x-content-bar.h"
 #include "caja-navigation-window-pane.h"
-#include <eel/eel-accessibility.h>
-#include <eel/eel-debug.h>
-#include <eel/eel-gdk-extensions.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
-#include <eel/eel-vfs-extensions.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-#include <glib/gi18n.h>
-#include <libcaja-extension/caja-location-widget-provider.h>
-#include <libcaja-private/caja-debug-log.h>
-#include <libcaja-private/caja-extensions.h>
-#include <libcaja-private/caja-file-attributes.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-metadata.h>
-#include <libcaja-private/caja-mime-actions.h>
-#include <libcaja-private/caja-module.h>
-#include <libcaja-private/caja-monitor.h>
-#include <libcaja-private/caja-search-directory.h>
-#include <libcaja-private/caja-view-factory.h>
-#include <libcaja-private/caja-window-info.h>
-#include <libcaja-private/caja-window-slot-info.h>
-#include <libcaja-private/caja-autorun.h>
 
 /* FIXME bugzilla.gnome.org 41243:
  * We should use inheritance instead of these special cases
diff --git a/src/caja-window-menus.c b/src/caja-window-menus.c
index b82059fd..14676b7c 100644
--- a/src/caja-window-menus.c
+++ b/src/caja-window-menus.c
@@ -26,8 +26,26 @@
  *                           split into separate file just for convenience.
  */
 #include <config.h>
-
 #include <locale.h>
+#include <string.h>
+
+#include <gtk/gtk.h>
+#include <gio/gio.h>
+#include <glib/gi18n.h>
+
+#include "../eel/eel-gtk-extensions.h"
+
+#include "../libcaja-extension/caja-menu-provider.h"
+#include "../libcaja-private/caja-extensions.h"
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-icon-names.h"
+#include "../libcaja-private/caja-ui-utilities.h"
+#include "../libcaja-private/caja-module.h"
+#include "../libcaja-private/caja-search-directory.h"
+#include "../libcaja-private/caja-search-engine.h"
+#include "../libcaja-private/caja-signaller.h"
+#include "../libcaja-private/caja-trash-monitor.h"
 
 #include "caja-actions.h"
 #include "caja-application.h"
@@ -39,22 +57,6 @@
 #include "caja-window-private.h"
 #include "caja-desktop-window.h"
 #include "caja-search-bar.h"
-#include <gtk/gtk.h>
-#include <gio/gio.h>
-#include <glib/gi18n.h>
-#include <eel/eel-gtk-extensions.h>
-#include <libcaja-extension/caja-menu-provider.h>
-#include <libcaja-private/caja-extensions.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-icon-names.h>
-#include <libcaja-private/caja-ui-utilities.h>
-#include <libcaja-private/caja-module.h>
-#include <libcaja-private/caja-search-directory.h>
-#include <libcaja-private/caja-search-engine.h>
-#include <libcaja-private/caja-signaller.h>
-#include <libcaja-private/caja-trash-monitor.h>
-#include <string.h>
 
 #define MENU_PATH_EXTENSION_ACTIONS                     "/MenuBar/File/Extension Actions"
 #define POPUP_PATH_EXTENSION_ACTIONS                     "/background/Before Zoom Items/Extension Actions"
diff --git a/src/caja-window-pane.c b/src/caja-window-pane.c
index 0d2ddae8..452f648e 100644
--- a/src/caja-window-pane.c
+++ b/src/caja-window-pane.c
@@ -22,11 +22,12 @@
    Author: Holger Berndt <[email protected]>
 */
 
+#include "../eel/eel-gtk-macros.h"
+
 #include "caja-window-pane.h"
 #include "caja-window-private.h"
 #include "caja-navigation-window-pane.h"
 #include "caja-window-manage-views.h"
-#include <eel/eel-gtk-macros.h>
 
 static void caja_window_pane_init       (CajaWindowPane *pane);
 static void caja_window_pane_class_init (CajaWindowPaneClass *class);
diff --git a/src/caja-window-private.h b/src/caja-window-private.h
index 83cce1df..3cf29a37 100644
--- a/src/caja-window-private.h
+++ b/src/caja-window-private.h
@@ -28,6 +28,8 @@
 #ifndef CAJA_WINDOW_PRIVATE_H
 #define CAJA_WINDOW_PRIVATE_H
 
+#include "../libcaja-private/caja-directory.h"
+
 #include "caja-window.h"
 #include "caja-window-slot.h"
 #include "caja-window-pane.h"
@@ -35,8 +37,6 @@
 #include "caja-navigation-window.h"
 #include "caja-bookmark-list.h"
 
-#include <libcaja-private/caja-directory.h>
-
 struct _CajaNavigationWindowPane;
 
 /* FIXME bugzilla.gnome.org 42575: Migrate more fields into here. */
diff --git a/src/caja-window-slot.c b/src/caja-window-slot.c
index 2f3c39cb..affb64a7 100644
--- a/src/caja-window-slot.c
+++ b/src/caja-window-slot.c
@@ -21,17 +21,19 @@
 
    Author: Christian Neumair <[email protected]>
 */
+
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-string.h"
+
+#include "../libcaja-private/caja-file.h"
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-window-slot-info.h"
+
 #include "caja-window-slot.h"
 #include "caja-navigation-window-slot.h"
-
 #include "caja-desktop-window.h"
 #include "caja-window-private.h"
 #include "caja-window-manage-views.h"
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-window-slot-info.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-string.h>
 
 static void caja_window_slot_init       (CajaWindowSlot *slot);
 static void caja_window_slot_class_init (CajaWindowSlotClass *class);
diff --git a/src/caja-window-toolbars.c b/src/caja-window-toolbars.c
index 1611e16e..d1112073 100644
--- a/src/caja-window-toolbars.c
+++ b/src/caja-window-toolbars.c
@@ -27,25 +27,28 @@
  */
 
 #include <config.h>
-
 #include <unistd.h>
+
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
+
+#include "../eel/eel-mate-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-string.h"
+
+#include "../libcaja-extension/caja-menu-provider.h"
+#include "../libcaja-private/caja-bookmark.h"
+#include "../libcaja-private/caja-extensions.h"
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-ui-utilities.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-module.h"
+
 #include "caja-application.h"
 #include "caja-window-manage-views.h"
 #include "caja-window-private.h"
 #include "caja-window.h"
-#include <eel/eel-mate-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-string.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#include <glib/gi18n.h>
-#include <libcaja-extension/caja-menu-provider.h>
-#include <libcaja-private/caja-bookmark.h>
-#include <libcaja-private/caja-extensions.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-ui-utilities.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-module.h>
 
 /* FIXME bugzilla.gnome.org 41243:
  * We should use inheritance instead of these special cases
diff --git a/src/caja-window.c b/src/caja-window.c
index 0cdb2aaf..5f29cbbe 100644
--- a/src/caja-window.c
+++ b/src/caja-window.c
@@ -26,8 +26,32 @@
 /* caja-window.c: Implementation of the main window object */
 
 #include <config.h>
-#include "caja-window-private.h"
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdkx.h>
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#ifdef HAVE_X11_XF86KEYSYM_H
+#include <X11/XF86keysym.h>
+#endif
+
+#include "../eel/eel-debug.h"
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-string.h"
+
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-file-attributes.h"
+#include "../libcaja-private/caja-global-preferences.h"
+#include "../libcaja-private/caja-metadata.h"
+#include "../libcaja-private/caja-mime-actions.h"
+#include "../libcaja-private/caja-program-choosing.h"
+#include "../libcaja-private/caja-view-factory.h"
+#include "../libcaja-private/caja-clipboard.h"
+#include "../libcaja-private/caja-search-directory.h"
+#include "../libcaja-private/caja-signaller.h"
+
+#include "caja-window-private.h"
 #include "caja-actions.h"
 #include "caja-application.h"
 #include "caja-bookmarks-window.h"
@@ -39,27 +63,6 @@
 #include "caja-search-bar.h"
 #include "caja-navigation-window-pane.h"
 #include "caja-src-marshal.h"
-#include <eel/eel-debug.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-string.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk/gdkx.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#ifdef HAVE_X11_XF86KEYSYM_H
-#include <X11/XF86keysym.h>
-#endif
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-file-attributes.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-metadata.h>
-#include <libcaja-private/caja-mime-actions.h>
-#include <libcaja-private/caja-program-choosing.h>
-#include <libcaja-private/caja-view-factory.h>
-#include <libcaja-private/caja-clipboard.h>
-#include <libcaja-private/caja-search-directory.h>
-#include <libcaja-private/caja-signaller.h>
 
 #define MAX_HISTORY_ITEMS 50
 
diff --git a/src/caja-window.h b/src/caja-window.h
index 59410a2c..137891a1 100644
--- a/src/caja-window.h
+++ b/src/caja-window.h
@@ -28,11 +28,14 @@
 #define CAJA_WINDOW_H
 
 #include <gtk/gtk.h>
-#include <eel/eel-glib-extensions.h>
-#include <libcaja-private/caja-bookmark.h>
-#include <libcaja-private/caja-entry.h>
-#include <libcaja-private/caja-window-info.h>
-#include <libcaja-private/caja-search-directory.h>
+
+#include "../eel/eel-glib-extensions.h"
+
+#include "../libcaja-private/caja-bookmark.h"
+#include "../libcaja-private/caja-entry.h"
+#include "../libcaja-private/caja-window-info.h"
+#include "../libcaja-private/caja-search-directory.h"
+
 #include "caja-application.h"
 #include "caja-information-panel.h"
 #include "caja-side-pane.h"
diff --git a/src/caja-x-content-bar.c b/src/caja-x-content-bar.c
index 73a58b70..43f9a23c 100644
--- a/src/caja-x-content-bar.c
+++ b/src/caja-x-content-bar.c
@@ -22,15 +22,16 @@
  *
  */
 
-#include "config.h"
+#include <config.h>
+#include <string.h>
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
-#include <string.h>
+
+#include "../libcaja-private/caja-autorun.h"
+#include "../libcaja-private/caja-icon-info.h"
 
 #include "caja-x-content-bar.h"
-#include <libcaja-private/caja-autorun.h>
-#include <libcaja-private/caja-icon-info.h>
 
 struct _CajaXContentBarPrivate
 {
diff --git a/src/caja-zoom-action.c b/src/caja-zoom-action.c
index 50401d59..e8d60e17 100644
--- a/src/caja-zoom-action.c
+++ b/src/caja-zoom-action.c
@@ -25,13 +25,15 @@
 
 #include <config.h>
 
+#include <gtk/gtk.h>
+
+#include "../eel/eel-gtk-extensions.h"
+
 #include "caja-zoom-action.h"
 #include "caja-zoom-control.h"
 #include "caja-navigation-window.h"
 #include "caja-window-private.h"
 #include "caja-navigation-window-slot.h"
-#include <gtk/gtk.h>
-#include <eel/eel-gtk-extensions.h>
 
 static void caja_zoom_action_init       (CajaZoomAction *action);
 static void caja_zoom_action_class_init (CajaZoomActionClass *class);
diff --git a/src/caja-zoom-control.c b/src/caja-zoom-control.c
index 080e703d..49f4abd7 100644
--- a/src/caja-zoom-control.c
+++ b/src/caja-zoom-control.c
@@ -28,22 +28,25 @@
  */
 
 #include <config.h>
-#include "caja-zoom-control.h"
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include <atk/atkaction.h>
 #include <glib/gi18n.h>
-#include <eel/eel-accessibility.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-graphic-effects.h>
-#include <eel/eel-gtk-extensions.h>
 #include <gtk/gtk.h>
 #include <gtk/gtk-a11y.h>
 #include <gdk/gdkkeysyms.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+
+#include "../eel/eel-accessibility.h"
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-graphic-effects.h"
+#include "../eel/eel-gtk-extensions.h"
+
+#include "../libcaja-private/caja-file-utilities.h"
+#include "../libcaja-private/caja-global-preferences.h"
+
+#include "caja-zoom-control.h"
 
 enum
 {
diff --git a/src/caja-zoom-control.h b/src/caja-zoom-control.h
index f5aec1ea..8e02a38a 100644
--- a/src/caja-zoom-control.h
+++ b/src/caja-zoom-control.h
@@ -29,7 +29,8 @@
 #define CAJA_ZOOM_CONTROL_H
 
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-icon-info.h> /* For CajaZoomLevel */
+
+#include "../libcaja-private/caja-icon-info.h" /* For CajaZoomLevel */
 
 #define CAJA_TYPE_ZOOM_CONTROL caja_zoom_control_get_type()
 #define CAJA_ZOOM_CONTROL(obj) \
diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c
index 11f60aa8..72d64a84 100644
--- a/src/file-manager/fm-desktop-icon-view.c
+++ b/src/file-manager/fm-desktop-icon-view.c
@@ -25,39 +25,42 @@
 */
 
 #include <config.h>
-#include "fm-icon-container.h"
-#include "fm-desktop-icon-view.h"
-#include "fm-actions.h"
-
-#include <X11/Xatom.h>
-#include <gtk/gtk.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-vfs-extensions.h>
 #include <fcntl.h>
-#include <gdk/gdkx.h>
-#include <glib/gi18n.h>
-#include <libcaja-private/caja-desktop-icon-file.h>
-#include <libcaja-private/caja-directory-background.h>
-#include <libcaja-private/caja-directory-notify.h>
-#include <libcaja-private/caja-file-changes-queue.h>
-#include <libcaja-private/caja-file-operations.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-ui-utilities.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-view-factory.h>
-#include <libcaja-private/caja-link.h>
-#include <libcaja-private/caja-metadata.h>
-#include <libcaja-private/caja-monitor.h>
-#include <libcaja-private/caja-program-choosing.h>
-#include <libcaja-private/caja-trash-monitor.h>
 #include <limits.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
+
+#include <X11/Xatom.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+#include <glib/gi18n.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <unistd.h>
+
+#include "../../eel/eel-glib-extensions.h"
+#include "../../eel/eel-gtk-extensions.h"
+#include "../../eel/eel-vfs-extensions.h"
+
+#include "../../libcaja-private/caja-desktop-icon-file.h"
+#include "../../libcaja-private/caja-directory-background.h"
+#include "../../libcaja-private/caja-directory-notify.h"
+#include "../../libcaja-private/caja-file-changes-queue.h"
+#include "../../libcaja-private/caja-file-operations.h"
+#include "../../libcaja-private/caja-file-utilities.h"
+#include "../../libcaja-private/caja-ui-utilities.h"
+#include "../../libcaja-private/caja-global-preferences.h"
+#include "../../libcaja-private/caja-view-factory.h"
+#include "../../libcaja-private/caja-link.h"
+#include "../../libcaja-private/caja-metadata.h"
+#include "../../libcaja-private/caja-monitor.h"
+#include "../../libcaja-private/caja-program-choosing.h"
+#include "../../libcaja-private/caja-trash-monitor.h"
+
+#include "fm-icon-container.h"
+#include "fm-desktop-icon-view.h"
+#include "fm-actions.h"
 
 /* Timeout to check the desktop directory for updates */
 #define RESCAN_TIMEOUT 4
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 49072404..fcb68695 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -29,64 +29,66 @@
 
 #include <config.h>
 #include <math.h>
-#include "fm-directory-view.h"
-#include "fm-list-view.h"
-#include "fm-desktop-icon-view.h"
-
-#include "fm-actions.h"
-#include "fm-error-reporting.h"
-#include "fm-marshal.h"
-#include "fm-properties-window.h"
-#include "libcaja-private/caja-open-with-dialog.h"
 
-#include <eel/eel-background.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-mate-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
-#include <eel/eel-vfs-extensions.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <gio/gio.h>
-#include <libcaja-private/caja-recent.h>
-#include <libcaja-extension/caja-menu-provider.h>
-#include <libcaja-private/caja-clipboard.h>
-#include <libcaja-private/caja-clipboard-monitor.h>
-#include <libcaja-private/caja-debug-log.h>
-#include <libcaja-private/caja-desktop-icon-file.h>
-#include <libcaja-private/caja-desktop-directory.h>
-#include <libcaja-private/caja-extensions.h>
-#include <libcaja-private/caja-search-directory.h>
-#include <libcaja-private/caja-directory-background.h>
-#include <libcaja-private/caja-directory.h>
-#include <libcaja-private/caja-dnd.h>
-#include <libcaja-private/caja-file-attributes.h>
-#include <libcaja-private/caja-file-changes-queue.h>
-#include <libcaja-private/caja-file-dnd.h>
-#include <libcaja-private/caja-file-operations.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-file-private.h> /* for caja_file_get_existing_by_uri */
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-link.h>
-#include <libcaja-private/caja-metadata.h>
-#include <libcaja-private/caja-mime-actions.h>
-#include <libcaja-private/caja-module.h>
-#include <libcaja-private/caja-program-choosing.h>
-#include <libcaja-private/caja-trash-monitor.h>
-#include <libcaja-private/caja-ui-utilities.h>
-#include <libcaja-private/caja-signaller.h>
-#include <libcaja-private/caja-autorun.h>
-#include <libcaja-private/caja-icon-names.h>
-#include <libcaja-private/caja-undostack-manager.h>
 
 #define MATE_DESKTOP_USE_UNSTABLE_API
 #include <libmate-desktop/mate-desktop-utils.h>
 
+#include "../../eel/eel-background.h"
+#include "../../eel/eel-glib-extensions.h"
+#include "../../eel/eel-mate-extensions.h"
+#include "../../eel/eel-gtk-extensions.h"
+#include "../../eel/eel-gtk-macros.h"
+#include "../../eel/eel-stock-dialogs.h"
+#include "../../eel/eel-string.h"
+#include "../../eel/eel-vfs-extensions.h"
+
+#include "../../libcaja-private/caja-recent.h"
+#include "../../libcaja-extension/caja-menu-provider.h"
+#include "../../libcaja-private/caja-clipboard.h"
+#include "../../libcaja-private/caja-clipboard-monitor.h"
+#include "../../libcaja-private/caja-debug-log.h"
+#include "../../libcaja-private/caja-desktop-icon-file.h"
+#include "../../libcaja-private/caja-desktop-directory.h"
+#include "../../libcaja-private/caja-extensions.h"
+#include "../../libcaja-private/caja-search-directory.h"
+#include "../../libcaja-private/caja-directory-background.h"
+#include "../../libcaja-private/caja-directory.h"
+#include "../../libcaja-private/caja-dnd.h"
+#include "../../libcaja-private/caja-file-attributes.h"
+#include "../../libcaja-private/caja-file-changes-queue.h"
+#include "../../libcaja-private/caja-file-dnd.h"
+#include "../../libcaja-private/caja-file-operations.h"
+#include "../../libcaja-private/caja-file-utilities.h"
+#include "../../libcaja-private/caja-file-private.h" /* for caja_file_get_existing_by_uri */
+#include "../../libcaja-private/caja-global-preferences.h"
+#include "../../libcaja-private/caja-link.h"
+#include "../../libcaja-private/caja-metadata.h"
+#include "../../libcaja-private/caja-mime-actions.h"
+#include "../../libcaja-private/caja-module.h"
+#include "../../libcaja-private/caja-program-choosing.h"
+#include "../../libcaja-private/caja-trash-monitor.h"
+#include "../../libcaja-private/caja-ui-utilities.h"
+#include "../../libcaja-private/caja-signaller.h"
+#include "../../libcaja-private/caja-autorun.h"
+#include "../../libcaja-private/caja-icon-names.h"
+#include "../../libcaja-private/caja-undostack-manager.h"
+
+#include "fm-directory-view.h"
+#include "fm-list-view.h"
+#include "fm-desktop-icon-view.h"
+#include "fm-actions.h"
+#include "fm-error-reporting.h"
+#include "fm-marshal.h"
+#include "fm-properties-window.h"
+#include "libcaja-private/caja-open-with-dialog.h"
+
 /* Minimum starting update inverval */
 #define UPDATE_INTERVAL_MIN 100
 /* Maximum update interval */
diff --git a/src/file-manager/fm-directory-view.h b/src/file-manager/fm-directory-view.h
index 91c0164d..1f4fb878 100644
--- a/src/file-manager/fm-directory-view.h
+++ b/src/file-manager/fm-directory-view.h
@@ -29,16 +29,18 @@
 #define FM_DIRECTORY_VIEW_H
 
 #include <gtk/gtk.h>
-#include <eel/eel-background.h>
-#include <libcaja-private/caja-directory.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-icon-container.h>
-#include <libcaja-private/caja-link.h>
-#include <libcaja-private/caja-view.h>
-#include <libcaja-private/caja-window-info.h>
-#include <libcaja-private/caja-window-slot-info.h>
 #include <gio/gio.h>
 
+#include "../../eel/eel-background.h"
+
+#include "../../libcaja-private/caja-directory.h"
+#include "../../libcaja-private/caja-file.h"
+#include "../../libcaja-private/caja-icon-container.h"
+#include "../../libcaja-private/caja-link.h"
+#include "../../libcaja-private/caja-view.h"
+#include "../../libcaja-private/caja-window-info.h"
+#include "../../libcaja-private/caja-window-slot-info.h"
+
 typedef struct FMDirectoryView FMDirectoryView;
 typedef struct FMDirectoryViewClass FMDirectoryViewClass;
 
diff --git a/src/file-manager/fm-ditem-page.c b/src/file-manager/fm-ditem-page.c
index cdcf4fd0..c95aba3f 100644
--- a/src/file-manager/fm-ditem-page.c
+++ b/src/file-manager/fm-ditem-page.c
@@ -22,17 +22,19 @@
  */
 
 #include <config.h>
-#include "fm-ditem-page.h"
-
 #include <string.h>
 
-#include <eel/eel-glib-extensions.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libcaja-extension/caja-extension-types.h>
-#include <libcaja-extension/caja-file-info.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-file-attributes.h>
+
+#include "../../eel/eel-glib-extensions.h"
+
+#include "../../libcaja-extension/caja-extension-types.h"
+#include "../../libcaja-extension/caja-file-info.h"
+#include "../../libcaja-private/caja-file.h"
+#include "../../libcaja-private/caja-file-attributes.h"
+
+#include "fm-ditem-page.h"
 
 #define MAIN_GROUP "Desktop Entry"
 
diff --git a/src/file-manager/fm-empty-view.c b/src/file-manager/fm-empty-view.c
index 36d76d9d..9380a6b1 100644
--- a/src/file-manager/fm-empty-view.c
+++ b/src/file-manager/fm-empty-view.c
@@ -23,15 +23,17 @@
 */
 
 #include <config.h>
-#include "fm-empty-view.h"
-
 #include <string.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-view.h>
-#include <libcaja-private/caja-view-factory.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-vfs-extensions.h>
+
+#include "../../eel/eel-glib-extensions.h"
+#include "../../eel/eel-gtk-macros.h"
+#include "../../eel/eel-vfs-extensions.h"
+
+#include "../../libcaja-private/caja-file-utilities.h"
+#include "../../libcaja-private/caja-view.h"
+#include "../../libcaja-private/caja-view-factory.h"
+
+#include "fm-empty-view.h"
 
 struct FMEmptyViewDetails
 {
diff --git a/src/file-manager/fm-error-reporting.c b/src/file-manager/fm-error-reporting.c
index db950307..7bfc3b86 100644
--- a/src/file-manager/fm-error-reporting.c
+++ b/src/file-manager/fm-error-reporting.c
@@ -24,14 +24,17 @@
 */
 
 #include <config.h>
-#include "fm-error-reporting.h"
-
 #include <string.h>
+
 #include <glib/gi18n.h>
-#include <libcaja-private/caja-debug-log.h>
-#include <libcaja-private/caja-file.h>
-#include <eel/eel-string.h>
-#include <eel/eel-stock-dialogs.h>
+
+#include "../../eel/eel-string.h"
+#include "../../eel/eel-stock-dialogs.h"
+
+#include "../../libcaja-private/caja-debug-log.h"
+#include "../../libcaja-private/caja-file.h"
+
+#include "fm-error-reporting.h"
 
 #define NEW_NAME_TAG "Caja: new name"
 #define MAXIMUM_DISPLAYED_FILE_NAME_LENGTH	50
diff --git a/src/file-manager/fm-error-reporting.h b/src/file-manager/fm-error-reporting.h
index ed1b371c..a0eb6e4e 100644
--- a/src/file-manager/fm-error-reporting.h
+++ b/src/file-manager/fm-error-reporting.h
@@ -27,7 +27,8 @@
 #define FM_ERROR_REPORTING_H
 
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-file.h>
+
+#include "../../libcaja-private/caja-file.h"
 
 void fm_report_error_loading_directory	 (CajaFile   *file,
         GError         *error,
diff --git a/src/file-manager/fm-icon-container.c b/src/file-manager/fm-icon-container.c
index f744d65a..c7db54fa 100644
--- a/src/file-manager/fm-icon-container.c
+++ b/src/file-manager/fm-icon-container.c
@@ -22,15 +22,17 @@
    Author: Michael Meeks <[email protected]>
 */
 #include <config.h>
-
 #include <string.h>
+
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include <eel/eel-glib-extensions.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-file-attributes.h>
-#include <libcaja-private/caja-thumbnails.h>
-#include <libcaja-private/caja-desktop-icon-file.h>
+
+#include "../../eel/eel-glib-extensions.h"
+
+#include "../../libcaja-private/caja-global-preferences.h"
+#include "../../libcaja-private/caja-file-attributes.h"
+#include "../../libcaja-private/caja-thumbnails.h"
+#include "../../libcaja-private/caja-desktop-icon-file.h"
 
 #include "fm-icon-container.h"
 
diff --git a/src/file-manager/fm-icon-container.h b/src/file-manager/fm-icon-container.h
index 9d8e90a5..3a448f10 100644
--- a/src/file-manager/fm-icon-container.h
+++ b/src/file-manager/fm-icon-container.h
@@ -25,7 +25,8 @@
 #ifndef FM_ICON_CONTAINER_H
 #define FM_ICON_CONTAINER_H
 
-#include <libcaja-private/caja-icon-container.h>
+#include "../../libcaja-private/caja-icon-container.h"
+
 #include "fm-icon-view.h"
 
 typedef struct FMIconContainer FMIconContainer;
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index 110ed58c..baa4394d 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -23,46 +23,48 @@
 */
 
 #include <config.h>
-#include "fm-icon-view.h"
-
-#include "fm-actions.h"
-#include "fm-icon-container.h"
-#include "fm-desktop-icon-view.h"
-#include "fm-error-reporting.h"
 #include <stdlib.h>
-#include <eel/eel-background.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
-#include <eel/eel-vfs-extensions.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <gio/gio.h>
-#include <libcaja-private/caja-clipboard-monitor.h>
-#include <libcaja-private/caja-directory-background.h>
-#include <libcaja-private/caja-directory.h>
-#include <libcaja-private/caja-dnd.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-ui-utilities.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-icon-container.h>
-#include <libcaja-private/caja-icon-dnd.h>
-#include <libcaja-private/caja-link.h>
-#include <libcaja-private/caja-metadata.h>
-#include <libcaja-private/caja-view-factory.h>
-#include <libcaja-private/caja-clipboard.h>
-#include <libcaja-private/caja-desktop-icon-file.h>
 #include <locale.h>
 #include <signal.h>
 #include <stdio.h>
+#include <unistd.h>
+
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <gio/gio.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <unistd.h>
 
+#include "../../eel/eel-background.h"
+#include "../../eel/eel-glib-extensions.h"
+#include "../../eel/eel-gtk-extensions.h"
+#include "../../eel/eel-gtk-macros.h"
+#include "../../eel/eel-stock-dialogs.h"
+#include "../../eel/eel-string.h"
+#include "../../eel/eel-vfs-extensions.h"
+
+#include "../../libcaja-private/caja-clipboard-monitor.h"
+#include "../../libcaja-private/caja-directory-background.h"
+#include "../../libcaja-private/caja-directory.h"
+#include "../../libcaja-private/caja-dnd.h"
+#include "../../libcaja-private/caja-file-utilities.h"
+#include "../../libcaja-private/caja-ui-utilities.h"
+#include "../../libcaja-private/caja-global-preferences.h"
+#include "../../libcaja-private/caja-icon-container.h"
+#include "../../libcaja-private/caja-icon-dnd.h"
+#include "../../libcaja-private/caja-link.h"
+#include "../../libcaja-private/caja-metadata.h"
+#include "../../libcaja-private/caja-view-factory.h"
+#include "../../libcaja-private/caja-clipboard.h"
+#include "../../libcaja-private/caja-desktop-icon-file.h"
+
+#include "fm-icon-view.h"
+#include "fm-actions.h"
+#include "fm-icon-container.h"
+#include "fm-desktop-icon-view.h"
+#include "fm-error-reporting.h"
 #include "caja-audio-mime-types.h"
 
 #define POPUP_PATH_ICON_APPEARANCE		"/selection/Icon Appearance Items"
diff --git a/src/file-manager/fm-list-model.c b/src/file-manager/fm-list-model.c
index 641a3fcf..f8f053c1 100644
--- a/src/file-manager/fm-list-model.c
+++ b/src/file-manager/fm-list-model.c
@@ -25,16 +25,20 @@
 */
 
 #include <config.h>
-#include "fm-list-model.h"
-#include <libegg/eggtreemultidnd.h>
-
+#include <glib.h>
 #include <string.h>
-#include <eel/eel-graphic-effects.h>
+#include <cairo-gobject.h>
+
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libcaja-private/caja-dnd.h>
-#include <glib.h>
-#include <cairo-gobject.h>
+
+#include "../../libegg/eggtreemultidnd.h"
+
+#include "../../eel/eel-graphic-effects.h"
+
+#include "../../libcaja-private/caja-dnd.h"
+
+#include "fm-list-model.h"
 
 enum
 {
diff --git a/src/file-manager/fm-list-model.h b/src/file-manager/fm-list-model.h
index 33b5add7..2d8f3cb1 100644
--- a/src/file-manager/fm-list-model.h
+++ b/src/file-manager/fm-list-model.h
@@ -24,9 +24,11 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-directory.h>
-#include <libcaja-extension/caja-column.h>
+
+#include "../../libcaja-private/caja-file.h"
+#include "../../libcaja-private/caja-directory.h"
+
+#include "../../libcaja-extension/caja-column.h"
 
 #ifndef FM_LIST_MODEL_H
 #define FM_LIST_MODEL_H
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index fe16fe44..3c616fa1 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -26,41 +26,44 @@
 */
 
 #include <config.h>
-#include "fm-list-view.h"
-
-#include <string.h>
-#include "fm-error-reporting.h"
-#include "fm-list-model.h"
 #include <string.h>
-#include <eel/eel-vfs-extensions.h>
-#include <eel/eel-gdk-extensions.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-stock-dialogs.h>
+
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <libegg/eggtreemultidnd.h>
 #include <glib/gi18n.h>
 #include <glib-object.h>
-#include <libcaja-extension/caja-column-provider.h>
-#include <libcaja-private/caja-clipboard-monitor.h>
-#include <libcaja-private/caja-column-chooser.h>
-#include <libcaja-private/caja-column-utilities.h>
-#include <libcaja-private/caja-debug-log.h>
-#include <libcaja-private/caja-directory-background.h>
-#include <libcaja-private/caja-dnd.h>
-#include <libcaja-private/caja-file-dnd.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-ui-utilities.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-icon-dnd.h>
-#include <libcaja-private/caja-metadata.h>
-#include <libcaja-private/caja-module.h>
-#include <libcaja-private/caja-tree-view-drag-dest.h>
-#include <libcaja-private/caja-view-factory.h>
-#include <libcaja-private/caja-clipboard.h>
-#include <libcaja-private/caja-cell-renderer-text-ellipsized.h>
+
+#include "../../eel/eel-vfs-extensions.h"
+#include "../../eel/eel-gdk-extensions.h"
+#include "../../eel/eel-glib-extensions.h"
+#include "../../eel/eel-gtk-macros.h"
+#include "../../eel/eel-stock-dialogs.h"
+
+#include "../../libegg/eggtreemultidnd.h"
+
+#include "../../libcaja-extension/caja-column-provider.h"
+#include "../../libcaja-private/caja-clipboard-monitor.h"
+#include "../../libcaja-private/caja-column-chooser.h"
+#include "../../libcaja-private/caja-column-utilities.h"
+#include "../../libcaja-private/caja-debug-log.h"
+#include "../../libcaja-private/caja-directory-background.h"
+#include "../../libcaja-private/caja-dnd.h"
+#include "../../libcaja-private/caja-file-dnd.h"
+#include "../../libcaja-private/caja-file-utilities.h"
+#include "../../libcaja-private/caja-ui-utilities.h"
+#include "../../libcaja-private/caja-global-preferences.h"
+#include "../../libcaja-private/caja-icon-dnd.h"
+#include "../../libcaja-private/caja-metadata.h"
+#include "../../libcaja-private/caja-module.h"
+#include "../../libcaja-private/caja-tree-view-drag-dest.h"
+#include "../../libcaja-private/caja-view-factory.h"
+#include "../../libcaja-private/caja-clipboard.h"
+#include "../../libcaja-private/caja-cell-renderer-text-ellipsized.h"
+
+#include "fm-list-view.h"
+#include "fm-error-reporting.h"
+#include "fm-list-model.h"
 
 struct FMListViewDetails
 {
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index 7eafb9a5..fced94da 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -23,41 +23,45 @@
 */
 
 #include <config.h>
-#include "fm-properties-window.h"
-#include "fm-ditem-page.h"
-
-#define MATE_DESKTOP_USE_UNSTABLE_API
+#include <string.h>
+#include <cairo.h>
 
-#include "fm-error-reporting.h"
-#include "libcaja-private/caja-mime-application-chooser.h"
-#include <eel/eel-accessibility.h>
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-mate-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-labeled-image.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-vfs-extensions.h>
-#include <eel/eel-wrap-table.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
-#include <libmate-desktop/mate-desktop-thumbnail.h>
-#include <libcaja-extension/caja-property-page-provider.h>
-#include <libcaja-private/caja-entry.h>
-#include <libcaja-private/caja-extensions.h>
-#include <libcaja-private/caja-file-attributes.h>
-#include <libcaja-private/caja-file-operations.h>
-#include <libcaja-private/caja-desktop-icon-file.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-emblem-utils.h>
-#include <libcaja-private/caja-link.h>
-#include <libcaja-private/caja-metadata.h>
-#include <libcaja-private/caja-module.h>
-#include <libcaja-private/caja-mime-actions.h>
-#include <string.h>
 #include <sys/stat.h>
-#include <cairo.h>
+
+#define MATE_DESKTOP_USE_UNSTABLE_API
+#include <libmate-desktop/mate-desktop-thumbnail.h>
+
+#include "../../eel/eel-accessibility.h"
+#include "../../eel/eel-gdk-pixbuf-extensions.h"
+#include "../../eel/eel-glib-extensions.h"
+#include "../../eel/eel-mate-extensions.h"
+#include "../../eel/eel-gtk-extensions.h"
+#include "../../eel/eel-labeled-image.h"
+#include "../../eel/eel-stock-dialogs.h"
+#include "../../eel/eel-vfs-extensions.h"
+#include "../../eel/eel-wrap-table.h"
+
+#include "../../libcaja-extension/caja-property-page-provider.h"
+
+#include "../../libcaja-private/caja-mime-application-chooser.h"
+#include "../../libcaja-private/caja-entry.h"
+#include "../../libcaja-private/caja-extensions.h"
+#include "../../libcaja-private/caja-file-attributes.h"
+#include "../../libcaja-private/caja-file-operations.h"
+#include "../../libcaja-private/caja-desktop-icon-file.h"
+#include "../../libcaja-private/caja-global-preferences.h"
+#include "../../libcaja-private/caja-emblem-utils.h"
+#include "../../libcaja-private/caja-link.h"
+#include "../../libcaja-private/caja-metadata.h"
+#include "../../libcaja-private/caja-module.h"
+#include "../../libcaja-private/caja-mime-actions.h"
+
+#include "fm-properties-window.h"
+#include "fm-ditem-page.h"
+#include "fm-error-reporting.h"
 
 #if HAVE_SYS_VFS_H
 #include <sys/vfs.h>
diff --git a/src/file-manager/fm-properties-window.h b/src/file-manager/fm-properties-window.h
index 860b76bb..c4415aaf 100644
--- a/src/file-manager/fm-properties-window.h
+++ b/src/file-manager/fm-properties-window.h
@@ -27,7 +27,8 @@
 #define FM_PROPERTIES_WINDOW_H
 
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-file.h>
+
+#include "../../libcaja-private/caja-file.h"
 
 typedef struct FMPropertiesWindow FMPropertiesWindow;
 
diff --git a/src/file-manager/fm-tree-model.c b/src/file-manager/fm-tree-model.c
index ed4fc6e7..b512d622 100644
--- a/src/file-manager/fm-tree-model.c
+++ b/src/file-manager/fm-tree-model.c
@@ -27,16 +27,19 @@
 /* fm-tree-model.c - model for the tree view */
 
 #include <config.h>
-#include "fm-tree-model.h"
+#include <string.h>
+#include <cairo-gobject.h>
 
-#include <eel/eel-graphic-effects.h>
 #include <glib/gi18n.h>
-#include <libcaja-private/caja-directory.h>
-#include <libcaja-private/caja-file-attributes.h>
-#include <libcaja-private/caja-file.h>
 #include <gtk/gtk.h>
-#include <string.h>
-#include <cairo-gobject.h>
+
+#include "../../eel/eel-graphic-effects.h"
+
+#include "../../libcaja-private/caja-directory.h"
+#include "../../libcaja-private/caja-file-attributes.h"
+#include "../../libcaja-private/caja-file.h"
+
+#include "fm-tree-model.h"
 
 enum
 {
diff --git a/src/file-manager/fm-tree-model.h b/src/file-manager/fm-tree-model.h
index a5d05862..38f02902 100644
--- a/src/file-manager/fm-tree-model.h
+++ b/src/file-manager/fm-tree-model.h
@@ -28,9 +28,11 @@
 #define FM_TREE_MODEL_H
 
 #include <glib-object.h>
+
 #include <gtk/gtk.h>
 #include <gio/gio.h>
-#include <libcaja-private/caja-file.h>
+
+#include "../../libcaja-private/caja-file.h"
 
 #define FM_TYPE_TREE_MODEL fm_tree_model_get_type()
 #define FM_TREE_MODEL(obj) \
diff --git a/src/file-manager/fm-tree-view.c b/src/file-manager/fm-tree-view.c
index 5f23b045..476ce85a 100644
--- a/src/file-manager/fm-tree-view.c
+++ b/src/file-manager/fm-tree-view.c
@@ -30,36 +30,39 @@
  */
 
 #include <config.h>
-#include "fm-tree-view.h"
-
-#include "fm-tree-model.h"
-#include "fm-properties-window.h"
 #include <string.h>
-#include <eel/eel-gtk-extensions.h>
+#include <cairo-gobject.h>
+
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include <cairo-gobject.h>
-#include <libcaja-private/caja-clipboard.h>
-#include <libcaja-private/caja-clipboard-monitor.h>
-#include <libcaja-private/caja-desktop-icon-file.h>
-#include <libcaja-private/caja-debug-log.h>
-#include <libcaja-private/caja-file-attributes.h>
-#include <libcaja-private/caja-file-operations.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-icon-names.h>
-#include <libcaja-private/caja-mime-actions.h>
-#include <libcaja-private/caja-program-choosing.h>
-#include <libcaja-private/caja-tree-view-drag-dest.h>
-#include <libcaja-private/caja-sidebar-provider.h>
-#include <libcaja-private/caja-module.h>
-#include <libcaja-private/caja-window-info.h>
-#include <libcaja-private/caja-window-slot-info.h>
-#include <libcaja-private/caja-directory.h>
-#include <libcaja-private/caja-directory-private.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-file-private.h>
+
+#include "../../eel/eel-gtk-extensions.h"
+
+#include "../../libcaja-private/caja-clipboard.h"
+#include "../../libcaja-private/caja-clipboard-monitor.h"
+#include "../../libcaja-private/caja-desktop-icon-file.h"
+#include "../../libcaja-private/caja-debug-log.h"
+#include "../../libcaja-private/caja-file-attributes.h"
+#include "../../libcaja-private/caja-file-operations.h"
+#include "../../libcaja-private/caja-file-utilities.h"
+#include "../../libcaja-private/caja-global-preferences.h"
+#include "../../libcaja-private/caja-icon-names.h"
+#include "../../libcaja-private/caja-mime-actions.h"
+#include "../../libcaja-private/caja-program-choosing.h"
+#include "../../libcaja-private/caja-tree-view-drag-dest.h"
+#include "../../libcaja-private/caja-sidebar-provider.h"
+#include "../../libcaja-private/caja-module.h"
+#include "../../libcaja-private/caja-window-info.h"
+#include "../../libcaja-private/caja-window-slot-info.h"
+#include "../../libcaja-private/caja-directory.h"
+#include "../../libcaja-private/caja-directory-private.h"
+#include "../../libcaja-private/caja-file.h"
+#include "../../libcaja-private/caja-file-private.h"
+
+#include "fm-tree-view.h"
+#include "fm-tree-model.h"
+#include "fm-properties-window.h"
 
 typedef struct
 {