diff --git a/src/border.c b/src/border.c
index cfec339bd..859bb0639 100644
--- a/src/border.c
+++ b/src/border.c
@@ -482,7 +482,7 @@ e_focus_in(Ecore_Event * ev)
 	     {
 		ecore_button_ungrab(b->win.container, g->button, g->mods,
 				    g->any_mod);
-		free(g);
+		FREE(g);
 		b->click_grab = NULL;
 	     }
 	}
@@ -1142,7 +1142,7 @@ e_cb_border_mouse_down(E_Border * b, Ecore_Event * e)
 					 g->any_mod);
 		     ecore_window_button_grab_auto_replay_set(b->win.main,
 							      NULL);
-		     free(g);
+		     FREE(g);
 		     b->grabs = evas_list_remove(b->grabs, g);
 		     goto again;
 		  }
@@ -2862,7 +2862,7 @@ e_border_adopt_children(Window win)
 		  b->ignore_unmap = 2;
 	       }
 	  }
-	free(wins);
+	FREE(wins);
      }
 
    D_RETURN;
diff --git a/src/debug.h b/src/debug.h
index 17e91bd21..144751959 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -28,13 +28,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <unistd.h>
 #include <stdio.h>
 
-/*
-#undef DEBUG
-*/
+
+#define DEBUG
+
 
 #ifdef DEBUG
 
-#define D(fmt, args...) printf(fmt, ## args);
+#define D(fmt, args...) printf(fmt, ## args); fflush(stdout);
 #else
 #define D(msg, args...)
 #endif
diff --git a/src/e_file.c b/src/e_file.c
index e20de6941..6e5955c0b 100644
--- a/src/e_file.c
+++ b/src/e_file.c
@@ -97,7 +97,7 @@ e_file_set_mime(E_File * f, char *base, char *mime)
  *    if (f->info.custom_icon) 
  *      {
  * 	if (f->info.icon) 
- * 	   free(f->info.icon);
+ * 	   FREE(f->info.icon);
  * 	f->info.icon = strdup(f->info.custom_icon);
  * 	evas_set_image_file(f->view->evas, f->obj.icon, f->info.custom_icon);
  * 	e_view_queue_resort(f->view);	
@@ -150,7 +150,7 @@ e_file_set_link(E_File * f, char *link)
      {
 	if ((f->info.link) && (!strcmp(f->info.link, link)))
 	  {
-	     free(f->info.link);
+	     FREE(f->info.link);
 	     f->info.link = strdup(link);
 	     /* effect changes here */
 	  }
diff --git a/src/entry.c b/src/entry.c
index 8e31efb70..6e8508fce 100644
--- a/src/entry.c
+++ b/src/entry.c
@@ -215,7 +215,7 @@ e_entry_move_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
 		  if (entry->selection_win)
 		     ecore_window_destroy(entry->selection_win);
 		  entry->selection_win = ecore_selection_set(str2);
-		  free(str2);
+		  FREE(str2);
 	       }
 	  }
 	e_entry_configure(entry);
@@ -571,7 +571,7 @@ e_entry_handle_keypress(E_Entry * entry, Ecore_Event_Key_Down * e)
 		  e_strdup(str2, e_entry_get_text(entry));
 		  str2[entry->cursor_pos] = 0;
 		  e_entry_set_text(entry, str2);
-		  free(str2);
+		  FREE(str2);
 	       }
 	     else if ((strlen(type) == 1) && (type[0] == 0x06))	/* ctrl+f */
 	       {
@@ -993,7 +993,7 @@ e_entry_insert_text(E_Entry * entry, char *text)
    strcat(str2, text);
    strcat(str2, &(entry->buffer[entry->cursor_pos]));
    e_entry_set_text(entry, str2);
-   free(str2);
+   FREE(str2);
    entry->cursor_pos += strlen(text);
    e_entry_configure(entry);
 
@@ -1016,7 +1016,7 @@ e_entry_clear_selection(E_Entry * entry)
 	strcpy(&(str2[entry->select.start]),
 	       &(entry->buffer[entry->select.start + entry->select.length]));
 	e_entry_set_text(entry, str2);
-	free(str2);
+	FREE(str2);
 	entry->cursor_pos = entry->select.start;
 	entry->select.start = -1;
      }
@@ -1051,7 +1051,7 @@ e_entry_delete_to_right(E_Entry * entry)
    e_strdup(str2, e_entry_get_text(entry));
    strcpy(&(str2[entry->cursor_pos]), &(entry->buffer[entry->cursor_pos + 1]));
    e_entry_set_text(entry, str2);
-   free(str2);
+   FREE(str2);
    e_entry_configure(entry);
 
    D_RETURN;
diff --git a/src/epplet.c b/src/epplet.c
index ee71f79a5..0ea264596 100644
--- a/src/epplet.c
+++ b/src/epplet.c
@@ -536,7 +536,7 @@ e_epplet_cb_cleanup(E_Epplet_CB_Info * cb)
 	cb->data2->refcount--;
 	cb->data2 = NULL;
      }
-   free(cb);
+   FREE(cb);
 #endif
 }
 
diff --git a/src/menu.c b/src/menu.c
index e009da668..b061f67cc 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1371,7 +1371,7 @@ e_menu_del_item(E_Menu * m, E_Menu_Item * mi)
    IF_FREE(mi->icon);
    if (mi->menu->selected == mi)
       mi->menu->selected = NULL;
-   free(mi);
+   FREE(mi);
    mi->menu = NULL;
 
    D_RETURN;
diff --git a/src/menubuild.c b/src/menubuild.c
index 85cbb5d66..650bc4585 100644
--- a/src/menubuild.c
+++ b/src/menubuild.c
@@ -339,7 +339,7 @@ e_build_menu_gnome_apps_build_dir(E_Build_Menu * bm, char *dir)
 		if (!have_it)
 		   entries = evas_list_append(entries, strdup(s));
 	     }
-	   free(s);
+	   FREE(s);
 	}
       if (dirlist)
 	 evas_list_free(dirlist);
diff --git a/src/object.c b/src/object.c
index 8b70e438c..462cbed09 100644
--- a/src/object.c
+++ b/src/object.c
@@ -24,7 +24,7 @@ e_object_cleanup(E_Object * obj)
    if (!obj)
       D_RETURN;
 
-   free(obj);
+   FREE(obj);
 
    D_RETURN;
 }
diff --git a/src/view.c b/src/view.c
index 5cd3a7478..56676e83b 100644
--- a/src/view.c
+++ b/src/view.c
@@ -1429,7 +1429,7 @@ e_view_resort_alphabetical(E_View * v)
    qsort(array, count, sizeof(E_Icon *), e_view_restart_alphabetical_qsort_cb);
    for (i = 0; i < count; i++)
       icons = evas_list_append(icons, array[i]);
-   free(array);
+   FREE(array);
 
    evas_list_free(v->icons);
    v->icons = icons;