diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
index ba4ecb168..d96121b97 100644
--- a/gio/gdbusprivate.c
+++ b/gio/gdbusprivate.c
@@ -37,6 +37,7 @@
 #include "gasyncresult.h"
 #include "gsimpleasyncresult.h"
 #include "ginputstream.h"
+#include "gmemoryinputstream.h"
 #include "giostream.h"
 #include "gsocketcontrolmessage.h"
 #include "gsocketconnection.h"
diff --git a/glib/gunicollate.c b/glib/gunicollate.c
index ef399a77f..165ecbc25 100644
--- a/glib/gunicollate.c
+++ b/glib/gunicollate.c
@@ -36,6 +36,9 @@
 #include "gstring.h"
 #include "gstrfuncs.h"
 #include "gtestutils.h"
+#ifndef __STDC_ISO_10646__
+#include "gconvert.h"
+#endif
 
 
 #ifdef _MSC_VER
diff --git a/glib/guniprop.c b/glib/guniprop.c
index e74109980..639057434 100644
--- a/glib/guniprop.c
+++ b/glib/guniprop.c
@@ -35,6 +35,9 @@
 #include "gmirroringtable.h"
 #include "gscripttable.h"
 #include "gunicodeprivate.h"
+#ifdef G_OS_WIN32
+#include "gwin32.h"
+#endif
 
 #define ATTR_TABLE(Page) (((Page) <= G_UNICODE_LAST_PAGE_PART1) \
                           ? attr_table_part1[Page] \