9 files changed, 27 insertions, 14 deletions
diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c
index edcaf9b05b..6449b23463 100644
--- a/e-util/e-text-event-processor.c
+++ b/e-util/e-text-event-processor.c
@@ -19,8 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gtk/gtksignal.h>
 #include "e-text-event-processor.h"
+#include <gtk/gtksignal.h>
 
 static void e_text_event_processor_init		(ETextEventProcessor		 *card);
 static void e_text_event_processor_class_init	(ETextEventProcessorClass	 *klass);
diff --git a/e-util/e-util.h b/e-util/e-util.h
index b960434421..3e861ed673 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -4,7 +4,6 @@
 #include <sys/types.h>
 #include <glib.h>
 #include <gtk/gtktypeutils.h>
-#include <bonobo/bonobo-xobject.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c
index 95fcc86bb4..e25e2dc497 100644
--- a/e-util/e-xml-utils.c
+++ b/e-util/e-xml-utils.c
@@ -21,14 +21,16 @@
  */
 
 #include <config.h>
+
+#include "e-xml-utils.h"
+
+#include "gal/util/e-i18n.h"
+#include <glib.h>
 #include <locale.h>
 #include <math.h>
-#include <string.h>
 #include <gnome-xml/parser.h>
 #include <gnome-xml/xmlmemory.h>
 #include <libgnome/libgnome.h>
-#include "gal/util/e-i18n.h"
-#include "e-xml-utils.h"
 
 xmlNode *
 e_xml_get_child_by_name (const xmlNode *parent, const xmlChar *child_name)
@@ -260,9 +262,9 @@ e_xml_get_bool_prop_by_name_with_default(const xmlNode *parent, const xmlChar *p
 
 	prop = xmlGetProp ((xmlNode *) parent, prop_name);
 	if (prop != NULL) {
-		if (strcasecmp (prop, "true") == 0) {
+		if (g_strcasecmp (prop, "true") == 0) {
 			ret_val = TRUE;
-		} else if (strcasecmp (prop, "false") == 0) {
+		} else if (g_strcasecmp (prop, "false") == 0) {
 			ret_val = FALSE;
 		}
 		xmlFree(prop);
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c
index 90782f4d11..3eebc921c9 100644
--- a/widgets/misc/e-canvas-vbox.c
+++ b/widgets/misc/e-canvas-vbox.c
@@ -234,8 +234,10 @@ e_canvas_vbox_realize (GnomeCanvasItem *item)
 static void
 e_canvas_vbox_remove_item (GnomeCanvasItem *item, ECanvasVbox *vbox)
 {
-	vbox->items = g_list_remove(vbox->items, item);
-	gtk_object_unref(GTK_OBJECT(vbox));
+	if (!GTK_OBJECT_DESTROYED (vbox)) {
+		vbox->items = g_list_remove(vbox->items, item);
+		gtk_object_unref(GTK_OBJECT(vbox));
+	}
 }
 
 static void
diff --git a/widgets/misc/e-cursors.c b/widgets/misc/e-cursors.c
index 4049fbf315..1b5a8a226e 100644
--- a/widgets/misc/e-cursors.c
+++ b/widgets/misc/e-cursors.c
@@ -5,13 +5,16 @@
  *   Miguel de Icaza (miguel@gnu.org)
  */
 #include <config.h>
-#include "e-colors.h"
+
 #include "e-cursors.h"
+
+#include "e-colors.h"
 #include "pixmaps/cursor_cross.xpm"
 #include "pixmaps/cursor_zoom_in.xpm"
 #include "pixmaps/cursor_zoom_out.xpm"
 #include "pixmaps/cursor_hand_open.xpm"
 #include "pixmaps/cursor_hand_closed.xpm"
+#include <stdio.h>
 
 #define GDK_INTERNAL_CURSOR -1
 
diff --git a/widgets/misc/e-cursors.h b/widgets/misc/e-cursors.h
index a8374d6506..4f04ff08cc 100644
--- a/widgets/misc/e-cursors.h
+++ b/widgets/misc/e-cursors.h
@@ -2,6 +2,7 @@
 #define GNOME_APP_LIB_CURSORS_H
 
 #include <gdk/gdk.h>
+#include <libgnome/gnome-defs.h>
 
 BEGIN_GNOME_DECLS
 
diff --git a/widgets/text/e-text-model-uri.c b/widgets/text/e-text-model-uri.c
index 72deddc2d9..62790cbcc5 100644
--- a/widgets/text/e-text-model-uri.c
+++ b/widgets/text/e-text-model-uri.c
@@ -8,12 +8,14 @@
  */
 
 #include <config.h>
+
+#include "e-text-model-uri.h"
+
 #include <ctype.h>
 #include <sys/types.h>
 #include <regex.h>
 #include <gtk/gtkmain.h>
 #include <libgnome/gnome-url.h>
-#include "e-text-model-uri.h"
 
 static void e_text_model_uri_class_init (ETextModelURIClass *class);
 static void e_text_model_uri_init (ETextModelURI *model);
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index 9bfc504459..785367ce32 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -18,17 +18,19 @@
  * Author: Federico Mena <federico@nuclecu.unam.mx> */
 
 #include <config.h>
+
+#include "e-text.h"
+
 #include <math.h>
 #include <ctype.h>
 #include <unicode.h>
-#include <string.h>
 #include <gdk/gdkx.h> /* for BlackPixel */
 #include <gtk/gtkinvisible.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkselection.h>
 #include <gtk/gtkwindow.h>
 #include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include "e-text.h"
+
 #include "gal/widgets/e-canvas.h"
 #include "gal/widgets/e-canvas-utils.h"
 #include "gal/widgets/e-unicode.h"
diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h
index 0c33b448f3..185734d1df 100644
--- a/widgets/text/e-text.h
+++ b/widgets/text/e-text.h
@@ -20,11 +20,13 @@
 #ifndef E_TEXT_H
 #define E_TEXT_H
 
+#include <gtk/gtkobject.h>
 #include <gtk/gtkpacker.h>
+
 #include <gal/widgets/e-font.h>
 #include <gal/util/e-text-event-processor.h>
 #include <gal/e-text/e-text-model.h>
-#include <libgnomeui/gnome-canvas.h>
+#include <gal/widgets/e-canvas.h>
 
 BEGIN_GNOME_DECLS