Improvde #include order consistency

This was mostly fixed already, just re-fix a few details here.
https://bugzilla.gnome.org/show_bug.cgi?id=71704

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"