Also clean up includes

diff --git a/glib/gconvert.c b/glib/gconvert.c
index 21e8c1f..2925173 100644 (file)
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -43,6 +43,7 @@
 
 #include "gconvert.h"
 
+#include "gcharset.h"
 #include "gprintfint.h"
 #include "gslist.h"
 #include "gstrfuncs.h"

diff --git a/glib/gmessages.c b/glib/gmessages.c
index f0c836e..b0c1cad 100644 (file)
--- a/glib/gmessages.c
+++ b/glib/gmessages.c
@@ -60,9 +60,10 @@
 #include <errno.h>
 
 #include "gmessages.h"
-#include "glib-init.h"
 
+#include "glib-init.h"
 #include "gbacktrace.h"
+#include "gcharset.h"
 #include "gconvert.h"
 #include "gmem.h"
 #include "gprintfint.h"

diff --git a/glib/gunicode.h b/glib/gunicode.h
index 2090bff..71ebbba 100644 (file)
--- a/glib/gunicode.h
+++ b/glib/gunicode.h
@@ -489,9 +489,6 @@ typedef enum
 guint32        g_unicode_script_to_iso15924   (GUnicodeScript script);
 GUnicodeScript g_unicode_script_from_iso15924 (guint32        iso15924);
 
-gboolean g_get_charset (const char **charset);
-gchar *  g_get_codeset (void);
-
 /* These are all analogs of the <ctype.h> functions.
  */
 gboolean g_unichar_isalnum   (gunichar c) G_GNUC_CONST;

diff --git a/glib/gutils.h b/glib/gutils.h
index 103584d..18f6b41 100644 (file)
--- a/glib/gutils.h
+++ b/glib/gutils.h
@@ -155,10 +155,6 @@ const gchar * const * g_get_system_config_dirs (void);
 
 const gchar * g_get_user_runtime_dir (void);
 
-const gchar * const * g_get_language_names (void);
-
-gchar **g_get_locale_variants (const gchar *locale);
-
 /**
  * GUserDirectory:
  * @G_USER_DIRECTORY_DESKTOP: the user's Desktop directory