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-private.h b/pango/pango-fontset-private.h
deleted file mode 100644
index 717af7d2..00000000
--- a/pango/pango-fontset-private.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Pango
- * pango-fontset.h: Font set handling
- *
- * Copyright (C) 2001 Red Hat Software
- *
- * 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, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __PANGO_FONTSET_PRIVATE_H__
-#define __PANGO_FONTSET_PRIVATE_H__
-
-#include <pango/pango-types.h>
-#include <pango/pango-fontset.h>
-#include <pango/pango-coverage.h>
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-G_END_DECLS
-
-#endif /* __PANGO_FONTSET_PRIVATE_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 ())