Clean up includes. Remove/replace <gnome.h>, <bonobo.h> and <gtk/gtk.h>.

2001-03-29  Kjartan Maraas  <kmaraas@gnome.org>

	* *.*: Clean up includes. Remove/replace <gnome.h>, <bonobo.h>
	and <gtk/gtk.h>.

svn path=/trunk/; revision=9027

5 files changed, 17 insertions, 6 deletions

diff --git a/executive-summary/component/e-summary-callbacks.c b/executive-summary/component/e-summary-callbacks.c
index 4ffa7f4d00..8d1a2eb5fb 100644
--- a/executive-summary/component/e-summary-callbacks.c
+++ b/executive-summary/component/e-summary-callbacks.c
@@ -36,11 +36,11 @@
 
 #include <liboaf/liboaf.h>
 #include <glade/glade.h>
-#include <e-summary-callbacks.h>
 #include <gtkhtml/gtkhtml.h>
 #include <e-util/e-html-utils.h>
 
 #include "e-summary.h"
+#include "e-summary-callbacks.h"
 
 #include "Composer.h"
 
diff --git a/executive-summary/component/e-summary-factory.c b/executive-summary/component/e-summary-factory.c
index 444c8e8558..e94ebaaec1 100644
--- a/executive-summary/component/e-summary-factory.c
+++ b/executive-summary/component/e-summary-factory.c
@@ -26,15 +26,17 @@
 #include <config.h>
 #endif
 
+#include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-main.h>
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-control.h>
+#include <bonobo/bonobo-ui-util.h>
 
 #include <liboaf/liboaf.h>
 
-#include "gal/util/e-util.h"
-#include "e-util/e-gui-utils.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gal/util/e-util.h>
+#include <e-util/e-gui-utils.h>
 
 #include "e-summary-factory.h"
 
diff --git a/executive-summary/component/e-summary-util.c b/executive-summary/component/e-summary-util.c
index a983da39b8..53dcea9488 100644
--- a/executive-summary/component/e-summary-util.c
+++ b/executive-summary/component/e-summary-util.c
@@ -23,6 +23,7 @@
 
 #include <e-summary-util.h>
 
+#include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/executive-summary/component/e-summary.c b/executive-summary/component/e-summary.c
index 0e5d613ad8..64866318ac 100644
--- a/executive-summary/component/e-summary.c
+++ b/executive-summary/component/e-summary.c
@@ -25,11 +25,17 @@
 #include <config.h>
 #endif
 
+#include <glib.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnome/gnome-util.h>
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-event-source.h>
 #include <bonobo/bonobo-listener.h>
 #include <bonobo/bonobo-property-bag.h>
 #include <bonobo/bonobo-property-control.h>
+#include <bonobo/bonobo-storage.h>
+#include <bonobo/bonobo-stream-client.h>
 
 #include <gtkhtml/gtkhtml.h>
 #include <gtkhtml/gtkhtml-embedded.h>
diff --git a/executive-summary/component/main.c b/executive-summary/component/main.c
index 0834802da1..e5e45632f1 100644
--- a/executive-summary/component/main.c
+++ b/executive-summary/component/main.c
@@ -25,8 +25,10 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
-
+#include <glib.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-init.h>
 #include <bonobo/bonobo-main.h>
 #include <liboaf/liboaf.h>
 #include <glade/glade.h>