Fix headers. Remove unneccesary ones and replace with more finegrained

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

	* *.*: Fix headers. Remove unneccesary ones and replace
	with more finegrained ones where needed.

svn path=/trunk/; revision=9028

43 files changed, 122 insertions, 66 deletions

diff --git a/filter/ChangeLog b/filter/ChangeLog
index b1e381e18f..32d7683be3 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-30  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* *.*: Fix headers. Remove unneccesary ones and replace
+	with more finegrained ones where needed.
+	
 2001-03-22  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* filter-datespec.c (validate): Oops, an unspecified date is '0',
diff --git a/filter/filter-code.c b/filter/filter-code.c
index c008043a5f..b9ee0d2645 100644
--- a/filter/filter-code.c
+++ b/filter/filter-code.c
@@ -22,9 +22,6 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtk.h>
-#include <gnome.h>
-
 #include "filter-code.h"
 
 static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff);
diff --git a/filter/filter-code.h b/filter/filter-code.h
index c4bb04caab..68550640f0 100644
--- a/filter/filter-code.h
+++ b/filter/filter-code.h
@@ -21,8 +21,6 @@
 #ifndef _FILTER_CODE_H
 #define _FILTER_CODE_H
 
-#include <gtk/gtk.h>
-
 #include "filter-input.h"
 
 #define FILTER_CODE(obj)	GTK_CHECK_CAST (obj, filter_code_get_type (), FilterCode)
diff --git a/filter/filter-colour.c b/filter/filter-colour.c
index ffa6489cfb..437621fd5e 100644
--- a/filter/filter-colour.c
+++ b/filter/filter-colour.c
@@ -22,9 +22,9 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtk.h>
-#include <gnome.h>
+#include <gtk/gtksignal.h>
 #include <gnome-xml/xmlmemory.h>
+#include <libgnomeui/gnome-color-picker.h>
 
 #include "e-util/e-sexp.h"
 #include "filter-colour.h"
diff --git a/filter/filter-colour.h b/filter/filter-colour.h
index 3526dfcfda..680da775ea 100644
--- a/filter/filter-colour.h
+++ b/filter/filter-colour.h
@@ -21,7 +21,6 @@
 #ifndef _FILTER_COLOUR_H
 #define _FILTER_COLOUR_H
 
-#include <gtk/gtk.h>
 #include "filter-element.h"
 
 #define FILTER_COLOUR(obj)	GTK_CHECK_CAST (obj, filter_colour_get_type (), FilterColour)
diff --git a/filter/filter-context.c b/filter/filter-context.c
index c6fa69f38a..7ed5829bc6 100644
--- a/filter/filter-context.c
+++ b/filter/filter-context.c
@@ -22,8 +22,8 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtk.h>
-#include <gnome.h>
+#include <gtk/gtktypeutils.h>
+#include <gtk/gtkobject.h>
 
 #include "filter-context.h"
 #include "filter-filter.h"
diff --git a/filter/filter-context.h b/filter/filter-context.h
index 1fa0b80af7..e1b05879b1 100644
--- a/filter/filter-context.h
+++ b/filter/filter-context.h
@@ -21,7 +21,6 @@
 #ifndef _FILTER_CONTEXT_H
 #define _FILTER_CONTEXT_H
 
-#include <gtk/gtk.h>
 #include "rule-context.h"
 
 #define FILTER_CONTEXT(obj)	GTK_CHECK_CAST (obj, filter_context_get_type (), FilterContext)
diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c
index 6618bbdd67..49027d2afd 100644
--- a/filter/filter-datespec.c
+++ b/filter/filter-datespec.c
@@ -19,9 +19,25 @@
  */
 
 #include <config.h>
+
+#include <string.h>
+#include <stdlib.h>
 #include <time.h>
-#include <gtk/gtk.h>
-#include <gnome.h>
+#include <glib.h>
+#include <gtk/gtkcalendar.h>
+#include <gtk/gtkhbox.h>
+#include <gtk/gtkhseparator.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkmenu.h>
+#include <gtk/gtkmenuitem.h>
+#include <gtk/gtkoptionmenu.h>
+#include <gtk/gtkspinbutton.h>
+#include <gtk/gtktable.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-dialog.h>
+#include <libgnomeui/gnome-dialog-util.h>
+#include <libgnomeui/gnome-stock.h>
 
 #include "filter-datespec.h"
 #include "e-util/e-sexp.h"
diff --git a/filter/filter-datespec.h b/filter/filter-datespec.h
index 1292a94e36..53cc3f3156 100644
--- a/filter/filter-datespec.h
+++ b/filter/filter-datespec.h
@@ -21,7 +21,7 @@
 #ifndef _FILTER_DATESPEC_H
 #define _FILTER_DATESPEC_H
 
-#include <gtk/gtk.h>
+#include <time.h>
 #include "filter-element.h"
 
 #define FILTER_DATESPEC(obj)	GTK_CHECK_CAST (obj, filter_datespec_get_type (), FilterDatespec)
diff --git a/filter/filter-editor.c b/filter/filter-editor.c
index 800bed9e7f..959ec57075 100644
--- a/filter/filter-editor.c
+++ b/filter/filter-editor.c
@@ -20,10 +20,13 @@
  */
 
 #include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
 
+#include <glib.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <glade/glade.h>
 #include <gal/widgets/e-unicode.h>
+
 #include "filter-editor.h"
 #include "filter-context.h"
 #include "filter-filter.h"
diff --git a/filter/filter-editor.h b/filter/filter-editor.h
index 44f99a7df6..3d65f9c99f 100644
--- a/filter/filter-editor.h
+++ b/filter/filter-editor.h
@@ -21,7 +21,6 @@
 #ifndef _FILTER_EDITOR_H
 #define _FILTER_EDITOR_H
 
-#include <gtk/gtk.h>
 #include "rule-editor.h"
 
 #define FILTER_EDITOR(obj)	GTK_CHECK_CAST (obj, filter_editor_get_type (), FilterEditor)
diff --git a/filter/filter-element.c b/filter/filter-element.c
index cbc2c009f9..dd7a7167bb 100644
--- a/filter/filter-element.c
+++ b/filter/filter-element.c
@@ -22,8 +22,8 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtk.h>
-#include <gnome.h>
+#include <string.h>
+#include <gtk/gtktypeutils.h>
 
 #include "filter-element.h"
 #include "filter-input.h"
@@ -34,6 +34,7 @@
 #include "filter-score.h"
 #include "filter-folder.h"
 
+
 static gboolean validate (FilterElement *fe);
 static void xml_create(FilterElement *fe, xmlNodePtr node);
 static FilterElement *clone(FilterElement *fe);
diff --git a/filter/filter-element.h b/filter/filter-element.h
index 2f784dfa36..11c5f66286 100644
--- a/filter/filter-element.h
+++ b/filter/filter-element.h
@@ -21,7 +21,8 @@
 #ifndef _FILTER_ELEMENT_H
 #define _FILTER_ELEMENT_H
 
-#include <gtk/gtk.h>
+#include <gtk/gtkobject.h>
+#include <gtk/gtkwidget.h>
 #include <gnome-xml/parser.h>
 
 #define FILTER_ELEMENT(obj)	GTK_CHECK_CAST (obj, filter_element_get_type (), FilterElement)
diff --git a/filter/filter-filter.c b/filter/filter-filter.c
index ebd3560863..c939fa9b2c 100644
--- a/filter/filter-filter.c
+++ b/filter/filter-filter.c
@@ -20,10 +20,15 @@
  */
 
 #include <config.h>
-#include <gnome.h>
-#include <gnome-xml/xmlmemory.h>
 
+#include <string.h>
+#include <glib.h>
+#include <gnome-xml/xmlmemory.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-stock.h>
 #include <gal/widgets/e-unicode.h>
+
 #include "filter-filter.h"
 #include "filter-context.h"
 
diff --git a/filter/filter-filter.h b/filter/filter-filter.h
index 944aba42ae..bcbe310832 100644
--- a/filter/filter-filter.h
+++ b/filter/filter-filter.h
@@ -21,7 +21,6 @@
 #ifndef _FILTER_FILTER_H
 #define _FILTER_FILTER_H
 
-#include <gtk/gtk.h>
 #include "filter-rule.h"
 
 #define FILTER_FILTER(obj)	GTK_CHECK_CAST (obj, filter_filter_get_type (), FilterFilter)
diff --git a/filter/filter-folder.c b/filter/filter-folder.c
index e00e61484e..9176492baf 100644
--- a/filter/filter-folder.c
+++ b/filter/filter-folder.c
@@ -19,10 +19,14 @@
  */
 
 #include <config.h>
-#include <gnome.h>
 
 #define SHELL
 
+#include <glib.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-dialog.h>
+#include <libgnomeui/gnome-dialog-util.h>
 #include <gal/widgets/e-unicode.h>
 
 #include "filter-folder.h"
diff --git a/filter/filter-folder.h b/filter/filter-folder.h
index ee52d7037b..fea4d4087e 100644
--- a/filter/filter-folder.h
+++ b/filter/filter-folder.h
@@ -21,7 +21,6 @@
 #ifndef _FILTER_FOLDER_H
 #define _FILTER_FOLDER_H
 
-#include <gtk/gtk.h>
 #include "filter-element.h"
 
 #define FILTER_FOLDER(obj)	GTK_CHECK_CAST (obj, filter_folder_get_type (), FilterFolder)
diff --git a/filter/filter-input.c b/filter/filter-input.c
index 2304b39635..6c06849d2b 100644
--- a/filter/filter-input.c
+++ b/filter/filter-input.c
@@ -22,11 +22,16 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtk.h>
-#include <gnome.h>
+#include <string.h>
 #include <regex.h>
+#include <gtk/gtkobject.h>
+#include <gtk/gtkwidget.h>
 
 #include <gnome-xml/xmlmemory.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-dialog.h>
+#include <libgnomeui/gnome-dialog-util.h>
 #include <gal/widgets/e-unicode.h>
 
 #include "filter-input.h"
diff --git a/filter/filter-input.h b/filter/filter-input.h
index 0ce43d980d..0c6cccca60 100644
--- a/filter/filter-input.h
+++ b/filter/filter-input.h
@@ -21,7 +21,6 @@
 #ifndef _FILTER_INPUT_H
 #define _FILTER_INPUT_H
 
-#include <gtk/gtk.h>
 #include "filter-element.h"
 
 #define FILTER_INPUT(obj)	GTK_CHECK_CAST (obj, filter_input_get_type (), FilterInput)
diff --git a/filter/filter-option.c b/filter/filter-option.c
index 3992c9e46a..186e3d69bf 100644
--- a/filter/filter-option.c
+++ b/filter/filter-option.c
@@ -19,13 +19,17 @@
  */
 
 #include <config.h>
-#include <gnome.h>
+
+#include <string.h>
+#include <glib.h>
 #include <gnome-xml/xmlmemory.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <gal/widgets/e-unicode.h>
 
 #include "filter-option.h"
 #include "filter-part.h"
 #include "e-util/e-sexp.h"
-#include <gal/widgets/e-unicode.h>
 
 #define d(x)
 
diff --git a/filter/filter-option.h b/filter/filter-option.h
index 1bbec79d84..c7b3713edc 100644
--- a/filter/filter-option.h
+++ b/filter/filter-option.h
@@ -21,8 +21,6 @@
 #ifndef _FILTER_OPTION_H
 #define _FILTER_OPTION_H
 
-#include <gtk/gtk.h>
-
 #include "filter-element.h"
 
 #define FILTER_OPTION(obj)	GTK_CHECK_CAST (obj, filter_option_get_type (), FilterOption)
diff --git a/filter/filter-part.c b/filter/filter-part.c
index 1243b6105e..e95ae3e01a 100644
--- a/filter/filter-part.c
+++ b/filter/filter-part.c
@@ -19,14 +19,20 @@
  */
 
 #include <config.h>
-#include <gnome.h>
 
+#include <stdlib.h>
+#include <string.h>
+
+#include <glib.h>
 #include <gnome-xml/xmlmemory.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
 #include <gal/widgets/e-unicode.h>
 
 #include "filter-part.h"
 #include "filter-element.h"
 
+
 #define d(x)
 
 static void filter_part_class_init	(FilterPartClass *class);
diff --git a/filter/filter-part.h b/filter/filter-part.h
index bc9424486b..2e7842e942 100644
--- a/filter/filter-part.h
+++ b/filter/filter-part.h
@@ -21,7 +21,7 @@
 #ifndef _FILTER_PART_H
 #define _FILTER_PART_H
 
-#include <gtk/gtk.h>
+#include <gtk/gtkobject.h>
 #include "filter-input.h"
 
 #define FILTER_PART(obj)	GTK_CHECK_CAST (obj, filter_part_get_type (), FilterPart)
diff --git a/filter/filter-rule.c b/filter/filter-rule.c
index 44dbeb0b1a..8ad3262136 100644
--- a/filter/filter-rule.c
+++ b/filter/filter-rule.c
@@ -20,9 +20,13 @@
  */
 
 #include <config.h>
-#include <gnome.h>
-#include <gnome-xml/xmlmemory.h>
 
+#include <string.h>
+#include <glib.h>
+#include <gnome-xml/xmlmemory.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-stock.h>
 #include <gal/widgets/e-unicode.h>
 
 #include "filter-rule.h"
diff --git a/filter/filter-rule.h b/filter/filter-rule.h
index 8f194f54c8..4cbb49ce79 100644
--- a/filter/filter-rule.h
+++ b/filter/filter-rule.h
@@ -21,8 +21,7 @@
 #ifndef _FILTER_RULE_H
 #define _FILTER_RULE_H
 
-#include <gtk/gtk.h>
-
+#include <gtk/gtkobject.h>
 #include "filter-part.h"
 
 #define FILTER_RULE(obj)	GTK_CHECK_CAST (obj, filter_rule_get_type (), FilterRule)
diff --git a/filter/filter-score.c b/filter/filter-score.c
index 722ac5bb65..56d41f5759 100644
--- a/filter/filter-score.c
+++ b/filter/filter-score.c
@@ -24,8 +24,9 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtk.h>
-#include <gnome.h>
+#include <stdlib.h>
+#include <gtk/gtksignal.h>
+#include <gtk/gtkspinbutton.h>
 #include <gnome-xml/xmlmemory.h>
 
 #include "e-util/e-sexp.h"
diff --git a/filter/filter-score.h b/filter/filter-score.h
index 126a0fff0b..c1871abfd7 100644
--- a/filter/filter-score.h
+++ b/filter/filter-score.h
@@ -23,7 +23,6 @@
 #ifndef _FILTER_SCORE_H
 #define _FILTER_SCORE_H
 
-#include <gtk/gtk.h>
 #include "filter-element.h"
 
 #define FILTER_SCORE(obj)           GTK_CHECK_CAST (obj, filter_score_get_type (), FilterScore)
diff --git a/filter/rule-context.c b/filter/rule-context.c
index 1133bc1f63..5ab201c64a 100644
--- a/filter/rule-context.c
+++ b/filter/rule-context.c
@@ -23,8 +23,10 @@
 #endif
 
 #include <errno.h>
-#include <gtk/gtk.h>
-#include <gnome.h>
+#include <string.h>
+#include <gtk/gtksignal.h>
+#include <libgnomeui/gnome-dialog.h>
+#include <libgnomeui/gnome-stock.h>
 
 #include "rule-context.h"
 
diff --git a/filter/rule-context.h b/filter/rule-context.h
index e2338d5cb5..724550744a 100644
--- a/filter/rule-context.h
+++ b/filter/rule-context.h
@@ -21,7 +21,7 @@
 #ifndef _RULE_CONTEXT_H
 #define _RULE_CONTEXT_H
 
-#include <gtk/gtk.h>
+#include <gtk/gtkobject.h>
 #include <gnome-xml/parser.h>
 
 #include "filter-part.h"
diff --git a/filter/rule-editor.c b/filter/rule-editor.c
index 4826cdf01c..3353952800 100644
--- a/filter/rule-editor.c
+++ b/filter/rule-editor.c
@@ -20,7 +20,11 @@
  */
 
 #include <config.h>
-#include <gnome.h>
+
+#include <glib.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-stock.h>
 #include <glade/glade.h>
 
 #include <gal/widgets/e-unicode.h>
diff --git a/filter/rule-editor.h b/filter/rule-editor.h
index 9b45c8b41c..517b923cfe 100644
--- a/filter/rule-editor.h
+++ b/filter/rule-editor.h
@@ -21,7 +21,7 @@
 #ifndef _RULE_EDITOR_H
 #define _RULE_EDITOR_H
 
-#include <gtk/gtk.h>
+#include <gtk/gtklist.h>
 #include <libgnomeui/gnome-dialog.h>
 
 #define RULE_EDITOR(obj)	GTK_CHECK_CAST (obj, rule_editor_get_type (), RuleEditor)
diff --git a/filter/score-context.c b/filter/score-context.c
index b4c8654ff8..0ee62594e2 100644
--- a/filter/score-context.c
+++ b/filter/score-context.c
@@ -22,12 +22,12 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtk.h>
-#include <gnome.h>
+#include <gtk/gtkobject.h>
 
 #include "score-context.h"
 #include "score-rule.h"
 
+
 static void score_context_class_init	(ScoreContextClass *class);
 static void score_context_init	(ScoreContext *gspaper);
 static void score_context_finalise	(GtkObject *obj);
diff --git a/filter/score-context.h b/filter/score-context.h
index b89f70c1f8..47bd8a3989 100644
--- a/filter/score-context.h
+++ b/filter/score-context.h
@@ -21,8 +21,6 @@
 #ifndef _SCORE_CONTEXT_H
 #define _SCORE_CONTEXT_H
 
-#include <gtk/gtk.h>
-
 #include "rule-context.h"
 
 #define SCORE_CONTEXT(obj)	GTK_CHECK_CAST (obj, score_context_get_type (), ScoreContext)
diff --git a/filter/score-editor.c b/filter/score-editor.c
index 8f20b97381..e67f37a21b 100644
--- a/filter/score-editor.c
+++ b/filter/score-editor.c
@@ -20,10 +20,13 @@
  */
 
 #include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
 
+#include <glib.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <glade/glade.h>
 #include <gal/widgets/e-unicode.h>
+
 #include "score-editor.h"
 #include "score-context.h"
 #include "score-rule.h"
diff --git a/filter/score-editor.h b/filter/score-editor.h
index 686963c879..a7dcd83774 100644
--- a/filter/score-editor.h
+++ b/filter/score-editor.h
@@ -21,7 +21,6 @@
 #ifndef _SCORE_EDITOR_H
 #define _SCORE_EDITOR_H
 
-#include <gtk/gtk.h>
 #include "rule-editor.h"
 
 #define SCORE_EDITOR(obj)	GTK_CHECK_CAST (obj, score_editor_get_type (), ScoreEditor)
diff --git a/filter/score-rule.c b/filter/score-rule.c
index f34f46081d..3def7b3cee 100644
--- a/filter/score-rule.c
+++ b/filter/score-rule.c
@@ -20,7 +20,18 @@
  */
 
 #include <config.h>
-#include <gnome.h>
+
+#include <string.h>
+
+#include <glib.h>
+#include <gtk/gtkbox.h>
+#include <gtk/gtkframe.h>
+#include <gtk/gtkhbox.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtksignal.h>
+#include <gtk/gtkspinbutton.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
 
 #include "score-rule.h"
 
diff --git a/filter/score-rule.h b/filter/score-rule.h
index 25607fd7c4..6e37316aea 100644
--- a/filter/score-rule.h
+++ b/filter/score-rule.h
@@ -21,8 +21,6 @@
 #ifndef _SCORE_RULE_H
 #define _SCORE_RULE_H
 
-#include <gtk/gtk.h>
-
 #include "filter-rule.h"
 
 #define SCORE_RULE(obj)	GTK_CHECK_CAST (obj, score_rule_get_type (), ScoreRule)
diff --git a/filter/vfolder-context.c b/filter/vfolder-context.c
index d895676404..d2a40a13c8 100644
--- a/filter/vfolder-context.c
+++ b/filter/vfolder-context.c
@@ -22,8 +22,7 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtk.h>
-#include <gnome.h>
+#include <gtk/gtkobject.h>
 
 #include "vfolder-context.h"
 #include "vfolder-rule.h"
diff --git a/filter/vfolder-context.h b/filter/vfolder-context.h
index 0bf1b5aaf2..6107baf566 100644
--- a/filter/vfolder-context.h
+++ b/filter/vfolder-context.h
@@ -21,8 +21,6 @@
 #ifndef _VFOLDER_CONTEXT_H
 #define _VFOLDER_CONTEXT_H
 
-#include <gtk/gtk.h>
-
 #include "rule-context.h"
 
 #define VFOLDER_CONTEXT(obj)	GTK_CHECK_CAST (obj, vfolder_context_get_type (), VfolderContext)
diff --git a/filter/vfolder-editor.c b/filter/vfolder-editor.c
index 7251de6bf7..83da1563fc 100644
--- a/filter/vfolder-editor.c
+++ b/filter/vfolder-editor.c
@@ -20,10 +20,13 @@
  */
 
 #include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
 
+#include <glib.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <glade/glade.h>
 #include <gal/widgets/e-unicode.h>
+
 #include "vfolder-editor.h"
 #include "vfolder-context.h"
 #include "vfolder-rule.h"
diff --git a/filter/vfolder-editor.h b/filter/vfolder-editor.h
index 115ebdbc74..f8fe85503f 100644
--- a/filter/vfolder-editor.h
+++ b/filter/vfolder-editor.h
@@ -21,7 +21,6 @@
 #ifndef _VFOLDER_EDITOR_H
 #define _VFOLDER_EDITOR_H
 
-#include <gtk/gtk.h>
 #include "rule-editor.h"
 
 #define VFOLDER_EDITOR(obj)	GTK_CHECK_CAST (obj, vfolder_editor_get_type (), VfolderEditor)
diff --git a/filter/vfolder-rule.c b/filter/vfolder-rule.c
index 8c58d0ba5e..7dd889bcf5 100644
--- a/filter/vfolder-rule.c
+++ b/filter/vfolder-rule.c
@@ -19,10 +19,13 @@
  */
 
 #include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
 
+#include <glib.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <glade/glade.h>
 #include <gal/widgets/e-unicode.h>
+
 #include "vfolder-context.h"
 #include "vfolder-rule.h"
 #include "shell/evolution-shell-client.h"
diff --git a/filter/vfolder-rule.h b/filter/vfolder-rule.h
index c3fa130c84..23044f3fde 100644
--- a/filter/vfolder-rule.h
+++ b/filter/vfolder-rule.h
@@ -21,7 +21,6 @@
 #ifndef _VFOLDER_RULE_H
 #define _VFOLDER_RULE_H
 
-#include <gtk/gtk.h>
 #include "filter-rule.h"
 
 #define VFOLDER_RULE(obj)	GTK_CHECK_CAST (obj, vfolder_rule_get_type (), VfolderRule)