6 files changed, 26 insertions, 12 deletions
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index 1b2efa4f02..58f11a1e3a 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -14,6 +14,9 @@
  */
 
 #include <config.h>
+
+#include "e-table-config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <gtk/gtkentry.h>
@@ -24,7 +27,6 @@
 #include <libgnomeui/gnome-dialog.h>
 #include <libgnomeui/gnome-propertybox.h>
 #include <glade/glade.h>
-#include "e-table-config.h"
 #include "gal/util/e-util.h"
 #include "gal/util/e-i18n.h"
 
@@ -111,7 +113,7 @@ find_model_column_by_name (ETableSpecification *spec, const char *s)
 
 	for (column = spec->columns; *column; column++){
 
-		if (strcasecmp ((*column)->title, s) == 0)
+		if (g_strcasecmp ((*column)->title, s) == 0)
 			return (*column)->model_col;
 	}
 	return -1;
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index f84a225ff7..36b79866bb 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -13,16 +13,19 @@
  *
  */
 #include <config.h>
+
+#include "e-table-item.h"
+
 #include <math.h>
 #include <stdio.h>
 #include <gtk/gtksignal.h>
 #include <gdk/gdkkeysyms.h>
-#include "e-table-item.h"
 #include "e-table-subset.h"
 #include "e-cell.h"
 #include "gal/widgets/e-canvas.h"
 #include "gal/widgets/e-canvas-utils.h"
 #include "gal/util/e-util.h"
+#include <string.h>
 
 #define PARENT_OBJECT_TYPE gnome_canvas_item_get_type ()
 
diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c
index 1fab95a7e1..b92881a847 100644
--- a/widgets/table/e-table-memory.c
+++ b/widgets/table/e-table-memory.c
@@ -12,6 +12,8 @@
  */
 #include <config.h>
 
+#include "e-table-memory.h"
+
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -24,7 +26,7 @@
 
 #include "gal/util/e-util.h"
 #include "gal/util/e-xml-utils.h"
-#include "e-table-memory.h"
+#include <string.h>
 
 #define PARENT_TYPE E_TABLE_MODEL_TYPE
 
diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c
index 2566f7e264..bc4cf16f39 100644
--- a/widgets/table/e-table-sort-info.c
+++ b/widgets/table/e-table-sort-info.c
@@ -9,10 +9,13 @@
  * (C) 1999, 2000, 2001 Ximian, Inc.
  */
 #include <config.h>
-#include <gtk/gtksignal.h>
+
 #include "e-table-sort-info.h"
+
+#include <gtk/gtksignal.h>
 #include "gal/util/e-util.h"
 #include "gal/util/e-xml-utils.h"
+#include <string.h>
 
 #define ETM_CLASS(e) ((ETableSortInfoClass *)((GtkObject *)e)->klass)
 
diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c
index 10866abc08..e4a7df56c9 100644
--- a/widgets/table/e-table-specification.c
+++ b/widgets/table/e-table-specification.c
@@ -9,13 +9,15 @@
  * (C) 2000, 2001 Ximian, Inc.
  */
 #include <config.h>
+
+#include "e-table-specification.h"
+
 #include <stdlib.h>
 #include <gtk/gtksignal.h>
 #include <gnome-xml/parser.h>
 #include <gnome-xml/xmlmemory.h>
 #include "gal/util/e-util.h"
 #include "gal/util/e-xml-utils.h"
-#include "e-table-specification.h"
 
 #define PARENT_TYPE (gtk_object_get_type ())
 
@@ -173,20 +175,20 @@ e_table_specification_load_from_node (ETableSpecification *specification,
 
 	specification->selection_mode = GTK_SELECTION_MULTIPLE;
 	temp = e_xml_get_string_prop_by_name (node, "selection-mode");
-	if (temp && !strcasecmp (temp, "single")) {
+	if (temp && !g_strcasecmp (temp, "single")) {
 		specification->selection_mode = GTK_SELECTION_SINGLE;
-	} else if (temp && !strcasecmp (temp, "browse")) {
+	} else if (temp && !g_strcasecmp (temp, "browse")) {
 		specification->selection_mode = GTK_SELECTION_BROWSE;
-	} else if (temp && !strcasecmp (temp, "extended")) {
+	} else if (temp && !g_strcasecmp (temp, "extended")) {
 		specification->selection_mode = GTK_SELECTION_EXTENDED;
 	}
 	g_free (temp);
 
 	specification->cursor_mode = E_CURSOR_SIMPLE;
 	temp = e_xml_get_string_prop_by_name (node, "cursor-mode");
-	if (temp && !strcasecmp (temp, "line")) {
+	if (temp && !g_strcasecmp (temp, "line")) {
 		specification->cursor_mode = E_CURSOR_LINE;
-	} else 	if (temp && !strcasecmp (temp, "spreadsheet")) {
+	} else 	if (temp && !g_strcasecmp (temp, "spreadsheet")) {
 		specification->cursor_mode = E_CURSOR_SPREADSHEET;
 	}
 	g_free (temp);
diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c
index ddea067b91..b369789609 100644
--- a/widgets/table/e-tree-sorted.c
+++ b/widgets/table/e-tree-sorted.c
@@ -16,11 +16,14 @@
 
 #include <config.h>
 
+#include "e-tree-sorted.h"
+
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <string.h>
 
 #include <gnome-xml/parser.h>
 #include <gnome-xml/xmlmemory.h>
@@ -28,7 +31,6 @@
 #include <gtk/gtksignal.h>
 #include "gal/util/e-util.h"
 #include "gal/util/e-xml-utils.h"
-#include "e-tree-sorted.h"
 #include "e-table-sorting-utils.h"
 
 #define PARENT_TYPE E_TREE_MODEL_TYPE