13 files changed, 71 insertions, 28 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index d723dab631..f4865f316e 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,18 @@
+2001-03-29  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* e-icon-list.c: Replace #include <gtk/gtk.h>
+	* e-msg-composer-attachment-bar.c: Replace #include <gnome.h>
+	* e-msg-composer-attachment-bar.h: Remove #include <gnome.h>
+	* e-msg-composer-attachment.c: Remove #include <gnome.h>
+	* e-msg-composer-attachment.h: Same here.
+	* e-msg-composer-hdrs.c: Replace #include <gnome.h> and <bonobo.h>
+	* e-msg-composer-hdrs.h: Replace #include <gnome.h>
+	* e-msg-composer-file.c: #include <gtk/gtkmain.h>, <gtk/gtksignal.h>
+	* e-msg-composer.c: Replace #include <bonobo.h>, <gnome.h>
+	* e-msg-composer.h: Replace #include <gnome.h> and <bonobo.h>
+	* evolution-composer.c: Replace #include <bonobo.h>
+	* listener.c: Same here.
+	
 2001-03-28  Dan Winship  <danw@ximian.com>
 
 	* e-msg-composer.c (save_draft): Use the drafts folder specified
diff --git a/composer/e-icon-list.c b/composer/e-icon-list.c
index 1586fbace4..a5e7ac45cd 100644
--- a/composer/e-icon-list.c
+++ b/composer/e-icon-list.c
@@ -39,14 +39,20 @@
  * GList for item storage.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <string.h>
 #include <stdio.h>
-#include <gtk/gtk.h>
-#include "e-icon-list.h"
+#include <gtk/gtkmain.h>
+#include <gtk/gtkobject.h>
+#include <gtk/gtksignal.h>
+#include <gtk/gtkwidget.h>
 #include <libgnomeui/gnome-icon-item.h>
 #include <libgnomeui/gnome-canvas-rect-ellipse.h>
 #include <gdk-pixbuf/gnome-canvas-pixbuf.h>
+#include "e-icon-list.h"
 
 #include "bad-icon.xpm"
 
diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c
index 9c125e08b8..10d711a384 100644
--- a/composer/e-msg-composer-attachment-bar.c
+++ b/composer/e-msg-composer-attachment-bar.c
@@ -21,8 +21,16 @@
  * Author: Ettore Perazzoli
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
-#include <gnome.h>
+#endif
+
+#include <gtk/gtksignal.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-util.h>
+#include <libgnomeui/gnome-app.h>
+#include <libgnomeui/gnome-app-helper.h>
+#include <libgnomeui/gnome-popup-menu.h>
 #include <glade/glade.h>
 #include <libgnomevfs/gnome-vfs-mime-info.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/composer/e-msg-composer-attachment-bar.h b/composer/e-msg-composer-attachment-bar.h
index 17d717cc10..5c7db51df5 100644
--- a/composer/e-msg-composer-attachment-bar.h
+++ b/composer/e-msg-composer-attachment-bar.h
@@ -24,7 +24,6 @@
 #ifndef __E_MSG_COMPOSER_ATTACHMENT_BAR_H__
 #define __E_MSG_COMPOSER_ATTACHMENT_BAR_H__
 
-#include <gnome.h>
 #include "e-icon-list.h"
 #include <camel/camel-multipart.h>
 
diff --git a/composer/e-msg-composer-attachment.c b/composer/e-msg-composer-attachment.c
index 0255cd4e4c..4ab9f4f7b1 100644
--- a/composer/e-msg-composer-attachment.c
+++ b/composer/e-msg-composer-attachment.c
@@ -29,7 +29,6 @@
 
 #include <sys/stat.h>
 
-#include <gnome.h>
 #include <camel/camel.h>
 #include <gal/widgets/e-unicode.h>
 #include <libgnomevfs/gnome-vfs-mime.h>
diff --git a/composer/e-msg-composer-attachment.h b/composer/e-msg-composer-attachment.h
index 47bc85ece0..7be3c9d595 100644
--- a/composer/e-msg-composer-attachment.h
+++ b/composer/e-msg-composer-attachment.h
@@ -23,10 +23,9 @@
 #ifndef __E_MSG_COMPOSER_ATTACHMENT_H__
 #define __E_MSG_COMPOSER_ATTACHMENT_H__
 
-#include <gnome.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <glade/glade-xml.h>
 #include <camel/camel-mime-part.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index aa723d3822..d6c8106aa0 100644
--- a/composer/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -25,19 +25,19 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
-#include <camel/camel.h>
-
-#include <bonobo.h>
+#include <bonobo/bonobo-control.h>
+#include <bonobo/bonobo-widget.h>
 
+#include <libgnomeui/gnome-uidefs.h>
 #include <liboaf/liboaf.h>
 
 #include "Composer.h"
 
-#include "e-msg-composer-hdrs.h"
 #include <gal/e-text/e-entry.h>
 #include <gal/widgets/e-unicode.h>
 
+#include <camel/camel.h>
+#include "e-msg-composer-hdrs.h"
 #include "mail/mail-config.h"
 
 
diff --git a/composer/e-msg-composer-hdrs.h b/composer/e-msg-composer-hdrs.h
index 7d8d985825..dcf2ac1d8e 100644
--- a/composer/e-msg-composer-hdrs.h
+++ b/composer/e-msg-composer-hdrs.h
@@ -24,7 +24,7 @@
 #ifndef ___E_MSG_COMPOSER_HDRS_H__
 #define ___E_MSG_COMPOSER_HDRS_H__
 
-#include <gnome.h>
+#include <gtk/gtktable.h>
 #include <camel/camel-mime-message.h>
 #include <mail/mail-config.h>
 
diff --git a/composer/e-msg-composer-select-file.c b/composer/e-msg-composer-select-file.c
index 36b53c8446..b6cdf8e97b 100644
--- a/composer/e-msg-composer-select-file.c
+++ b/composer/e-msg-composer-select-file.c
@@ -22,7 +22,8 @@
  */
 
 #include <gtk/gtkfilesel.h>
-
+#include <gtk/gtkmain.h>
+#include <gtk/gtksignal.h>
 #include "e-msg-composer-select-file.h"
 
 
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 1080453391..83a12e231c 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -39,13 +39,26 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <errno.h>
 
-#include <bonobo.h>
+#include <errno.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-config.h>
+#include <libgnomeui/gnome-app.h>
+#include <libgnomeui/gnome-uidefs.h>
+#include <libgnomeui/gnome-dialog.h>
+#include <libgnomeui/gnome-dialog-util.h>
+#include <libgnomeui/gnome-stock.h>
+#include <bonobo/bonobo-exception.h>
+#include <bonobo/bonobo-moniker-util.h>
+#include <bonobo/bonobo-object-client.h>
 #include <bonobo/bonobo-stream-memory.h>
+#include <bonobo/bonobo-ui-util.h>
+#include <bonobo/bonobo-widget.h>
+#include <libgnomevfs/gnome-vfs.h>
+
 #include <glade/glade.h>
-#include <gnome.h>
-#include <libgnorba/gnorba.h>
+#include <gal/widgets/e-gui-utils.h>
+#include <gal/widgets/e-scroll-frame.h>
 #include <gtkhtml/gtkhtml.h>
 
 #include "camel/camel.h"
@@ -58,8 +71,6 @@
 #include "mail/mail-mt.h"
 
 #include "e-util/e-html-utils.h"
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-scroll-frame.h>
 
 #include "e-msg-composer.h"
 #include "e-msg-composer-attachment-bar.h"
@@ -69,8 +80,6 @@
 #include "Editor.h"
 #include "listener.h"
 
-#include <libgnomevfs/gnome-vfs.h>
-
 #define GNOME_GTKHTML_EDITOR_CONTROL_ID "OAFIID:GNOME_GtkHTML_Editor"
 
 
diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
index 5cca0590ac..990be1edb4 100644
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@ -27,8 +27,8 @@
 typedef struct _EMsgComposer       EMsgComposer;
 typedef struct _EMsgComposerClass  EMsgComposerClass;
 
-#include <gnome.h>
-#include <bonobo.h>
+#include <bonobo/bonobo-win.h>
+#include <bonobo/bonobo-ui-component.h>
 
 #include "e-msg-composer-attachment-bar.h"
 #include "e-msg-composer-hdrs.h"
diff --git a/composer/evolution-composer.c b/composer/evolution-composer.c
index 2ea7949462..abca28306b 100644
--- a/composer/evolution-composer.c
+++ b/composer/evolution-composer.c
@@ -21,13 +21,16 @@
  * Author: Dan Winship <danw@helixcode.com>
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
-#include <bonobo.h>
-#include <camel/camel.h>
+#include <gtk/gtksignal.h>
+#include <bonobo/bonobo-item-handler.h>
+#include <bonobo/bonobo-generic-factory.h>
 #include <gal/util/e-util.h>
 #include <gal/widgets/e-gui-utils.h>
-#include <bonobo/bonobo-item-handler.h>
+#include <camel/camel.h>
 #include "evolution-composer.h"
 #include "mail/mail-config.h"
 
diff --git a/composer/listener.c b/composer/listener.c
index 1b1e5f278b..7ce6747885 100644
--- a/composer/listener.c
+++ b/composer/listener.c
@@ -20,8 +20,12 @@
     Boston, MA 02111-1307, USA.
 */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
-#include <bonobo.h>
+#endif
+
+#include <bonobo/bonobo-arg.h>
+#include <bonobo/bonobo-object.h>
 
 #include "listener.h"