9 files changed, 18 insertions, 8 deletions
diff --git a/widgets/text/e-entry.c b/widgets/text/e-entry.c
index 5dc5d13fe9..4ab21be725 100644
--- a/widgets/text/e-entry.c
+++ b/widgets/text/e-entry.c
@@ -38,9 +38,10 @@
 #include <alloca.h>
 #endif
 #include <stdio.h>
-#include <libgnomeui/gnome-canvas.h>
+#include <gdk/gdkkeysyms.h>
 #include <gtk/gtksignal.h>
 #include <gnome-xml/parser.h>
+#include <libgnomeui/gnome-canvas.h>
 #include "gal/util/e-util.h"
 #include "gal/widgets/e-canvas.h"
 #include "gal/widgets/e-canvas-utils.h"
diff --git a/widgets/text/e-table-text-model.c b/widgets/text/e-table-text-model.c
index 7320c48e36..daf0456110 100644
--- a/widgets/text/e-table-text-model.c
+++ b/widgets/text/e-table-text-model.c
@@ -18,6 +18,7 @@
 
 #include <config.h>
 #include <ctype.h>
+#include <gtk/gtksignal.h>
 #include "e-table-text-model.h"
 
 static void e_table_text_model_class_init (ETableTextModelClass *class);
diff --git a/widgets/text/e-table-text-model.h b/widgets/text/e-table-text-model.h
index 5cf0b8a231..8f3694843f 100644
--- a/widgets/text/e-table-text-model.h
+++ b/widgets/text/e-table-text-model.h
@@ -19,7 +19,6 @@
 #ifndef E_TABLE_TEXT_MODEL_H
 #define E_TABLE_TEXT_MODEL_H
 
-#include <gnome.h>
 #include <gal/e-text/e-text-model.h>
 #include <gal/e-table/e-table-model.h>
 
diff --git a/widgets/text/e-text-model-uri.c b/widgets/text/e-text-model-uri.c
index 55b293016f..72deddc2d9 100644
--- a/widgets/text/e-text-model-uri.c
+++ b/widgets/text/e-text-model-uri.c
@@ -11,6 +11,8 @@
 #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);
diff --git a/widgets/text/e-text-model-uri.h b/widgets/text/e-text-model-uri.h
index d070e34f53..9743935529 100644
--- a/widgets/text/e-text-model-uri.h
+++ b/widgets/text/e-text-model-uri.h
@@ -10,7 +10,6 @@
 #ifndef E_TEXT_MODEL_URI_H
 #define E_TEXT_MODEL_URI_H
 
-#include <gnome.h>
 #include <gal/e-text/e-text-model.h>
 
 BEGIN_GNOME_DECLS
diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c
index 29c6ffb6b1..4fec8724d8 100644
--- a/widgets/text/e-text-model.c
+++ b/widgets/text/e-text-model.c
@@ -20,6 +20,8 @@
 
 #include <config.h>
 #include <ctype.h>
+#include <string.h>
+#include <gtk/gtksignal.h>
 #include "e-text-model-repos.h"
 #include "e-text-model.h"
 
diff --git a/widgets/text/e-text-model.h b/widgets/text/e-text-model.h
index afd9b79960..b697ca8396 100644
--- a/widgets/text/e-text-model.h
+++ b/widgets/text/e-text-model.h
@@ -20,8 +20,9 @@
 #ifndef E_TEXT_MODEL_H
 #define E_TEXT_MODEL_H
 
-#include <gnome.h>
-
+#include <glib.h>
+#include <gtk/gtkobject.h>
+#include <libgnome/gnome-defs.h>
 
 BEGIN_GNOME_DECLS
 
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index 121100d37f..9bfc504459 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -20,9 +20,14 @@
 #include <config.h>
 #include <math.h>
 #include <ctype.h>
-#include <gdk/gdkx.h> /* for BlackPixel */
 #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"
diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h
index eae84af102..0c33b448f3 100644
--- a/widgets/text/e-text.h
+++ b/widgets/text/e-text.h
@@ -20,11 +20,11 @@
 #ifndef E_TEXT_H
 #define E_TEXT_H
 
-#include <gnome.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>
 
 BEGIN_GNOME_DECLS