From 374467c11c731700661e81ef848c613afac781c6 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Thu, 5 Apr 2018 17:05:21 +0200
Subject: [PATCH] a11y: Fix headers

We were getting a gcc warning before.
---
 gtk/a11y/gtkaccessibility.h           |  3 ---
 gtk/a11y/gtkwindowaccessible.c        |  7 ++++---
 gtk/a11y/gtkwindowaccessibleprivate.h | 30 +++++++++++++++++++++++++++
 gtk/gtkwindow.c                       |  2 +-
 4 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 gtk/a11y/gtkwindowaccessibleprivate.h

diff --git a/gtk/a11y/gtkaccessibility.h b/gtk/a11y/gtkaccessibility.h
index a62a13f8b1..41d98067cd 100644
--- a/gtk/a11y/gtkaccessibility.h
+++ b/gtk/a11y/gtkaccessibility.h
@@ -28,9 +28,6 @@ void      _gtk_accessibility_init              (void);
 gboolean  _gtk_accessibility_key_snooper       (GtkWidget   *widget,
                                                 GdkEventKey *event);
 
-void      _gtk_window_accessible_set_is_active (GtkWindow   *window,
-                                                gboolean     is_active);
-
 G_END_DECLS
 
 #endif /* __GTK_ACCESSIBILITY_H__ */
diff --git a/gtk/a11y/gtkwindowaccessible.c b/gtk/a11y/gtkwindowaccessible.c
index a05f5942cf..268f5b0c60 100644
--- a/gtk/a11y/gtkwindowaccessible.c
+++ b/gtk/a11y/gtkwindowaccessible.c
@@ -18,12 +18,13 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
+#include "gtkwindowaccessibleprivate.h"
 
 #include "gtkaccessibility.h"
-#include "gtkwidgetaccessibleprivate.h"
-#include "gtkwindowaccessible.h"
 #include "gtktoplevelaccessible.h"
+#include "gtkwidgetaccessibleprivate.h"
+
+#include "gtklabel.h"
 #include "gtkwidgetprivate.h"
 #include "gtkwindowprivate.h"
 
diff --git a/gtk/a11y/gtkwindowaccessibleprivate.h b/gtk/a11y/gtkwindowaccessibleprivate.h
new file mode 100644
index 0000000000..ba2fbfb9e8
--- /dev/null
+++ b/gtk/a11y/gtkwindowaccessibleprivate.h
@@ -0,0 +1,30 @@
+/* GTK+ - accessibility implementations
+ * Copyright (C) 2018  Benjamin Otte <otte@gnome.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GTK_WINDOW_ACCESSIBLE_PRIVATE_H__
+#define __GTK_WINDOW_ACCESSIBLE_PRIVATE_H__
+
+#include <gtk/a11y/gtkwindowaccessible.h>
+
+G_BEGIN_DECLS
+
+void            _gtk_window_accessible_set_is_active    (GtkWindow              *window,
+                                                         gboolean                is_active);
+
+G_END_DECLS
+
+#endif /* __GTK_WINDOW_ACCESSIBLE_PRIVATE_H__ */
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index fbc782da06..4d8b284283 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -67,7 +67,7 @@
 #include "gtkwidgetprivate.h"
 #include "gtkwindowgroup.h"
 
-#include "a11y/gtkwindowaccessible.h"
+#include "a11y/gtkwindowaccessibleprivate.h"
 #include "a11y/gtkcontaineraccessibleprivate.h"
 #include "inspector/init.h"
 #include "inspector/window.h"