diff --git a/gobject/gatomicarray.c b/gobject/gatomicarray.c
index d621e945f..77966f2eb 100644
--- a/gobject/gatomicarray.c
+++ b/gobject/gatomicarray.c
@@ -19,10 +19,10 @@
 
 #include "config.h"
 
-#include "gatomicarray.h"
-
 #include <string.h>
 
+#include "gatomicarray.h"
+
 /* A GAtomicArray is a growable, mutable array of data
  * generally of the form of a header of a specific size and
  * then a array of items of a fixed size.
diff --git a/gobject/gclosure.c b/gobject/gclosure.c
index 14647e831..dd3fae60b 100644
--- a/gobject/gclosure.c
+++ b/gobject/gclosure.c
@@ -34,7 +34,7 @@
 #include "genums.h"
 #include "gvalue.h"
 #include "gvaluetypes.h"
-#include  "gtype-private.h"
+#include "gtype-private.h"
 
 
 /**
diff --git a/gobject/glib-genmarshal.c b/gobject/glib-genmarshal.c
index 24b95ff44..c6083ed8e 100644
--- a/gobject/glib-genmarshal.c
+++ b/gobject/glib-genmarshal.c
@@ -28,6 +28,11 @@
 #endif
 #include <sys/types.h>
 #include <sys/stat.h>
+
+#ifdef G_OS_WIN32
+#include <io.h>
+#endif
+
 #include <glib/gstdio.h>
 
 #undef G_LOG_DOMAIN
@@ -35,10 +40,6 @@
 #include <glib.h>
 #include <glib/gprintf.h>
 
-#ifdef G_OS_WIN32
-#include <io.h>
-#endif
-
 /* --- defines --- */
 #define	PRG_NAME	"glib-genmarshal"
 #define	PKG_NAME	"GLib"
diff --git a/gobject/gtype.c b/gobject/gtype.c
index 6fc5d464b..6df810c14 100644
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@@ -33,7 +33,7 @@
 #include "gatomicarray.h"
 #include "gobject_trace.h"
 
-#include "../glib/gconstructor.h"
+#include "gconstructor.h"
 
 
 /**