Index: src/gth-viewer-actions-callbacks.h
===================================================================
--- src/gth-viewer-actions-callbacks.h	(revision 2453)
+++ src/gth-viewer-actions-callbacks.h	(working copy)
@@ -23,7 +23,7 @@
 #ifndef GTH_VIEWER_ACTIONS_CALLBACKS_H
 #define GTH_VIEWER_ACTIONS_CALLBACKS_H
 
-#include <gtk/gtkaction.h>
+#include <gtk/gtk.h>
 
 #define DEFINE_ACTION(x) void x (GtkAction *action, gpointer data);
 
Index: src/catalog-web-exporter.h
===================================================================
--- src/catalog-web-exporter.h	(revision 2453)
+++ src/catalog-web-exporter.h	(working copy)
@@ -26,7 +26,6 @@
 #include <glib.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkenums.h> /* for GtkSortType */
 #include "gth-window.h"
 #include "image-loader.h"
 #include "typedefs.h"
Index: src/catalog-png-exporter.c
===================================================================
--- src/catalog-png-exporter.c	(revision 2453)
+++ src/catalog-png-exporter.c	(working copy)
@@ -26,7 +26,7 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <gdk/gdkrgb.h>
+#include <gdk/gdk.h>
 #include <gio/gio.h>
 
 #include "catalog-png-exporter.h"
Index: src/catalog-png-exporter.h
===================================================================
--- src/catalog-png-exporter.h	(revision 2453)
+++ src/catalog-png-exporter.h	(working copy)
@@ -25,7 +25,7 @@
 
 #include <glib.h>
 #include <gdk/gdk.h>
-#include <gtk/gtkenums.h> /* for GtkSortType */
+#include <gtk/gtk.h> /* for GtkSortType */
 #include <gio/gio.h>
 #include <libgnomevfs/gnome-vfs-file-size.h>
 #include <libgnomevfs/gnome-vfs-handle.h>
Index: src/gth-filter-bar.h
===================================================================
--- src/gth-filter-bar.h	(revision 2453)
+++ src/gth-filter-bar.h	(working copy)
@@ -23,7 +23,7 @@
 #ifndef GTH_FILTER_BAR_H
 #define GTH_FILTER_BAR_H
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 #include "gth-filter.h"
 
 #define GTH_TYPE_FILTER_BAR         (gth_filter_bar_get_type ())
Index: src/gth-folder-selection-dialog.h
===================================================================
--- src/gth-folder-selection-dialog.h	(revision 2453)
+++ src/gth-folder-selection-dialog.h	(working copy)
@@ -24,7 +24,7 @@
 #define GTH_FOLDER_SELECTION_DIALOG_H
 
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 
 #define GTH_TYPE_FOLDER_SELECTION         (gth_folder_selection_get_type ())
Index: src/gth-browser-actions-callbacks.h
===================================================================
--- src/gth-browser-actions-callbacks.h	(revision 2453)
+++ src/gth-browser-actions-callbacks.h	(working copy)
@@ -23,7 +23,7 @@
 #ifndef GTH_BROWSER_ACTIONS_CALLBACKS_H
 #define GTH_BROWSER_ACTIONS_CALLBACKS_H
 
-#include <gtk/gtkaction.h>
+#include <gtk/gtk.h>
 
 #define DEFINE_ACTION(x) void x (GtkAction *action, gpointer data);
 
Index: src/gth-exif-data-viewer.h
===================================================================
--- src/gth-exif-data-viewer.h	(revision 2453)
+++ src/gth-exif-data-viewer.h	(working copy)
@@ -24,7 +24,7 @@
 #define GTH_EXIF_DATA_VIEWER_H
 
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 #include "image-viewer.h"
 #include "file-data.h"
 
Index: src/dlg-open-with.h
===================================================================
--- src/dlg-open-with.h	(revision 2453)
+++ src/dlg-open-with.h	(working copy)
@@ -24,7 +24,7 @@
 #define DLG_OPEN_WITH_H
 
 #include <glib.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 void  dlg_open_with (GtkWindow *window, 
 		     GList     *list);
Index: src/gth-category-selection-dialog.h
===================================================================
--- src/gth-category-selection-dialog.h	(revision 2453)
+++ src/gth-category-selection-dialog.h	(working copy)
@@ -23,7 +23,7 @@
 #ifndef GTH_CATEGORY_SELECTION_DIALOG_H
 #define GTH_CATEGORY_SELECTION_DIALOG_H
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 #define GTH_TYPE_CATEGORY_SELECTION         (gth_category_selection_get_type ())
 #define GTH_CATEGORY_SELECTION(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GTH_TYPE_CATEGORY_SELECTION, GthCategorySelection))
Index: src/gth-window-actions-callbacks.h
===================================================================
--- src/gth-window-actions-callbacks.h	(revision 2453)
+++ src/gth-window-actions-callbacks.h	(working copy)
@@ -23,7 +23,7 @@
 #ifndef GTH_WINDOW_ACTIONS_CALLBACKS_H
 #define GTH_WINDOW_ACTIONS_CALLBACKS_H
 
-#include <gtk/gtkaction.h>
+#include <gtk/gtk.h>
 
 #define DEFINE_ACTION(x) void x (GtkAction *action, gpointer data);
 
Index: src/gth-batch-op.h
===================================================================
--- src/gth-batch-op.h	(revision 2453)
+++ src/gth-batch-op.h	(working copy)
@@ -23,7 +23,7 @@
 #ifndef GTH_BATCH_OP_H
 #define GTH_BATCH_OP_H
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include "gth-pixbuf-op.h"
 
 #define GTH_TYPE_BATCH_OP            (gth_batch_op_get_type ())
Index: src/catalog-list.h
===================================================================
--- src/catalog-list.h	(revision 2453)
+++ src/catalog-list.h	(working copy)
@@ -23,9 +23,7 @@
 #ifndef CATALOG_LIST_H
 #define CATALOG_LIST_H
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 
 typedef struct {
 	char            *path;            /* The current dir to show. */
Index: src/gth-location.c
===================================================================
--- src/gth-location.c	(revision 2453)
+++ src/gth-location.c	(working copy)
@@ -25,7 +25,6 @@
 
 #include <glib/gi18n.h>
 #include <glib.h>
-#include <glib/gprintf.h>
 #include <gtk/gtk.h>
 #include <libgnomevfs/gnome-vfs-drive.h>
 #include <libgnomevfs/gnome-vfs-file-info.h>
Index: src/gtkcellrendererthreestates.c
===================================================================
--- src/gtkcellrendererthreestates.c	(revision 2453)
+++ src/gtkcellrendererthreestates.c	(working copy)
@@ -38,7 +38,6 @@
  */
 
 #include <stdlib.h>
-#include <gtk/gtksignal.h>
 #include "gtkcellrendererthreestates.h"
 #include "gthumb-marshal.h"
 
Index: src/gth-location.h
===================================================================
--- src/gth-location.h	(revision 2453)
+++ src/gth-location.h	(working copy)
@@ -23,7 +23,7 @@
 #ifndef GTH_LOCATION_H
 #define GTH_LOCATION_H
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 
 #define GTH_TYPE_LOCATION         (gth_location_get_type ())
 #define GTH_LOCATION(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GTH_TYPE_LOCATION, GthLocation))
Index: src/gtkcellrendererthreestates.h
===================================================================
--- src/gtkcellrendererthreestates.h	(revision 2453)
+++ src/gtkcellrendererthreestates.h	(working copy)
@@ -40,7 +40,7 @@
 #ifndef __GTK_CELL_RENDERER_THREE_STATES_H__
 #define __GTK_CELL_RENDERER_THREE_STATES_H__
 
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {
Index: src/gth-fullscreen-actions-callbacks.h
===================================================================
--- src/gth-fullscreen-actions-callbacks.h	(revision 2453)
+++ src/gth-fullscreen-actions-callbacks.h	(working copy)
@@ -23,7 +23,7 @@
 #ifndef GTH_FULLSCREEN_ACTIONS_CALLBACKS_H
 #define GTH_FULLSCREEN_ACTIONS_CALLBACKS_H
 
-#include <gtk/gtkaction.h>
+#include <gtk/gtk.h>
 
 #define DEFINE_ACTION(x) void x (GtkAction *action, gpointer data);
 
Index: src/bookmark-list.h
===================================================================
--- src/bookmark-list.h	(revision 2453)
+++ src/bookmark-list.h	(working copy)
@@ -24,9 +24,7 @@
 #define BOOKMARKS_LIST_H
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 
 typedef struct {
 	GList        *list;
Index: src/gth-window.h
===================================================================
--- src/gth-window.h	(revision 2453)
+++ src/gth-window.h	(working copy)
@@ -23,7 +23,7 @@
 #ifndef GTH_WINDOW_H
 #define GTH_WINDOW_H
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include "gth-pixbuf-op.h"
 #include "image-viewer.h"
 #include "gthumb-preloader.h"
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 2453)
+++ ChangeLog	(working copy)
@@ -1,3 +1,47 @@
+2008-12-12  Przemysław Grzegorczyk  <pgrzegorczyk@gmail.com>
+
+	* src/bookmark-list.h:
+	* src/catalog-list.h:
+	* src/catalog-png-exporter.c:
+	* src/catalog-png-exporter.h:
+	* src/catalog-web-exporter.h:
+	* src/dlg-open-with.h:
+	* src/gth-batch-op.h:
+	* src/gth-browser-actions-callbacks.h:
+	* src/gth-category-selection-dialog.h:
+	* src/gth-exif-data-viewer.h:
+	* src/gth-filter-bar.h:
+	* src/gth-folder-selection-dialog.h:
+	* src/gth-fullscreen-actions-callbacks.h:
+	* src/gth-location.c:
+	* src/gth-location.h:
+	* src/gth-viewer-actions-callbacks.h:
+	* src/gth-window-actions-callbacks.h:
+	* src/gth-window.h:
+	* src/gtkcellrendererthreestates.c:
+	* src/gtkcellrendererthreestates.h:
+	* libgthumb/catalog.h:
+	* libgthumb/cursors.c:
+	* libgthumb/dlg-save-image.h:
+	* libgthumb/eel-canvas-rect.c:
+	* libgthumb/file-utils.c:
+	* libgthumb/glib-utils.c:
+	* libgthumb/gth-file-view.h:
+	* libgthumb/gth-image-list.c:
+	* libgthumb/gth-image-list.h:
+	* libgthumb/gth-iviewer.h:
+	* libgthumb/gth-nav-window.h:
+	* libgthumb/image-loader.c:
+	* libgthumb/image-loader.h:
+	* libgthumb/image-viewer-image.h:
+	* libgthumb/image-viewer.c:
+	* libgthumb/image-viewer.h:
+	* libgthumb/nav-window.h:
+	* libgthumb/preferences.h:
+	* libgthumb/print-callbacks.c:
+	* libgthumb/thumb-loader.c: Cleaned up gtk and glib includes
+	to use only toplevel headers. Bug #564298.
+
 2008-11-17  Paolo Bacchilega  <paobac@svn.gnome.org>
 
 	* libgthumb/gth-filter.c (test_keywords): 
Index: libgthumb/preferences.h
===================================================================
--- libgthumb/preferences.h	(revision 2453)
+++ libgthumb/preferences.h	(working copy)
@@ -25,7 +25,7 @@
 
 
 #include <glib.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include "bookmarks.h"
 #include "typedefs.h"
 #include "image-viewer.h"
Index: libgthumb/gth-file-view.h
===================================================================
--- libgthumb/gth-file-view.h	(revision 2453)
+++ libgthumb/gth-file-view.h	(working copy)
@@ -25,8 +25,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "typedefs.h"
 
 G_BEGIN_DECLS
Index: libgthumb/catalog.h
===================================================================
--- libgthumb/catalog.h	(revision 2453)
+++ libgthumb/catalog.h	(working copy)
@@ -24,7 +24,7 @@
 #define CATALOG_H
 
 #include <glib.h>
-#include <gtk/gtkenums.h>
+#include <gtk/gtk.h>
 #include "search.h"
 #include "typedefs.h"
 
Index: libgthumb/image-loader.c
===================================================================
--- libgthumb/image-loader.c	(revision 2453)
+++ libgthumb/image-loader.c	(working copy)
@@ -26,13 +26,12 @@
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-thumbnail.h>
 #include <libgnomevfs/gnome-vfs-async-ops.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
-#include <gdk-pixbuf/gdk-pixbuf-animation.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <sys/stat.h>
 #include "image-loader.h"
 #include "gthumb-marshal.h"
Index: libgthumb/image-loader.h
===================================================================
--- libgthumb/image-loader.h	(revision 2453)
+++ libgthumb/image-loader.h	(working copy)
@@ -25,7 +25,6 @@
 
 #include <glib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gdk-pixbuf-loader.h>
 #include <libgnomeui/gnome-thumbnail.h>
 #include "typedefs.h"
 #include "file-data.h"
Index: libgthumb/nav-window.h
===================================================================
--- libgthumb/nav-window.h	(revision 2453)
+++ libgthumb/nav-window.h	(working copy)
@@ -23,7 +23,7 @@
 #ifndef NAV_WINDOW_H
 #define NAV_WINDOW_H
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "gth-iviewer.h"
 
 void nav_button_clicked_cb (GtkWidget      *widget,  
Index: libgthumb/cursors.c
===================================================================
--- libgthumb/cursors.c	(revision 2453)
+++ libgthumb/cursors.c	(working copy)
@@ -20,8 +20,7 @@
  */
 
 #include <config.h>
-#include <gdk/gdkcolor.h>
-#include <gdk/gdkdrawable.h>
+#include <gdk/gdk.h>
 #include "cursors.h"
 
 
Index: libgthumb/file-utils.c
===================================================================
--- libgthumb/file-utils.c	(revision 2453)
+++ libgthumb/file-utils.c	(working copy)
@@ -41,7 +41,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include <gdk-pixbuf/gdk-pixbuf-animation.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libgnomeui/gnome-thumbnail.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <libgnomevfs/gnome-vfs-handle.h>
Index: libgthumb/gth-nav-window.h
===================================================================
--- libgthumb/gth-nav-window.h	(revision 2453)
+++ libgthumb/gth-nav-window.h	(working copy)
@@ -23,7 +23,7 @@
 #ifndef _GTH_NAV_WINDOW_H
 #define _GTH_NAV_WINDOW_H
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 #include "gth-iviewer.h"
 
 #define GTH_TYPE_NAV_WINDOW            (gth_nav_window_get_type ())
Index: libgthumb/thumb-loader.c
===================================================================
--- libgthumb/thumb-loader.c	(revision 2453)
+++ libgthumb/thumb-loader.c	(working copy)
@@ -27,13 +27,13 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-thumbnail.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
 #include <libgnomevfs/gnome-vfs-mime.h>
-#include <gdk-pixbuf/gdk-pixbuf-animation.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "gthumb-init.h"
 #include "thumb-loader.h"
Index: libgthumb/dlg-save-image.h
===================================================================
--- libgthumb/dlg-save-image.h	(revision 2453)
+++ libgthumb/dlg-save-image.h	(working copy)
@@ -24,7 +24,7 @@
 #define DLG_SAVE_IMAGE_H
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include "file-data.h"
 
 typedef void (*ImageSavedFunc) (FileData  *file,
Index: libgthumb/image-viewer-image.h
===================================================================
--- libgthumb/image-viewer-image.h	(revision 2453)
+++ libgthumb/image-viewer-image.h	(working copy)
@@ -25,7 +25,6 @@
 
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gdk-pixbuf-loader.h>
 #include "file-data.h"
 #include "image-viewer-enums.h"
 
Index: libgthumb/print-callbacks.c
===================================================================
--- libgthumb/print-callbacks.c	(revision 2453)
+++ libgthumb/print-callbacks.c	(working copy)
@@ -31,7 +31,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <glade/glade.h>
 #include <pango/pango-layout.h>
-#include <gtk/gtkprintoperation.h>
+#include <gtk/gtk.h>
 #include <pango/pangocairo.h>
 
 #include "glib-utils.h"
Index: libgthumb/gth-image-list.c
===================================================================
--- libgthumb/gth-image-list.c	(revision 2453)
+++ libgthumb/gth-image-list.c	(working copy)
@@ -26,9 +26,7 @@
 #include <math.h>
 #include <glib.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkbindings.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #ifdef HAVE_RENDER
 #include <gdk/gdkx.h>
Index: libgthumb/gth-image-list.h
===================================================================
--- libgthumb/gth-image-list.h	(revision 2453)
+++ libgthumb/gth-image-list.h	(working copy)
@@ -23,7 +23,7 @@
 #ifndef GTH_IMAGE_LIST_H
 #define GTH_IMAGE_LIST_H
 
-#include <gtk/gtkcontainer.h>
+#include <gtk/gtk.h>
 #include "typedefs.h"
 
 G_BEGIN_DECLS
Index: libgthumb/gth-iviewer.h
===================================================================
--- libgthumb/gth-iviewer.h	(revision 2453)
+++ libgthumb/gth-iviewer.h	(working copy)
@@ -25,7 +25,7 @@
 
 #include <glib-object.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkadjustment.h>
+#include <gtk/gtk.h>
 
 #define GTH_TYPE_IVIEWER                (gth_iviewer_get_type ())
 #define GTH_IVIEWER(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_IVIEWER, GthIViewer))
Index: libgthumb/eel-canvas-rect.c
===================================================================
--- libgthumb/eel-canvas-rect.c	(revision 2453)
+++ libgthumb/eel-canvas-rect.c	(working copy)
@@ -26,7 +26,7 @@
 #include <math.h>
 #include <string.h>
 
-#include <glib/gstring.h>
+#include <glib.h>
 #include <libgnome/gnome-macros.h>
 #include <libgnomecanvas/gnome-canvas-util.h>
 
Index: libgthumb/glib-utils.c
===================================================================
--- libgthumb/glib-utils.c	(revision 2453)
+++ libgthumb/glib-utils.c	(working copy)
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <stdio.h>
 #include <glib.h>
-#include <glib/gprintf.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include "glib-utils.h"
 
Index: libgthumb/image-viewer.c
===================================================================
--- libgthumb/image-viewer.c	(revision 2453)
+++ libgthumb/image-viewer.c	(working copy)
@@ -25,9 +25,7 @@
 
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkhscrollbar.h>
-#include <gtk/gtkvscrollbar.h>
+#include <gtk/gtk.h>
 #include <libgnomevfs/gnome-vfs-types.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
Index: libgthumb/image-viewer.h
===================================================================
--- libgthumb/image-viewer.h	(revision 2453)
+++ libgthumb/image-viewer.h	(working copy)
@@ -25,7 +25,6 @@
 
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gdk-pixbuf-loader.h>
 #include "file-data.h"
 #include "image-loader.h"
 #include "image-viewer-enums.h"
