don't #include <glib.h> from other public headers

fix up some problems that were hidden by that

glib/glib.symbols

@@ -1259,8 +1259,6 @@ g_string_vprintf
  /* these are not internal, but we don't want to alias them */
 g_string_append_c
 #endif
-g_str_equal
-g_str_hash
 #endif
 #endif
 
@@ -1532,6 +1530,10 @@ g_double_hash
 g_direct_equal G_GNUC_CONST
 g_direct_hash G_GNUC_CONST
 #endif
+#if IN_FILE(__G_STRING_C__)
+g_str_equal
+g_str_hash
+#endif
 #endif
 
 #if IN_HEADER(__G_UTILS_H__)

glib/gtestutils.c

@@ -19,6 +19,7 @@
  */
 #include "config.h"
 #include "gtestutils.h"
+#include <glib.h>
 #include "galias.h"
 #include <sys/types.h>
 #ifdef G_OS_UNIX

glib/gtestutils.h

@@ -25,7 +25,11 @@
 #ifndef __G_TEST_UTILS_H__
 #define __G_TEST_UTILS_H__
 
-#include <glib.h>
+#include <glib/gmessages.h>
+#include <glib/gstring.h>
+#include <glib/gtypes.h>
+#include <glib/gerror.h>
+#include <glib/gslist.h>
 
 G_BEGIN_DECLS
 

glib/gurifuncs.c

@@ -22,6 +22,7 @@
 
 #include "config.h"
 #include "gurifuncs.h"
+#include <glib.h>
 #include "string.h"
 
 #include "galias.h"

glib/gurifuncs.h

@@ -27,7 +27,7 @@
 #ifndef __G_URI_FUNCS_H__
 #define __G_URI_FUNCS_H__
 
-#include <glib.h>
+#include <glib/gtypes.h>
 
 G_BEGIN_DECLS
 

glib/gvarianttype.c

@@ -23,6 +23,7 @@
 #include "gvarianttype.h"
 
 #include <glib/gtestutils.h>
+#include <glib/gstrfuncs.h>
 
 #include <string.h>