[pango/pango2] Avoid gio in Pango headers

[Matthias Clasen <matthiasc src gnome org>]

commit d04afafff8c1b62c98bce92c3f983b5bc89b3234
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Jun 23 13:11:20 2022 -0400

    Avoid gio in Pango headers
    
    We had a leftover include in pango-font-family.h.
    It is not needed, so drop it and instead include
    gio where we use its api.

 pango/pango-context.c     | 2 ++
 pango/pango-font-family.c | 2 ++
 pango/pango-font-family.h | 1 -
 tests/test-common.c       | 1 +
 tests/test-harfbuzz.c     | 1 +
 tests/test-itemize.c      | 1 +
 utils/pango-list.c        | 1 +
 7 files changed, 8 insertions(+), 1 deletion(-)
---
diff --git a/pango/pango-context.c b/pango/pango-context.c
index 2c9266908..915dd032c 100644
--- a/pango/pango-context.c
+++ b/pango/pango-context.c
@@ -23,6 +23,8 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include <gio/gio.h>
+
 #include "pango-context.h"
 #include "pango-context-private.h"
 #include "pango-impl-utils.h"
diff --git a/pango/pango-font-family.c b/pango/pango-font-family.c
index 5c0de724c..0d745d9f1 100644
--- a/pango/pango-font-family.c
+++ b/pango/pango-font-family.c
@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include <gio/gio.h>
+
 #include "pango-font-family-private.h"
 #include "pango-font-face.h"
 #include "pango-font.h"
diff --git a/pango/pango-font-family.h b/pango/pango-font-family.h
index be14ebe95..2056d7a25 100644
--- a/pango/pango-font-family.h
+++ b/pango/pango-font-family.h
@@ -22,7 +22,6 @@
 #include <pango/pango-types.h>
 
 #include <glib-object.h>
-#include <gio/gio.h>
 
 G_BEGIN_DECLS
 
diff --git a/tests/test-common.c b/tests/test-common.c
index 33047c7e9..d3afe0329 100644
--- a/tests/test-common.c
+++ b/tests/test-common.c
@@ -20,6 +20,7 @@
  */
 
 #include <glib.h>
+#include <gio/gio.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/tests/test-harfbuzz.c b/tests/test-harfbuzz.c
index 8c9d27ed4..1e6c23a15 100644
--- a/tests/test-harfbuzz.c
+++ b/tests/test-harfbuzz.c
@@ -20,6 +20,7 @@
  */
 
 #include <pango/pango.h>
+#include <gio/gio.h>
 #include "test-common.h"
 
 /* Some basic checks that the hb_font_t returned
diff --git a/tests/test-itemize.c b/tests/test-itemize.c
index 3d04a8970..3276f5fc9 100644
--- a/tests/test-itemize.c
+++ b/tests/test-itemize.c
@@ -20,6 +20,7 @@
  */
 
 #include <glib.h>
+#include <gio/gio.h>
 #include <string.h>
 #include <locale.h>
 
diff --git a/utils/pango-list.c b/utils/pango-list.c
index 31fc6d2c0..b8ad17939 100644
--- a/utils/pango-list.c
+++ b/utils/pango-list.c
@@ -25,6 +25,7 @@
 #include <pango/pango-hbface-private.h>
 #include <hb-ot.h>
 #include <glib/gstdio.h>
+#include <gio/gio.h>
 #include <stdlib.h>
 #include <locale.h>