8 files changed, 6 insertions, 20 deletions
diff --git a/smime/gui/ca-trust-dialog.c b/smime/gui/ca-trust-dialog.c
index cb77263883..e2545e6aef 100644
--- a/smime/gui/ca-trust-dialog.c
+++ b/smime/gui/ca-trust-dialog.c
@@ -28,8 +28,6 @@
 #include "ca-trust-dialog.h"
 #include "certificate-viewer.h"
 
-#include <gtk/gtk.h>
-
 #include <glib/gi18n.h>
 #include <glade/glade.h>
 
diff --git a/smime/gui/ca-trust-dialog.h b/smime/gui/ca-trust-dialog.h
index 54cba41310..5c29cb5616 100644
--- a/smime/gui/ca-trust-dialog.h
+++ b/smime/gui/ca-trust-dialog.h
@@ -23,7 +23,7 @@
 #ifndef _CA_TRUST_DIALOG_H_
 #define _CA_TRUST_DIALOG_H
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "e-cert.h"
 
 GtkWidget* ca_trust_dialog_show (ECert *cert, gboolean importing);
diff --git a/smime/gui/cert-trust-dialog.c b/smime/gui/cert-trust-dialog.c
index 9de35ae073..fa14fe5ba7 100644
--- a/smime/gui/cert-trust-dialog.c
+++ b/smime/gui/cert-trust-dialog.c
@@ -31,10 +31,7 @@
 #include "cert-trust-dialog.h"
 #include "ca-trust-dialog.h"
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 
 #include <glib/gi18n.h>
 #include <glade/glade.h>
diff --git a/smime/gui/certificate-viewer.c b/smime/gui/certificate-viewer.c
index 342f3d8c95..d014978e3e 100644
--- a/smime/gui/certificate-viewer.c
+++ b/smime/gui/certificate-viewer.c
@@ -29,8 +29,6 @@
 
 #include "e-asn1-object.h"
 
-#include <gtk/gtk.h>
-
 #include <glib/gi18n.h>
 #include <glade/glade.h>
 
diff --git a/smime/gui/certificate-viewer.h b/smime/gui/certificate-viewer.h
index cb7b07842a..ea1033a1a8 100644
--- a/smime/gui/certificate-viewer.h
+++ b/smime/gui/certificate-viewer.h
@@ -23,7 +23,7 @@
 #ifndef _CERTIFICATE_VIEWER_H_
 #define _CERTIFICATE_VIEWER_H
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "e-cert.h"
 
 GtkWidget* certificate_viewer_show (ECert *cert);
diff --git a/smime/gui/e-cert-selector.c b/smime/gui/e-cert-selector.c
index d41be35ad6..d7101d6ec8 100644
--- a/smime/gui/e-cert-selector.c
+++ b/smime/gui/e-cert-selector.c
@@ -25,12 +25,6 @@
 
 #include <glib/gi18n.h>
 
-#include <gtk/gtktextview.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkstock.h>
-
 #include "nss.h"
 #include "pk11func.h"
 #include "certdb.h"
diff --git a/smime/gui/e-cert-selector.h b/smime/gui/e-cert-selector.h
index 2ceb871386..05d74b2236 100644
--- a/smime/gui/e-cert-selector.h
+++ b/smime/gui/e-cert-selector.h
@@ -24,7 +24,7 @@
 #ifndef E_CERT_SELECTOR_H
 #define E_CERT_SELECTOR_H
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 #ifdef cplusplus
 extern "C" {
diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c
index a224026335..c8040ce15d 100644
--- a/smime/lib/e-cert-db.c
+++ b/smime/lib/e-cert-db.c
@@ -60,7 +60,8 @@
 #include <config.h>
 #endif
 
-#include <glib.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
 /* XXX toshok why oh *why* god WHY did they do this?  no fucking
@@ -90,8 +91,6 @@
 #include "e-util/e-util.h"
 #include "e-util/e-dialog-utils.h"
 #include "e-util/e-util-private.h"
-#include <gtk/gtkmessagedialog.h>
-#include <glib/gi18n.h>
 #include <libedataserverui/e-passwords.h>
 #include <sys/types.h>
 #include <sys/stat.h>