12 files changed, 67 insertions, 47 deletions
diff --git a/widgets/text/e-completion-callbacks.c b/widgets/text/e-completion-callbacks.c
index bccc400fab..a7c3c48d97 100644
--- a/widgets/text/e-completion-callbacks.c
+++ b/widgets/text/e-completion-callbacks.c
@@ -22,10 +22,14 @@
  */
 
 #include <config.h>
+
 #include <string.h>
 #include <stdio.h>
+
 #include <gtk/gtk.h>
+
 #include "gal/util/e-util.h"
+
 #include "e-completion-callbacks.h"
 
 static void e_completion_callbacks_class_init (ECompletionCallbacksClass *klass);
diff --git a/widgets/text/e-completion-match.c b/widgets/text/e-completion-match.c
index d13ba15973..180a16e657 100644
--- a/widgets/text/e-completion-match.c
+++ b/widgets/text/e-completion-match.c
@@ -22,8 +22,11 @@
  */
 
 #include <config.h>
+
 #include <string.h>
-#include <gal/widgets/e-unicode.h>
+
+#include "gal/widgets/e-unicode.h"
+
 #include "e-completion-match.h"
 
 static void
diff --git a/widgets/text/e-completion-view.c b/widgets/text/e-completion-view.c
index f9728de60c..13c9ca2860 100644
--- a/widgets/text/e-completion-view.c
+++ b/widgets/text/e-completion-view.c
@@ -24,15 +24,17 @@
 
 #include <config.h>
 
-#include "e-completion-view.h"
-
 #include <math.h>
+
 #include <gdk/gdkkeysyms.h>
-#include <gal/e-table/e-table-simple.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/util/e-i18n.h>
+
+#include "gal/e-table/e-table-scrolled.h"
+#include "gal/e-table/e-table-simple.h"
+#include "gal/util/e-i18n.h"
 #include "gal/util/e-marshal.h"
 
+#include "e-completion-view.h"
+
 enum {
 	E_COMPLETION_VIEW_NONEMPTY,
 	E_COMPLETION_VIEW_ADDED,
diff --git a/widgets/text/e-completion.c b/widgets/text/e-completion.c
index 6e455cb619..5146170ccc 100644
--- a/widgets/text/e-completion.c
+++ b/widgets/text/e-completion.c
@@ -23,12 +23,16 @@
  */
 
 #include <config.h>
+
 #include <string.h>
 #include <stdio.h>
+
 #include <gtk/gtk.h>
-#include "e-completion.h"
-#include "gal/util/e-util.h"
+
 #include "gal/util/e-marshal.h"
+#include "gal/util/e-util.h"
+
+#include "e-completion.h"
 
 enum {
 	COMPLETION_STARTED,
diff --git a/widgets/text/e-entry-test.c b/widgets/text/e-entry-test.c
index d30ba20a9f..c5e5687396 100644
--- a/widgets/text/e-entry-test.c
+++ b/widgets/text/e-entry-test.c
@@ -24,8 +24,11 @@
 #include <config.h>
 
 #include <gnome.h>
+
+#include "gal/util/e-i18n.h"
+#include "gal/util/e-util-private.h"
+
 #include "e-entry.h"
-#include <gal/util/e-i18n.h>
 
 static void destroy_callback(gpointer data, GObject *where_object_was)
 {
@@ -57,7 +60,7 @@ int main( int argc, char *argv[] )
   GtkWidget *app;
   GtkWidget *entry;
 
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
+  /*  bindtextdomain (PACKAGE, GAL_LOCALEDIR);
       textdomain (PACKAGE);*/
 
   gnome_init( "EEntry Test", VERSION, argc, argv);
diff --git a/widgets/text/e-entry.c b/widgets/text/e-entry.c
index f66a066921..8b41d952f0 100644
--- a/widgets/text/e-entry.c
+++ b/widgets/text/e-entry.c
@@ -23,24 +23,27 @@
  */
 
 #include <config.h>
+
 #include <math.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdio.h>
+
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktypebuiltins.h>
+#include <gtk/gtk.h>
 #include <libxml/parser.h>
 #include <libgnomecanvas/gnome-canvas.h>
-#include "gal/util/e-util.h"
+
 #include "gal/util/e-i18n.h"
+#include "gal/util/e-util.h"
 #include "gal/widgets/e-canvas.h"
 #include "gal/widgets/e-canvas-utils.h"
+
 #include "e-completion-view.h"
-#include "e-text.h"
 #include "e-entry.h"
+#include "e-text.h"
 
 #define MIN_ENTRY_WIDTH  150
 #define INNER_BORDER 2
diff --git a/widgets/text/e-table-text-model.c b/widgets/text/e-table-text-model.c
index 909a982528..ba71bcf002 100644
--- a/widgets/text/e-table-text-model.c
+++ b/widgets/text/e-table-text-model.c
@@ -22,9 +22,13 @@
  */
 
 #include <config.h>
+
 #include <ctype.h>
-#include <gtk/gtksignal.h>
-#include <gal/util/e-util.h>
+
+#include <gtk/gtk.h>
+
+#include "gal/util/e-util.h"
+
 #include "e-table-text-model.h"
 
 static void e_table_text_model_class_init (ETableTextModelClass *class);
diff --git a/widgets/text/e-text-model-test.c b/widgets/text/e-text-model-test.c
index 4913b7774e..1fec3a182d 100644
--- a/widgets/text/e-text-model-test.c
+++ b/widgets/text/e-text-model-test.c
@@ -22,11 +22,13 @@
  */
 
 #include <gnome.h>
-#include <gal/widgets/e-canvas.h>
+
+#include "gal/util/e-util.h"
+#include "gal/widgets/e-canvas.h"
+
 #include "e-text-model.h"
 #include "e-text-model-uri.h"
 #include "e-text.h"
-#include <gal/util/e-util.h>
 
 #if 0
 static void
diff --git a/widgets/text/e-text-model-uri.c b/widgets/text/e-text-model-uri.c
index 858771b481..d919b8cc94 100644
--- a/widgets/text/e-text-model-uri.c
+++ b/widgets/text/e-text-model-uri.c
@@ -23,14 +23,16 @@
 
 #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 <gal/util/e-util.h>
+
+#include "gal/util/e-util.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-model.c b/widgets/text/e-text-model.c
index ed6be10672..72562eaa49 100644
--- a/widgets/text/e-text-model.c
+++ b/widgets/text/e-text-model.c
@@ -24,14 +24,17 @@
 #undef  PARANOID_DEBUGGING
 
 #include <config.h>
+
 #include <ctype.h>
 #include <string.h>
-#include <gtk/gtksignal.h>
-#include <gal/util/e-util.h>
-#include "e-text-model-repos.h"
-#include "e-text-model.h"
+
+#include <gtk/gtk.h>
+
 #include "gal/util/e-util.h"
 
+#include "e-text-model.h"
+#include "e-text-model-repos.h"
+
 enum {
 	E_TEXT_MODEL_CHANGED,
 	E_TEXT_MODEL_REPOSITION,
diff --git a/widgets/text/e-text-test.c b/widgets/text/e-text-test.c
index d10a745d85..2c9a8c2dec 100644
--- a/widgets/text/e-text-test.c
+++ b/widgets/text/e-text-test.c
@@ -21,11 +21,13 @@
  * 02111-1307, USA.
  */
 
-#include "e-text.h"
 #include <gnome.h>
+
 #include "gal/widgets/e-canvas.h"
 #include "gal/widgets/e-unicode.h"
 
+#include "e-text.h"
+
 GnomeCanvasItem *rect;
 
 static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, GnomeCanvasItem *item)
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index 8bf0ffcfc1..7bafb5d58c 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -36,39 +36,27 @@
 
 #include <config.h>
 
-#include "e-text.h"
-
 #include <math.h>
 #include <ctype.h>
 #include <string.h>
+
 #include <glib-object.h>
-#include <gdk/gdkx.h> /* for BlackPixel */
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkclipboard.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtktypebuiltins.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkimmulticontext.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
+#include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
-#include <libgnome/gnome-i18n.h>
-#include "gal/util/e-util.h"
+#include <libart_lgpl/art_affine.h>
+#include <libart_lgpl/art_rgb.h>
+#include <libart_lgpl/art_rgb_bitmap_affine.h>
+
+#include "gal/a11y/e-text/gal-a11y-e-text.h"
 #include "gal/widgets/e-canvas.h"
 #include "gal/widgets/e-canvas-utils.h"
 #include "gal/widgets/e-unicode.h"
+#include "gal/util/e-i18n.h"
 #include "gal/util/e-text-event-processor-emacs-like.h"
 #include "gal/util/e-util.h"
-#include <libart_lgpl/art_affine.h>
-#include <libart_lgpl/art_rgb.h>
-#include <libart_lgpl/art_rgb_bitmap_affine.h>
 
-#include <atk/atk.h>
-#include "gal/a11y/e-text/gal-a11y-e-text.h"
+#include "e-text.h"
 
 #define PARENT_TYPE (gnome_canvas_item_get_type())