13 files changed, 68 insertions, 16 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index b981d5aa2d..a085ca5ff9 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,19 @@
+2001-03-29  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* e-dropdown-button.c: Replace #include <gtk/gtk.h>
+	* e-dropdown-button.h: Remove #include <gnome.h>
+	* e-filter-bar.c: Replace #include <gtk/gtk.h>
+	* e-filter-bar.h: Replace #include <gtk/gtk.h>
+	* e-messagebox.c: Add #includes to count for removed <gnome.h> in
+	e-messagebox.h:
+	* e-messagebox.h: Replace #include <gnome.h>
+	* e-search-bar.c: Replace #include <gnome.h>
+	* e-search-bar.h: Same here
+	* test-calendar.c: Remove #include <gnome.h>
+	* test-dateedit.c: Replace #include <gnome.h>
+	* test-dropdown-button.c: Same here.
+	* test-title-bar.c: Same here.
+
 2001-03-22  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* e-filter-bar.c (rule_editor_clicked): Validate the filter rule.
diff --git a/widgets/misc/e-dropdown-button.c b/widgets/misc/e-dropdown-button.c
index a8a42e9301..128b003ef9 100644
--- a/widgets/misc/e-dropdown-button.c
+++ b/widgets/misc/e-dropdown-button.c
@@ -28,7 +28,11 @@
 #endif
 
 
-#include <gtk/gtk.h>
+#include <stdio.h>
+#include <gtk/gtkarrow.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkwidget.h>
+#include <libgnomeui/gnome-popup-menu.h>
 #include <gal/util/e-util.h>
 
 #include "e-dropdown-button.h"
diff --git a/widgets/misc/e-dropdown-button.h b/widgets/misc/e-dropdown-button.h
index 6e3043f70e..6aa92d0bd8 100644
--- a/widgets/misc/e-dropdown-button.h
+++ b/widgets/misc/e-dropdown-button.h
@@ -31,8 +31,6 @@
 #include <gtk/gtktogglebutton.h>
 #include <gtk/gtkmenu.h>
 
-#include <gnome.h>
-
 #ifdef __cplusplus
 extern "C" {
 #pragma }
diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c
index 587fd6c5a6..24bbba4d57 100644
--- a/widgets/misc/e-filter-bar.c
+++ b/widgets/misc/e-filter-bar.c
@@ -25,7 +25,10 @@
 
 #include <config.h>
 
-#include <gtk/gtk.h>
+#include <glib.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-stock.h>
 
 #include "e-dropdown-button.h"
 #include "e-filter-bar.h"
diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h
index 8f4d60079b..58b0cd3db9 100644
--- a/widgets/misc/e-filter-bar.h
+++ b/widgets/misc/e-filter-bar.h
@@ -21,7 +21,8 @@
 #ifndef __E_FILTER_BAR_H__
 #define __E_FILTER_BAR_H__
 
-#include <gtk/gtk.h>
+#include <gtk/gtkobject.h>
+#include <gtk/gtkwidget.h>
 #include "e-search-bar.h"
 
 #include "filter/rule-context.h"
diff --git a/widgets/misc/e-messagebox.c b/widgets/misc/e-messagebox.c
index 172483a0bb..6549476e1d 100644
--- a/widgets/misc/e-messagebox.c
+++ b/widgets/misc/e-messagebox.c
@@ -24,6 +24,17 @@
 #include <stdarg.h>
 #include <string.h> /* for strcmp */
 
+#include <glib.h>
+#include <gtk/gtkalignment.h>
+#include <gtk/gtkcheckbutton.h>
+#include <gtk/gtkhbox.h>
+#include <gtk/gtklabel.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnome/gnome-triggers.h>
+#include <libgnome/gnome-util.h>
+#include <libgnomeui/gnome-pixmap.h>
+#include <libgnomeui/gnome-uidefs.h>
 #include "e-messagebox.h"
 
 #define E_MESSAGE_BOX_WIDTH  425
diff --git a/widgets/misc/e-messagebox.h b/widgets/misc/e-messagebox.h
index 0514aeb43f..11a4026848 100644
--- a/widgets/misc/e-messagebox.h
+++ b/widgets/misc/e-messagebox.h
@@ -23,7 +23,9 @@
 #ifndef __E_MESSAGE_BOX_H__
 #define __E_MESSAGE_BOX_H__
 
-#include <gnome.h>
+#include <glib.h>
+#include <gtk/gtkwidget.h>
+#include <libgnomeui/gnome-dialog.h>
 
 BEGIN_GNOME_DECLS
 
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index 30eaf0947f..61cff2f145 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -25,8 +25,11 @@
  */
 
 #include <config.h>
-#include <gnome.h>
 
+#include <stdio.h> /* printf */
+#include <glib.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
 #include "e-search-bar.h"
 #include "e-dropdown-button.h"
 
diff --git a/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h
index 36b80fafc2..254bdc09e7 100644
--- a/widgets/misc/e-search-bar.h
+++ b/widgets/misc/e-search-bar.h
@@ -21,7 +21,7 @@
 #ifndef __E_SEARCH_BAR_H__
 #define __E_SEARCH_BAR_H__
 
-#include <gnome.h>
+#include <gtk/gtkhbox.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/widgets/misc/test-calendar.c b/widgets/misc/test-calendar.c
index eb443c24c8..f3848ec274 100644
--- a/widgets/misc/test-calendar.c
+++ b/widgets/misc/test-calendar.c
@@ -30,8 +30,6 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
-
 #include "e-calendar.h"
 
 /* Drag and Drop stuff. */
diff --git a/widgets/misc/test-dateedit.c b/widgets/misc/test-dateedit.c
index 0bcd48ae51..74b10b8c8b 100644
--- a/widgets/misc/test-dateedit.c
+++ b/widgets/misc/test-dateedit.c
@@ -30,8 +30,13 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
-
+#include <glib.h>
+#include <gtk/gtkbutton.h>
+#include <gtk/gtkmain.h>
+#include <gtk/gtktable.h>
+#include <gtk/gtkwindow.h>
+#include <libgnomeui/gnome-app.h>
+#include <libgnomeui/gnome-init.h>
 #include "e-dateedit.h"
 
 static void delete_event_cb		(GtkWidget	*widget,
diff --git a/widgets/misc/test-dropdown-button.c b/widgets/misc/test-dropdown-button.c
index 3acfea3a1c..259e344bcb 100644
--- a/widgets/misc/test-dropdown-button.c
+++ b/widgets/misc/test-dropdown-button.c
@@ -27,8 +27,15 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
-
+#include <stdio.h>
+#include <glib.h>
+#include <gtk/gtkmain.h>
+#include <gtk/gtkmenu.h>
+#include <gtk/gtkwindow.h>
+#include <libgnomeui/gnome-app.h>
+#include <libgnomeui/gnome-app-helper.h>
+#include <libgnomeui/gnome-init.h>
+#include <libgnomeui/gnome-stock.h>
 #include "e-dropdown-button.h"
 
 
diff --git a/widgets/misc/test-title-bar.c b/widgets/misc/test-title-bar.c
index fdca1ae0db..2cbd392e49 100644
--- a/widgets/misc/test-title-bar.c
+++ b/widgets/misc/test-title-bar.c
@@ -25,8 +25,12 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
-
+#include <gtk/gtkbox.h>
+#include <gtk/gtkmain.h>
+#include <gtk/gtktext.h>
+#include <gtk/gtkvbox.h>
+#include <libgnomeui/gnome-app.h>
+#include <libgnomeui/gnome-init.h>
 #include "e-title-bar.h"
 
 static void