diff --git a/console/generic.c b/console/generic.c
index 98cc69e8a9b..6cb0181b5bb 100644
--- a/console/generic.c
+++ b/console/generic.c
@@ -10,10 +10,11 @@
    that driver supports into the driver struct. If it is a supplementary
    driver, it should make sure to preserve the old values. */
 
+#include "config.h"
+
 #include <stdio.h>
 
 #include "console.h"
-#include "config.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(console);
diff --git a/console/interface.c b/console/interface.c
index 54fa41f150a..5d5c03ad74f 100644
--- a/console/interface.c
+++ b/console/interface.c
@@ -6,11 +6,12 @@
    This could be done using a macro, but additional functionality
    may be provided here in the future. */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "config.h"
 #include "windef.h"
 #include "console.h"
 #include "options.h"
diff --git a/console/ncurses.c b/console/ncurses.c
index 5d1edc9a2b7..73600c36da8 100644
--- a/console/ncurses.c
+++ b/console/ncurses.c
@@ -1,8 +1,10 @@
 /* ncurses.c */
 /* Copyright 1999 - Joseph Pranevich */
 
-#include <stdio.h>
 #include "config.h"
+
+#include <stdio.h>
+
 #include "console.h"	/* Must define WINE_NCURSES */
 
 #ifdef WINE_NCURSES
diff --git a/console/tty.c b/console/tty.c
index 2ae49dd35d5..647af5cb9dd 100644
--- a/console/tty.c
+++ b/console/tty.c
@@ -10,9 +10,11 @@
    that driver supports into the driver struct. If it is a supplementary
    driver, it should make sure to perserve the old values. */
 
-#include <stdio.h>
-#include "console.h"
 #include "config.h"
+
+#include <stdio.h>
+
+#include "console.h"
 #include "windef.h"
 void TTY_Start()
 {
diff --git a/dlls/ddraw/d3ddevice/main.c b/dlls/ddraw/d3ddevice/main.c
index aafedcfe554..7ba5530d03a 100644
--- a/dlls/ddraw/d3ddevice/main.c
+++ b/dlls/ddraw/d3ddevice/main.c
@@ -4,8 +4,10 @@
    This files contains all the common stuff for D3D devices.
  */
 
-#include <string.h>
 #include "config.h"
+
+#include <string.h>
+
 #include "windef.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
diff --git a/dlls/ddraw/d3ddevice/mesa.c b/dlls/ddraw/d3ddevice/mesa.c
index a2dd59f8974..02fbb08fbf2 100644
--- a/dlls/ddraw/d3ddevice/mesa.c
+++ b/dlls/ddraw/d3ddevice/mesa.c
@@ -4,8 +4,10 @@
    This files contains the MESA implementation of all the D3D devices that
    Wine supports. */
 
-#include <string.h>
 #include "config.h"
+
+#include <string.h>
+
 #include "windef.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
diff --git a/dlls/ddraw/d3dexecutebuffer.c b/dlls/ddraw/d3dexecutebuffer.c
index aa49cbbcf26..0a3db7e5a24 100644
--- a/dlls/ddraw/d3dexecutebuffer.c
+++ b/dlls/ddraw/d3dexecutebuffer.c
@@ -4,8 +4,10 @@
    This files contains the implementation of Direct3DExecuteBuffer. */
 
 
-#include <string.h>
 #include "config.h"
+
+#include <string.h>
+
 #include "windef.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
diff --git a/dlls/ddraw/d3dtexture.c b/dlls/ddraw/d3dtexture.c
index be68b6c3a78..b1500cfbdd5 100644
--- a/dlls/ddraw/d3dtexture.c
+++ b/dlls/ddraw/d3dtexture.c
@@ -4,8 +4,10 @@
    This files contains the implementation of interface Direct3DTexture2. */
 
 
-#include <string.h>
 #include "config.h"
+
+#include <string.h>
+
 #include "windef.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c
index 247347c929e..90927ad68b2 100644
--- a/dlls/ntdll/exception.c
+++ b/dlls/ntdll/exception.c
@@ -5,10 +5,11 @@
  * Copyright 1999 Alexandre Julliard
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <signal.h>
 
-#include "config.h"
 #include "winnt.h"
 #include "ntddk.h"
 #include "global.h"
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index cbfde96b499..514a47dc12b 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -3,12 +3,13 @@
      Copyright (c) 1999 Lionel Ulmer
 */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 
 #include "wine/exception.h"
 
-#include "config.h"
 #include "debugtools.h"
 #include "gdi.h"
 #include "windef.h"
diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c
index 186d0e4dcc8..a22e59bd390 100644
--- a/dlls/shell32/systray.c
+++ b/dlls/shell32/systray.c
@@ -9,6 +9,8 @@
  *
  */
 
+#include "config.h"
+
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
@@ -19,7 +21,6 @@
 #include "shell32_main.h"
 #include "commctrl.h"
 #include "debugtools.h"
-#include "config.h"
 
 DEFAULT_DEBUG_CHANNEL(shell);
 
diff --git a/dlls/user/exticon.c b/dlls/user/exticon.c
index c9a822755d5..675b813c3b4 100644
--- a/dlls/user/exticon.c
+++ b/dlls/user/exticon.c
@@ -5,11 +5,14 @@
  * this should replace the icon extraction code in shell32 and shell16 once
  * it needs a serious test for compliance with the native API 
  */
+
+#include "config.h"
+
 #include <string.h>
 #include <stdlib.h>	/* abs() */
 #include <sys/types.h>
 #include <unistd.h>
-#include "config.h"
+
 #include "winbase.h"
 #include "windef.h"
 #include "winerror.h"
diff --git a/dlls/wineps/graphics.c b/dlls/wineps/graphics.c
index 3e8ea03283d..289a1cc03ea 100644
--- a/dlls/wineps/graphics.c
+++ b/dlls/wineps/graphics.c
@@ -4,9 +4,11 @@
  *	Copyright 1998  Huw D M Davies
  *
  */
+
+#include "config.h"
+
 #include <string.h>
 #include <math.h>
-#include "config.h"
 #if defined(HAVE_FLOAT_H)
  #include <float.h>
 #endif
diff --git a/graphics/env.c b/graphics/env.c
index d42f5f09c1f..9180248ded8 100644
--- a/graphics/env.c
+++ b/graphics/env.c
@@ -6,9 +6,12 @@
  * Copyright 1997 Marcus Meissner
  * Copyright 1998 Andreas Mohr
  */
+
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
+
 #include "gdi.h"
 #include "debugtools.h"
 
diff --git a/graphics/path.c b/graphics/path.c
index 025f23af522..9841a8ce4fd 100644
--- a/graphics/path.c
+++ b/graphics/path.c
@@ -5,10 +5,11 @@
  *                 1999 Huw D M Davies
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <math.h>
 #include <string.h>
-#include "config.h"
 #if defined(HAVE_FLOAT_H)
 #include <float.h>
 #endif
diff --git a/loader/loadorder.c b/loader/loadorder.c
index 3d09822bc7c..7d6dc13ca94 100644
--- a/loader/loadorder.c
+++ b/loader/loadorder.c
@@ -4,11 +4,12 @@
  * Copyright 1999 Bertho Stultiens
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 
-#include "config.h"
 #include "windef.h"
 #include "winreg.h"
 #include "winerror.h"
diff --git a/loader/pe_resource.c b/loader/pe_resource.c
index 31340f174e4..4fac376e961 100644
--- a/loader/pe_resource.c
+++ b/loader/pe_resource.c
@@ -10,11 +10,11 @@
  * Copyright 1997 Marcus Meissner
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <sys/types.h>
 
-#include "config.h"
-
 #include "wine/unicode.h"
 #include "windef.h"
 #include "winnls.h"
diff --git a/memory/heap.c b/memory/heap.c
index 285ebe2e879..99423309fb3 100644
--- a/memory/heap.c
+++ b/memory/heap.c
@@ -5,11 +5,13 @@
  * Copyright 1998 Ulrich Weigand
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
+
 #include "wine/winbase16.h"
 #include "wine/unicode.h"
 #include "selectors.h"
diff --git a/memory/selector.c b/memory/selector.c
index a014a70312c..c3f9d2a04fc 100644
--- a/memory/selector.c
+++ b/memory/selector.c
@@ -4,9 +4,10 @@
  * Copyright 1995 Alexandre Julliard
  */
 
+#include "config.h"
+
 #include <string.h>
 
-#include "config.h"
 #include "winerror.h"
 #include "wine/winbase16.h"
 #include "miscemu.h"
diff --git a/msdos/int11.c b/msdos/int11.c
index 708a1bade8a..22fe894f7e1 100644
--- a/msdos/int11.c
+++ b/msdos/int11.c
@@ -2,11 +2,12 @@
  * BIOS interrupt 11h handler
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "config.h"
 #include "windef.h"
 #include "miscemu.h"
 #include "msdos.h"
diff --git a/msdos/int16.c b/msdos/int16.c
index feba5d93bf1..6194974d2e7 100644
--- a/msdos/int16.c
+++ b/msdos/int16.c
@@ -2,11 +2,12 @@
  * DOS interrupt 16h handler
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "module.h"
 #include "callback.h"
 #include "dosexe.h"
diff --git a/relay32/relay386.c b/relay32/relay386.c
index 28173723cdd..fc10b694183 100644
--- a/relay32/relay386.c
+++ b/relay32/relay386.c
@@ -5,11 +5,12 @@
  */
 
 
+#include "config.h"
+
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
 
-#include "config.h"
 #include "winnt.h"
 #include "stackframe.h"
 #include "module.h"
diff --git a/scheduler/critsection.c b/scheduler/critsection.c
index 2b63fd6926d..7086a8bd80f 100644
--- a/scheduler/critsection.c
+++ b/scheduler/critsection.c
@@ -4,12 +4,13 @@
  * Copyright 1998 Alexandre Julliard
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
 #include <sys/types.h>
 
-#include "config.h"
 #include "winerror.h"
 #include "winbase.h"
 #include "ntddk.h"
diff --git a/server/mapping.c b/server/mapping.c
index 8dbe2e03de3..f4049f00300 100644
--- a/server/mapping.c
+++ b/server/mapping.c
@@ -4,12 +4,13 @@
  * Copyright (C) 1999 Alexandre Julliard
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "winnt.h"
 #include "winbase.h"
 
diff --git a/server/trace.c b/server/trace.c
index bd4de67ff11..f4ec2d7d7aa 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -4,12 +4,13 @@
  * Copyright (C) 1999 Alexandre Julliard
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/uio.h>
 
-#include "config.h"
 #include "winsock2.h"
 #include "winnt.h"
 #include "winbase.h"
diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c
index 6c497f51b4a..1909134195c 100644
--- a/tools/winebuild/import.c
+++ b/tools/winebuild/import.c
@@ -5,12 +5,13 @@
  *           2000 Eric Pouech
  */
 
+#include "config.h"
+
 #include <fcntl.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
 
-#include "config.h"
 #include "winnt.h"
 #include "build.h"
 
diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c
index b516b270477..e85263ede7d 100644
--- a/tools/winebuild/main.c
+++ b/tools/winebuild/main.c
@@ -8,13 +8,14 @@
  * Copyright 1999 Ulrich Weigand
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
 
-#include "config.h"
 #include "winnt.h"
 #include "build.h"
 
diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c
index a3a9ac37064..14842610ac2 100644
--- a/tools/winebuild/parser.c
+++ b/tools/winebuild/parser.c
@@ -8,6 +8,8 @@
  * Copyright 1999 Ulrich Weigand
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
@@ -15,7 +17,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "winbase.h"
 #include "build.h"
 
diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c
index 2ce0280346c..bb981e95cf6 100644
--- a/tools/winebuild/relay.c
+++ b/tools/winebuild/relay.c
@@ -8,10 +8,11 @@
  * Copyright 1999 Ulrich Weigand
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "winnt.h"
 #include "thread.h"
 #include "stackframe.h"
diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c
index 9dd436b8901..02543c316f6 100644
--- a/tools/winebuild/spec32.c
+++ b/tools/winebuild/spec32.c
@@ -8,12 +8,13 @@
  * Copyright 1999 Ulrich Weigand
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <ctype.h>
 #include <unistd.h>
 #include <string.h>
 
-#include "config.h"
 #include "winbase.h"
 #include "wine/exception.h"
 #include "build.h"
diff --git a/tools/wmc/mcl.c b/tools/wmc/mcl.c
index 65a8c9c71eb..5d640114c26 100644
--- a/tools/wmc/mcl.c
+++ b/tools/wmc/mcl.c
@@ -4,14 +4,15 @@
  * Copyright 2000 Bertho A. Stultiens (BS)
  *
  */
+
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <assert.h>
 #include <string.h>
 
-#include "config.h"
-
 #include "utils.h"
 #include "wmc.h"
 #include "lang.h"
diff --git a/tools/wmc/mcy.y b/tools/wmc/mcy.y
index b9dd71db152..f504bf8d08b 100644
--- a/tools/wmc/mcy.y
+++ b/tools/wmc/mcy.y
@@ -22,12 +22,12 @@
 
 %{
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
 
-#include "config.h"
-
 #include "utils.h"
 #include "wmc.h"
 #include "lang.h"
diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c
index 2750209d47e..28419d158a8 100644
--- a/tools/wmc/wmc.c
+++ b/tools/wmc/wmc.c
@@ -4,13 +4,14 @@
  * Copyright 2000 Bertho A. Stultiens (BS)
  *
  */
+
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
 
-#include "config.h"
-
 #include "wmc.h"
 #include "utils.h"
 #include "lang.h"
diff --git a/windows/winproc.c b/windows/winproc.c
index e4a96cef4ea..755f582169b 100644
--- a/windows/winproc.c
+++ b/windows/winproc.c
@@ -5,9 +5,10 @@
  * Copyright 1996 Alexandre Julliard
  */
 
+#include "config.h"
+
 #include <string.h>
 
-#include "config.h"
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
diff --git a/windows/x11drv/wineclipsrv.c b/windows/x11drv/wineclipsrv.c
index 662c85da771..33032e0b03d 100644
--- a/windows/x11drv/wineclipsrv.c
+++ b/windows/x11drv/wineclipsrv.c
@@ -44,6 +44,8 @@
  * TODO:
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <X11/Xlib.h>
@@ -51,8 +53,6 @@
 #include <X11/Xos.h>
 #include <X11/Xatom.h>
 
-#include "config.h"
-
 /*
  *  Lightweight debug definitions for Wine Clipboard Server.
  *  The standard FIXME, ERR, WARN & TRACE classes are supported