Index: tools/browser/component-list.h
===================================================================
--- tools/browser/component-list.h	(revision 2671)
+++ tools/browser/component-list.h	(working copy)
@@ -23,7 +23,7 @@
 #ifndef __COMPONENT_LIST_H__
 #define __COMPONENT_LIST_H__
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: tools/browser/component-details.c
===================================================================
--- tools/browser/component-details.c	(revision 2671)
+++ tools/browser/component-details.c	(working copy)
@@ -24,13 +24,7 @@
 
 #include "oaf-helper.h"
 #include "component-details.h"
-#include <gtk/gtknotebook.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreestore.h>
-#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtk.h>
 
 #define PARENT_TYPE GTK_TYPE_VBOX
 
Index: tools/browser/component-details.h
===================================================================
--- tools/browser/component-details.h	(revision 2671)
+++ tools/browser/component-details.h	(working copy)
@@ -21,7 +21,7 @@
 #ifndef __COMPONENT_DETAILS_H__
 #define __COMPONENT_DETAILS_H__
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: tools/browser/component-list.c
===================================================================
--- tools/browser/component-list.c	(revision 2671)
+++ tools/browser/component-list.c	(working copy)
@@ -24,17 +24,8 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrendererpixbuf.h>
+#include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkiconfactory.h>
 
 #include "oaf-helper.h"
 #include "component-list.h"
Index: tests/test-filesel.c
===================================================================
--- tests/test-filesel.c	(revision 2671)
+++ tests/test-filesel.c	(working copy)
@@ -13,7 +13,7 @@
 #include <bonobo/bonobo-file-selector-util.h>
 #include <bonobo/bonobo-ui-main.h>
 
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 
 #include <glib/gi18n.h>
 
Index: samples/compound-doc/container/container-filesel.c
===================================================================
--- samples/compound-doc/container/container-filesel.c	(revision 2671)
+++ samples/compound-doc/container/container-filesel.c	(working copy)
@@ -1,6 +1,5 @@
 #include "config.h"
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 #include "container-filesel.h"
 #include "container.h"
 
Index: samples/compound-doc/container/doc-view.h
===================================================================
--- samples/compound-doc/container/doc-view.h	(revision 2671)
+++ samples/compound-doc/container/doc-view.h	(working copy)
@@ -2,7 +2,7 @@
 #define _SAMPLE_DOC_VIEW_H
 
 #include <bonobo/Bonobo.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include "document.h"
 
Index: samples/compound-doc/container/container.c
===================================================================
--- samples/compound-doc/container/container.c	(revision 2671)
+++ samples/compound-doc/container/container.c	(working copy)
@@ -1,7 +1,7 @@
 #include "config.h"
 #include <stdlib.h>
 #include <libbonoboui.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include <libgnome/gnome-init.h>
 
 #include "container.h"
Index: samples/compound-doc/container/container-menu.c
===================================================================
--- samples/compound-doc/container/container-menu.c	(revision 2671)
+++ samples/compound-doc/container/container-menu.c	(working copy)
@@ -2,7 +2,7 @@
 #include <bonobo/bonobo-ui-component.h>
 #include <bonobo/bonobo-selector.h>
 #include <bonobo/bonobo-window.h>
-#include <gtk/gtkfilechooser.h>
+#include <gtk/gtk.h>
 
 #include "container-menu.h"
 #include "container.h"
Index: samples/canvdemo/square.c
===================================================================
--- samples/canvdemo/square.c	(revision 2671)
+++ samples/canvdemo/square.c	(working copy)
@@ -7,7 +7,7 @@
 #define WITH_BONOBO
 
 #include <string.h>
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 #include <libgnomecanvas/libgnomecanvas.h>
 
Index: samples/canvdemo/circle.c
===================================================================
--- samples/canvdemo/circle.c	(revision 2671)
+++ samples/canvdemo/circle.c	(working copy)
@@ -2,7 +2,7 @@
 #include "config.h"
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 #include <libgnomecanvas/libgnomecanvas.h>
 #include <bonobo/Bonobo.h>
