diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog
index bc73dcb85..34c162f70 100644
--- a/gmodule/ChangeLog
+++ b/gmodule/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-07  Matthias Clasen <mclasen@redhat.com>
+
+	* *.c: Make header include order consistent (#71704,
+	Diego Escalante Urrelo)
+
 2007-11-07  Matthias Clasen <mclasen@redhat.com>
 
 	* === Released 2.14.3 ===
diff --git a/gmodule/gmodule-ar.c b/gmodule/gmodule-ar.c
index 353a05779..8bc847d98 100644
--- a/gmodule/gmodule-ar.c
+++ b/gmodule/gmodule-ar.c
@@ -24,6 +24,9 @@
 /* because we are compatible with archive format only since AIX 4.3 */
 
 #define __AR_BIG__
+
+#include "config.h"
+
 #include <ar.h>
 #include <stdlib.h>
 
diff --git a/gmodule/gmodule-beos.c b/gmodule/gmodule-beos.c
index 159bc985a..c54eed990 100644
--- a/gmodule/gmodule-beos.c
+++ b/gmodule/gmodule-beos.c
@@ -23,6 +23,7 @@
 /* 
  * MT safe
  */
+#include "config.h"
 
 #include <be/kernel/image.h> /* image (aka DSO) handling functions... */
 
diff --git a/gmodule/gmodule-dl.c b/gmodule/gmodule-dl.c
index ce3377767..035b2a9e7 100644
--- a/gmodule/gmodule-dl.c
+++ b/gmodule/gmodule-dl.c
@@ -27,6 +27,7 @@
 /* 
  * MT safe
  */
+#include "config.h"
 
 #include <dlfcn.h>
 
diff --git a/gmodule/gmodule-dld.c b/gmodule/gmodule-dld.c
index 913ac453b..401b32f73 100644
--- a/gmodule/gmodule-dld.c
+++ b/gmodule/gmodule-dld.c
@@ -27,6 +27,7 @@
 /* 
  * MT safe
  */
+#include "config.h"
 
 #include <dl.h>
 
diff --git a/gmodule/gmodule-dyld.c b/gmodule/gmodule-dyld.c
index 3a96017d1..1896b43bd 100644
--- a/gmodule/gmodule-dyld.c
+++ b/gmodule/gmodule-dyld.c
@@ -19,6 +19,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#include "config.h"
 
 #include <mach-o/dyld.h>
 
diff --git a/gmodule/gmodule-os2.c b/gmodule/gmodule-os2.c
index 4dd0404d7..d074d8c78 100644
--- a/gmodule/gmodule-os2.c
+++ b/gmodule/gmodule-os2.c
@@ -27,6 +27,7 @@
 /* 
  * MT safe
  */
+#include "config.h"
 
 #include <dlfcn.h>
 
diff --git a/gmodule/gmodule-win32.c b/gmodule/gmodule-win32.c
index 3e8fe02fe..7dba30e1c 100644
--- a/gmodule/gmodule-win32.c
+++ b/gmodule/gmodule-win32.c
@@ -30,6 +30,7 @@
 /* 
  * MT safe
  */
+#include "config.h"
 
 #include <stdio.h>
 #include <windows.h>
diff --git a/gmodule/gmodule.c b/gmodule/gmodule.c
index 0bc6a68fb..063bd3197 100644
--- a/gmodule/gmodule.c
+++ b/gmodule/gmodule.c
@@ -28,10 +28,7 @@
  * MT safe
  */
 
-#include <config.h>
-#include "gmoduleconf.h"
-#include "gstdio.h"
-#include "gmodule.h"
+#include "config.h"
 
 #include <errno.h>
 #include <string.h>
@@ -45,6 +42,9 @@
 #include <io.h>		/* For open() and close() prototypes. */
 #endif
 
+#include "gmoduleconf.h"
+#include "gstdio.h"
+#include "gmodule.h"
 
 /* We maintain a list of modules, so we can reference count them.
  * That's needed because some platforms don't support refernce counts on