When including config.h, include it first.

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);

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"

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

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()
 {

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"

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"

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"

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"

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"

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"

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);
 

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"

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

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"
 

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

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"
 

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"
 

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"
 

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"

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"

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"

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"

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"

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"

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