[pango/fontset-cosmetics: 1/2] Drop pango-fontset-private.h

[Matthias Clasen <matthiasc src gnome org>]

commit f06559ee47341d462bd5f1d8a3fa1ecd2babde9c
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Dec 24 00:14:00 2021 -0500

    Drop pango-fontset-private.h
    
    This was just an empty header.

 pango/itemize.c                 |  2 +-
 pango/pango-context.c           |  2 +-
 pango/pango-fontmap.c           |  2 +-
 pango/pango-fontset-private.h   | 35 -----------------------------------
 pango/pango-fontset.c           |  2 +-
 pango/pangocoretext-fontmap.c   |  1 +
 pango/pangocoretext-private.h   |  1 -
 pango/pangofc-fontmap-private.h |  4 ++--
 pango/pangowin32-private.h      |  2 +-
 9 files changed, 8 insertions(+), 43 deletions(-)
---
diff --git a/pango/itemize.c b/pango/itemize.c
index 6380c12f..9aa0c29c 100644
--- a/pango/itemize.c
+++ b/pango/itemize.c
@@ -27,7 +27,7 @@
 #include "pango-impl-utils.h"
 
 #include "pango-font-private.h"
-#include "pango-fontset-private.h"
+#include "pango-fontset.h"
 #include "pango-fontmap-private.h"
 #include "pango-script-private.h"
 #include "pango-emoji-private.h"
diff --git a/pango/pango-context.c b/pango/pango-context.c
index d0166d94..d5e73cfe 100644
--- a/pango/pango-context.c
+++ b/pango/pango-context.c
@@ -29,7 +29,7 @@
 
 #include "pango-font-private.h"
 #include "pango-item-private.h"
-#include "pango-fontset-private.h"
+#include "pango-fontset.h"
 #include "pango-fontmap-private.h"
 #include "pango-script-private.h"
 #include "pango-emoji-private.h"
diff --git a/pango/pango-fontmap.c b/pango/pango-fontmap.c
index 525dd923..7321d975 100644
--- a/pango/pango-fontmap.c
+++ b/pango/pango-fontmap.c
@@ -24,7 +24,7 @@
 #include <gio/gio.h>
 
 #include "pango-fontmap-private.h"
-#include "pango-fontset-private.h"
+#include "pango-fontset-simple.h"
 #include "pango-impl-utils.h"
 #include <stdlib.h>
 
diff --git a/pango/pango-fontset.c b/pango/pango-fontset.c
index 43dccd3a..fc9e05b8 100644
--- a/pango/pango-fontset.c
+++ b/pango/pango-fontset.c
@@ -27,7 +27,7 @@
 
 #include "pango-types.h"
 #include "pango-font-private.h"
-#include "pango-fontset-private.h"
+#include "pango-fontset.h"
 #include "pango-impl-utils.h"
 
 static PangoFontMetrics *pango_fontset_real_get_metrics (PangoFontset *fontset);
diff --git a/pango/pangocoretext-fontmap.c b/pango/pangocoretext-fontmap.c
index 6a68003e..3bf78e9a 100644
--- a/pango/pangocoretext-fontmap.c
+++ b/pango/pangocoretext-fontmap.c
@@ -24,6 +24,7 @@
 #include "config.h"
 
 #include "pango-fontmap.h"
+#include "pango-fontset.h"
 #include "pangocoretext-private.h"
 #include "pango-impl-utils.h"
 
diff --git a/pango/pangocoretext-private.h b/pango/pangocoretext-private.h
index fffb8a65..88187df4 100644
--- a/pango/pangocoretext-private.h
+++ b/pango/pangocoretext-private.h
@@ -27,7 +27,6 @@
 #include "pangocoretext.h"
 #include "pango-font-private.h"
 #include "pango-fontmap-private.h"
-#include "pango-fontset-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/pango/pangofc-fontmap-private.h b/pango/pangofc-fontmap-private.h
index e081147d..68daea6c 100644
--- a/pango/pangofc-fontmap-private.h
+++ b/pango/pangofc-fontmap-private.h
@@ -25,8 +25,8 @@
 #include <pango/pangofc-fontmap.h>
 #include <pango/pangofc-decoder.h>
 #include <pango/pangofc-font-private.h>
-#include <pango/pango-fontmap-private.h>
-#include <pango/pango-fontset-private.h>
+#include <pango/pango-fontmap.h>
+#include <pango/pango-fontset.h>
 
 #include <fontconfig/fontconfig.h>
 
diff --git a/pango/pangowin32-private.h b/pango/pangowin32-private.h
index 3884c776..9102662a 100644
--- a/pango/pangowin32-private.h
+++ b/pango/pangowin32-private.h
@@ -54,7 +54,7 @@
 
 #include "pangowin32.h"
 #include "pango-font-private.h"
-#include "pango-fontset-private.h"
+#include "pango-fontset.h"
 #include "pango-fontmap-private.h"
 
 #define PANGO_TYPE_WIN32_FONT_MAP             (_pango_win32_font_map_get_type ())