1 files changed, 17 insertions, 14 deletions
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index 44972c11f5..37267950ec 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -7,24 +7,18 @@
  *
  * (C) 2000, 2001 Ximian, Inc.
  */
+
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <ctype.h>
-#include <gnome.h>
-#include "e-util/e-sexp.h"
-#include "folder-browser.h"
-#include "mail.h"
-#include "mail-callbacks.h"
-#include "mail-tools.h"
-#include "message-list.h"
-#include "mail-ops.h"
-#include "mail-vfolder.h"
-#include "mail-autofilter.h"
-#include "mail-mlist-magic.h"
-#include "mail-mt.h"
 
+#include <gdk/gdkkeysyms.h>
 #include <gal/util/e-util.h>
 #include <gal/widgets/e-unicode.h>
 #include <gal/e-paned/e-vpaned.h>
+#include <gal/widgets/e-popup-menu.h>
 
 #include "filter/vfolder-rule.h"
 #include "filter/vfolder-context.h"
@@ -32,12 +26,21 @@
 #include "filter/filter-input.h"
 
 #include "mail-search-dialogue.h"
+#include "e-util/e-sexp.h"
+#include "folder-browser.h"
+#include "mail.h"
+#include "mail-callbacks.h"
+#include "mail-tools.h"
+#include "message-list.h"
+#include "mail-ops.h"
+#include "mail-vfolder.h"
+#include "mail-autofilter.h"
+#include "mail-mlist-magic.h"
+#include "mail-mt.h"
 
 #include "mail-local.h"
 #include "mail-config.h"
 
-#include <gal/widgets/e-popup-menu.h>
-
 #define d(x) x
 
 #define PARENT_TYPE (gtk_table_get_type ())