From 808921dd3e1d59b6f28f2bfcc2df989eb90d0b81 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Fri, 9 Feb 2018 00:56:26 +0100
Subject: [PATCH] a11y: Remove gtk/h include from menu header

---
 gtk/a11y/gtkmenuaccessible.h |  1 -
 gtk/gtkmenu.c                | 34 ++++++++++++++++++----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/gtk/a11y/gtkmenuaccessible.h b/gtk/a11y/gtkmenuaccessible.h
index 15a1a3fa98..6a890fe270 100644
--- a/gtk/a11y/gtkmenuaccessible.h
+++ b/gtk/a11y/gtkmenuaccessible.h
@@ -22,7 +22,6 @@
 #error "Only <gtk/gtk-a11y.h> can be included directly."
 #endif
 
-#include <gtk/gtk.h>
 #include <gtk/a11y/gtkmenushellaccessible.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index aa1cdaac7a..a39aa42351 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -101,41 +101,43 @@
 
 #include "config.h"
 
-#include <string.h>
-
-#include  <gobject/gvaluecollector.h>
+#include "gtkmenuprivate.h"
 
 #include "gtkaccellabel.h"
 #include "gtkaccelmap.h"
 #include "gtkadjustment.h"
 #include "gtkbindings.h"
-#include "gtkcheckmenuitem.h"
+#include "gtkbox.h"
 #include "gtkcheckmenuitemprivate.h"
+#include "gtkcssnodeprivate.h"
+#include "gtkcssstylepropertyprivate.h"
+#include "gtkdnd.h"
+#include "gtkeventcontrollerscroll.h"
+#include "gtkiconprivate.h"
+#include "gtkintl.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
-#include "gtkmenuprivate.h"
 #include "gtkmenuitemprivate.h"
 #include "gtkmenushellprivate.h"
-#include "gtkwindow.h"
-#include "gtkbox.h"
+#include "gtkprivate.h"
 #include "gtkscrollbar.h"
 #include "gtksettings.h"
-#include "gtkprivate.h"
+#include "gtksnapshot.h"
+#include "gtkstylecontextprivate.h"
+#include "gtktypebuiltins.h"
 #include "gtkwidgetpath.h"
 #include "gtkwidgetprivate.h"
-#include "gtkdnd.h"
-#include "gtkintl.h"
-#include "gtktypebuiltins.h"
-#include "gtkwidgetprivate.h"
+#include "gtkwindowgroup.h"
 #include "gtkwindowprivate.h"
-#include "gtkcssnodeprivate.h"
-#include "gtkstylecontextprivate.h"
-#include "gtkcssstylepropertyprivate.h"
-#include "gtkiconprivate.h"
 
 #include "a11y/gtkmenuaccessible.h"
+
 #include "gdk/gdk-private.h"
 
+#include <gobject/gvaluecollector.h>
+#include <string.h>
+
+
 #define NAVIGATION_REGION_OVERSHOOT 50  /* How much the navigation region
                                          * extends below the submenu
                                          */