[glib: 1/5] Revert "Fix build error when compiling with mingw"

[Xavier Claessens <xclaesse src gnome org>]

commit 2d4b05bbf81680c00256a0cad0282667c56ebb95
Author: Xavier Claessens <xavier claessens collabora com>
Date:   Sat May 26 08:09:26 2018 -0400

    Revert "Fix build error when compiling with mingw"
    
    This reverts commit 00178f8c8e864d7efa7670720d25d4f3759da105.

 gobject/gclosure.c | 2 +-
 gobject/gtype.c    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/gobject/gclosure.c b/gobject/gclosure.c
index 31aa50fb1..b42af60bb 100644
--- a/gobject/gclosure.c
+++ b/gobject/gclosure.c
@@ -22,6 +22,7 @@
 
 #include "config.h"
 
+#include "../glib/valgrind.h"
 #include <string.h>
 
 #include <ffi.h>
@@ -34,7 +35,6 @@
 #include "gvaluetypes.h"
 #include "gtype-private.h"
 
-#include "../glib/valgrind.h"
 
 /**
  * SECTION:gclosure
diff --git a/gobject/gtype.c b/gobject/gtype.c
index faf8e38f7..275a8b60b 100644
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@@ -21,6 +21,7 @@
 
 #include "config.h"
 
+#include "../glib/valgrind.h"
 #include <string.h>
 
 #include "gtype.h"
@@ -37,8 +38,6 @@
 #include <windows.h>
 #endif
 
-#include "../glib/valgrind.h"
-
 #ifdef G_ENABLE_DEBUG
 #define        IF_DEBUG(debug_type)    if (_g_type_debug_flags & G_TYPE_DEBUG_ ## debug_type)
 #endif