local #include files inside "" instead <>

87 files changed, 450 insertions, 381 deletions

diff --git a/libcaja-private/caja-autorun.c b/libcaja-private/caja-autorun.c
index 04033445..339f49bc 100644
--- a/libcaja-private/caja-autorun.c
+++ b/libcaja-private/caja-autorun.c
@@ -33,8 +33,8 @@
 #include <gdk/gdkkeysyms.h>
 #include <cairo-gobject.h>
 
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-stock-dialogs.h>
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-stock-dialogs.h"
 
 #include "caja-icon-info.h"
 #include "caja-global-preferences.h"
diff --git a/libcaja-private/caja-autorun.h b/libcaja-private/caja-autorun.h
index 43223639..8e45af0e 100644
--- a/libcaja-private/caja-autorun.h
+++ b/libcaja-private/caja-autorun.h
@@ -41,8 +41,10 @@
 #define CAJA_AUTORUN_H
 
 #include <gtk/gtk.h>
-#include <eel/eel-background.h>
-#include <libcaja-private/caja-file.h>
+
+#include "../eel/eel-background.h"
+
+#include "caja-file.h"
 
 typedef void (*CajaAutorunComboBoxChanged) (gboolean selected_ask,
         gboolean selected_ignore,
diff --git a/libcaja-private/caja-bookmark.c b/libcaja-private/caja-bookmark.c
index 22fb58a5..1017508c 100644
--- a/libcaja-private/caja-bookmark.c
+++ b/libcaja-private/caja-bookmark.c
@@ -23,17 +23,17 @@
 */
 
 #include <config.h>
-#include "caja-bookmark.h"
-
-#include "caja-file.h"
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-vfs-extensions.h>
 #include <gtk/gtk.h>
 #include <gio/gio.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-icon-names.h>
+
+#include "../eel/eel-gdk-pixbuf-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-vfs-extensions.h"
+
+#include "caja-bookmark.h"
+#include "caja-file.h"
+#include "caja-icon-names.h"
 
 enum
 {
diff --git a/libcaja-private/caja-clipboard-monitor.c b/libcaja-private/caja-clipboard-monitor.c
index e9507a72..94c58759 100644
--- a/libcaja-private/caja-clipboard-monitor.c
+++ b/libcaja-private/caja-clipboard-monitor.c
@@ -23,14 +23,15 @@
 */
 
 #include <config.h>
+#include <gtk/gtk.h>
+
+#include "../eel/eel-debug.h"
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-glib-extensions.h"
+
 #include "caja-clipboard-monitor.h"
 #include "caja-file.h"
 
-#include <eel/eel-debug.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-glib-extensions.h>
-#include <gtk/gtk.h>
-
 /* X11 has a weakness when it comes to clipboard handling,
  * there is no way to get told when the owner of the clipboard
  * changes. This is often needed, for instance to set the
diff --git a/libcaja-private/caja-column-chooser.h b/libcaja-private/caja-column-chooser.h
index 3a25080e..c94f3f03 100644
--- a/libcaja-private/caja-column-chooser.h
+++ b/libcaja-private/caja-column-chooser.h
@@ -26,7 +26,8 @@
 #define CAJA_COLUMN_CHOOSER_H
 
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-file.h>
+
+#include "caja-file.h"
 
 #define CAJA_TYPE_COLUMN_CHOOSER caja_column_chooser_get_type()
 #define CAJA_COLUMN_CHOOSER(obj) \
diff --git a/libcaja-private/caja-column-utilities.c b/libcaja-private/caja-column-utilities.c
index 57dae7f5..e4aba54a 100644
--- a/libcaja-private/caja-column-utilities.c
+++ b/libcaja-private/caja-column-utilities.c
@@ -23,14 +23,15 @@
 */
 
 #include <config.h>
-#include "caja-column-utilities.h"
-
 #include <string.h>
-#include <eel/eel-glib-extensions.h>
 #include <glib/gi18n.h>
-#include <libcaja-extension/caja-column-provider.h>
-#include <libcaja-private/caja-extensions.h>
-#include <libcaja-private/caja-module.h>
+
+#include "../eel/eel-glib-extensions.h"
+#include "../libcaja-extension/caja-column-provider.h"
+
+#include "caja-column-utilities.h"
+#include "caja-extensions.h"
+#include "caja-module.h"
 
 static GList *
 get_builtin_columns (void)
diff --git a/libcaja-private/caja-column-utilities.h b/libcaja-private/caja-column-utilities.h
index 73800c5f..8bd4c825 100644
--- a/libcaja-private/caja-column-utilities.h
+++ b/libcaja-private/caja-column-utilities.h
@@ -25,8 +25,9 @@
 #ifndef CAJA_COLUMN_UTILITIES_H
 #define CAJA_COLUMN_UTILITIES_H
 
-#include <libcaja-extension/caja-column.h>
-#include <libcaja-private/caja-file.h>
+#include "../libcaja-extension/caja-column.h"
+
+#include "caja-file.h"
 
 GList *caja_get_all_columns       (void);
 GList *caja_get_common_columns    (void);
diff --git a/libcaja-private/caja-customization-data.c b/libcaja-private/caja-customization-data.c
index 0302323d..eb4b7d12 100644
--- a/libcaja-private/caja-customization-data.c
+++ b/libcaja-private/caja-customization-data.c
@@ -26,16 +26,6 @@
    names and images */
 
 #include <config.h>
-#include "caja-customization-data.h"
-
-#include "caja-file-utilities.h"
-#include <eel/eel-gdk-extensions.h>
-#include <eel/eel-gdk-extensions.h>
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-string.h>
-#include <eel/eel-vfs-extensions.h>
-#include <eel/eel-xml-extensions.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <glib.h>
 #include <gtk/gtk.h>
@@ -44,6 +34,17 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "../eel/eel-gdk-extensions.h"
+#include "../eel/eel-gdk-extensions.h"
+#include "../eel/eel-gdk-pixbuf-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-string.h"
+#include "../eel/eel-vfs-extensions.h"
+#include "../eel/eel-xml-extensions.h"
+
+#include "caja-customization-data.h"
+#include "caja-file-utilities.h"
+
 typedef enum
 {
     READ_PUBLIC_CUSTOMIZATIONS,
diff --git a/libcaja-private/caja-desktop-directory-file.c b/libcaja-private/caja-desktop-directory-file.c
index 1484dc3f..8775e607 100644
--- a/libcaja-private/caja-desktop-directory-file.c
+++ b/libcaja-private/caja-desktop-directory-file.c
@@ -24,21 +24,22 @@
 */
 
 #include <config.h>
-#include "caja-desktop-directory-file.h"
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <string.h>
+
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-macros.h"
 
+#include "caja-desktop-directory-file.h"
 #include "caja-desktop-metadata.h"
 #include "caja-directory-notify.h"
 #include "caja-directory-private.h"
 #include "caja-file-attributes.h"
 #include "caja-file-private.h"
 #include "caja-file-utilities.h"
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-macros.h>
 #include "caja-desktop-directory.h"
 #include "caja-metadata.h"
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <string.h>
 
 struct CajaDesktopDirectoryFileDetails
 {
diff --git a/libcaja-private/caja-desktop-directory-file.h b/libcaja-private/caja-desktop-directory-file.h
index c78906f2..c77d4e84 100644
--- a/libcaja-private/caja-desktop-directory-file.h
+++ b/libcaja-private/caja-desktop-directory-file.h
@@ -26,7 +26,7 @@
 #ifndef CAJA_DESKTOP_DIRECTORY_FILE_H
 #define CAJA_DESKTOP_DIRECTORY_FILE_H
 
-#include <libcaja-private/caja-file.h>
+#include "caja-file.h"
 
 #define CAJA_TYPE_DESKTOP_DIRECTORY_FILE caja_desktop_directory_file_get_type()
 #define CAJA_DESKTOP_DIRECTORY_FILE(obj) \
diff --git a/libcaja-private/caja-desktop-directory.c b/libcaja-private/caja-desktop-directory.c
index 5ec63864..9a0d3ca3 100644
--- a/libcaja-private/caja-desktop-directory.c
+++ b/libcaja-private/caja-desktop-directory.c
@@ -25,16 +25,17 @@
 */
 
 #include <config.h>
-#include "caja-desktop-directory.h"
+#include <gtk/gtk.h>
+
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-macros.h"
 
+#include "caja-desktop-directory.h"
 #include "caja-directory-private.h"
 #include "caja-file.h"
 #include "caja-file-private.h"
 #include "caja-file-utilities.h"
 #include "caja-global-preferences.h"
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <gtk/gtk.h>
 
 struct CajaDesktopDirectoryDetails
 {
diff --git a/libcaja-private/caja-desktop-directory.h b/libcaja-private/caja-desktop-directory.h
index da18fb87..1cd2cdeb 100644
--- a/libcaja-private/caja-desktop-directory.h
+++ b/libcaja-private/caja-desktop-directory.h
@@ -27,7 +27,7 @@
 #ifndef CAJA_DESKTOP_DIRECTORY_H
 #define CAJA_DESKTOP_DIRECTORY_H
 
-#include <libcaja-private/caja-directory.h>
+#include "caja-directory.h"
 
 #define CAJA_TYPE_DESKTOP_DIRECTORY caja_desktop_directory_get_type()
 #define CAJA_DESKTOP_DIRECTORY(obj) \
diff --git a/libcaja-private/caja-desktop-icon-file.c b/libcaja-private/caja-desktop-icon-file.c
index 2ee911ab..ecd360c8 100644
--- a/libcaja-private/caja-desktop-icon-file.c
+++ b/libcaja-private/caja-desktop-icon-file.c
@@ -24,8 +24,13 @@
 */
 
 #include <config.h>
-#include "caja-desktop-icon-file.h"
+#include <glib/gi18n.h>
+#include <string.h>
+#include <gio/gio.h>
+
+#include "../eel/eel-glib-extensions.h"
 
+#include "caja-desktop-icon-file.h"
 #include "caja-desktop-metadata.h"
 #include "caja-desktop-directory-file.h"
 #include "caja-directory-notify.h"
@@ -34,11 +39,7 @@
 #include "caja-file-private.h"
 #include "caja-file-utilities.h"
 #include "caja-file-operations.h"
-#include <eel/eel-glib-extensions.h>
 #include "caja-desktop-directory.h"
-#include <glib/gi18n.h>
-#include <string.h>
-#include <gio/gio.h>
 
 struct _CajaDesktopIconFilePrivate
 {
diff --git a/libcaja-private/caja-desktop-icon-file.h b/libcaja-private/caja-desktop-icon-file.h
index 280fbe81..bcabbcd1 100644
--- a/libcaja-private/caja-desktop-icon-file.h
+++ b/libcaja-private/caja-desktop-icon-file.h
@@ -26,8 +26,8 @@
 #ifndef CAJA_DESKTOP_ICON_FILE_H
 #define CAJA_DESKTOP_ICON_FILE_H
 
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-desktop-link.h>
+#include "caja-file.h"
+#include "caja-desktop-link.h"
 
 #define CAJA_TYPE_DESKTOP_ICON_FILE caja_desktop_icon_file_get_type()
 #define CAJA_DESKTOP_ICON_FILE(obj) \
diff --git a/libcaja-private/caja-desktop-link-monitor.c b/libcaja-private/caja-desktop-link-monitor.c
index 9d1e5d71..d76b393a 100644
--- a/libcaja-private/caja-desktop-link-monitor.c
+++ b/libcaja-private/caja-desktop-link-monitor.c
@@ -23,23 +23,24 @@
 */
 
 #include <config.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <gio/gio.h>
+#include <string.h>
+
+#include "../eel/eel-debug.h"
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-vfs-extensions.h"
+#include "../eel/eel-stock-dialogs.h"
+
 #include "caja-desktop-link-monitor.h"
 #include "caja-desktop-link.h"
 #include "caja-desktop-icon-file.h"
 #include "caja-directory.h"
 #include "caja-desktop-directory.h"
 #include "caja-global-preferences.h"
-
-#include <eel/eel-debug.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-vfs-extensions.h>
-#include <eel/eel-stock-dialogs.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <gio/gio.h>
-#include <libcaja-private/caja-trash-monitor.h>
-#include <string.h>
+#include "caja-trash-monitor.h"
 
 struct CajaDesktopLinkMonitorDetails
 {
diff --git a/libcaja-private/caja-desktop-link-monitor.h b/libcaja-private/caja-desktop-link-monitor.h
index bcf89c0d..65f7598e 100644
--- a/libcaja-private/caja-desktop-link-monitor.h
+++ b/libcaja-private/caja-desktop-link-monitor.h
@@ -26,7 +26,8 @@
 #define CAJA_DESKTOP_LINK_MONITOR_H
 
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-desktop-link.h>
+
+#include "caja-desktop-link.h"
 
 #define CAJA_TYPE_DESKTOP_LINK_MONITOR caja_desktop_link_monitor_get_type()
 #define CAJA_DESKTOP_LINK_MONITOR(obj) \
diff --git a/libcaja-private/caja-desktop-link.c b/libcaja-private/caja-desktop-link.c
index 360c75cc..d6261a89 100644
--- a/libcaja-private/caja-desktop-link.c
+++ b/libcaja-private/caja-desktop-link.c
@@ -23,18 +23,19 @@
 */
 
 #include <config.h>
+#include <glib/gi18n.h>
+#include <gio/gio.h>
+#include <string.h>
+
 #include "caja-desktop-link.h"
 #include "caja-desktop-link-monitor.h"
 #include "caja-desktop-icon-file.h"
 #include "caja-directory-private.h"
 #include "caja-desktop-directory.h"
 #include "caja-icon-names.h"
-#include <glib/gi18n.h>
-#include <gio/gio.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-trash-monitor.h>
-#include <libcaja-private/caja-global-preferences.h>
-#include <string.h>
+#include "caja-file-utilities.h"
+#include "caja-trash-monitor.h"
+#include "caja-global-preferences.h"
 
 struct _CajaDesktopLinkPrivate
 {
diff --git a/libcaja-private/caja-desktop-link.h b/libcaja-private/caja-desktop-link.h
index 5411622e..a35cda19 100644
--- a/libcaja-private/caja-desktop-link.h
+++ b/libcaja-private/caja-desktop-link.h
@@ -25,9 +25,10 @@
 #ifndef CAJA_DESKTOP_LINK_H
 #define CAJA_DESKTOP_LINK_H
 
-#include <libcaja-private/caja-file.h>
 #include <gio/gio.h>
 
+#include "caja-file.h"
+
 #define CAJA_TYPE_DESKTOP_LINK caja_desktop_link_get_type()
 #define CAJA_DESKTOP_LINK(obj) \
   (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAJA_TYPE_DESKTOP_LINK, CajaDesktopLink))
diff --git a/libcaja-private/caja-desktop-metadata.h b/libcaja-private/caja-desktop-metadata.h
index dfd98b4a..10c21802 100644
--- a/libcaja-private/caja-desktop-metadata.h
+++ b/libcaja-private/caja-desktop-metadata.h
@@ -29,7 +29,7 @@
 
 #include <glib.h>
 
-#include <libcaja-private/caja-file.h>
+#include "caja-file.h"
 
 void caja_desktop_set_metadata_string (CajaFile *file,
                                        const gchar *name,
diff --git a/libcaja-private/caja-directory-async.c b/libcaja-private/caja-directory-async.c
index 983b6e7c..0a1f2cb5 100644
--- a/libcaja-private/caja-directory-async.c
+++ b/libcaja-private/caja-directory-async.c
@@ -23,6 +23,12 @@
 */
 
 #include <config.h>
+#include <gtk/gtk.h>
+#include <libxml/parser.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "../eel/eel-glib-extensions.h"
 
 #include "caja-directory-notify.h"
 #include "caja-directory-private.h"
@@ -33,11 +39,6 @@
 #include "caja-global-preferences.h"
 #include "caja-link.h"
 #include "caja-marshal.h"
-#include <eel/eel-glib-extensions.h>
-#include <gtk/gtk.h>
-#include <libxml/parser.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 /* turn this on to see messages about each load_directory call: */
 #if 0
diff --git a/libcaja-private/caja-directory-background.c b/libcaja-private/caja-directory-background.c
index 02bccb6e..c577c332 100644
--- a/libcaja-private/caja-directory-background.c
+++ b/libcaja-private/caja-directory-background.c
@@ -27,17 +27,18 @@
 */
 
 #include <config.h>
-#include "caja-directory-background.h"
+#include <gtk/gtk.h>
+#include <string.h>
+
+#include "../eel/eel-gdk-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-background.h"
 
-#include <eel/eel-gdk-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-background.h>
+#include "caja-directory-background.h"
 #include "caja-dnd.h"
 #include "caja-global-preferences.h"
 #include "caja-metadata.h"
 #include "caja-file-attributes.h"
-#include <gtk/gtk.h>
-#include <string.h>
 
 static void caja_background_changed_cb (EelBackground *background,
                                         GdkDragAction  action,
diff --git a/libcaja-private/caja-directory-background.h b/libcaja-private/caja-directory-background.h
index c86e8136..e92b40ba 100644
--- a/libcaja-private/caja-directory-background.h
+++ b/libcaja-private/caja-directory-background.h
@@ -26,9 +26,10 @@
             Jasmine Hassan <[email protected]>
 */
 
-#include <eel/eel-background.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-icon-container.h>
+#include "../eel/eel-background.h"
+
+#include "caja-file.h"
+#include "caja-icon-container.h"
 
 void     caja_connect_background_to_file_metadata    (GtkWidget         *widget,
                                                       CajaFile          *file,
diff --git a/libcaja-private/caja-directory-notify.h b/libcaja-private/caja-directory-notify.h
index 707ea8d8..dabf35e5 100644
--- a/libcaja-private/caja-directory-notify.h
+++ b/libcaja-private/caja-directory-notify.h
@@ -23,7 +23,8 @@
 */
 
 #include <gdk/gdk.h>
-#include <libcaja-private/caja-file.h>
+
+#include "caja-file.h"
 
 typedef struct
 {
diff --git a/libcaja-private/caja-directory-private.h b/libcaja-private/caja-directory-private.h
index 3a4531a2..7fb36c09 100644
--- a/libcaja-private/caja-directory-private.h
+++ b/libcaja-private/caja-directory-private.h
@@ -23,14 +23,16 @@
 */
 
 #include <gio/gio.h>
-#include <eel/eel-vfs-extensions.h>
-#include <libcaja-private/caja-directory.h>
-#include <libcaja-private/caja-file-queue.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-monitor.h>
-#include <libcaja-extension/caja-info-provider.h>
 #include <libxml/tree.h>
 
+#include "../eel/eel-vfs-extensions.h"
+#include "../libcaja-extension/caja-info-provider.h"
+
+#include "caja-directory.h"
+#include "caja-file-queue.h"
+#include "caja-file.h"
+#include "caja-monitor.h"
+
 typedef struct LinkInfoReadState LinkInfoReadState;
 typedef struct TopLeftTextReadState TopLeftTextReadState;
 typedef struct FileMonitors FileMonitors;
diff --git a/libcaja-private/caja-directory.c b/libcaja-private/caja-directory.c
index f9dc639a..d4881d44 100644
--- a/libcaja-private/caja-directory.c
+++ b/libcaja-private/caja-directory.c
@@ -23,8 +23,13 @@
 */
 
 #include <config.h>
-#include "caja-directory-private.h"
+#include <gtk/gtk.h>
+#include <string.h>
+
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-macros.h"
 
+#include "caja-directory-private.h"
 #include "caja-directory-notify.h"
 #include "caja-file-attributes.h"
 #include "caja-file-private.h"
@@ -35,10 +40,6 @@
 #include "caja-metadata.h"
 #include "caja-desktop-directory.h"
 #include "caja-vfs-directory.h"
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <gtk/gtk.h>
-#include <string.h>
 
 enum
 {
diff --git a/libcaja-private/caja-directory.h b/libcaja-private/caja-directory.h
index 08697a0b..b375e015 100644
--- a/libcaja-private/caja-directory.h
+++ b/libcaja-private/caja-directory.h
@@ -27,7 +27,8 @@
 
 #include <gtk/gtk.h>
 #include <gio/gio.h>
-#include <libcaja-private/caja-file-attributes.h>
+
+#include "caja-file-attributes.h"
 
 G_BEGIN_DECLS
 
diff --git a/libcaja-private/caja-dnd.c b/libcaja-private/caja-dnd.c
index d7dfdc14..9e6d09bc 100644
--- a/libcaja-private/caja-dnd.c
+++ b/libcaja-private/caja-dnd.c
@@ -27,22 +27,23 @@
 /* FIXME: This should really be back in Caja, not here in Eel. */
 
 #include <config.h>
-#include "caja-dnd.h"
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-string.h"
+#include "../eel/eel-vfs-extensions.h"
 
+#include "caja-dnd.h"
 #include "caja-program-choosing.h"
 #include "caja-link.h"
 #include "caja-window-slot-info.h"
 #include "caja-window-info.h"
 #include "caja-view.h"
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-string.h>
-#include <eel/eel-vfs-extensions.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <stdio.h>
-#include <string.h>
+#include "caja-file-utilities.h"
 
 /* a set of defines stolen from the eel-icon-dnd.c file.
  * These are in microseconds.
diff --git a/libcaja-private/caja-dnd.h b/libcaja-private/caja-dnd.h
index ae4ee675..10c25673 100644
--- a/libcaja-private/caja-dnd.h
+++ b/libcaja-private/caja-dnd.h
@@ -28,7 +28,8 @@
 #define CAJA_DND_H
 
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-window-slot-info.h>
+
+#include "caja-window-slot-info.h"
 
 /* Drag & Drop target names. */
 #define CAJA_ICON_DND_MATE_ICON_LIST_TYPE	"x-special/mate-icon-list"
diff --git a/libcaja-private/caja-emblem-utils.c b/libcaja-private/caja-emblem-utils.c
index 2f4aa054..e9e8f48a 100644
--- a/libcaja-private/caja-emblem-utils.c
+++ b/libcaja-private/caja-emblem-utils.c
@@ -37,8 +37,8 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-stock-dialogs.h>
+#include "../eel/eel-gdk-pixbuf-extensions.h"
+#include "../eel/eel-stock-dialogs.h"
 
 #include "caja-file.h"
 #include "caja-emblem-utils.h"
diff --git a/libcaja-private/caja-entry.c b/libcaja-private/caja-entry.c
index 466b57e8..c0a85b2c 100644
--- a/libcaja-private/caja-entry.c
+++ b/libcaja-private/caja-entry.c
@@ -25,16 +25,16 @@
  */
 
 #include <config.h>
-#include "caja-entry.h"
-
 #include <string.h>
-#include "caja-global-preferences.h"
-#include <eel/eel-gdk-extensions.h>
-#include <eel/eel-gtk-macros.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
+#include "../eel/eel-gdk-extensions.h"
+#include "../eel/eel-gtk-macros.h"
+
+#include "caja-entry.h"
+#include "caja-global-preferences.h"
 
 struct CajaEntryDetails
 {
diff --git a/libcaja-private/caja-file-conflict-dialog.c b/libcaja-private/caja-file-conflict-dialog.c
index 61af0d92..dbd75a2e 100644
--- a/libcaja-private/caja-file-conflict-dialog.c
+++ b/libcaja-private/caja-file-conflict-dialog.c
@@ -24,16 +24,16 @@
 */
 
 #include <config.h>
-#include "caja-file-conflict-dialog.h"
-
 #include <string.h>
 #include <glib-object.h>
 #include <gio/gio.h>
 #include <glib/gi18n.h>
 #include <pango/pango.h>
-#include <eel/eel-vfs-extensions.h>
-#include <eel/eel-stock-dialogs.h>
 
+#include "../eel/eel-vfs-extensions.h"
+#include "../eel/eel-stock-dialogs.h"
+
+#include "caja-file-conflict-dialog.h"
 #include "caja-file.h"
 #include "caja-icon-info.h"
 
diff --git a/libcaja-private/caja-file-dnd.h b/libcaja-private/caja-file-dnd.h
index 117e1823..4d9d0a90 100644
--- a/libcaja-private/caja-file-dnd.h
+++ b/libcaja-private/caja-file-dnd.h
@@ -25,8 +25,8 @@
 #ifndef CAJA_FILE_DND_H
 #define CAJA_FILE_DND_H
 
-#include <libcaja-private/caja-dnd.h>
-#include <libcaja-private/caja-file.h>
+#include "caja-dnd.h"
+#include "caja-file.h"
 
 #define CAJA_FILE_DND_ERASE_KEYWORD "erase"
 
diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c
index 6de6fdfe..f563f2a8 100644
--- a/libcaja-private/caja-file-operations.c
+++ b/libcaja-private/caja-file-operations.c
@@ -35,20 +35,6 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <stdlib.h>
-
-#include "caja-file-operations.h"
-
-#include "caja-debug-log.h"
-#include "caja-file-changes-queue.h"
-#include "caja-lib-self-check-functions.h"
-
-#include "caja-progress-info.h"
-
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-vfs-extensions.h>
-
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <gdk/gdk.h>
@@ -57,6 +43,17 @@
 #include <gio/gio.h>
 #include <glib.h>
 #include <libnotify/notify.h>
+
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-stock-dialogs.h"
+#include "../eel/eel-vfs-extensions.h"
+
+#include "caja-file-operations.h"
+#include "caja-debug-log.h"
+#include "caja-file-changes-queue.h"
+#include "caja-lib-self-check-functions.h"
+#include "caja-progress-info.h"
 #include "caja-file-changes-queue.h"
 #include "caja-file-private.h"
 #include "caja-desktop-icon-file.h"
diff --git a/libcaja-private/caja-file-private.h b/libcaja-private/caja-file-private.h
index 053f62a0..2e1d0920 100644
--- a/libcaja-private/caja-file-private.h
+++ b/libcaja-private/caja-file-private.h
@@ -25,12 +25,13 @@
 #ifndef CAJA_FILE_PRIVATE_H
 #define CAJA_FILE_PRIVATE_H
 
-#include <libcaja-private/caja-directory.h>
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-monitor.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-string.h>
-#include <libcaja-private/caja-undostack-manager.h>
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-string.h"
+
+#include "caja-directory.h"
+#include "caja-file.h"
+#include "caja-monitor.h"
+#include "caja-undostack-manager.h"
 
 #define CAJA_FILE_LARGE_TOP_LEFT_TEXT_MAXIMUM_CHARACTERS_PER_LINE 80
 #define CAJA_FILE_LARGE_TOP_LEFT_TEXT_MAXIMUM_LINES               24
diff --git a/libcaja-private/caja-file-queue.h b/libcaja-private/caja-file-queue.h
index 32dee492..1d18f14e 100644
--- a/libcaja-private/caja-file-queue.h
+++ b/libcaja-private/caja-file-queue.h
@@ -23,7 +23,7 @@
 #ifndef CAJA_FILE_QUEUE_H
 #define CAJA_FILE_QUEUE_H
 
-#include <libcaja-private/caja-file.h>
+#include "caja-file.h"
 
 typedef struct CajaFileQueue CajaFileQueue;
 
diff --git a/libcaja-private/caja-file-utilities.c b/libcaja-private/caja-file-utilities.c
index 46f90b0a..355bb82e 100644
--- a/libcaja-private/caja-file-utilities.c
+++ b/libcaja-private/caja-file-utilities.c
@@ -23,8 +23,18 @@
 */
 
 #include <config.h>
-#include "caja-file-utilities.h"
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <glib/gstdio.h>
+#include <gio/gio.h>
+#include <stdlib.h>
+
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-stock-dialogs.h"
+#include "../eel/eel-string.h"
+#include "../eel/eel-debug.h"
 
+#include "caja-file-utilities.h"
 #include "caja-global-preferences.h"
 #include "caja-lib-self-check-functions.h"
 #include "caja-metadata.h"
@@ -32,15 +42,6 @@
 #include "caja-file-operations.h"
 #include "caja-search-directory.h"
 #include "caja-signaller.h"
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
-#include <eel/eel-debug.h>
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <glib/gstdio.h>
-#include <gio/gio.h>
-#include <stdlib.h>
 
 #define DEFAULT_CAJA_DIRECTORY_MODE (0755)
 
diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c
index 95d58f25..a7d848ab 100644
--- a/libcaja-private/caja-file.c
+++ b/libcaja-private/caja-file.c
@@ -23,8 +23,33 @@
 */
 
 #include <config.h>
-#include "caja-file.h"
+#include <grp.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <glib/gstdio.h>
+#include <gio/gio.h>
+#include <glib.h>
+#include <libxml/parser.h>
+#include <pwd.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <sys/time.h>
+#include <time.h>
+#include <unistd.h>
+#include <sys/stat.h>
+
+#include "../eel/eel-debug.h"
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-vfs-extensions.h"
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-string.h"
+
+#include "../libcaja-extension/caja-file-info.h"
+#include "../libcaja-extension/caja-extension-private.h"
+#include "../libcaja-private/caja-extensions.h"
 
+#include "caja-file.h"
 #include "caja-directory-notify.h"
 #include "caja-directory-private.h"
 #include "caja-signaller.h"
@@ -46,31 +71,6 @@
 #include "caja-ui-utilities.h"
 #include "caja-vfs-file.h"
 #include "caja-saved-search-file.h"
-#include <eel/eel-debug.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-vfs-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-string.h>
-#include <grp.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <glib/gstdio.h>
-#include <gio/gio.h>
-#include <glib.h>
-
-#include <libcaja-extension/caja-file-info.h>
-#include <libcaja-extension/caja-extension-private.h>
-#include <libcaja-private/caja-extensions.h>
-
-#include <libxml/parser.h>
-#include <pwd.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <sys/time.h>
-#include <time.h>
-#include <unistd.h>
-#include <sys/stat.h>
 
 #ifdef HAVE_SELINUX
 #include <selinux/selinux.h>
diff --git a/libcaja-private/caja-file.h b/libcaja-private/caja-file.h
index 4c24b15a..0a04a53c 100644
--- a/libcaja-private/caja-file.h
+++ b/libcaja-private/caja-file.h
@@ -27,8 +27,9 @@
 
 #include <gtk/gtk.h>
 #include <gio/gio.h>
-#include <libcaja-private/caja-file-attributes.h>
-#include <libcaja-private/caja-icon-info.h>
+
+#include "caja-file-attributes.h"
+#include "caja-icon-info.h"
 
 G_BEGIN_DECLS
 
diff --git a/libcaja-private/caja-global-preferences.c b/libcaja-private/caja-global-preferences.c
index c5f6f193..36783dc9 100644
--- a/libcaja-private/caja-global-preferences.c
+++ b/libcaja-private/caja-global-preferences.c
@@ -24,15 +24,16 @@
 */
 
 #include <config.h>
-#include "caja-global-preferences.h"
+#include <glib/gi18n.h>
+
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-stock-dialogs.h"
+#include "../eel/eel-string.h"
 
+#include "caja-global-preferences.h"
 #include "caja-file-utilities.h"
 #include "caja-file.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 <glib/gi18n.h>
 
 /*
  * Public functions
diff --git a/libcaja-private/caja-icon-canvas-item.c b/libcaja-private/caja-icon-canvas-item.c
index 1a35fda7..37ba1672 100644
--- a/libcaja-private/caja-icon-canvas-item.c
+++ b/libcaja-private/caja-icon-canvas-item.c
@@ -24,21 +24,7 @@
 
 #include <config.h>
 #include <math.h>
-#include "caja-icon-canvas-item.h"
-
 #include <glib/gi18n.h>
-
-#include "caja-file-utilities.h"
-#include "caja-global-preferences.h"
-#include "caja-icon-private.h"
-#include <eel/eel-art-extensions.h>
-#include <eel/eel-gdk-extensions.h>
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-graphic-effects.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-string.h>
-#include <eel/eel-accessibility.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
@@ -49,6 +35,20 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "../eel/eel-art-extensions.h"
+#include "../eel/eel-gdk-extensions.h"
+#include "../eel/eel-gdk-pixbuf-extensions.h"
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-graphic-effects.h"
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-string.h"
+#include "../eel/eel-accessibility.h"
+
+#include "caja-icon-canvas-item.h"
+#include "caja-file-utilities.h"
+#include "caja-global-preferences.h"
+#include "caja-icon-private.h"
+
 #define EMBLEM_SPACING 2
 
 /* gap between bottom of icon and start of text box */
diff --git a/libcaja-private/caja-icon-canvas-item.h b/libcaja-private/caja-icon-canvas-item.h
index 507fd8ad..58215412 100644
--- a/libcaja-private/caja-icon-canvas-item.h
+++ b/libcaja-private/caja-icon-canvas-item.h
@@ -25,8 +25,8 @@
 #ifndef CAJA_ICON_CANVAS_ITEM_H
 #define CAJA_ICON_CANVAS_ITEM_H
 
-#include <eel/eel-canvas.h>
-#include <eel/eel-art-extensions.h>
+#include "../eel/eel-canvas.h"
+#include "../eel/eel-art-extensions.h"
 
 G_BEGIN_DECLS
 
diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c
index b082f9b7..3a376faf 100644
--- a/libcaja-private/caja-icon-container.c
+++ b/libcaja-private/caja-icon-container.c
@@ -27,25 +27,7 @@
 
 #include <config.h>
 #include <math.h>
-#include "caja-icon-container.h"
-
-#include "caja-debug-log.h"
-#include "caja-global-preferences.h"
-#include "caja-icon-private.h"
-#include "caja-lib-self-check-functions.h"
-#include "caja-marshal.h"
 #include <atk/atkaction.h>
-#include <eel/eel-accessibility.h>
-#include <eel/eel-background.h>
-#include <eel/eel-vfs-extensions.h>
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-mate-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-art-extensions.h>
-#include <eel/eel-editable-label.h>
-#include <eel/eel-string.h>
-#include <eel/eel-canvas.h>
-#include <eel/eel-canvas-rect-ellipse.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
@@ -53,6 +35,25 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "../eel/eel-accessibility.h"
+#include "../eel/eel-background.h"
+#include "../eel/eel-vfs-extensions.h"
+#include "../eel/eel-gdk-pixbuf-extensions.h"
+#include "../eel/eel-mate-extensions.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-art-extensions.h"
+#include "../eel/eel-editable-label.h"
+#include "../eel/eel-string.h"
+#include "../eel/eel-canvas.h"
+#include "../eel/eel-canvas-rect-ellipse.h"
+
+#include "caja-icon-container.h"
+#include "caja-debug-log.h"
+#include "caja-global-preferences.h"
+#include "caja-icon-private.h"
+#include "caja-lib-self-check-functions.h"
+#include "caja-marshal.h"
+
 #define TAB_NAVIGATION_DISABLED
 
 /* Interval for updating the rubberband selection, in milliseconds.  */
diff --git a/libcaja-private/caja-icon-container.h b/libcaja-private/caja-icon-container.h
index cb24bca2..2bc03818 100644
--- a/libcaja-private/caja-icon-container.h
+++ b/libcaja-private/caja-icon-container.h
@@ -26,8 +26,9 @@
 #ifndef CAJA_ICON_CONTAINER_H
 #define CAJA_ICON_CONTAINER_H
 
-#include <eel/eel-canvas.h>
-#include <libcaja-private/caja-icon-info.h>
+#include "../eel/eel-canvas.h"
+
+#include "caja-icon-info.h"
 
 #define CAJA_TYPE_ICON_CONTAINER caja_icon_container_get_type()
 #define CAJA_ICON_CONTAINER(obj) \
diff --git a/libcaja-private/caja-icon-dnd.c b/libcaja-private/caja-icon-dnd.c
index 0917960c..0215a98f 100644
--- a/libcaja-private/caja-icon-dnd.c
+++ b/libcaja-private/caja-icon-dnd.c
@@ -33,32 +33,34 @@
 
 #include <config.h>
 #include <math.h>
-#include "caja-icon-dnd.h"
+#include <stdio.h>
+#include <string.h>
+
+#include <gdk/gdkkeysyms.h>
+#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
+#include "../eel/eel-background.h"
+#include "../eel/eel-gdk-pixbuf-extensions.h"
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-mate-extensions.h"
+#include "../eel/eel-graphic-effects.h"
+#include "../eel/eel-gtk-extensions.h"
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-stock-dialogs.h"
+#include "../eel/eel-string.h"
+#include "../eel/eel-vfs-extensions.h"
+#include "../eel/eel-canvas-rect-ellipse.h"
+
+#include "caja-icon-dnd.h"
 #include "caja-debug-log.h"
 #include "caja-file-dnd.h"
 #include "caja-icon-private.h"
 #include "caja-link.h"
 #include "caja-metadata.h"
-#include <eel/eel-background.h>
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-mate-extensions.h>
-#include <eel/eel-graphic-effects.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
-#include <eel/eel-vfs-extensions.h>
-#include <gdk/gdkkeysyms.h>
-#include <gdk/gdkx.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <eel/eel-canvas-rect-ellipse.h>
-#include <libcaja-private/caja-file-utilities.h>
-#include <libcaja-private/caja-file-changes-queue.h>
-#include <stdio.h>
-#include <string.h>
+#include "caja-file-utilities.h"
+#include "caja-file-changes-queue.h"
 
 static const GtkTargetEntry drag_types [] =
 {
diff --git a/libcaja-private/caja-icon-dnd.h b/libcaja-private/caja-icon-dnd.h
index 6cf14aa0..2cea0f1d 100644
--- a/libcaja-private/caja-icon-dnd.h
+++ b/libcaja-private/caja-icon-dnd.h
@@ -28,8 +28,8 @@
 #ifndef CAJA_ICON_DND_H
 #define CAJA_ICON_DND_H
 
-#include <libcaja-private/caja-icon-container.h>
-#include <libcaja-private/caja-dnd.h>
+#include "caja-icon-container.h"
+#include "caja-dnd.h"
 
 /* DnD-related information. */
 typedef struct
diff --git a/libcaja-private/caja-icon-private.h b/libcaja-private/caja-icon-private.h
index 7145a3c4..6d1657d5 100644
--- a/libcaja-private/caja-icon-private.h
+++ b/libcaja-private/caja-icon-private.h
@@ -25,10 +25,11 @@
 #ifndef CAJA_ICON_CONTAINER_PRIVATE_H
 #define CAJA_ICON_CONTAINER_PRIVATE_H
 
-#include <eel/eel-glib-extensions.h>
-#include <libcaja-private/caja-icon-canvas-item.h>
-#include <libcaja-private/caja-icon-container.h>
-#include <libcaja-private/caja-icon-dnd.h>
+#include "../eel/eel-glib-extensions.h"
+
+#include "caja-icon-canvas-item.h"
+#include "caja-icon-container.h"
+#include "caja-icon-dnd.h"
 
 /* An Icon. */
 
diff --git a/libcaja-private/caja-lib-self-check-functions.h b/libcaja-private/caja-lib-self-check-functions.h
index 4fa973e3..4e9a2de0 100644
--- a/libcaja-private/caja-lib-self-check-functions.h
+++ b/libcaja-private/caja-lib-self-check-functions.h
@@ -23,7 +23,7 @@
    Author: Darin Adler <[email protected]>
 */
 
-#include <eel/eel-self-checks.h>
+#include "../eel/eel-self-checks.h"
 
 void caja_run_lib_self_checks (void);
 
diff --git a/libcaja-private/caja-link.c b/libcaja-private/caja-link.c
index 4f39a474..733cae22 100644
--- a/libcaja-private/caja-link.c
+++ b/libcaja-private/caja-link.c
@@ -24,19 +24,21 @@
 */
 
 #include <config.h>
-#include "caja-link.h"
+#include <stdlib.h>
+#include <string.h>
+
+#include <glib/gi18n.h>
+#include <gio/gio.h>
 
+#include "../eel/eel-vfs-extensions.h"
+
+#include "caja-link.h"
 #include "caja-directory-notify.h"
 #include "caja-directory.h"
 #include "caja-file-utilities.h"
 #include "caja-file.h"
 #include "caja-program-choosing.h"
 #include "caja-icon-names.h"
-#include <eel/eel-vfs-extensions.h>
-#include <glib/gi18n.h>
-#include <gio/gio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #define MAIN_GROUP "Desktop Entry"
 
diff --git a/libcaja-private/caja-mime-actions.c b/libcaja-private/caja-mime-actions.c
index 09e809ce..789086e1 100644
--- a/libcaja-private/caja-mime-actions.c
+++ b/libcaja-private/caja-mime-actions.c
@@ -23,16 +23,17 @@
 */
 
 #include <config.h>
-#include "caja-mime-actions.h"
+#include <string.h>
 
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
-#include <string.h>
 #include <gdk/gdkx.h>
 
+#include "../eel/eel-glib-extensions.h"
+#include "../eel/eel-stock-dialogs.h"
+#include "../eel/eel-string.h"
+
+#include "caja-mime-actions.h"
 #include "caja-file-attributes.h"
 #include "caja-file.h"
 #include "caja-autorun.h"
diff --git a/libcaja-private/caja-mime-actions.h b/libcaja-private/caja-mime-actions.h
index 3a8ba638..48c9c1c5 100644
--- a/libcaja-private/caja-mime-actions.h
+++ b/libcaja-private/caja-mime-actions.h
@@ -27,9 +27,9 @@
 
 #include <gio/gio.h>
 
-#include <libcaja-private/caja-file.h>
-#include <libcaja-private/caja-window-info.h>
-#include <libcaja-private/caja-window-slot-info.h>
+#include "caja-file.h"
+#include "caja-window-info.h"
+#include "caja-window-slot-info.h"
 
 CajaFileAttributes caja_mime_actions_get_required_file_attributes (void);
 
diff --git a/libcaja-private/caja-mime-application-chooser.c b/libcaja-private/caja-mime-application-chooser.c
index 5abb9cda..d043b22a 100644
--- a/libcaja-private/caja-mime-application-chooser.c
+++ b/libcaja-private/caja-mime-application-chooser.c
@@ -26,19 +26,20 @@
 */
 
 #include <config.h>
-#include "caja-mime-application-chooser.h"
-
-#include "caja-open-with-dialog.h"
-#include "caja-signaller.h"
-#include "caja-file.h"
-#include <eel/eel-stock-dialogs.h>
-
 #include <string.h>
+
 #include <glib/gi18n-lib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 
+#include "../eel/eel-stock-dialogs.h"
+
+#include "caja-mime-application-chooser.h"
+#include "caja-open-with-dialog.h"
+#include "caja-signaller.h"
+#include "caja-file.h"
+
 struct _CajaMimeApplicationChooserDetails
 {
     char *uri;
diff --git a/libcaja-private/caja-module.c b/libcaja-private/caja-module.c
index e2ec7ea7..d7405d4d 100644
--- a/libcaja-private/caja-module.c
+++ b/libcaja-private/caja-module.c
@@ -22,12 +22,13 @@
  */
 
 #include <config.h>
-#include "caja-module.h"
-
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-debug.h>
 #include <gmodule.h>
-#include <libcaja-private/caja-extensions.h>
+
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-debug.h"
+
+#include "caja-module.h"
+#include "caja-extensions.h"
 
 #define CAJA_TYPE_MODULE    	(caja_module_get_type ())
 #define CAJA_MODULE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), CAJA_TYPE_MODULE, CajaModule))
diff --git a/libcaja-private/caja-open-with-dialog.c b/libcaja-private/caja-open-with-dialog.c
index e42a8fbd..f12775d7 100644
--- a/libcaja-private/caja-open-with-dialog.c
+++ b/libcaja-private/caja-open-with-dialog.c
@@ -26,16 +26,17 @@
 */
 
 #include <config.h>
-#include "caja-open-with-dialog.h"
-#include "caja-signaller.h"
-
-#include <eel/eel-stock-dialogs.h>
-
 #include <string.h>
+#include <cairo-gobject.h>
+
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <gio/gio.h>
-#include <cairo-gobject.h>
+
+#include "../eel/eel-stock-dialogs.h"
+
+#include "caja-open-with-dialog.h"
+#include "caja-signaller.h"
 
 #define sure_string(s)                    ((const char *)((s)!=NULL?(s):""))
 #define DESKTOP_ENTRY_GROUP		  "Desktop Entry"
diff --git a/libcaja-private/caja-program-choosing.c b/libcaja-private/caja-program-choosing.c
index 920261d7..5efdb7ec 100644
--- a/libcaja-private/caja-program-choosing.c
+++ b/libcaja-private/caja-program-choosing.c
@@ -24,24 +24,25 @@
 */
 
 #include <config.h>
-#include "caja-program-choosing.h"
+#include <stdlib.h>
 
-#include "caja-mime-actions.h"
-#include "caja-global-preferences.h"
-#include "caja-icon-info.h"
-#include "caja-recent.h"
-#include "caja-desktop-icon-file.h"
-#include <eel/eel-mate-extensions.h>
-#include <eel/eel-stock-dialogs.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <gio/gdesktopappinfo.h>
-#include <stdlib.h>
-
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 
+#include "../eel/eel-mate-extensions.h"
+#include "../eel/eel-stock-dialogs.h"
+
+#include "caja-program-choosing.h"
+#include "caja-mime-actions.h"
+#include "caja-global-preferences.h"
+#include "caja-icon-info.h"
+#include "caja-recent.h"
+#include "caja-desktop-icon-file.h"
+
 /**
  * application_cannot_open_location
  *
diff --git a/libcaja-private/caja-program-choosing.h b/libcaja-private/caja-program-choosing.h
index 50646a55..9f3c7b52 100644
--- a/libcaja-private/caja-program-choosing.h
+++ b/libcaja-private/caja-program-choosing.h
@@ -28,7 +28,8 @@
 
 #include <gtk/gtk.h>
 #include <gio/gio.h>
-#include <libcaja-private/caja-file.h>
+
+#include "caja-file.h"
 
 typedef void (*CajaApplicationChoiceCallback) (GAppInfo                      *application,
         gpointer			  callback_data);
diff --git a/libcaja-private/caja-progress-info.c b/libcaja-private/caja-progress-info.c
index 0023c65e..d11cf69a 100644
--- a/libcaja-private/caja-progress-info.c
+++ b/libcaja-private/caja-progress-info.c
@@ -24,12 +24,15 @@
 
 #include <config.h>
 #include <math.h>
+#include <string.h>
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <eel/eel-glib-extensions.h>
+
+#include "../eel/eel-glib-extensions.h"
+
 #include "caja-progress-info.h"
 #include "caja-global-preferences.h"
-#include <string.h>
 
 enum
 {
diff --git a/libcaja-private/caja-query.c b/libcaja-private/caja-query.c
index a654eb2c..023231d8 100644
--- a/libcaja-private/caja-query.c
+++ b/libcaja-private/caja-query.c
@@ -23,12 +23,13 @@
 
 #include <config.h>
 #include <string.h>
+#include <glib/gi18n.h>
+
+#include "../eel/eel-gtk-macros.h"
+#include "../eel/eel-glib-extensions.h"
 
 #include "caja-query.h"
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-glib-extensions.h>
-#include <glib/gi18n.h>
-#include <libcaja-private/caja-file-utilities.h>
+#include "caja-file-utilities.h"
 
 struct CajaQueryDetails
 {
diff --git a/libcaja-private/caja-recent.c b/libcaja-private/caja-recent.c
index f2925175..9b8d0e9c 100644
--- a/libcaja-private/caja-recent.c
+++ b/libcaja-private/caja-recent.c
@@ -18,9 +18,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "caja-recent.h"
+#include "../eel/eel-vfs-extensions.h"
 
-#include <eel/eel-vfs-extensions.h>
+#include "caja-recent.h"
 
 #define DEFAULT_APP_EXEC "gio open %u"
 
diff --git a/libcaja-private/caja-recent.h b/libcaja-private/caja-recent.h
index dac63637..d2147237 100644
--- a/libcaja-private/caja-recent.h
+++ b/libcaja-private/caja-recent.h
@@ -4,9 +4,10 @@
 #define __CAJA_RECENT_H__
 
 #include <gtk/gtk.h>
-#include <libcaja-private/caja-file.h>
 #include <gio/gio.h>
 
+#include "caja-file.h"
+
 void caja_recent_add_file (CajaFile *file,
                            GAppInfo *application);
 
diff --git a/libcaja-private/caja-saved-search-file.h b/libcaja-private/caja-saved-search-file.h
index 35d93fd7..42089993 100644
--- a/libcaja-private/caja-saved-search-file.h
+++ b/libcaja-private/caja-saved-search-file.h
@@ -26,7 +26,7 @@
 #ifndef CAJA_SAVED_SEARCH_FILE_H
 #define CAJA_SAVED_SEARCH_FILE_H
 
-#include <libcaja-private/caja-vfs-file.h>
+#include "caja-vfs-file.h"
 
 #define CAJA_TYPE_SAVED_SEARCH_FILE caja_saved_search_file_get_type()
 #define CAJA_SAVED_SEARCH_FILE(obj) \
diff --git a/libcaja-private/caja-search-directory-file.c b/libcaja-private/caja-search-directory-file.c
index bf13bb7e..dfd21c09 100644
--- a/libcaja-private/caja-search-directory-file.c
+++ b/libcaja-private/caja-search-directory-file.c
@@ -24,18 +24,20 @@
 */
 
 #include <config.h>
-#include "caja-search-directory-file.h"
+#include <string.h>
+
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
+#include "../eel/eel-glib-extensions.h"
+
+#include "caja-search-directory-file.h"
 #include "caja-directory-notify.h"
 #include "caja-directory-private.h"
 #include "caja-file-attributes.h"
 #include "caja-file-private.h"
 #include "caja-file-utilities.h"
-#include <eel/eel-glib-extensions.h>
 #include "caja-search-directory.h"
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <string.h>
 
 struct CajaSearchDirectoryFileDetails
 {
diff --git a/libcaja-private/caja-search-directory-file.h b/libcaja-private/caja-search-directory-file.h
index 2bfb7a7e..ac6a8d0d 100644
--- a/libcaja-private/caja-search-directory-file.h
+++ b/libcaja-private/caja-search-directory-file.h
@@ -26,7 +26,7 @@
 #ifndef CAJA_SEARCH_DIRECTORY_FILE_H
 #define CAJA_SEARCH_DIRECTORY_FILE_H
 
-#include <libcaja-private/caja-file.h>
+#include "caja-file.h"
 
 #define CAJA_TYPE_SEARCH_DIRECTORY_FILE caja_search_directory_file_get_type()
 #define CAJA_SEARCH_DIRECTORY_FILE(obj) \
diff --git a/libcaja-private/caja-search-directory.c b/libcaja-private/caja-search-directory.c
index e6fb7cd5..befc4aca 100644
--- a/libcaja-private/caja-search-directory.c
+++ b/libcaja-private/caja-search-directory.c
@@ -21,19 +21,21 @@
 */
 
 #include <config.h>
+#include <string.h>
+
+#include <gtk/gtk.h>
+#include <gio/gio.h>
+#include <sys/time.h>
+
+#include "../eel/eel-glib-extensions.h"
+
 #include "caja-search-directory.h"
 #include "caja-search-directory-file.h"
-
 #include "caja-directory-private.h"
 #include "caja-file.h"
 #include "caja-file-private.h"
 #include "caja-file-utilities.h"
 #include "caja-search-engine.h"
-#include <eel/eel-glib-extensions.h>
-#include <gtk/gtk.h>
-#include <gio/gio.h>
-#include <string.h>
-#include <sys/time.h>
 
 struct CajaSearchDirectoryDetails
 {
diff --git a/libcaja-private/caja-search-directory.h b/libcaja-private/caja-search-directory.h
index b7e6a00b..4214f097 100644
--- a/libcaja-private/caja-search-directory.h
+++ b/libcaja-private/caja-search-directory.h
@@ -25,8 +25,8 @@
 #ifndef CAJA_SEARCH_DIRECTORY_H
 #define CAJA_SEARCH_DIRECTORY_H
 
-#include <libcaja-private/caja-directory.h>
-#include <libcaja-private/caja-query.h>
+#include "caja-directory.h"
+#include "caja-query.h"
 
 #define CAJA_TYPE_SEARCH_DIRECTORY caja_search_directory_get_type()
 #define CAJA_SEARCH_DIRECTORY(obj) \
diff --git a/libcaja-private/caja-search-engine-beagle.c b/libcaja-private/caja-search-engine-beagle.c
index 14bbb605..4b546898 100644
--- a/libcaja-private/caja-search-engine-beagle.c
+++ b/libcaja-private/caja-search-engine-beagle.c
@@ -22,11 +22,12 @@
  */
 
 #include <config.h>
-#include "caja-search-engine-beagle.h"
-
-#include <eel/eel-gtk-macros.h>
 #include <gmodule.h>
 
+#include "../eel/eel-gtk-macros.h"
+
+#include "caja-search-engine-beagle.h"
+
 typedef struct _BeagleHit BeagleHit;
 typedef struct _BeagleQuery BeagleQuery;
 typedef struct _BeagleClient BeagleClient;
diff --git a/libcaja-private/caja-search-engine-beagle.h b/libcaja-private/caja-search-engine-beagle.h
index 4fe65663..cd213acc 100644
--- a/libcaja-private/caja-search-engine-beagle.h
+++ b/libcaja-private/caja-search-engine-beagle.h
@@ -24,7 +24,7 @@
 #ifndef CAJA_SEARCH_ENGINE_BEAGLE_H
 #define CAJA_SEARCH_ENGINE_BEAGLE_H
 
-#include <libcaja-private/caja-search-engine.h>
+#include "caja-search-engine.h"
 
 #define CAJA_TYPE_SEARCH_ENGINE_BEAGLE		(caja_search_engine_beagle_get_type ())
 #define CAJA_SEARCH_ENGINE_BEAGLE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), CAJA_TYPE_SEARCH_ENGINE_BEAGLE, CajaSearchEngineBeagle))
diff --git a/libcaja-private/caja-search-engine-simple.c b/libcaja-private/caja-search-engine-simple.c
index 519ea51a..bb03054a 100644
--- a/libcaja-private/caja-search-engine-simple.c
+++ b/libcaja-private/caja-search-engine-simple.c
@@ -22,14 +22,15 @@
  */
 
 #include <config.h>
-#include "caja-search-engine-simple.h"
-
 #include <string.h>
 #include <glib.h>
 
-#include <eel/eel-gtk-macros.h>
 #include <gio/gio.h>
 
+#include "../eel/eel-gtk-macros.h"
+
+#include "caja-search-engine-simple.h"
+
 #define BATCH_SIZE 500
 
 typedef struct
diff --git a/libcaja-private/caja-search-engine-simple.h b/libcaja-private/caja-search-engine-simple.h
index a66fe7b1..eaf4a77a 100644
--- a/libcaja-private/caja-search-engine-simple.h
+++ b/libcaja-private/caja-search-engine-simple.h
@@ -24,7 +24,7 @@
 #ifndef CAJA_SEARCH_ENGINE_SIMPLE_H
 #define CAJA_SEARCH_ENGINE_SIMPLE_H
 
-#include <libcaja-private/caja-search-engine.h>
+#include "caja-search-engine.h"
 
 #define CAJA_TYPE_SEARCH_ENGINE_SIMPLE		(caja_search_engine_simple_get_type ())
 #define CAJA_SEARCH_ENGINE_SIMPLE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), CAJA_TYPE_SEARCH_ENGINE_SIMPLE, CajaSearchEngineSimple))
diff --git a/libcaja-private/caja-search-engine-tracker.c b/libcaja-private/caja-search-engine-tracker.c
index 5f97a70e..b7a97508 100644
--- a/libcaja-private/caja-search-engine-tracker.c
+++ b/libcaja-private/caja-search-engine-tracker.c
@@ -22,11 +22,13 @@
  */
 
 #include <config.h>
-#include "caja-search-engine-tracker.h"
-#include <eel/eel-gtk-macros.h>
 #include <gmodule.h>
 #include <string.h>
 
+#include "../eel/eel-gtk-macros.h"
+
+#include "caja-search-engine-tracker.h"
+
 typedef struct _TrackerClient TrackerClient;
 
 typedef enum
diff --git a/libcaja-private/caja-search-engine-tracker.h b/libcaja-private/caja-search-engine-tracker.h
index 72c6ef67..d9682e49 100644
--- a/libcaja-private/caja-search-engine-tracker.h
+++ b/libcaja-private/caja-search-engine-tracker.h
@@ -24,7 +24,7 @@
 #ifndef CAJA_SEARCH_ENGINE_TRACKER_H
 #define CAJA_SEARCH_ENGINE_TRACKER_H
 
-#include <libcaja-private/caja-search-engine.h>
+#include "caja-search-engine.h"
 
 #define CAJA_TYPE_SEARCH_ENGINE_TRACKER		(caja_search_engine_tracker_get_type ())
 #define CAJA_SEARCH_ENGINE_TRACKER(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), CAJA_TYPE_SEARCH_ENGINE_TRACKER, CajaSearchEngineTracker))
diff --git a/libcaja-private/caja-search-engine.c b/libcaja-private/caja-search-engine.c
index 59bb05ab..e7cca500 100644
--- a/libcaja-private/caja-search-engine.c
+++ b/libcaja-private/caja-search-engine.c
@@ -22,13 +22,14 @@
  */
 
 #include <config.h>
+
+#include "../eel/eel-gtk-macros.h"
+
 #include "caja-search-engine.h"
 #include "caja-search-engine-beagle.h"
 #include "caja-search-engine-simple.h"
 #include "caja-search-engine-tracker.h"
 
-#include <eel/eel-gtk-macros.h>
-
 struct CajaSearchEngineDetails
 {
     int none;
diff --git a/libcaja-private/caja-search-engine.h b/libcaja-private/caja-search-engine.h
index 3f37d2fc..3d811ff4 100644
--- a/libcaja-private/caja-search-engine.h
+++ b/libcaja-private/caja-search-engine.h
@@ -25,7 +25,8 @@
 #define CAJA_SEARCH_ENGINE_H
 
 #include <glib-object.h>
-#include <libcaja-private/caja-query.h>
+
+#include "caja-query.h"
 
 #define CAJA_TYPE_SEARCH_ENGINE		(caja_search_engine_get_type ())
 #define CAJA_SEARCH_ENGINE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), CAJA_TYPE_SEARCH_ENGINE, CajaSearchEngine))
diff --git a/libcaja-private/caja-sidebar-provider.h b/libcaja-private/caja-sidebar-provider.h
index 21febd6a..2c762e14 100644
--- a/libcaja-private/caja-sidebar-provider.h
+++ b/libcaja-private/caja-sidebar-provider.h
@@ -25,8 +25,8 @@
 #ifndef CAJA_SIDEBAR_PROVIDER_H
 #define CAJA_SIDEBAR_PROVIDER_H
 
-#include <libcaja-private/caja-sidebar.h>
-#include <libcaja-private/caja-window-info.h>
+#include "caja-sidebar.h"
+#include "caja-window-info.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/libcaja-private/caja-signaller.c b/libcaja-private/caja-signaller.c
index 0d31bed7..3e7a53cd 100644
--- a/libcaja-private/caja-signaller.c
+++ b/libcaja-private/caja-signaller.c
@@ -27,9 +27,10 @@
  */
 
 #include <config.h>
-#include "caja-signaller.h"
 
-#include <eel/eel-debug.h>
+#include "../eel/eel-debug.h"
+
+#include "caja-signaller.h"
 
 typedef GObject CajaSignaller;
 typedef GObjectClass CajaSignallerClass;
diff --git a/libcaja-private/caja-thumbnails.c b/libcaja-private/caja-thumbnails.c
index 3f009475..62d36648 100644
--- a/libcaja-private/caja-thumbnails.c
+++ b/libcaja-private/caja-thumbnails.c
@@ -24,28 +24,29 @@
 */
 
 #include <config.h>
-#include "caja-thumbnails.h"
-
-#define MATE_DESKTOP_USE_UNSTABLE_API
-
-#include "caja-directory-notify.h"
-#include "caja-global-preferences.h"
-#include "caja-file-utilities.h"
 #include <math.h>
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-graphic-effects.h>
-#include <eel/eel-string.h>
-#include <eel/eel-debug.h>
-#include <eel/eel-vfs-extensions.h>
-#include <gtk/gtk.h>
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/wait.h>
 #include <unistd.h>
 #include <signal.h>
+
+#include <gtk/gtk.h>
+#include <sys/wait.h>
+
+#define MATE_DESKTOP_USE_UNSTABLE_API
 #include <libmate-desktop/mate-desktop-thumbnail.h>
 
+#include "../eel/eel-gdk-pixbuf-extensions.h"
+#include "../eel/eel-graphic-effects.h"
+#include "../eel/eel-string.h"
+#include "../eel/eel-debug.h"
+#include "../eel/eel-vfs-extensions.h"
+
+#include "caja-thumbnails.h"
+#include "caja-directory-notify.h"
+#include "caja-global-preferences.h"
+#include "caja-file-utilities.h"
 #include "caja-file-private.h"
 
 /* turn this on to see messages about thumbnail creation */
diff --git a/libcaja-private/caja-thumbnails.h b/libcaja-private/caja-thumbnails.h
index e391149f..95ffb7fb 100644
--- a/libcaja-private/caja-thumbnails.h
+++ b/libcaja-private/caja-thumbnails.h
@@ -26,7 +26,8 @@
 #define CAJA_THUMBNAILS_H
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libcaja-private/caja-file.h>
+
+#include "caja-file.h"
 
 /* Returns NULL if there's no thumbnail yet. */
 void       caja_create_thumbnail                (CajaFile *file);
diff --git a/libcaja-private/caja-trash-monitor.c b/libcaja-private/caja-trash-monitor.c
index 9fe9e715..a48feb70 100644
--- a/libcaja-private/caja-trash-monitor.c
+++ b/libcaja-private/caja-trash-monitor.c
@@ -24,15 +24,17 @@
 */
 
 #include <config.h>
-#include "caja-trash-monitor.h"
 
+#include <gio/gio.h>
+#include <string.h>
+
+#include "../eel/eel-debug.h"
+
+#include "caja-trash-monitor.h"
 #include "caja-directory-notify.h"
 #include "caja-directory.h"
 #include "caja-file-attributes.h"
 #include "caja-icon-names.h"
-#include <eel/eel-debug.h>
-#include <gio/gio.h>
-#include <string.h>
 
 struct _CajaTrashMonitorPrivate
 {
diff --git a/libcaja-private/caja-tree-view-drag-dest.c b/libcaja-private/caja-tree-view-drag-dest.c
index 0cd60fd5..4698c1e6 100644
--- a/libcaja-private/caja-tree-view-drag-dest.c
+++ b/libcaja-private/caja-tree-view-drag-dest.c
@@ -29,18 +29,20 @@
  */
 
 #include <config.h>
-#include "caja-tree-view-drag-dest.h"
+#include <stdio.h>
+#include <string.h>
 
-#include <eel/eel-gtk-macros.h>
 #include <gtk/gtk.h>
+
+#include "../eel/eel-gtk-macros.h"
+
+#include "caja-tree-view-drag-dest.h"
 #include "caja-file-dnd.h"
 #include "caja-file-changes-queue.h"
 #include "caja-icon-dnd.h"
 #include "caja-link.h"
 #include "caja-marshal.h"
 #include "caja-debug-log.h"
-#include <stdio.h>
-#include <string.h>
 
 #define AUTO_SCROLL_MARGIN 20
 
diff --git a/libcaja-private/caja-ui-utilities.c b/libcaja-private/caja-ui-utilities.c
index 1cdb5125..69d963f3 100644
--- a/libcaja-private/caja-ui-utilities.c
+++ b/libcaja-private/caja-ui-utilities.c
@@ -23,15 +23,17 @@
 */
 
 #include <config.h>
-#include "caja-ui-utilities.h"
-#include "caja-file-utilities.h"
-#include "caja-icon-info.h"
-#include <gio/gio.h>
 
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <eel/eel-debug.h>
-#include <eel/eel-graphic-effects.h>
+#include <gio/gio.h>
+
+#include "../eel/eel-debug.h"
+#include "../eel/eel-graphic-effects.h"
+
+#include "caja-ui-utilities.h"
+#include "caja-file-utilities.h"
+#include "caja-icon-info.h"
 
 void
 caja_ui_unmerge_ui (GtkUIManager *ui_manager,
diff --git a/libcaja-private/caja-ui-utilities.h b/libcaja-private/caja-ui-utilities.h
index c7a8d595..e51c2487 100644
--- a/libcaja-private/caja-ui-utilities.h
+++ b/libcaja-private/caja-ui-utilities.h
@@ -25,7 +25,8 @@
 #define CAJA_UI_UTILITIES_H
 
 #include <gtk/gtk.h>
-#include <libcaja-extension/caja-menu-item.h>
+
+#include "../libcaja-extension/caja-menu-item.h"
 
 char *      caja_get_ui_directory              (void);
 char *      caja_ui_file                       (const char        *partial_path);
diff --git a/libcaja-private/caja-vfs-directory.c b/libcaja-private/caja-vfs-directory.c
index 278992af..0698afd3 100644
--- a/libcaja-private/caja-vfs-directory.c
+++ b/libcaja-private/caja-vfs-directory.c
@@ -24,10 +24,11 @@
 */
 
 #include <config.h>
-#include "caja-vfs-directory.h"
 
+#include "../eel/eel-gtk-macros.h"
+
+#include "caja-vfs-directory.h"
 #include "caja-directory-private.h"
-#include <eel/eel-gtk-macros.h>
 #include "caja-file-private.h"
 
 static void caja_vfs_directory_init       (gpointer   object,
diff --git a/libcaja-private/caja-vfs-directory.h b/libcaja-private/caja-vfs-directory.h
index 969dbbe1..646d5389 100644
--- a/libcaja-private/caja-vfs-directory.h
+++ b/libcaja-private/caja-vfs-directory.h
@@ -26,7 +26,7 @@
 #ifndef CAJA_VFS_DIRECTORY_H
 #define CAJA_VFS_DIRECTORY_H
 
-#include <libcaja-private/caja-directory.h>
+#include "caja-directory.h"
 
 #define CAJA_TYPE_VFS_DIRECTORY caja_vfs_directory_get_type()
 #define CAJA_VFS_DIRECTORY(obj) \
diff --git a/libcaja-private/caja-vfs-file.c b/libcaja-private/caja-vfs-file.c
index 00048d06..f2908a26 100644
--- a/libcaja-private/caja-vfs-file.c
+++ b/libcaja-private/caja-vfs-file.c
@@ -24,14 +24,16 @@
 */
 
 #include <config.h>
-#include "caja-vfs-file.h"
 
+#include <glib/gi18n.h>
+
+#include "../eel/eel-gtk-macros.h"
+
+#include "caja-vfs-file.h"
 #include "caja-directory-notify.h"
 #include "caja-directory-private.h"
 #include "caja-file-private.h"
 #include "caja-autorun.h"
-#include <eel/eel-gtk-macros.h>
-#include <glib/gi18n.h>
 
 static void caja_vfs_file_init       (gpointer   object,
                                       gpointer   klass);
diff --git a/libcaja-private/caja-vfs-file.h b/libcaja-private/caja-vfs-file.h
index 1069464c..0019f45f 100644
--- a/libcaja-private/caja-vfs-file.h
+++ b/libcaja-private/caja-vfs-file.h
@@ -26,7 +26,7 @@
 #ifndef CAJA_VFS_FILE_H
 #define CAJA_VFS_FILE_H
 
-#include <libcaja-private/caja-file.h>
+#include "caja-file.h"
 
 #define CAJA_TYPE_VFS_FILE caja_vfs_file_get_type()
 #define CAJA_VFS_FILE(obj) \
diff --git a/libcaja-private/caja-view-factory.h b/libcaja-private/caja-view-factory.h
index e40fd8aa..294c2245 100644
--- a/libcaja-private/caja-view-factory.h
+++ b/libcaja-private/caja-view-factory.h
@@ -27,10 +27,11 @@
 
 #include <string.h>
 
-#include <libcaja-private/caja-view.h>
-#include <libcaja-private/caja-window-slot-info.h>
 #include <gio/gio.h>
 
+#include "caja-view.h"
+#include "caja-window-slot-info.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/libcaja-private/caja-view.h b/libcaja-private/caja-view.h
index 3f2da382..93fafdab 100644
--- a/libcaja-private/caja-view.h
+++ b/libcaja-private/caja-view.h
@@ -29,7 +29,7 @@
 #include <gtk/gtk.h>
 
 /* For CajaZoomLevel */
-#include <libcaja-private/caja-icon-info.h>
+#include "caja-icon-info.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/libcaja-private/caja-window-info.h b/libcaja-private/caja-window-info.h
index b4cf8722..ea2d23c6 100644
--- a/libcaja-private/caja-window-info.h
+++ b/libcaja-private/caja-window-info.h
@@ -26,9 +26,11 @@
 #define CAJA_WINDOW_INFO_H
 
 #include <glib-object.h>
-#include <libcaja-private/caja-view.h>
+
 #include <gtk/gtk.h>
 
+#include "caja-view.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif