Index: src/plugins/pgpcore/passphrase.c
===================================================================
RCS file: //claws/src/plugins/pgpcore/Attic/passphrase.c,v
retrieving revision 1.1.2.29
retrieving revision 1.1.2.30
diff -u -r1.1.2.29 -r1.1.2.30
--- src/plugins/pgpcore/passphrase.c	10 Jan 2008 17:45:25 -0000	1.1.2.29
+++ src/plugins/pgpcore/passphrase.c	5 Jul 2008 10:02:55 -0000	1.1.2.30
@@ -30,17 +30,7 @@
 #ifdef GDK_WINDOWING_X11
 #  include <gdk/gdkx.h>
 #endif /* GDK_WINDOWING_X11 */
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkfilesel.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h> 
 #include <string.h>
 #include <sys/types.h>
 #ifdef G_OS_WIN32
Index: src/plugins/pgpcore/prefs_gpg.c
===================================================================
RCS file: //claws/src/plugins/pgpcore/Attic/prefs_gpg.c,v
retrieving revision 1.1.2.28
retrieving revision 1.1.2.29
diff -u -r1.1.2.28 -r1.1.2.29
--- src/plugins/pgpcore/prefs_gpg.c	4 Oct 2007 17:36:48 -0000	1.1.2.28
+++ src/plugins/pgpcore/prefs_gpg.c	5 Jul 2008 10:02:55 -0000	1.1.2.29
@@ -22,8 +22,7 @@
 #include <glib/gi18n.h>
 
 #include "defs.h"
-#include "utils.h"
-#include "gtk/gtkutils.h"
+#include "utils.h" 
 #include "prefs.h"
 #include "prefs_gtk.h"
 #include "prefs_gpg.h"
Index: src/plugins/pgpcore/select-keys.c
===================================================================
RCS file: //claws/src/plugins/pgpcore/Attic/select-keys.c,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -r1.1.2.19 -r1.1.2.20
--- src/plugins/pgpcore/select-keys.c	17 Oct 2007 16:03:01 -0000	1.1.2.19
+++ src/plugins/pgpcore/select-keys.c	5 Jul 2008 10:02:56 -0000	1.1.2.20
@@ -27,19 +27,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkclist.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkstock.h>
-
+#include <gtk/gtk.h>
 #include "select-keys.h"
 #include "utils.h"
 #include "gtkutils.h"