[all] use g_list_free() and g_strcmp0 instead of eel functions

 Was: general: use g_list_free_full() instead of eel functions
 http://git.gnome.org/browse/nautilus/commit/?id=5e669515fd7f760382e6b7aa1449734a35a2d7f4
 .
 Instead of g_list_free_full(), we use g_list_foreach and g_list_free() to avoid
 unnecessary glib dependency bump to 2.28

53 files changed, 302 insertions, 320 deletions

diff --git a/eel/eel-gdk-pixbuf-extensions.c b/eel/eel-gdk-pixbuf-extensions.c
index fed0eb45..040855b8 100644
--- a/eel/eel-gdk-pixbuf-extensions.c
+++ b/eel/eel-gdk-pixbuf-extensions.c
@@ -66,18 +66,6 @@ eel_gdk_pixbuf_list_ref (GList *pixbuf_list)
     g_list_foreach (pixbuf_list, (GFunc) g_object_ref, NULL);
 }
 
-/**
- * eel_gdk_pixbuf_list_free
- * @pixbuf_list: A list of GdkPixbuf objects.
- *
- * Unrefs all the pixbufs, then frees the list.
- **/
-void
-eel_gdk_pixbuf_list_free (GList *pixbuf_list)
-{
-    eel_g_list_free_deep_custom (pixbuf_list, (GFunc) g_object_unref, NULL);
-}
-
 GdkPixbuf *
 eel_gdk_pixbuf_load (const char *uri)
 {
diff --git a/eel/eel-gdk-pixbuf-extensions.h b/eel/eel-gdk-pixbuf-extensions.h
index ae649e55..07a7a0ac 100644
--- a/eel/eel-gdk-pixbuf-extensions.h
+++ b/eel/eel-gdk-pixbuf-extensions.h
@@ -43,8 +43,6 @@ typedef void (* EelPixbufLoadCallback) (GError         *error,
 
 /* Convenience functions for lists of GdkPixbuf objects. */
 void                 eel_gdk_pixbuf_list_ref                  (GList                 *pixbuf_list);
-void                 eel_gdk_pixbuf_list_unref                (GList                 *pixbuf_list);
-void                 eel_gdk_pixbuf_list_free                 (GList                 *pixbuf_list);
 
 
 /* Loading a GdkPixbuf with a URI. */
diff --git a/eel/eel-glib-extensions.c b/eel/eel-glib-extensions.c
index ea7ecbca..63ac74a7 100644
--- a/eel/eel-glib-extensions.c
+++ b/eel/eel-glib-extensions.c
@@ -376,63 +376,6 @@ eel_g_str_list_index (GList *str_list,
 }
 
 /**
- * eel_g_list_free_deep_custom
- *
- * Frees the elements of a list and then the list, using a custom free function.
- *
- * @list: List of elements that can be freed with the provided free function.
- * @element_free_func: function to call with the data pointer and user_data to free it.
- * @user_data: User data to pass to element_free_func
- **/
-void
-eel_g_list_free_deep_custom (GList *list, GFunc element_free_func, gpointer user_data)
-{
-    g_list_foreach (list, element_free_func, user_data);
-    g_list_free (list);
-}
-
-/**
- * eel_g_list_free_deep
- *
- * Frees the elements of a list and then the list.
- * @list: List of elements that can be freed with g_free.
- **/
-void
-eel_g_list_free_deep (GList *list)
-{
-    eel_g_list_free_deep_custom (list, (GFunc) g_free, NULL);
-}
-
-/**
- * eel_g_list_free_deep_custom
- *
- * Frees the elements of a list and then the list, using a custom free function.
- *
- * @list: List of elements that can be freed with the provided free function.
- * @element_free_func: function to call with the data pointer and user_data to free it.
- * @user_data: User data to pass to element_free_func
- **/
-void
-eel_g_slist_free_deep_custom (GSList *list, GFunc element_free_func, gpointer user_data)
-{
-    g_slist_foreach (list, element_free_func, user_data);
-    g_slist_free (list);
-}
-
-/**
- * eel_g_slist_free_deep
- *
- * Frees the elements of a list and then the list.
- * @list: List of elements that can be freed with g_free.
- **/
-void
-eel_g_slist_free_deep (GSList *list)
-{
-    eel_g_slist_free_deep_custom (list, (GFunc) g_free, NULL);
-}
-
-
-/**
  * eel_g_strv_find
  *
  * Get index of string in array of strings.
@@ -762,31 +705,6 @@ eel_g_object_list_ref (GList *list)
 }
 
 /**
- * eel_g_object_list_unref
- *
- * Unref all the objects in a list.
- * @list: GList of objects.
- **/
-void
-eel_g_object_list_unref (GList *list)
-{
-    g_list_foreach (list, (GFunc) g_object_unref, NULL);
-}
-
-/**
- * eel_g_object_list_free
- *
- * Free a list of objects after unrefing them.
- * @list: GList of objects.
- **/
-void
-eel_g_object_list_free (GList *list)
-{
-    eel_g_object_list_unref (list);
-    g_list_free (list);
-}
-
-/**
  * eel_g_object_list_copy
  *
  * Copy the list of objects, ref'ing each one.
@@ -1214,11 +1132,16 @@ eel_self_check_glib_extensions (void)
     EEL_CHECK_BOOLEAN_RESULT (eel_g_str_list_equal (compare_list_1, compare_list_4), FALSE);
     EEL_CHECK_BOOLEAN_RESULT (eel_g_str_list_equal (compare_list_1, compare_list_5), FALSE);
 
-    eel_g_list_free_deep (compare_list_1);
-    eel_g_list_free_deep (compare_list_2);
-    eel_g_list_free_deep (compare_list_3);
-    eel_g_list_free_deep (compare_list_4);
-    eel_g_list_free_deep (compare_list_5);
+    g_list_foreach (compare_list_1, (GFunc) g_free, NULL);
+    g_list_free(compare_list_1);
+    g_list_foreach (compare_list_2, (GFunc) g_free, NULL);
+    g_list_free(compare_list_2);
+    g_list_foreach (compare_list_3, (GFunc) g_free, NULL);
+    g_list_free(compare_list_3);
+    g_list_foreach (compare_list_4, (GFunc) g_free, NULL);
+    g_list_free(compare_list_4);
+    g_list_foreach (compare_list_5, (GFunc) g_free, NULL);
+    g_list_free(compare_list_5);
 
     /* eel_g_list_partition */
 
diff --git a/eel/eel-glib-extensions.h b/eel/eel-glib-extensions.h
index 1a8bd3e8..416ebe2f 100644
--- a/eel/eel-glib-extensions.h
+++ b/eel/eel-glib-extensions.h
@@ -54,18 +54,6 @@ GList *     eel_g_list_partition                        (GList                 *
         gpointer               user_data,
         GList                **removed);
 
-/* List functions for lists of g_free'able objects. */
-void        eel_g_list_free_deep                        (GList                 *list);
-void        eel_g_list_free_deep_custom                 (GList                 *list,
-        GFunc                  element_free_func,
-        gpointer               user_data);
-
-/* List functions for slists of g_free'able objects. */
-void        eel_g_slist_free_deep                       (GSList                *list);
-void        eel_g_slist_free_deep_custom                (GSList                *list,
-        GFunc                  element_free_func,
-        gpointer               user_data);
-
 /* List functions for lists of C strings. */
 gboolean    eel_g_str_list_equal                        (GList                 *str_list_a,
         GList                 *str_list_b);
@@ -76,8 +64,6 @@ int         eel_g_str_list_index                        (GList                 *
 
 /* List functions for lists of objects */
 GList *     eel_g_object_list_ref                       (GList                 *list);
-void        eel_g_object_list_unref                     (GList                 *list);
-void        eel_g_object_list_free                      (GList                 *list);
 GList *     eel_g_object_list_copy                      (GList                 *list);
 
 /* GHashTable functions */
diff --git a/libcaja-private/caja-autorun.c b/libcaja-private/caja-autorun.c
index 89b8e63d..66534642 100644
--- a/libcaja-private/caja-autorun.c
+++ b/libcaja-private/caja-autorun.c
@@ -33,7 +33,6 @@
 #include <gdk/gdkkeysyms.h>
 
 #include <eel/eel-glib-extensions.h>
-#include <eel/eel-stock-dialogs.h>
 
 #include "caja-icon-info.h"
 #include "caja-global-preferences.h"
@@ -652,7 +651,8 @@ caja_autorun_prepare_combo_box (GtkWidget *combo_box,
     {
         g_object_unref (default_app_info);
     }
-    eel_g_object_list_free (app_info_list);
+    g_list_foreach (app_info_list, (GFunc) g_object_unref, NULL);
+    g_list_free(app_info_list);
 
     gtk_combo_box_set_model (GTK_COMBO_BOX (combo_box), GTK_TREE_MODEL (list_store));
     g_object_unref (G_OBJECT (list_store));
diff --git a/libcaja-private/caja-bookmark.c b/libcaja-private/caja-bookmark.c
index e20efd96..48952fbb 100644
--- a/libcaja-private/caja-bookmark.c
+++ b/libcaja-private/caja-bookmark.c
@@ -29,10 +29,10 @@
 #include <eel/eel-gdk-pixbuf-extensions.h>
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-gtk-macros.h>
-#include <eel/eel-string.h>
 #include <eel/eel-vfs-extensions.h>
 #include <gtk/gtk.h>
 #include <gio/gio.h>
+#include <string.h>
 #include <libcaja-private/caja-file.h>
 #include <libcaja-private/caja-icon-names.h>
 
@@ -143,7 +143,7 @@ caja_bookmark_compare_with (gconstpointer a, gconstpointer b)
     bookmark_a = CAJA_BOOKMARK (a);
     bookmark_b = CAJA_BOOKMARK (b);
 
-    if (eel_strcmp (bookmark_a->details->name,
+    if (g_strcmp0 (bookmark_a->details->name,
                     bookmark_b->details->name) != 0)
     {
         return 1;
diff --git a/libcaja-private/caja-clipboard.c b/libcaja-private/caja-clipboard.c
index bc06675a..bce5d552 100644
--- a/libcaja-private/caja-clipboard.c
+++ b/libcaja-private/caja-clipboard.c
@@ -33,7 +33,6 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <eel/eel-glib-extensions.h>
 #include <string.h>
 
 typedef struct _TargetCallbackData TargetCallbackData;
@@ -662,31 +661,27 @@ caja_clipboard_clear_if_colliding_uris (GtkWidget *widget,
     collision = FALSE;
     data = gtk_clipboard_wait_for_contents (caja_clipboard_get (widget),
                                             copied_files_atom);
-    if (data == NULL)
-    {
+    if (data == NULL) {
         return;
     }
 
     clipboard_item_uris = caja_clipboard_get_uri_list_from_selection_data (data, NULL,
                           copied_files_atom);
 
-    for (l = (GList *) item_uris; l; l = l->next)
-    {
+    for (l = (GList *) item_uris; l; l = l->next) {
         if (g_list_find_custom ((GList *) item_uris, l->data,
-                                (GCompareFunc) g_strcmp0))
-        {
+                                (GCompareFunc) g_strcmp0)) {
             collision = TRUE;
             break;
         }
     }
 
-    if (collision)
-    {
+    if (collision) {
         gtk_clipboard_clear (caja_clipboard_get (widget));
     }
 
-    if (clipboard_item_uris)
-    {
-        eel_g_list_free_deep (clipboard_item_uris);
+    if (clipboard_item_uris) {
+        g_list_foreach (clipboard_item_uris, (GFunc) g_free, NULL);
+    	g_list_free(clipboard_item_uris);
     }
 }
diff --git a/libcaja-private/caja-customization-data.c b/libcaja-private/caja-customization-data.c
index aeeab942..01521d0a 100644
--- a/libcaja-private/caja-customization-data.c
+++ b/libcaja-private/caja-customization-data.c
@@ -32,10 +32,8 @@
 #include <eel/eel-gdk-extensions.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-vfs-extensions.h>
-#include <eel/eel-string.h>
 #include <eel/eel-xml-extensions.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <glib.h>
@@ -260,7 +258,7 @@ caja_customization_data_get_next_element_for_display (CajaCustomizationData *dat
                 label_out);
     }
 
-    is_reset_image = eel_strcmp(g_file_info_get_name (current_file_info), RESET_IMAGE_NAME) == 0;
+    is_reset_image = g_strcmp0(g_file_info_get_name (current_file_info), RESET_IMAGE_NAME) == 0;
 
     *emblem_name = g_strdup (g_file_info_get_name (current_file_info));
 
@@ -306,8 +304,10 @@ caja_customization_data_destroy (CajaCustomizationData *data)
         g_object_unref (data->pattern_frame);
     }
 
-    eel_g_object_list_free (data->public_file_list);
-    eel_g_object_list_free (data->private_file_list);
+    g_list_foreach(data->public_file_list, (GFunc) g_object_unref, NULL);
+    g_list_free(data->public_file_list);
+    g_list_foreach(data->private_file_list, (GFunc) g_object_unref, NULL);
+    g_list_free(data->private_file_list);
 
     if (data->name_map_hash != NULL)
     {
@@ -427,7 +427,7 @@ format_name_for_display (CajaCustomizationData *data, const char* name)
 {
     char *formatted_str, *mapped_name;
 
-    if (!eel_strcmp(name, RESET_IMAGE_NAME))
+    if (!g_strcmp0(name, RESET_IMAGE_NAME))
     {
         return g_strdup (_("Reset"));
     }
diff --git a/libcaja-private/caja-debug-log.c b/libcaja-private/caja-debug-log.c
index 89ff6933..1ccfed0b 100644
--- a/libcaja-private/caja-debug-log.c
+++ b/libcaja-private/caja-debug-log.c
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <time.h>
 #include <sys/time.h>
-#include <eel/eel-glib-extensions.h>
 #include "caja-debug-log.h"
 #include "caja-file.h"
 
@@ -309,7 +308,8 @@ caja_debug_log_with_file_list (gboolean is_milestone, const char *domain, GList
     caja_debug_logv (is_milestone, domain, uris, format, args);
     va_end (args);
 
-    eel_g_list_free_deep (uris);
+    g_list_foreach (uris, (GFunc) g_free, NULL);
+    g_list_free(uris);
 }
 
 gboolean
diff --git a/libcaja-private/caja-directory-async.c b/libcaja-private/caja-directory-async.c
index a20d90d7..9694b1b0 100644
--- a/libcaja-private/caja-directory-async.c
+++ b/libcaja-private/caja-directory-async.c
@@ -34,7 +34,6 @@
 #include "caja-link.h"
 #include "caja-marshal.h"
 #include <eel/eel-glib-extensions.h>
-#include <eel/eel-string.h>
 #include <gtk/gtk.h>
 #include <libxml/parser.h>
 #include <stdio.h>
@@ -1080,7 +1079,8 @@ dequeue_pending_idle_callback (gpointer callback_data)
 
             file->details->got_mime_list = TRUE;
             file->details->mime_list_is_up_to_date = TRUE;
-            eel_g_list_free_deep (file->details->mime_list);
+            g_list_foreach (file->details->mime_list, (GFunc) g_free, NULL);
+            g_list_free(file->details->mime_list);
             file->details->mime_list = istr_set_get_as_list
                                        (dir_load_state->load_mime_list_hash);
 
@@ -1093,7 +1093,8 @@ dequeue_pending_idle_callback (gpointer callback_data)
     }
 
 drain:
-    eel_g_object_list_free (pending_file_info);
+    g_list_foreach (pending_file_info, (GFunc) g_object_unref, NULL);
+    g_list_free(pending_file_info);
 
     /* Get the state machine running again. */
     caja_directory_async_state_changed (directory);
@@ -1181,7 +1182,8 @@ file_list_cancel (CajaDirectory *directory)
 
     if (directory->details->pending_file_info != NULL)
     {
-        eel_g_object_list_free  (directory->details->pending_file_info);
+	g_list_foreach (directory->details->pending_file_info, (GFunc) g_object_unref, NULL);
+    	g_list_free(directory->details->pending_file_info);
         directory->details->pending_file_info = NULL;
     }
 
@@ -2786,7 +2788,8 @@ count_more_files_callback (GObject *source_object,
                                             state);
     }
 
-    eel_g_object_list_free (files);
+    g_list_foreach (files, (GFunc) g_object_unref, NULL);
+    g_list_free(files);
 
     if (error)
     {
@@ -3011,7 +3014,8 @@ deep_count_state_free (DeepCountState *state)
     {
         g_object_unref (state->deep_count_location);
     }
-    eel_g_object_list_free (state->deep_count_subdirectories);
+    g_list_foreach (state->deep_count_subdirectories, (GFunc) g_object_unref, NULL);
+    g_list_free(state->deep_count_subdirectories);
     g_array_free (state->seen_deep_count_inodes, TRUE);
     g_free (state);
 }
@@ -3319,7 +3323,8 @@ mime_list_done (MimeListState *state, gboolean success)
     file = state->mime_list_file;
 
     file->details->mime_list_is_up_to_date = TRUE;
-    eel_g_list_free_deep (file->details->mime_list);
+    g_list_foreach(file->details->mime_list, (GFunc) g_free, NULL);
+    g_list_free(file->details->mime_list);
     if (success)
     {
         file->details->mime_list_failed = TRUE;
@@ -4574,7 +4579,8 @@ get_mount_at (GFile *target)
         g_object_unref (root);
     }
 
-    eel_g_object_list_free (mounts);
+    g_list_foreach (mounts, (GFunc) g_object_unref, NULL);
+    g_list_free(mounts);
 
     g_object_unref (monitor);
 
diff --git a/libcaja-private/caja-directory.c b/libcaja-private/caja-directory.c
index efcfc5ed..38d73794 100644
--- a/libcaja-private/caja-directory.c
+++ b/libcaja-private/caja-directory.c
@@ -37,8 +37,8 @@
 #include "caja-vfs-directory.h"
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-gtk-macros.h>
-#include <eel/eel-string.h>
 #include <gtk/gtk.h>
+#include <string.h>
 
 enum
 {
@@ -175,7 +175,8 @@ caja_directory_finalize (GObject *object)
     if (directory->details->monitor_list != NULL)
     {
         g_warning ("destroying a CajaDirectory while it's being monitored");
-        eel_g_list_free_deep (directory->details->monitor_list);
+        g_list_foreach(directory->details->monitor_list, (GFunc) g_free, NULL);
+        g_list_free(directory->details->monitor_list);
     }
 
     if (directory->details->monitor != NULL)
@@ -212,7 +213,8 @@ caja_directory_finalize (GObject *object)
     g_assert (directory->details->directory_load_in_progress == NULL);
     g_assert (directory->details->count_in_progress == NULL);
     g_assert (directory->details->dequeue_pending_idle_id == 0);
-    eel_g_object_list_free (directory->details->pending_file_info);
+    g_list_foreach(directory->details->pending_file_info, (GFunc) g_object_unref, NULL);
+    g_list_free(directory->details->pending_file_info);
 
     EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
 }
@@ -758,7 +760,7 @@ caja_directory_find_file_by_internal_filename (CajaDirectory *directory,
 {
     CajaFile *result;
 
-    if (eel_strcmp (internal_filename, ".") == 0)
+    if (g_strcmp0 (internal_filename, ".") == 0)
     {
         result = caja_directory_get_existing_corresponding_file (directory);
         if (result != NULL)
@@ -1092,7 +1094,8 @@ caja_directory_notify_files_added_by_uri (GList *uris)
 
     files = caja_file_list_from_uris (uris);
     caja_directory_notify_files_added (files);
-    eel_g_object_list_free (files);
+    g_list_foreach(files, (GFunc) g_object_unref, NULL);
+    g_list_free(files);
 }
 
 void
@@ -1141,7 +1144,8 @@ caja_directory_notify_files_changed_by_uri (GList *uris)
 
     files = caja_file_list_from_uris (uris);
     caja_directory_notify_files_changed (files);
-    eel_g_object_list_free (files);
+    g_list_foreach(files, (GFunc) g_object_unref, NULL);
+    g_list_free(files);
 }
 
 void
@@ -1202,7 +1206,8 @@ caja_directory_notify_files_removed_by_uri (GList *uris)
 
     files = caja_file_list_from_uris (uris);
     caja_directory_notify_files_changed (files);
-    eel_g_object_list_free (files);
+    g_list_foreach(files, (GFunc) g_object_unref, NULL);
+    g_list_free(files);
 }
 
 static void
diff --git a/libcaja-private/caja-dnd.c b/libcaja-private/caja-dnd.c
index 87617a77..feea5ca8 100644
--- a/libcaja-private/caja-dnd.c
+++ b/libcaja-private/caja-dnd.c
@@ -129,7 +129,8 @@ caja_drag_uri_array_from_selection_list (const GList *selection_list)
 
     uri_list = caja_drag_uri_list_from_selection_list (selection_list);
     uris = caja_drag_uri_array_from_list (uri_list);
-    eel_g_list_free_deep (uri_list);
+    g_list_foreach(uri_list, (GFunc) g_free, NULL);
+    g_list_free(uri_list);
 
     return uris;
 }
@@ -1315,7 +1316,9 @@ slot_proxy_handle_drop (GtkWidget                *widget,
                                                 uri_list,
                                                 target_uri,
                                                 gdk_drag_context_get_selected_action (context));
-            eel_g_list_free_deep (uri_list);
+            g_list_foreach(uri_list, (GFunc) g_free, NULL);
+            g_list_free(uri_list);
+
         }
         else if (drag_info->info == CAJA_ICON_DND_URI_LIST)
         {
diff --git a/libcaja-private/caja-emblem-utils.c b/libcaja-private/caja-emblem-utils.c
index 3c41a016..dd70dbc3 100644
--- a/libcaja-private/caja-emblem-utils.c
+++ b/libcaja-private/caja-emblem-utils.c
@@ -37,7 +37,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include <eel/eel-glib-extensions.h>
 #include <eel/eel-gdk-pixbuf-extensions.h>
 #include <eel/eel-stock-dialogs.h>
 
@@ -120,7 +119,8 @@ is_reserved_keyword (const char *keyword)
     result = g_list_find_custom (available,
                                  (char *) icon_name,
                                  (GCompareFunc) g_ascii_strcasecmp) != NULL;
-    eel_g_list_free_deep (available);
+    g_list_foreach(available, (GFunc) g_free, NULL);
+    g_list_free(available);
     g_free (icon_name);
     return result;
 }
diff --git a/libcaja-private/caja-file-changes-queue.c b/libcaja-private/caja-file-changes-queue.c
index b3cd1db0..39cf123e 100644
--- a/libcaja-private/caja-file-changes-queue.c
+++ b/libcaja-private/caja-file-changes-queue.c
@@ -24,7 +24,6 @@
 #include "caja-file-changes-queue.h"
 
 #include "caja-directory-notify.h"
-#include <eel/eel-glib-extensions.h>
 
 #ifdef G_THREADS_ENABLED
 #define MUTEX_LOCK(a)	if ((a) != NULL) g_mutex_lock (a)
@@ -289,7 +288,8 @@ pairs_list_free (GList *pairs)
     }
 
     /* delete the list and the now empty pair structs */
-    eel_g_list_free_deep (pairs);
+    g_list_foreach(pairs, (GFunc) g_free, NULL);
+    g_list_free(pairs);
 }
 
 static void
@@ -304,7 +304,8 @@ position_set_list_free (GList *list)
         g_object_unref (item->location);
     }
     /* delete the list and the now empty structs */
-    eel_g_list_free_deep (list);
+    g_list_foreach(list, (GFunc) g_free, NULL);
+    g_list_free(list);
 }
 
 /* go through changes in the change queue, send ones with the same kind
@@ -386,7 +387,8 @@ caja_file_changes_consume_changes (gboolean consume_all)
             {
                 deletions = g_list_reverse (deletions);
                 caja_directory_notify_files_removed (deletions);
-                eel_g_object_list_free (deletions);
+    		g_list_foreach(deletions, (GFunc) g_object_unref, NULL);
+    		g_list_free(deletions);
                 deletions = NULL;
             }
             if (moves != NULL)
@@ -400,14 +402,16 @@ caja_file_changes_consume_changes (gboolean consume_all)
             {
                 additions = g_list_reverse (additions);
                 caja_directory_notify_files_added (additions);
-                eel_g_object_list_free (additions);
+    		g_list_foreach(additions, (GFunc) g_object_unref, NULL);
+    		g_list_free(additions);
                 additions = NULL;
             }
             if (changes != NULL)
             {
                 changes = g_list_reverse (changes);
                 caja_directory_notify_files_changed (changes);
-                eel_g_object_list_free (changes);
+    		g_list_foreach(changes, (GFunc) g_object_unref, NULL);
+    		g_list_free(changes);
                 changes = NULL;
             }
             if (position_set_requests != NULL)
diff --git a/libcaja-private/caja-file-dnd.c b/libcaja-private/caja-file-dnd.c
index a44d42f3..2c239643 100644
--- a/libcaja-private/caja-file-dnd.c
+++ b/libcaja-private/caja-file-dnd.c
@@ -30,7 +30,6 @@
 #include "caja-dnd.h"
 #include "caja-directory.h"
 #include "caja-file-utilities.h"
-#include <eel/eel-glib-extensions.h>
 #include <string.h>
 
 static gboolean
@@ -182,5 +181,6 @@ caja_drag_file_receive_dropped_keyword (CajaFile *file,
     }
 
     caja_file_set_keywords (file, keywords);
-    eel_g_list_free_deep (keywords);
+    g_list_foreach(keywords, (GFunc) g_free, NULL);
+    g_list_free(keywords);
 }
diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c
index 24bb4a19..067f52d5 100644
--- a/libcaja-private/caja-file-operations.c
+++ b/libcaja-private/caja-file-operations.c
@@ -1858,7 +1858,8 @@ delete_job_done (gpointer user_data)
 
 	job = user_data;
 
-	eel_g_object_list_free (job->files);
+    	g_list_foreach(job->files, (GFunc) g_object_unref, NULL);
+    	g_list_free(job->files);
 
 	if (job->done_callback) {
 		debuting_uris = g_hash_table_new_full (g_file_hash, (GEqualFunc)g_file_equal, g_object_unref, NULL);
@@ -2187,7 +2188,8 @@ has_trash_files (GMount *mount)
 		}
 	}
 
-	eel_g_object_list_free (dirs);
+    	g_list_foreach(dirs, (GFunc) g_object_unref, NULL);
+    	g_list_free(dirs);
 
 	return res;
 }
@@ -4460,7 +4462,8 @@ copy_job_done (gpointer user_data)
 		job->done_callback (job->debuting_files, job->done_callback_data);
 	}
 
-	eel_g_object_list_free (job->files);
+    	g_list_foreach(job->files, (GFunc) g_object_unref, NULL);
+    	g_list_free(job->files);
 	if (job->destination) {
 		g_object_unref (job->destination);
 	}
@@ -4987,7 +4990,8 @@ move_job_done (gpointer user_data)
 		job->done_callback (job->debuting_files, job->done_callback_data);
 	}
 
-	eel_g_object_list_free (job->files);
+    	g_list_foreach(job->files, (GFunc) g_object_unref, NULL);
+    	g_list_free(job->files);
 	g_object_unref (job->destination);
 	g_hash_table_unref (job->debuting_files);
 	g_free (job->icon_positions);
@@ -5067,7 +5071,8 @@ move_job (GIOSchedulerJob *io_job,
 		    &source_info, &transfer_info);
 
  aborted:
-	eel_g_list_free_deep (fallbacks);
+    	g_list_foreach(fallbacks, (GFunc) g_free, NULL);
+    	g_list_free(fallbacks);
 
 	g_free (dest_fs_id);
 	g_free (dest_fs_type);
@@ -5321,7 +5326,8 @@ link_job_done (gpointer user_data)
 		job->done_callback (job->debuting_files, job->done_callback_data);
 	}
 
-	eel_g_object_list_free (job->files);
+    	g_list_foreach(job->files, (GFunc) g_object_unref, NULL);
+    	g_list_free(job->files);
 	g_object_unref (job->destination);
 	g_hash_table_unref (job->debuting_files);
 	g_free (job->icon_positions);
@@ -5773,7 +5779,8 @@ caja_file_operations_copy_move (const GList *item_uris,
 					       done_callback, done_callback_data);
 	}
 
-	eel_g_object_list_free (locations);
+    	g_list_foreach(locations, (GFunc) g_object_unref, NULL);
+    	g_list_free(locations);
 	if (dest) {
 		g_object_unref (dest);
 	}
@@ -6251,7 +6258,8 @@ empty_trash_job_done (gpointer user_data)
 
 	job = user_data;
 
-	eel_g_object_list_free (job->trash_dirs);
+    	g_list_foreach(job->trash_dirs, (GFunc) g_object_unref, NULL);
+    	g_list_free(job->trash_dirs);
 
 	if (job->done_callback) {
 		job->done_callback (job->done_callback_data);
diff --git a/libcaja-private/caja-file-utilities.c b/libcaja-private/caja-file-utilities.c
index 61ad5c47..bfe8321e 100644
--- a/libcaja-private/caja-file-utilities.c
+++ b/libcaja-private/caja-file-utilities.c
@@ -1428,7 +1428,8 @@ caja_restore_files_from_trash (GList *files,
              parent_window,
              NULL, NULL);
 
-            eel_g_object_list_free (locations);
+            g_list_foreach(locations, (GFunc) g_object_unref, NULL);
+            g_list_free(locations);
             g_object_unref (original_dir_location);
         }
 
diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c
index 31863c9c..788eec68 100644
--- a/libcaja-private/caja-file.c
+++ b/libcaja-private/caja-file.c
@@ -816,11 +816,14 @@ finalize (GObject *object)
 
 	eel_ref_str_unref (file->details->filesystem_id);
 
-	eel_g_list_free_deep (file->details->mime_list);
-
-	eel_g_list_free_deep (file->details->pending_extension_emblems);
-	eel_g_list_free_deep (file->details->extension_emblems);
-	eel_g_object_list_free (file->details->pending_info_providers);
+        g_list_foreach(file->details->mime_list, (GFunc) g_free, NULL);
+        g_list_free(file->details->mime_list);
+        g_list_foreach(file->details->pending_extension_emblems, (GFunc) g_free, NULL);
+        g_list_free(file->details->pending_extension_emblems);
+        g_list_foreach(file->details->extension_emblems, (GFunc) g_free, NULL);
+        g_list_free(file->details->extension_emblems);
+        g_list_foreach(file->details->pending_info_providers, (GFunc) g_object_unref, NULL);
+        g_list_free(file->details->pending_info_providers);
 
 	if (file->details->pending_extension_attributes) {
 		g_hash_table_destroy (file->details->pending_extension_attributes);
@@ -2994,7 +2997,8 @@ fill_emblem_cache_if_needed (CajaFile *file)
 	/* Zero-terminate so we can tell where the list ends. */
 	*scanner = 0;
 
-	eel_g_list_free_deep (keywords);
+        g_list_foreach(keywords, (GFunc) g_free, NULL);
+        g_list_free(keywords);
 }
 
 static int
@@ -6601,7 +6605,8 @@ caja_file_get_emblem_icons (CajaFile *file,
 		icons = g_list_prepend (icons, icon);
 	}
 
-	eel_g_list_free_deep (keywords);
+        g_list_foreach(keywords, (GFunc) g_free, NULL);
+        g_list_free(keywords);
 
 	return icons;
 }
@@ -6660,7 +6665,8 @@ sort_keyword_list_and_remove_duplicates (GList *keywords)
 			if (strcmp ((const char *) p->data, (const char *) p->next->data) == 0) {
 				duplicate_link = p->next;
 				keywords = g_list_remove_link (keywords, duplicate_link);
-				eel_g_list_free_deep (duplicate_link);
+				g_list_foreach(duplicate_link, (GFunc) g_free, NULL);
+				g_list_free(duplicate_link);
 			} else {
 				p = p->next;
 			}
@@ -7554,7 +7560,8 @@ void
 caja_file_invalidate_extension_info_internal (CajaFile *file)
 {
 	if (file->details->pending_info_providers)
-		eel_g_object_list_free (file->details->pending_info_providers);
+		g_list_foreach(file->details->pending_info_providers, (GFunc) g_object_unref, NULL);
+		g_list_free(file->details->pending_info_providers);
 
 	file->details->pending_info_providers =
 		caja_module_get_extensions_for_type (CAJA_TYPE_INFO_PROVIDER);
@@ -8376,7 +8383,8 @@ caja_file_invalidate_extension_info (CajaFile *file)
 void
 caja_file_info_providers_done (CajaFile *file)
 {
-	eel_g_list_free_deep (file->details->extension_emblems);
+	g_list_foreach(file->details->extension_emblems, (GFunc) g_free, NULL);
+	g_list_free(file->details->extension_emblems);
 	file->details->extension_emblems = file->details->pending_extension_emblems;
 	file->details->pending_extension_emblems = NULL;
 
diff --git a/libcaja-private/caja-icon-canvas-item.c b/libcaja-private/caja-icon-canvas-item.c
index 9f6992cf..bcec72a5 100644
--- a/libcaja-private/caja-icon-canvas-item.c
+++ b/libcaja-private/caja-icon-canvas-item.c
@@ -327,7 +327,8 @@ caja_icon_canvas_item_finalize (GObject *object)
         g_object_unref (details->text_util);
     }
 
-    eel_gdk_pixbuf_list_free (details->emblem_pixbufs);
+    g_list_foreach(details->emblem_pixbufs, (GFunc) g_object_unref, NULL);
+    g_list_free(details->emblem_pixbufs);
     g_free (details->editable_text);
     g_free (details->additional_text);
     g_free (details->attach_points);
@@ -419,7 +420,7 @@ caja_icon_canvas_item_set_property (GObject        *object,
     {
 
     case PROP_EDITABLE_TEXT:
-        if (eel_strcmp (details->editable_text,
+        if (g_strcmp0 (details->editable_text,
                         g_value_get_string (value)) == 0)
         {
             return;
@@ -446,7 +447,7 @@ caja_icon_canvas_item_set_property (GObject        *object,
         break;
 
     case PROP_ADDITIONAL_TEXT:
-        if (eel_strcmp (details->additional_text,
+        if (g_strcmp0 (details->additional_text,
                         g_value_get_string (value)) == 0)
         {
             return;
@@ -763,7 +764,8 @@ caja_icon_canvas_item_set_emblems (CajaIconCanvasItem *item,
 
     /* Take in the new list of emblems. */
     eel_gdk_pixbuf_list_ref (emblem_pixbufs);
-    eel_gdk_pixbuf_list_free (item->details->emblem_pixbufs);
+    g_list_foreach(item->details->emblem_pixbufs, (GFunc) g_object_unref, NULL);
+    g_list_free(item->details->emblem_pixbufs);
     item->details->emblem_pixbufs = g_list_copy (emblem_pixbufs);
 
     caja_icon_canvas_item_invalidate_bounds_cache (item);
diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c
index efda5cab..6b2f18e8 100644
--- a/libcaja-private/caja-icon-container.c
+++ b/libcaja-private/caja-icon-container.c
@@ -7775,7 +7775,7 @@ caja_icon_container_update_icon (CajaIconContainer *container,
      * happened to be typing at that moment.
      */
     if (icon == get_icon_being_renamed (container) &&
-            eel_strcmp (editable_text,
+            g_strcmp0 (editable_text,
                         caja_icon_canvas_item_get_editable_text (icon->item)) != 0)
     {
         end_renaming_mode (container, FALSE);
@@ -7795,7 +7795,8 @@ caja_icon_container_update_icon (CajaIconContainer *container,
 
     /* Let the pixbufs go. */
     g_object_unref (pixbuf);
-    eel_gdk_pixbuf_list_free (emblem_pixbufs);
+    g_list_foreach(emblem_pixbufs, (GFunc) g_object_unref, NULL);
+    g_list_free(emblem_pixbufs);
 
     g_free (editable_text);
     g_free (additional_text);
@@ -9678,7 +9679,7 @@ caja_icon_container_set_font (CajaIconContainer *container,
 {
     g_return_if_fail (CAJA_IS_ICON_CONTAINER (container));
 
-    if (eel_strcmp (container->details->font, font) == 0)
+    if (g_strcmp0 (container->details->font, font) == 0)
     {
         return;
     }
diff --git a/libcaja-private/caja-merged-directory.c b/libcaja-private/caja-merged-directory.c
index 0dc1b10c..a3e2a9b2 100644
--- a/libcaja-private/caja-merged-directory.c
+++ b/libcaja-private/caja-merged-directory.c
@@ -589,7 +589,8 @@ real_directory_notify_files_removed (CajaDirectory *real_directory)
         caja_directory_notify_files_removed_by_uri (files);
     }
 
-    eel_g_list_free_deep (files);
+    g_list_foreach(files, (GFunc) g_free, NULL);
+    g_list_free(files);
 }
 
 static void
diff --git a/libcaja-private/caja-mime-actions.c b/libcaja-private/caja-mime-actions.c
index 794c84b0..4668e0ac 100644
--- a/libcaja-private/caja-mime-actions.c
+++ b/libcaja-private/caja-mime-actions.c
@@ -230,7 +230,8 @@ static void
 application_launch_parameters_free (ApplicationLaunchParameters *parameters)
 {
     g_object_unref (parameters->application);
-    eel_g_list_free_deep (parameters->uris);
+    g_list_foreach(parameters->uris, (GFunc) g_free, NULL);
+    g_list_free(parameters->uris);
 
     g_free (parameters);
 }
@@ -512,7 +513,8 @@ caja_mime_has_any_applications_for_file (CajaFile *file)
     if (apps)
     {
         result = TRUE;
-        eel_g_object_list_free (apps);
+        g_list_foreach(apps, (GFunc) g_object_unref, NULL);
+        g_list_free(apps);
     }
     else
     {
@@ -733,7 +735,8 @@ trash_or_delete_files (GtkWindow *parent_window,
     caja_file_operations_trash_or_delete (locations,
                                           parent_window,
                                           NULL, NULL);
-    eel_g_object_list_free (locations);
+    g_list_foreach(locations, (GFunc) g_object_unref, NULL);
+    g_list_free(locations);
 }
 
 static void
diff --git a/libcaja-private/caja-mime-application-chooser.c b/libcaja-private/caja-mime-application-chooser.c
index 32767f38..dd8af544 100644
--- a/libcaja-private/caja-mime-application-chooser.c
+++ b/libcaja-private/caja-mime-application-chooser.c
@@ -32,8 +32,6 @@
 #include "caja-signaller.h"
 #include "caja-file.h"
 #include <eel/eel-stock-dialogs.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-string.h>
 
 #include <string.h>
 #include <glib/gi18n-lib.h>
@@ -565,7 +563,8 @@ refresh_model (CajaMimeApplicationChooser *chooser)
         g_object_unref (default_app);
     }
 
-    eel_g_object_list_free (applications);
+    g_list_foreach(applications, (GFunc) g_object_unref, NULL);
+    g_list_free(applications);
 }
 
 static void
@@ -673,8 +672,7 @@ set_uri_and_type_for_multiple_files (CajaMimeApplicationChooser *chooser,
         char *extension_current;
 
         extension_current = get_extension_from_file (CAJA_FILE (iter->data));
-        if (eel_strcmp (first_extension, extension_current))
-        {
+        if (g_strcmp0 (first_extension, extension_current)) {
             same_extension = FALSE;
             g_free (extension_current);
             break;
diff --git a/libcaja-private/caja-open-with-dialog.c b/libcaja-private/caja-open-with-dialog.c
index 93e376c9..50ca03ef 100644
--- a/libcaja-private/caja-open-with-dialog.c
+++ b/libcaja-private/caja-open-with-dialog.c
@@ -29,7 +29,6 @@
 #include "caja-open-with-dialog.h"
 #include "caja-signaller.h"
 
-#include <eel/eel-glib-extensions.h>
 #include <eel/eel-stock-dialogs.h>
 
 #include <string.h>
@@ -291,7 +290,8 @@ add_or_find_application (CajaOpenWithDialog *dialog)
 
         if (applications != NULL)
         {
-            eel_g_object_list_free (applications);
+            g_list_foreach(applications, (GFunc) g_object_unref, NULL);
+            g_list_free(applications);
         }
     }
 
diff --git a/libcaja-private/caja-program-choosing.c b/libcaja-private/caja-program-choosing.c
index 56d6e8eb..f7b3fa42 100644
--- a/libcaja-private/caja-program-choosing.c
+++ b/libcaja-private/caja-program-choosing.c
@@ -31,10 +31,8 @@
 #include "caja-icon-info.h"
 #include "caja-recent.h"
 #include "caja-desktop-icon-file.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 <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
@@ -165,7 +163,8 @@ caja_launch_application (GAppInfo *application,
     uris = g_list_reverse (uris);
     caja_launch_application_by_uri (application, uris,
                                     parent_window);
-    eel_g_list_free_deep (uris);
+    g_list_foreach(uris, (GFunc) g_free, NULL);
+    g_list_free(uris);
 }
 
 void
@@ -274,7 +273,8 @@ caja_launch_application_by_uri (GAppInfo *application,
         }
     }
 
-    eel_g_object_list_free (locations);
+    g_list_foreach(locations, (GFunc) g_object_unref, NULL);
+    g_list_free(locations);
 }
 
 /**
@@ -450,7 +450,8 @@ caja_launch_desktop_file (GdkScreen   *screen,
                " drop them again."),
              parent_window);
 
-            eel_g_object_list_free (files);
+            g_list_foreach(files, (GFunc) g_object_unref, NULL);
+            g_list_free(files);
             g_object_unref (app_info);
             return;
         }
@@ -502,7 +503,8 @@ caja_launch_desktop_file (GdkScreen   *screen,
         g_free (message);
     }
 
-    eel_g_object_list_free (files);
+    g_list_foreach(files, (GFunc) g_object_unref, NULL);
+    g_list_free(files);
     g_object_unref (context);
     g_object_unref (app_info);
 }
diff --git a/libcaja-private/caja-progress-info.c b/libcaja-private/caja-progress-info.c
index b547ead8..789b5de0 100644
--- a/libcaja-private/caja-progress-info.c
+++ b/libcaja-private/caja-progress-info.c
@@ -26,9 +26,9 @@
 #include <math.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <eel/eel-string.h>
 #include <eel/eel-glib-extensions.h>
 #include "caja-progress-info.h"
+#include <string.h>
 
 enum
 {
@@ -800,7 +800,7 @@ caja_progress_info_take_status (CajaProgressInfo *info,
 {
     G_LOCK (progress_info);
 
-    if (eel_strcmp (info->status, status) != 0)
+    if (g_strcmp0 (info->status, status) != 0)
     {
         g_free (info->status);
         info->status = status;
@@ -822,7 +822,7 @@ caja_progress_info_set_status (CajaProgressInfo *info,
 {
     G_LOCK (progress_info);
 
-    if (eel_strcmp (info->status, status) != 0)
+    if (g_strcmp0 (info->status, status) != 0)
     {
         g_free (info->status);
         info->status = g_strdup (status);
@@ -841,7 +841,7 @@ caja_progress_info_take_details (CajaProgressInfo *info,
 {
     G_LOCK (progress_info);
 
-    if (eel_strcmp (info->details, details) != 0)
+    if (g_strcmp0 (info->details, details) != 0)
     {
         g_free (info->details);
         info->details = details;
@@ -863,7 +863,7 @@ caja_progress_info_set_details (CajaProgressInfo *info,
 {
     G_LOCK (progress_info);
 
-    if (eel_strcmp (info->details, details) != 0)
+    if (g_strcmp0 (info->details, details) != 0)
     {
         g_free (info->details);
         info->details = g_strdup (details);
diff --git a/libcaja-private/caja-query.c b/libcaja-private/caja-query.c
index 42804eda..9c6044af 100644
--- a/libcaja-private/caja-query.c
+++ b/libcaja-private/caja-query.c
@@ -118,7 +118,10 @@ caja_query_get_mime_types (CajaQuery *query)
 void
 caja_query_set_mime_types (CajaQuery *query, GList *mime_types)
 {
-    eel_g_list_free_deep (query->details->mime_types);
+    g_list_foreach(query->details->mime_types, (GFunc) g_free, NULL);
+    g_list_free(query->details->mime_types);
+    g_list_foreach(query->details->mime_types, (GFunc) g_free, NULL);
+    g_list_free(query->details->mime_types);
     query->details->mime_types = eel_g_str_list_copy (mime_types);
 }
 
diff --git a/libcaja-private/caja-search-engine-beagle.c b/libcaja-private/caja-search-engine-beagle.c
index 0a2c34ff..6e59b060 100644
--- a/libcaja-private/caja-search-engine-beagle.c
+++ b/libcaja-private/caja-search-engine-beagle.c
@@ -25,7 +25,6 @@
 #include "caja-search-engine-beagle.h"
 
 #include <eel/eel-gtk-macros.h>
-#include <eel/eel-glib-extensions.h>
 #include <gmodule.h>
 
 typedef struct _BeagleHit BeagleHit;
@@ -342,7 +341,8 @@ caja_search_engine_beagle_start (CajaSearchEngine *engine)
 
     /* These must live during the lifetime of the query */
     g_free (text);
-    eel_g_list_free_deep (mimetypes);
+    g_list_foreach(mimetypes, (GFunc) g_free, NULL);
+    g_list_free(mimetypes);
 }
 
 static void
diff --git a/libcaja-private/caja-search-engine-simple.c b/libcaja-private/caja-search-engine-simple.c
index 5e906334..cf50497f 100644
--- a/libcaja-private/caja-search-engine-simple.c
+++ b/libcaja-private/caja-search-engine-simple.c
@@ -28,7 +28,6 @@
 #include <glib.h>
 
 #include <eel/eel-gtk-macros.h>
-#include <eel/eel-glib-extensions.h>
 #include <gio/gio.h>
 
 #define BATCH_SIZE 500
@@ -138,8 +137,10 @@ search_thread_data_free (SearchThreadData *data)
     g_hash_table_destroy (data->visited);
     g_object_unref (data->cancellable);
     g_strfreev (data->words);
-    eel_g_list_free_deep (data->mime_types);
-    eel_g_list_free_deep (data->uri_hits);
+    g_list_foreach(data->mime_types, (GFunc) g_free, NULL);
+    g_list_free(data->mime_types);
+    g_list_foreach(data->uri_hits, (GFunc) g_free, NULL);
+    g_list_free(data->uri_hits);
     g_free (data);
 }
 
@@ -181,7 +182,8 @@ search_thread_add_hits_idle (gpointer user_data)
                                        hits->uris);
     }
 
-    eel_g_list_free_deep (hits->uris);
+    g_list_foreach(hits->uris, (GFunc) g_free, NULL);
+    g_list_free(hits->uris);
     g_free (hits);
 
     return FALSE;
diff --git a/libcaja-private/caja-search-engine-tracker.c b/libcaja-private/caja-search-engine-tracker.c
index ea56a924..e47af045 100644
--- a/libcaja-private/caja-search-engine-tracker.c
+++ b/libcaja-private/caja-search-engine-tracker.c
@@ -24,7 +24,6 @@
 #include <config.h>
 #include "caja-search-engine-tracker.h"
 #include <eel/eel-gtk-macros.h>
-#include <eel/eel-glib-extensions.h>
 #include <gmodule.h>
 #include <string.h>
 
@@ -462,7 +461,8 @@ caja_search_engine_tracker_start (CajaSearchEngine *engine)
 
     tracker->details->query_pending = TRUE;
     g_free (search_text);
-    eel_g_list_free_deep (mimetypes);
+    g_list_foreach(mimetypes, (GFunc) g_free, NULL);
+    g_list_free(mimetypes);
 }
 
 static void
diff --git a/libcaja-private/caja-undostack-manager.c b/libcaja-private/caja-undostack-manager.c
index 465e35e1..0a19934e 100644
--- a/libcaja-private/caja-undostack-manager.c
+++ b/libcaja-private/caja-undostack-manager.c
@@ -33,7 +33,6 @@
 #include <glib/gi18n.h>
 #include <locale.h>
 #include <gdk/gdk.h>
-#include <eel/eel-glib-extensions.h>
 
 /* *****************************************************************
  Private fields
@@ -432,7 +431,8 @@ caja_undostack_manager_redo (CajaUndoStackManager * manager,
         uris = construct_gfile_list (action->sources, action->src_dir);
         caja_file_operations_copy (uris, NULL,
             action->dest_dir, NULL, undo_redo_done_transfer_callback, action);
-        eel_g_object_list_free (uris);
+    	g_list_foreach(uris, (GFunc) g_object_unref, NULL);
+    	g_list_free(uris);
         break;
       case CAJA_UNDOSTACK_CREATEFILEFROMTEMPLATE:
         puri = get_uri_parent (action->target_uri);
@@ -448,14 +448,16 @@ caja_undostack_manager_redo (CajaUndoStackManager * manager,
         uris = construct_gfile_list (action->sources, action->src_dir);
         caja_file_operations_duplicate (uris, NULL, NULL,
             undo_redo_done_transfer_callback, action);
-        eel_g_object_list_free (uris);
+    	g_list_foreach(uris, (GFunc) g_object_unref, NULL);
+    	g_list_free(uris);
         break;
       case CAJA_UNDOSTACK_RESTOREFROMTRASH:
       case CAJA_UNDOSTACK_MOVE:
         uris = construct_gfile_list (action->sources, action->src_dir);
         caja_file_operations_move (uris, NULL,
             action->dest_dir, NULL, undo_redo_done_transfer_callback, action);
-        eel_g_object_list_free (uris);
+    	g_list_foreach(uris, (GFunc) g_object_unref, NULL);
+    	g_list_free(uris);
         break;
       case CAJA_UNDOSTACK_RENAME:
         new_name = get_uri_basename (action->new_uri);
@@ -489,14 +491,16 @@ caja_undostack_manager_redo (CajaUndoStackManager * manager,
           caja_file_operations_trash_or_delete
               (uris, NULL, undo_redo_done_delete_callback, action);
           g_list_free (uri_to_trash);
-          eel_g_object_list_free (uris);
+    	  g_list_foreach(uris, (GFunc) g_object_unref, NULL);
+    	  g_list_free(uris);
         }
         break;
       case CAJA_UNDOSTACK_CREATELINK:
         uris = construct_gfile_list (action->sources, action->src_dir);
         caja_file_operations_link (uris, NULL,
             action->dest_dir, NULL, undo_redo_done_transfer_callback, action);
-        eel_g_object_list_free (uris);
+    	g_list_foreach(uris, (GFunc) g_object_unref, NULL);
+    	g_list_free(uris);
         break;
       case CAJA_UNDOSTACK_SETPERMISSIONS:
         file = caja_file_get_by_uri (action->target_uri);
@@ -579,7 +583,8 @@ caja_undostack_manager_undo (CajaUndoStackManager * manager,
         if (priv->confirm_delete) {
           caja_file_operations_delete (uris, NULL,
               undo_redo_done_delete_callback, action);
-          eel_g_object_list_free (uris);
+    	  g_list_foreach(uris, (GFunc) g_object_unref, NULL);
+    	  g_list_free(uris);
         } else {
           /* We skip the confirmation message
            */
@@ -600,7 +605,8 @@ caja_undostack_manager_undo (CajaUndoStackManager * manager,
         uris = construct_gfile_list (action->destinations, action->dest_dir);
         caja_file_operations_trash_or_delete (uris, NULL,
             undo_redo_done_delete_callback, action);
-        eel_g_object_list_free (uris);
+    	g_list_foreach(uris, (GFunc) g_object_unref, NULL);
+    	g_list_free(uris);
         break;
       case CAJA_UNDOSTACK_MOVETOTRASH:
         files_to_restore = retrieve_files_to_restore (action->trashed);
@@ -630,7 +636,8 @@ caja_undostack_manager_undo (CajaUndoStackManager * manager,
         uris = construct_gfile_list (action->destinations, action->dest_dir);
         caja_file_operations_move (uris, NULL,
             action->src_dir, NULL, undo_redo_done_transfer_callback, action);
-        eel_g_object_list_free (uris);
+    	g_list_foreach(uris, (GFunc) g_object_unref, NULL);
+    	g_list_free(uris);
         break;
       case CAJA_UNDOSTACK_RENAME:
         new_name = get_uri_basename (action->old_uri);
diff --git a/src/caja-application.c b/src/caja-application.c
index 978af2d6..edba1d5c 100644
--- a/src/caja-application.c
+++ b/src/caja-application.c
@@ -257,7 +257,8 @@ automount_all_volumes (CajaApplication *application)
             /* pass NULL as GMountOperation to avoid user interaction */
             g_volume_mount (volume, 0, NULL, NULL, startup_volume_mount_cb, NULL);
         }
-        eel_g_object_list_free (volumes);
+    	g_list_foreach(volumes, (GFunc) g_object_unref, NULL);
+    	g_list_free(volumes);
     }
 
 }
diff --git a/src/caja-bookmark-list.c b/src/caja-bookmark-list.c
index cde07a1c..db594cf7 100644
--- a/src/caja-bookmark-list.c
+++ b/src/caja-bookmark-list.c
@@ -31,9 +31,9 @@
 #include <libcaja-private/caja-file-utilities.h>
 #include <libcaja-private/caja-file.h>
 #include <libcaja-private/caja-icon-names.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-string.h>
+
 #include <gio/gio.h>
+#include <string.h>
 
 #define MAX_BOOKMARK_LENGTH 80
 #define LOAD_JOB 1
@@ -167,7 +167,8 @@ static void
 clear (CajaBookmarkList *bookmarks)
 {
     g_list_foreach (bookmarks->list, stop_monitoring_one, bookmarks);
-    eel_g_object_list_free (bookmarks->list);
+    g_list_foreach(bookmarks->list, (GFunc) g_object_unref, NULL);
+    g_list_free(bookmarks->list);
     bookmarks->list = NULL;
 }
 
@@ -407,7 +408,7 @@ caja_bookmark_list_delete_items_with_uri (CajaBookmarkList *bookmarks,
         next = node->next;
 
         bookmark_uri = caja_bookmark_get_uri (CAJA_BOOKMARK (node->data));
-        if (eel_strcmp (bookmark_uri, uri) == 0)
+        if (g_strcmp0 (bookmark_uri, uri) == 0)
         {
             bookmarks->list = g_list_remove_link (bookmarks->list, node);
             stop_monitoring_bookmark (bookmarks, CAJA_BOOKMARK (node->data));
diff --git a/src/caja-emblem-sidebar.c b/src/caja-emblem-sidebar.c
index ea21bec9..1de86f9b 100644
--- a/src/caja-emblem-sidebar.c
+++ b/src/caja-emblem-sidebar.c
@@ -32,8 +32,6 @@
 #include "caja-emblem-sidebar.h"
 
 #include <stdio.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-string.h>
 #include <eel/eel-wrap-table.h>
 #include <eel/eel-labeled-image.h>
 #include <eel/eel-graphic-effects.h>
@@ -1008,7 +1006,8 @@ caja_emblem_sidebar_populate (CajaEmblemSidebar *emblem_sidebar)
 
         widgets = g_list_prepend (widgets, emblem_widget);
     }
-    eel_g_list_free_deep (icons);
+    g_list_foreach(icons, (GFunc) g_free, NULL);
+    g_list_free(icons);
 
     /* sort the emblems by display name */
     widgets = g_list_sort (widgets, emblem_widget_sort_func);
diff --git a/src/caja-history-sidebar.c b/src/caja-history-sidebar.c
index 2375a046..b69dce51 100644
--- a/src/caja-history-sidebar.c
+++ b/src/caja-history-sidebar.c
@@ -27,9 +27,7 @@
 
 #include <config.h>
 
-#include <eel/eel-debug.h>
 #include <eel/eel-gtk-extensions.h>
-#include <eel/eel-glib-extensions.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libcaja-private/caja-bookmark.h>
@@ -123,7 +121,8 @@ update_history (CajaHistorySidebar *sidebar)
         }
         g_free (name);
     }
-    eel_g_object_list_free (history);
+    g_list_foreach(history, (GFunc) g_object_unref, NULL);
+    g_list_free(history);
 
     selection = GTK_TREE_SELECTION (gtk_tree_view_get_selection (sidebar->tree_view));
 
diff --git a/src/caja-information-panel.c b/src/caja-information-panel.c
index 5585457e..7aa17908 100644
--- a/src/caja-information-panel.c
+++ b/src/caja-information-panel.c
@@ -1228,7 +1228,8 @@ selection_changed_callback (CajaWindowInfo *window,
 
     caja_information_panel_set_uri (panel, uri, name);
 
-    eel_g_object_list_unref (selection);
+    g_list_foreach (selection, (GFunc) g_object_unref, NULL);
+    g_list_free (selection);
     g_free (uri);
     g_free (name);
 }
diff --git a/src/caja-navigation-window-slot.c b/src/caja-navigation-window-slot.c
index 703cca90..14963733 100644
--- a/src/caja-navigation-window-slot.c
+++ b/src/caja-navigation-window-slot.c
@@ -88,7 +88,8 @@ caja_navigation_window_slot_clear_forward_list (CajaNavigationWindowSlot *slot)
 {
     g_assert (CAJA_IS_NAVIGATION_WINDOW_SLOT (slot));
 
-    eel_g_object_list_free (slot->forward_list);
+    g_list_foreach(slot->forward_list, (GFunc) g_object_unref, NULL);
+    g_list_free(slot->forward_list);
     slot->forward_list = NULL;
 }
 
@@ -97,7 +98,8 @@ caja_navigation_window_slot_clear_back_list (CajaNavigationWindowSlot *slot)
 {
     g_assert (CAJA_IS_NAVIGATION_WINDOW_SLOT (slot));
 
-    eel_g_object_list_free (slot->back_list);
+    g_list_foreach(slot->back_list, (GFunc) g_object_unref, NULL);
+    g_list_free(slot->back_list);
     slot->back_list = NULL;
 }
 
diff --git a/src/caja-notes-viewer.c b/src/caja-notes-viewer.c
index dc2df7fd..e62a0f14 100644
--- a/src/caja-notes-viewer.c
+++ b/src/caja-notes-viewer.c
@@ -31,7 +31,6 @@
 
 #include <eel/eel-debug.h>
 #include <eel/eel-gtk-extensions.h>
-#include <eel/eel-string.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libcaja-private/caja-file-attributes.h>
@@ -141,7 +140,7 @@ set_saved_text (CajaNotesViewer *notes, char *new_notes)
     old_text = notes->details->previous_saved_text;
     notes->details->previous_saved_text = new_notes;
 
-    if (eel_strcmp (old_text, new_notes) != 0)
+    if (g_strcmp0 (old_text, new_notes) != 0)
     {
         g_signal_emit_by_name (CAJA_SIDEBAR (notes),
                                "tab_icon_changed");
@@ -207,7 +206,7 @@ load_note_text_from_metadata (CajaFile *file,
     /* This fn is called for any change signal on the file, so make sure that the
      * metadata has actually changed.
      */
-    if (eel_strcmp (saved_text, notes->details->previous_saved_text) != 0)
+    if (g_strcmp0 (saved_text, notes->details->previous_saved_text) != 0)
     {
         set_saved_text (notes, saved_text);
         cancel_pending_save (notes);
diff --git a/src/caja-pathbar.c b/src/caja-pathbar.c
index cc79e497..57821d60 100644
--- a/src/caja-pathbar.c
+++ b/src/caja-pathbar.c
@@ -20,10 +20,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <eel/eel-debug.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-string.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
@@ -1754,7 +1750,8 @@ setup_file_path_mounted_mount (GFile *location, ButtonData *button_data)
         g_object_unref (default_location);
         g_object_unref (root);
     }
-    eel_g_object_list_free (mounts);
+    g_list_foreach(mounts, (GFunc) g_object_unref, NULL);
+    g_list_free(mounts);
     return result;
 }
 
@@ -1963,7 +1960,7 @@ button_data_file_changed (CajaFile *file,
     if (button_data->type != MOUNT_BUTTON)
     {
         display_name = caja_file_get_display_name (file);
-        if (eel_strcmp (display_name, button_data->dir_name) != 0)
+        if (g_strcmp0 (display_name, button_data->dir_name) != 0)
         {
             g_free (button_data->dir_name);
             button_data->dir_name = g_strdup (display_name);
diff --git a/src/caja-places-sidebar.c b/src/caja-places-sidebar.c
index c12c6200..a6b3f022 100644
--- a/src/caja-places-sidebar.c
+++ b/src/caja-places-sidebar.c
@@ -417,7 +417,7 @@ compare_for_selection (CajaPlacesSidebar *sidebar,
 {
     int res;
 
-    res = eel_strcmp (added_uri, last_uri);
+    res = g_strcmp0 (added_uri, last_uri);
 
     if (res == 0)
     {
@@ -429,7 +429,7 @@ compare_for_selection (CajaPlacesSidebar *sidebar,
         *path = gtk_tree_model_get_path (sidebar->filter_model,
                                          iter);
     }
-    else if (eel_strcmp (location, added_uri) == 0)
+    else if (g_strcmp0 (location, added_uri) == 0)
     {
         if (*path == NULL)
         {
@@ -842,7 +842,8 @@ update_places (CajaPlacesSidebar *sidebar)
         g_free (tooltip);
     }
 
-    eel_g_object_list_free (network_mounts);
+    g_list_foreach (network_mounts, (GFunc) g_object_unref, NULL);
+    g_list_free(network_mounts);
 
     /* network:// */
     mount_uri = "network:///"; /* No need to strdup */
diff --git a/src/caja-property-browser.c b/src/caja-property-browser.c
index 5fb5c249..e3ee8dd7 100644
--- a/src/caja-property-browser.c
+++ b/src/caja-property-browser.c
@@ -34,7 +34,6 @@
 
 #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>
@@ -233,7 +232,8 @@ caja_property_browser_dispose (GObject *object)
     g_free (property_browser->details->dragged_file);
     g_free (property_browser->details->drag_type);
 
-    eel_g_list_free_deep (property_browser->details->keywords);
+    g_list_foreach (property_browser->details->keywords, (GFunc) g_free, NULL);
+    g_list_free(property_browser->details->keywords);
 
     if (property_browser->details->property_chit)
     {
@@ -1796,7 +1796,8 @@ make_properties_from_directories (CajaPropertyBrowser *property_browser)
 
     if (property_browser->details->category_type == CAJA_PROPERTY_EMBLEM)
     {
-        eel_g_list_free_deep (property_browser->details->keywords);
+        g_list_foreach(property_browser->details->keywords, (GFunc) g_free, NULL);
+        g_list_free(property_browser->details->keywords);
         property_browser->details->keywords = NULL;
 
         icons = caja_emblem_list_available ();
@@ -1850,7 +1851,8 @@ make_properties_from_directories (CajaPropertyBrowser *property_browser)
                 g_object_unref (object_pixbuf);
             }
         }
-        eel_g_list_free_deep (icons);
+        g_list_foreach(icons, (GFunc) g_free, NULL);
+        g_list_free(icons);
     }
     else
     {
diff --git a/src/caja-query-editor.c b/src/caja-query-editor.c
index 1b7ea10f..b0d04008 100644
--- a/src/caja-query-editor.c
+++ b/src/caja-query-editor.c
@@ -864,8 +864,8 @@ type_add_rows_from_query (CajaQueryEditor    *editor,
                                         &iter);
     }
 
-    eel_g_list_free_deep (mime_types);
-
+    g_list_foreach(mime_types, (GFunc) g_free, NULL);
+    g_list_free(mime_types);
 }
 
 /* End of row types */
diff --git a/src/caja-spatial-window.c b/src/caja-spatial-window.c
index 5dd3bbce..94e43956 100644
--- a/src/caja-spatial-window.c
+++ b/src/caja-spatial-window.c
@@ -42,7 +42,6 @@
 #include "caja-search-bar.h"
 #include "caja-window-manage-views.h"
 #include "caja-zoom-control.h"
-#include <eel/eel-glib-extensions.h>
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-string.h>
@@ -556,7 +555,8 @@ location_menu_item_activated_callback (GtkWidget *menu_item,
         caja_window_slot_open_location_with_selection
         (slot, dest, selection, close_behind);
 
-        eel_g_object_list_free (selection);
+    	g_list_foreach(selection, (GFunc) g_object_unref, NULL);
+    	g_list_free(selection);
     }
 
     if (event != NULL) {
diff --git a/src/caja-trash-bar.c b/src/caja-trash-bar.c
index 77e60f88..beb993bd 100644
--- a/src/caja-trash-bar.c
+++ b/src/caja-trash-bar.c
@@ -70,7 +70,8 @@ restore_button_clicked_cb (GtkWidget *button,
     caja_restore_files_from_trash (files, GTK_WINDOW (gtk_widget_get_toplevel (button)));
 
     caja_file_list_free (files);
-    eel_g_object_list_free (locations);
+    g_list_foreach(locations, (GFunc) g_object_unref, NULL);
+    g_list_free(locations);
 }
 
 static void
diff --git a/src/caja-window-manage-views.c b/src/caja-window-manage-views.c
index aba56377..5156cb18 100644
--- a/src/caja-window-manage-views.c
+++ b/src/caja-window-manage-views.c
@@ -860,7 +860,7 @@ caja_window_slot_content_view_matches_iid (CajaWindowSlot *slot,
     {
         return FALSE;
     }
-    return eel_strcmp (caja_view_get_view_id (slot->content_view), iid) == 0;
+    return g_strcmp0 (caja_view_get_view_id (slot->content_view), iid) == 0;
 }
 
 static gboolean
@@ -1390,7 +1390,7 @@ create_content_view (CajaWindowSlot *slot,
     }
 
     if (slot->content_view != NULL &&
-            eel_strcmp (caja_view_get_view_id (slot->content_view),
+            g_strcmp0 (caja_view_get_view_id (slot->content_view),
                         view_id) == 0)
     {
         /* reuse existing content view */
@@ -1421,7 +1421,8 @@ create_content_view (CajaWindowSlot *slot,
                            FALSE,
                            TRUE);
 
-        eel_g_object_list_free (slot->pending_selection);
+    	g_list_foreach(slot->pending_selection, (GFunc) g_object_unref, NULL);
+    	g_list_free(slot->pending_selection);
         slot->pending_selection = NULL;
     }
     else if (slot->location != NULL)
@@ -1432,7 +1433,8 @@ create_content_view (CajaWindowSlot *slot,
                            selection,
                            FALSE,
                            TRUE);
-        eel_g_object_list_free (selection);
+    	g_list_foreach(selection, (GFunc) g_object_unref, NULL);
+    	g_list_free(selection);
     }
     else
     {
@@ -1490,7 +1492,8 @@ load_new_location (CajaWindowSlot *slot,
         caja_view_set_selection (view, selection_copy);
     }
 
-    eel_g_object_list_free (selection_copy);
+    g_list_foreach(selection_copy, (GFunc) g_object_unref, NULL);
+    g_list_free(selection_copy);
 }
 
 /* A view started to load the location its viewing, either due to
@@ -1947,7 +1950,8 @@ free_location_change (CajaWindowSlot *slot)
     }
     slot->pending_location = NULL;
 
-    eel_g_object_list_free (slot->pending_selection);
+    g_list_foreach(slot->pending_selection, (GFunc) g_object_unref, NULL);
+    g_list_free(slot->pending_selection);
     slot->pending_selection = NULL;
 
     /* Don't free pending_scroll_to, since thats needed until
@@ -2001,7 +2005,8 @@ cancel_location_change (CajaWindowSlot *slot)
                            selection,
                            TRUE,
                            FALSE);
-        eel_g_object_list_free (selection);
+    	g_list_foreach(selection, (GFunc) g_object_unref, NULL);
+    	g_list_free(selection);
     }
 
     end_location_change (slot);
@@ -2351,7 +2356,8 @@ caja_window_slot_reload (CajaWindowSlot *slot)
      NULL, NULL);
     g_free (current_pos);
     g_object_unref (location);
-    eel_g_object_list_free (selection);
+    g_list_foreach(selection, (GFunc) g_object_unref, NULL);
+    g_list_free(selection);
 }
 
 void
diff --git a/src/caja-window-slot.c b/src/caja-window-slot.c
index e82bcb00..5d87a60f 100644
--- a/src/caja-window-slot.c
+++ b/src/caja-window-slot.c
@@ -662,7 +662,8 @@ caja_window_slot_dispose (GObject *object)
         g_object_ref (slot->location);
     }
 
-    eel_g_list_free_deep (slot->pending_selection);
+    g_list_foreach(slot->pending_selection, (GFunc) g_free, NULL);
+    g_list_free(slot->pending_selection);
     slot->pending_selection = NULL;
 
     if (slot->current_location_bookmark != NULL)
diff --git a/src/caja-window.c b/src/caja-window.c
index 142ae4a1..35b78432 100644
--- a/src/caja-window.c
+++ b/src/caja-window.c
@@ -343,7 +343,8 @@ caja_window_go_up (CajaWindow *window, gboolean close_behind, gboolean new_tab)
 
     g_object_unref (parent);
 
-    eel_g_object_list_free (selection);
+    g_list_foreach(selection, (GFunc) g_object_unref, NULL);
+    g_list_free(selection);
 }
 
 static void
@@ -605,9 +606,8 @@ caja_window_get_property (GObject *object,
 static void
 free_stored_viewers (CajaWindow *window)
 {
-    eel_g_list_free_deep_custom (window->details->short_list_viewers,
-                                 (GFunc) g_free,
-                                 NULL);
+    g_list_foreach(window->details->short_list_viewers, (GFunc) g_free, NULL);
+    g_list_free(window->details->short_list_viewers);
     window->details->short_list_viewers = NULL;
     g_free (window->details->extra_viewer);
     window->details->extra_viewer = NULL;
@@ -1760,7 +1760,8 @@ caja_send_history_list_changed (void)
 static void
 free_history_list (void)
 {
-    eel_g_object_list_free (history_list);
+    g_list_foreach(history_list, (GFunc) g_object_unref, NULL);
+    g_list_free(history_list);
     history_list = NULL;
 }
 
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index a4119ec4..c40a40ba 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -1025,7 +1025,8 @@ delete_selected_files (FMDirectoryView *view)
 
 	caja_file_operations_delete (locations, fm_directory_view_get_containing_window (view), NULL, NULL);
 
-	eel_g_object_list_free (locations);
+	g_list_foreach(locations, (GFunc) g_object_unref, NULL);
+	g_list_free(locations);
         caja_file_list_free (selection);
 }
 
@@ -1934,7 +1935,8 @@ fm_directory_view_set_selection_locations (CajaView *caja_view,
 		/* If we are still loading, set the list of pending URIs instead.
 		 * done_loading() will eventually select the pending URIs and reveal them.
 		 */
-		eel_g_object_list_free (view->details->pending_locations_selected);
+		g_list_foreach(view->details->pending_locations_selected, (GFunc) g_object_unref, NULL);
+		g_list_free(view->details->pending_locations_selected);
 		view->details->pending_locations_selected =
 			eel_g_object_list_copy (selection_locations);
 	}
@@ -2548,7 +2550,8 @@ done_loading (FMDirectoryView *view,
 				fm_directory_view_reveal_selection (view);
 			}
 		}
-		eel_g_object_list_free (locations_selected);
+		g_list_foreach(locations_selected, (GFunc) g_object_unref, NULL);
+		g_list_free(locations_selected);
 		fm_directory_view_display_selection_info (view);
 	}
 
@@ -3790,7 +3793,8 @@ fm_directory_view_create_links_for_files (FMDirectoryView *view, GList *files,
 	caja_file_operations_copy_move (uris, relative_item_points, dir_uri, GDK_ACTION_LINK,
 					    GTK_WIDGET (view), copy_move_done_callback, copy_move_done_data);
 	g_free (dir_uri);
-	eel_g_list_free_deep (uris);
+	g_list_foreach(uris, (GFunc) g_free, NULL);
+	g_list_free(uris);
 }
 
 static void
@@ -3822,7 +3826,8 @@ fm_directory_view_duplicate_selection (FMDirectoryView *view, GList *files,
         copy_move_done_data = pre_copy_move (view);
 	caja_file_operations_copy_move (uris, relative_item_points, NULL, GDK_ACTION_COPY,
 		GTK_WIDGET (view), copy_move_done_callback, copy_move_done_data);
-	eel_g_list_free_deep (uris);
+	g_list_foreach(uris, (GFunc) g_free, NULL);
+	g_list_free(uris);
 }
 
 /* special_link_in_selection
@@ -3926,7 +3931,8 @@ trash_or_delete_files (GtkWindow *parent_window,
 						  parent_window,
 						  (CajaDeleteCallback) trash_or_delete_done_cb,
 						  view);
-	eel_g_object_list_free (locations);
+	g_list_foreach(locations, (GFunc) g_object_unref, NULL);
+	g_list_free(locations);
 }
 
 static gboolean
@@ -4675,7 +4681,8 @@ reset_open_with_menu (FMDirectoryView *view, GList *selection)
 						   index,
 						   menu_path, popup_path, submenu_visible);
 	}
-	eel_g_object_list_free (applications);
+	g_list_foreach(applications, (GFunc) g_object_unref, NULL);
+	g_list_free(applications);
 	if (default_app != NULL) {
 		g_object_unref (default_app);
 	}
@@ -5970,7 +5977,8 @@ move_copy_selection_to_location (FMDirectoryView *view,
 					   0, 0,
 					   view);
 
-	eel_g_list_free_deep (uris);
+	g_list_foreach(uris, (GFunc) g_free, NULL);
+	g_list_free(uris);
 	caja_file_list_free (selection);
 }
 
@@ -6110,7 +6118,10 @@ paste_clipboard_data (FMDirectoryView *view,
 			gtk_clipboard_clear (caja_clipboard_get (GTK_WIDGET (view)));
 		}
 
-		eel_g_list_free_deep (item_uris);
+    		g_list_foreach(item_uris, (GFunc) g_free, NULL);
+    		g_list_free(item_uris);
+		g_list_foreach(item_uris, (GFunc) g_free, NULL);
+		g_list_free(item_uris);
 	}
 }
 
@@ -7104,7 +7115,8 @@ action_location_delete_callback (GtkAction *action,
 	caja_file_operations_delete (files, fm_directory_view_get_containing_window (view),
 					 NULL, NULL);
 
-	eel_g_object_list_free (files);
+	g_list_foreach(files, (GFunc) g_object_unref, NULL);
+	g_list_free(files);
 }
 
 static void
@@ -9787,7 +9799,8 @@ fm_directory_view_stop (FMDirectoryView *view)
 	view->details->old_added_files = NULL;
 	file_and_directory_list_free (view->details->old_changed_files);
 	view->details->old_changed_files = NULL;
-	eel_g_object_list_free (view->details->pending_locations_selected);
+	g_list_foreach(view->details->pending_locations_selected, (GFunc) g_object_unref, NULL);
+	g_list_free(view->details->pending_locations_selected);
 	view->details->pending_locations_selected = NULL;
 
 	if (view->details->model != NULL) {
@@ -10565,7 +10578,8 @@ fm_directory_view_handle_uri_list_drop (FMDirectoryView  *view,
 					   target_uri != NULL ? target_uri : container_uri,
 					   action, x, y, view);
 
-	eel_g_list_free_deep (real_uri_list);
+	g_list_foreach(real_uri_list, (GFunc) g_free, NULL);
+	g_list_free(real_uri_list);
 
 	if (points != NULL)
 		g_array_free (points, TRUE);
diff --git a/src/file-manager/fm-list-model.c b/src/file-manager/fm-list-model.c
index b814a313..f6ba0168 100644
--- a/src/file-manager/fm-list-model.c
+++ b/src/file-manager/fm-list-model.c
@@ -29,8 +29,6 @@
 #include <libegg/eggtreemultidnd.h>
 
 #include <string.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-glib-extensions.h>
 #include <eel/eel-gdk-pixbuf-extensions.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
@@ -373,7 +371,8 @@ fm_list_model_get_value (GtkTreeModel *tree_model, GtkTreeIter *iter, int column
                     g_object_unref (emblem);
             	}
 
-            	eel_g_object_list_free (emblem_icons);
+                g_list_foreach (emblem_icons, (GFunc) g_object_unref, NULL);
+                g_list_free(emblem_icons);
 
             	g_object_unref (gicon);
             	gicon = emblemed_icon;
@@ -679,7 +678,8 @@ fm_list_model_get_first_iter_for_file (FMListModel          *model,
         res = TRUE;
         *iter = *(GtkTreeIter *)list->data;
     }
-    eel_g_list_free_deep (list);
+    g_list_foreach(list, (GFunc) g_free, NULL);
+    g_list_free(list);
 
     return res;
 }
@@ -1806,7 +1806,8 @@ refresh_row (gpointer data,
         gtk_tree_path_free (path);
     }
 
-    eel_g_list_free_deep (iters);
+    g_list_foreach(iters, (GFunc) g_free, NULL);
+    g_list_free(iters);
 }
 
 void
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index e9fdd88b..f487c333 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -2325,7 +2325,8 @@ fm_list_view_set_selection (FMDirectoryView *view, GList *selection)
             gtk_tree_selection_select_iter (tree_selection,
                                             (GtkTreeIter *)l->data);
         }
-        eel_g_list_free_deep (iters);
+    	g_list_foreach(iters, (GFunc) g_free, NULL);
+    	g_list_free(iters);
     }
 
     g_signal_handlers_unblock_by_func (tree_selection, list_selection_changed_callback, view);
@@ -2362,7 +2363,8 @@ fm_list_view_invert_selection (FMDirectoryView *view)
             gtk_tree_selection_unselect_iter (tree_selection,
                                               (GtkTreeIter *)l->data);
         }
-        eel_g_list_free_deep (iters);
+    	g_list_foreach(iters, (GFunc) g_free, NULL);
+    	g_list_free(iters);
     }
 
     g_list_free (selection);
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index ea07b1c4..4a7b7c54 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -37,7 +37,6 @@
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-labeled-image.h>
 #include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
 #include <eel/eel-vfs-extensions.h>
 #include <eel/eel-wrap-table.h>
 #include <gtk/gtk.h>
@@ -700,7 +699,7 @@ update_name_field (FMPropertiesWindow *window)
 		set_name_field (window, original_name, current_name);
 
 		if (original_name == NULL ||
-		    eel_strcmp (original_name, current_name) != 0) {
+		    g_strcmp0 (original_name, current_name) != 0) {
 			g_object_set_data_full (G_OBJECT (window->details->name_field),
 						"original_name",
 						current_name,
@@ -842,7 +841,8 @@ file_has_keyword (CajaFile *file, const char *keyword)
 
 	keywords = caja_file_get_keywords (file);
 	word = g_list_find_custom (keywords, keyword, (GCompareFunc) strcmp);
-	eel_g_list_free_deep (keywords);
+    	g_list_foreach(keywords, (GFunc) g_free, NULL);
+    	g_list_free(keywords);
 
 	return (word != NULL);
 }
@@ -932,7 +932,8 @@ emblem_button_toggled (GtkToggleButton *button,
 			keywords = g_list_prepend (keywords, g_strdup (name));
 		}
 		caja_file_set_keywords (file, keywords);
-		eel_g_list_free_deep (keywords);
+    		g_list_foreach(keywords, (GFunc) g_free, NULL);
+    		g_list_free(keywords);
 	}
 
 	for (l = files_off; l != NULL; l = l->next) {
@@ -945,10 +946,12 @@ emblem_button_toggled (GtkToggleButton *button,
 		word = g_list_find_custom (keywords, name,  (GCompareFunc)strcmp);
 		if (word) {
 			keywords = g_list_remove_link (keywords, word);
-			eel_g_list_free_deep (word);
+    			g_list_foreach(word, (GFunc) g_free, NULL);
+    			g_list_free(word);
 		}
 		caja_file_set_keywords (file, keywords);
-		eel_g_list_free_deep (keywords);
+    		g_list_foreach(keywords, (GFunc) g_free, NULL);
+    		g_list_free(keywords);
 	}
 
 	g_list_free (files_on);
@@ -1204,7 +1207,8 @@ properties_window_update (FMPropertiesWindow *window,
 			refresh_extension_pages (window);
 		}
 
-		eel_g_list_free_deep (window->details->mime_list);
+	    	g_list_foreach(window->details->mime_list, (GFunc) g_free, NULL);
+    		g_list_free(window->details->mime_list);
 		window->details->mime_list = mime_list;
 	}
 }
@@ -1813,7 +1817,8 @@ synch_groups_combo_box (GtkComboBox *combo_box, CajaFile *file)
 	gtk_combo_box_set_active (combo_box, current_group_index);
 
 	g_free (current_group_name);
-	eel_g_list_free_deep (groups);
+    	g_list_foreach(groups, (GFunc) g_free, NULL);
+    	g_list_free(groups);
 }
 
 static gboolean
@@ -2168,7 +2173,8 @@ synch_user_menu (GtkComboBox *combo_box, CajaFile *file)
 	gtk_combo_box_set_active (combo_box, owner_index);
 
 	g_free (owner_name);
-	eel_g_list_free_deep (users);
+    	g_list_foreach(users, (GFunc) g_free, NULL);
+    	g_list_free(users);
 }
 
 static GtkComboBox*
@@ -3424,7 +3430,7 @@ get_initial_emblems (GList *files)
 	ret = g_hash_table_new_full (g_direct_hash,
 				     g_direct_equal,
 				     NULL,
-				     (GDestroyNotify)eel_g_list_free_deep);
+				     (GFunc) g_free);
 
 	for (l = files; l != NULL; l = l->next) {
 		CajaFile *file;
@@ -3563,7 +3569,8 @@ create_emblems_page (FMPropertiesWindow *window)
 
 		gtk_container_add (GTK_CONTAINER (emblems_table), button);
 	}
-	eel_g_list_free_deep (icons);
+    	g_list_foreach(icons, (GFunc) g_free, NULL);
+    	g_list_free(icons);
 	gtk_widget_show_all (emblems_table);
 }
 
@@ -5047,7 +5054,8 @@ get_pending_key (GList *file_list)
 		g_string_append (key, ";");
 	}
 
-	eel_g_list_free_deep (uris);
+    	g_list_foreach(uris, (GFunc) g_free, NULL);
+    	g_list_free(uris);
 
 	ret = key->str;
 	g_string_free (key, FALSE);
@@ -5620,7 +5628,8 @@ real_finalize (GObject *object)
 
 	window = FM_PROPERTIES_WINDOW (object);
 
-	eel_g_list_free_deep (window->details->mime_list);
+    	g_list_foreach(window->details->mime_list, (GFunc) g_free, NULL);
+    	g_list_free(window->details->mime_list);
 
 	g_free (window->details->pending_name);
 	g_free (window->details);
diff --git a/src/file-manager/fm-tree-model.c b/src/file-manager/fm-tree-model.c
index 3a3e3604..3423e2d1 100644
--- a/src/file-manager/fm-tree-model.c
+++ b/src/file-manager/fm-tree-model.c
@@ -29,7 +29,6 @@
 #include <config.h>
 #include "fm-tree-model.h"
 
-#include <eel/eel-glib-extensions.h>
 #include <eel/eel-gdk-pixbuf-extensions.h>
 #include <glib/gi18n.h>
 #include <libcaja-private/caja-directory.h>
@@ -320,7 +319,8 @@ get_menu_icon_for_file (TreeNode *node,
         }
     }
 
-    eel_g_object_list_free (emblem_icons);
+    g_list_foreach (emblem_icons, (GFunc) g_object_unref, NULL);
+    g_list_free(emblem_icons);
 
     info = caja_icon_info_lookup (gicon, size);
     retval = caja_icon_info_get_pixbuf_nodefault_at_size (info, size);
diff --git a/src/file-manager/fm-tree-view.c b/src/file-manager/fm-tree-view.c
index d673c70b..37559f53 100644
--- a/src/file-manager/fm-tree-view.c
+++ b/src/file-manager/fm-tree-view.c
@@ -35,9 +35,7 @@
 #include "fm-tree-model.h"
 #include "fm-properties-window.h"
 #include <string.h>
-#include <eel/eel-glib-extensions.h>
 #include <eel/eel-gtk-extensions.h>
-#include <eel/eel-stock-dialogs.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
@@ -1061,7 +1059,8 @@ paste_clipboard_data (FMTreeView *view,
             gtk_clipboard_clear (caja_clipboard_get (GTK_WIDGET (view)));
         }
 
-        eel_g_list_free_deep (item_uris);
+    	g_list_foreach(item_uris, (GFunc) g_free, NULL);
+    	g_list_free(item_uris);
     }
 }
 
@@ -1124,7 +1123,8 @@ fm_tree_view_trash_cb (GtkWidget *menu_item,
     caja_file_operations_trash_or_delete (list,
                                           fm_tree_view_get_containing_window (view),
                                           NULL, NULL);
-    eel_g_object_list_free (list);
+    g_list_foreach(list, (GFunc) g_object_unref, NULL);
+    g_list_free(list);
 }
 
 static void
@@ -1142,7 +1142,8 @@ fm_tree_view_delete_cb (GtkWidget *menu_item,
                                     caja_file_get_location (view->details->popup_file));
 
     caja_file_operations_delete (location_list, fm_tree_view_get_containing_window (view), NULL, NULL);
-    eel_g_object_list_free (location_list);
+    g_list_foreach(location_list, (GFunc) g_object_unref, NULL);
+    g_list_free(location_list);
 }
 
 static void