[libegg/spread-table-dnd: 29/45] Use single includes

[Murray Cumming <murrayc src gnome org>]

commit bb8a9122257b717f9ee374c7fa5b2ee08fa77dec
Author: David King <davidk openismus com>
Date:   Wed Mar 23 10:40:08 2011 +0100

    Use single includes

 libegg/dock/egg-dock-item-grip.c              |    5 ++---
 libegg/dock/egg-dock-item-grip.h              |    2 +-
 libegg/dock/egg-dock-master.h                 |    2 +-
 libegg/dock/egg-dock-notebook.c               |    2 +-
 libegg/dock/egg-dock-object.h                 |    2 +-
 libegg/dock/egg-dock-paned.c                  |    3 +--
 libegg/pixbufthumbnail/egg-pixbuf-thumbnail.c |    2 +-
 libegg/treeviewutils/egg-cell-renderer-text.h |    2 +-
 libegg/treeviewutils/eggcellrendererkeys.h    |    2 +-
 libegg/treeviewutils/eggcellrendererpopup.h   |    2 +-
 libegg/treeviewutils/eggtreemodelfilter.h     |    2 +-
 libegg/treeviewutils/eggtreemodelunion.h      |    2 +-
 libegg/treeviewutils/eggtreeviewstate.h       |    2 +-
 13 files changed, 14 insertions(+), 16 deletions(-)
---
diff --git a/libegg/dock/egg-dock-item-grip.c b/libegg/dock/egg-dock-item-grip.c
index 9ca348a..1db336b 100644
--- a/libegg/dock/egg-dock-item-grip.c
+++ b/libegg/dock/egg-dock-item-grip.c
@@ -18,10 +18,9 @@
 #include <util/eggintl.h>
 #include <string.h>
 #include <glib-object.h>
-#include <atk/atkstateset.h>
+#include <atk/atk.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkaccessible.h>
-#include <gtk/gtkbindings.h>
+#include <gtk/gtk.h>
 #include <util/egg-macros.h>
 #include "egg-dock-item.h"
 #include "egg-dock-item-grip.h"
diff --git a/libegg/dock/egg-dock-item-grip.h b/libegg/dock/egg-dock-item-grip.h
index 822a03f..46951ac 100644
--- a/libegg/dock/egg-dock-item-grip.h
+++ b/libegg/dock/egg-dock-item-grip.h
@@ -14,7 +14,7 @@
 #ifndef _EGG_DOCK_ITEM_GRIP_H_
 #define _EGG_DOCK_ITEM_GRIP_H_
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <dock/egg-dock-item.h>
 
 G_BEGIN_DECLS
diff --git a/libegg/dock/egg-dock-master.h b/libegg/dock/egg-dock-master.h
index 12288ec..380eb52 100644
--- a/libegg/dock/egg-dock-master.h
+++ b/libegg/dock/egg-dock-master.h
@@ -24,7 +24,7 @@
 #define __EGG_DOCK_MASTER_H__
 
 #include <glib-object.h>
-#include <gtk/gtktypeutils.h>
+#include <gtk/gtk.h>
 #include <dock/egg-dock-object.h>
 
 
diff --git a/libegg/dock/egg-dock-notebook.c b/libegg/dock/egg-dock-notebook.c
index 3ff3b68..35290ac 100644
--- a/libegg/dock/egg-dock-notebook.c
+++ b/libegg/dock/egg-dock-notebook.c
@@ -24,7 +24,7 @@
 #endif
 
 #include <util/eggintl.h>
-#include <gtk/gtknotebook.h>
+#include <gtk/gtk.h>
 #include <util/egg-macros.h>
 
 #include "egg-dock-notebook.h"
diff --git a/libegg/dock/egg-dock-object.h b/libegg/dock/egg-dock-object.h
index 433fa78..d021eb8 100644
--- a/libegg/dock/egg-dock-object.h
+++ b/libegg/dock/egg-dock-object.h
@@ -23,7 +23,7 @@
 #ifndef __EGG_DOCK_OBJECT_H__
 #define __EGG_DOCK_OBJECT_H__
 
-#include <gtk/gtkcontainer.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/libegg/dock/egg-dock-paned.c b/libegg/dock/egg-dock-paned.c
index d22094a..5582545 100644
--- a/libegg/dock/egg-dock-paned.c
+++ b/libegg/dock/egg-dock-paned.c
@@ -26,8 +26,7 @@
 
 #include <util/eggintl.h>
 #include <string.h>
-#include <gtk/gtkhpaned.h>
-#include <gtk/gtkvpaned.h>
+#include <gtk/gtk.h>
 #include <util/egg-macros.h>
 
 #include "egg-dock-paned.h"
diff --git a/libegg/pixbufthumbnail/egg-pixbuf-thumbnail.c b/libegg/pixbufthumbnail/egg-pixbuf-thumbnail.c
index a0dab9a..8215961 100644
--- a/libegg/pixbufthumbnail/egg-pixbuf-thumbnail.c
+++ b/libegg/pixbufthumbnail/egg-pixbuf-thumbnail.c
@@ -37,7 +37,7 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
-#include <gdk-pixbuf/gdk-pixbuf-io.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "egg-pixbuf-thumbnail.h"
 
diff --git a/libegg/treeviewutils/egg-cell-renderer-text.h b/libegg/treeviewutils/egg-cell-renderer-text.h
index 763794e..1263547 100644
--- a/libegg/treeviewutils/egg-cell-renderer-text.h
+++ b/libegg/treeviewutils/egg-cell-renderer-text.h
@@ -23,7 +23,7 @@
 #ifndef __EGG_CELL_RENDERER_TEXT_H__
 #define __EGG_CELL_RENDERER_TEXT_H__
 
-#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/libegg/treeviewutils/eggcellrendererkeys.h b/libegg/treeviewutils/eggcellrendererkeys.h
index 8a3d64a..24e58ae 100644
--- a/libegg/treeviewutils/eggcellrendererkeys.h
+++ b/libegg/treeviewutils/eggcellrendererkeys.h
@@ -20,7 +20,7 @@
 #ifndef __EGG_CELL_RENDERER_KEYS_H__
 #define __EGG_CELL_RENDERER_KEYS_H__
 
-#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtk.h>
 #include "eggaccelerators.h"
 
 G_BEGIN_DECLS
diff --git a/libegg/treeviewutils/eggcellrendererpopup.h b/libegg/treeviewutils/eggcellrendererpopup.h
index 014684e..02de29a 100644
--- a/libegg/treeviewutils/eggcellrendererpopup.h
+++ b/libegg/treeviewutils/eggcellrendererpopup.h
@@ -20,7 +20,7 @@
 #ifndef __EGG_CELL_RENDERER_POPUP_H__
 #define __EGG_CELL_RENDERER_POPUP_H__
 
-#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/libegg/treeviewutils/eggtreemodelfilter.h b/libegg/treeviewutils/eggtreemodelfilter.h
index 69cc3d3..86728e5 100644
--- a/libegg/treeviewutils/eggtreemodelfilter.h
+++ b/libegg/treeviewutils/eggtreemodelfilter.h
@@ -21,7 +21,7 @@
 #ifndef __EGG_TREE_MODEL_FILTER_H__
 #define __EGG_TREE_MODEL_FILTER_H__
 
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/libegg/treeviewutils/eggtreemodelunion.h b/libegg/treeviewutils/eggtreemodelunion.h
index a5f92e5..196c793 100644
--- a/libegg/treeviewutils/eggtreemodelunion.h
+++ b/libegg/treeviewutils/eggtreemodelunion.h
@@ -7,7 +7,7 @@
 #ifndef __EGG_TREE_MODEL_UNION_H__
 #define __EGG_TREE_MODEL_UNION_H__
 
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/libegg/treeviewutils/eggtreeviewstate.h b/libegg/treeviewutils/eggtreeviewstate.h
index cb75c90..cf25492 100644
--- a/libegg/treeviewutils/eggtreeviewstate.h
+++ b/libegg/treeviewutils/eggtreeviewstate.h
@@ -21,7 +21,7 @@
 #ifndef __EGG_TREE_VIEW_STATE_H__
 #define __EGG_TREE_VIEW_STATE_H__
 
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 
 gboolean egg_tree_view_state_apply_from_string (GtkTreeView *tree_view, const gchar *string, GError **error);