From 396056e0118e637bf70ac5fcab9c858b33c2f52e Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Fri, 9 Feb 2018 01:02:06 +0100
Subject: [PATCH] a11y: Remove gtk.h include from iconview header

---
 gtk/a11y/gtkiconviewaccessible.h        |  1 -
 gtk/a11y/gtkiconviewaccessibleprivate.h |  2 ++
 gtk/gtkiconview.c                       | 38 +++++++++++++------------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/gtk/a11y/gtkiconviewaccessible.h b/gtk/a11y/gtkiconviewaccessible.h
index 40b555c146..87976f22ff 100644
--- a/gtk/a11y/gtkiconviewaccessible.h
+++ b/gtk/a11y/gtkiconviewaccessible.h
@@ -22,7 +22,6 @@
 #error "Only <gtk/gtk-a11y.h> can be included directly."
 #endif
 
-#include <gtk/gtk.h>
 #include <gtk/a11y/gtkcontaineraccessible.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkiconviewaccessibleprivate.h b/gtk/a11y/gtkiconviewaccessibleprivate.h
index c8a2421689..2fa04a2966 100644
--- a/gtk/a11y/gtkiconviewaccessibleprivate.h
+++ b/gtk/a11y/gtkiconviewaccessibleprivate.h
@@ -20,6 +20,8 @@
 
 #include <gtk/a11y/gtkiconviewaccessible.h>
 
+#include <gtk/gtkiconview.h>
+
 G_BEGIN_DECLS
 
 void _gtk_icon_view_accessible_adjustment_changed  (GtkIconView *icon_view);
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 9a0211ad4e..6ffbd1d523 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -17,39 +17,41 @@
 
 #include "config.h"
 
-#include <string.h>
-
-#include "gtkiconview.h"
 #include "gtkiconviewprivate.h"
 
+#include "gtkaccessible.h"
 #include "gtkadjustmentprivate.h"
-#include "gtkcelllayout.h"
-#include "gtkcellrenderer.h"
+#include "gtkbindings.h"
 #include "gtkcellareabox.h"
 #include "gtkcellareacontext.h"
-#include "gtkcellrenderertext.h"
+#include "gtkcelllayout.h"
+#include "gtkcellrenderer.h"
 #include "gtkcellrendererpixbuf.h"
-#include "gtkorientable.h"
-#include "gtkmarshalers.h"
-#include "gtkbindings.h"
-#include "gtkdnd.h"
-#include "gtkmain.h"
-#include "gtkintl.h"
-#include "gtkaccessible.h"
-#include "gtkwindow.h"
-#include "gtkentry.h"
+#include "gtkcellrenderertext.h"
 #include "gtkcombobox.h"
+#include "gtkcssnodeprivate.h"
+#include "gtkdnd.h"
+#include "gtkdragdest.h"
+#include "gtkdragsource.h"
+#include "gtkentry.h"
+#include "gtkintl.h"
+#include "gtkmain.h"
+#include "gtkmarshalers.h"
+#include "gtkorientable.h"
+#include "gtkprivate.h"
 #include "gtkscrollable.h"
 #include "gtksizerequest.h"
 #include "gtksnapshotprivate.h"
+#include "gtkstylecontextprivate.h"
 #include "gtktreednd.h"
 #include "gtktypebuiltins.h"
-#include "gtkprivate.h"
-#include "gtkcssnodeprivate.h"
 #include "gtkwidgetprivate.h"
-#include "gtkstylecontextprivate.h"
+#include "gtkwindow.h"
+
 #include "a11y/gtkiconviewaccessibleprivate.h"
 
+#include <string.h>
+
 /**
  * SECTION:gtkiconview
  * @title: GtkIconView