7 files changed, 13 insertions, 8 deletions
diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c
index c369177f6a..f3077ae42f 100644
--- a/e-util/e-text-event-processor-emacs-like.c
+++ b/e-util/e-text-event-processor-emacs-like.c
@@ -19,7 +19,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gnome.h>
+#include <string.h>
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtksignal.h>
 #include "e-text-event-processor-emacs-like.h"
 
 static void e_text_event_processor_emacs_like_init		(ETextEventProcessorEmacsLike		 *card);
diff --git a/e-util/e-text-event-processor-emacs-like.h b/e-util/e-text-event-processor-emacs-like.h
index dbc909e2c7..7d1f0e68d2 100644
--- a/e-util/e-text-event-processor-emacs-like.h
+++ b/e-util/e-text-event-processor-emacs-like.h
@@ -21,7 +21,6 @@
 #ifndef __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__
 #define __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__
 
-#include <gnome.h>
 #include <gal/util/e-text-event-processor.h>
 
 #ifdef __cplusplus
diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c
index 772ae5c12b..edcaf9b05b 100644
--- a/e-util/e-text-event-processor.c
+++ b/e-util/e-text-event-processor.c
@@ -19,7 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gnome.h>
+#include <gtk/gtksignal.h>
 #include "e-text-event-processor.h"
 
 static void e_text_event_processor_init		(ETextEventProcessor		 *card);
diff --git a/e-util/e-text-event-processor.h b/e-util/e-text-event-processor.h
index e11c6451cc..00785db757 100644
--- a/e-util/e-text-event-processor.h
+++ b/e-util/e-text-event-processor.h
@@ -21,7 +21,8 @@
 #ifndef __E_TEXT_EVENT_PROCESSOR_H__
 #define __E_TEXT_EVENT_PROCESSOR_H__
 
-#include <gnome.h>
+#include <glib.h>
+#include <gtk/gtkobject.h>
 #include <gal/util/e-text-event-processor-types.h>
 
 #ifdef __cplusplus
diff --git a/e-util/e-util.h b/e-util/e-util.h
index e1e6205583..b960434421 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -1,9 +1,10 @@
 #ifndef _E_UTIL_H_
 #define _E_UTIL_H_
 
+#include <sys/types.h>
 #include <glib.h>
 #include <gtk/gtktypeutils.h>
-#include <sys/types.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 4f13a616b4..95fcc86bb4 100644
--- a/e-util/e-xml-utils.c
+++ b/e-util/e-xml-utils.c
@@ -21,12 +21,13 @@
  */
 
 #include <config.h>
-#include "gal/util/e-i18n.h"
 #include <locale.h>
-#include <libgnome/libgnome.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 *
diff --git a/e-util/e-xml-utils.h b/e-util/e-xml-utils.h
index bdcd756f3b..3a4649411c 100644
--- a/e-util/e-xml-utils.h
+++ b/e-util/e-xml-utils.h
@@ -23,7 +23,8 @@
 #ifndef __E_XML_UTILS__
 #define __E_XML_UTILS__
 
-#include <gnome.h>
+#include <libgnome/gnome-defs.h>
+#include <glib.h>
 #include <gnome-xml/tree.h>
 
 BEGIN_GNOME_DECLS