When including 'wine/port.h', include it first.
Remove redundant 'config.h' includes.
diff --git a/controls/menu.c b/controls/menu.c
index f15adea..50abd2e 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -12,6 +12,8 @@
* This is probably not the meaning this style has in MS-Windows.
*/
+#include "wine/port.h"
+
#include <assert.h>
#include <ctype.h>
#include <stdlib.h>
@@ -23,7 +25,6 @@
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "wine/unicode.h"
-#include "wine/port.h"
#include "win.h"
#include "controls.h"
#include "nonclient.h"
diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c
index 59a2536..7bf6582 100644
--- a/dlls/dplayx/dplay.c
+++ b/dlls/dplayx/dplay.c
@@ -6,8 +6,10 @@
*
*/
-#include <string.h>
#include "wine/port.h"
+
+#include <string.h>
+
#include "windef.h"
#include "winerror.h"
#include "winbase.h"
diff --git a/dlls/kernel/comm.c b/dlls/kernel/comm.c
index 3c9f23f..3a98e24 100644
--- a/dlls/kernel/comm.c
+++ b/dlls/kernel/comm.c
@@ -32,7 +32,6 @@
*
*/
-#include "config.h"
#include "wine/port.h"
#include <stdlib.h>
diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index e8ae92f..83a8287 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -9,6 +9,8 @@
*
*/
+#include "wine/port.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -16,7 +18,6 @@
#include "winbase.h"
#include "debugtools.h"
-#include "wine/port.h"
#include "sql.h"
#include "sqltypes.h"
diff --git a/dlls/winsock/async.c b/dlls/winsock/async.c
index 062bacc..75dea38 100644
--- a/dlls/winsock/async.c
+++ b/dlls/winsock/async.c
@@ -19,7 +19,7 @@
* whole stuff did not work anyway to other changes).
*/
-#include "config.h"
+#include "wine/port.h"
#include <string.h>
#include <sys/types.h>
@@ -85,7 +85,6 @@
#include "ws2spi.h"
#include "wine/winsock16.h"
#include "winnt.h"
-#include "wine/port.h"
#include "debugtools.h"
diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c
index 7b41bae..ffe31c3 100644
--- a/dlls/winsock/socket.c
+++ b/dlls/winsock/socket.c
@@ -15,7 +15,7 @@
* ws_XXXXent32 (winsock2.h) and 1-byte forced ws_XXXXent16 (winsock16.h).
*/
-#include "config.h"
+#include "wine/port.h"
#include <stdio.h>
#include <string.h>
@@ -95,7 +95,6 @@
#include "wine/winsock16.h"
#include "winnt.h"
#include "heap.h"
-#include "wine/port.h"
#include "services.h"
#include "wine/server.h"
#include "file.h"
diff --git a/files/drive.c b/files/drive.c
index 401af13..9a8882e 100644
--- a/files/drive.c
+++ b/files/drive.c
@@ -10,7 +10,7 @@
*
*/
-#include "config.h"
+#include "wine/port.h"
#include <assert.h>
#include <ctype.h>
@@ -48,7 +48,6 @@
#include "heap.h"
#include "msdos.h"
#include "options.h"
-#include "wine/port.h"
#include "task.h"
#include "debugtools.h"
#include "wine/server.h"
diff --git a/library/port.c b/library/port.c
index d2c2c1b..d20e321 100644
--- a/library/port.c
+++ b/library/port.c
@@ -4,7 +4,6 @@
* Copyright 1996 Alexandre Julliard
*/
-#include "config.h"
#include "wine/port.h"
#ifdef __BEOS__
diff --git a/loader/elf.c b/loader/elf.c
index aa864ac..c93d418 100644
--- a/loader/elf.c
+++ b/loader/elf.c
@@ -9,7 +9,7 @@
* IDEA(s): could be used to split up shell32,comctl32...
*/
-#include "config.h"
+#include "wine/port.h"
#include <assert.h>
#include <stdio.h>
@@ -21,7 +21,6 @@
#include "module.h"
#include "debugtools.h"
#include "winerror.h"
-#include "wine/port.h"
DEFAULT_DEBUG_CHANNEL(win32);
diff --git a/loader/ne/module.c b/loader/ne/module.c
index 649d449..fc8b5b9 100644
--- a/loader/ne/module.c
+++ b/loader/ne/module.c
@@ -4,13 +4,15 @@
* Copyright 1995 Alexandre Julliard
*/
+#include "wine/port.h"
+
#include <assert.h>
#include <fcntl.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <ctype.h>
-#include "wine/port.h"
+
#include "wine/winbase16.h"
#include "wine/library.h"
#include "winerror.h"
diff --git a/loader/ne/resource.c b/loader/ne/resource.c
index 710b063..fdebb0d 100644
--- a/loader/ne/resource.c
+++ b/loader/ne/resource.c
@@ -6,14 +6,16 @@
* Copyright 1997 Alex Korobka
*/
+#include "wine/port.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <fcntl.h>
#include <unistd.h>
+
#include "windef.h"
-#include "wine/port.h"
#include "wine/winbase16.h"
#include "wine/library.h"
#include "module.h"
diff --git a/memory/global.c b/memory/global.c
index 8a4ef73..d2f54cb 100644
--- a/memory/global.c
+++ b/memory/global.c
@@ -5,6 +5,8 @@
*/
/* 0xffff sometimes seems to mean: CURRENT_DS */
+#include "wine/port.h"
+
#include <sys/types.h>
#include <stdlib.h>
#include <time.h>
@@ -14,7 +16,6 @@
#include "wine/winbase16.h"
#include "wine/exception.h"
-#include "wine/port.h"
#include "global.h"
#include "toolhelp.h"
#include "selectors.h"
diff --git a/memory/virtual.c b/memory/virtual.c
index 8ec2b70..6fe46e9 100644
--- a/memory/virtual.c
+++ b/memory/virtual.c
@@ -4,7 +4,7 @@
* Copyright 1997 Alexandre Julliard
*/
-#include "config.h"
+#include "wine/port.h"
#include <assert.h>
#include <errno.h>
@@ -25,7 +25,6 @@
#include "wine/exception.h"
#include "wine/unicode.h"
#include "wine/library.h"
-#include "wine/port.h"
#include "winerror.h"
#include "file.h"
#include "global.h"
diff --git a/misc/cpu.c b/misc/cpu.c
index 9cd9f0f..ac1074e 100644
--- a/misc/cpu.c
+++ b/misc/cpu.c
@@ -5,11 +5,12 @@
* Copyright 1997-1998 Marcus Meissner
*/
+#include "wine/port.h"
+
#include <ctype.h>
#include <string.h>
#include <stdio.h>
-#include "config.h"
-#include "wine/port.h"
+
#include "winbase.h"
#include "winreg.h"
#include "winnt.h"
diff --git a/msdos/dosmem.c b/msdos/dosmem.c
index ec0ce12..0bf62ee 100644
--- a/msdos/dosmem.c
+++ b/msdos/dosmem.c
@@ -5,7 +5,7 @@
* Copyright 1996 Marcus Meissner
*/
-#include "config.h"
+#include "wine/port.h"
#include <signal.h>
#include <stdlib.h>
@@ -17,7 +17,6 @@
#include "winbase.h"
#include "wine/winbase16.h"
-#include "wine/port.h"
#include "global.h"
#include "selectors.h"
diff --git a/msdos/dpmi.c b/msdos/dpmi.c
index 7e74cea..11b9bff 100644
--- a/msdos/dpmi.c
+++ b/msdos/dpmi.c
@@ -4,13 +4,13 @@
* Copyright 1995 Alexandre Julliard
*/
+#include "wine/port.h"
+
#include <unistd.h>
#include <string.h>
-#include "config.h"
#include "windef.h"
#include "wine/winbase16.h"
-#include "wine/port.h"
#include "builtin16.h"
#include "miscemu.h"
#include "msdos.h"
diff --git a/scheduler/client.c b/scheduler/client.c
index cda568d..f467948 100644
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -4,7 +4,7 @@
* Copyright (C) 1998 Alexandre Julliard
*/
-#include "config.h"
+#include "wine/port.h"
#include <assert.h>
#include <ctype.h>
@@ -30,7 +30,6 @@
#include <unistd.h>
#include <stdarg.h>
-#include "wine/port.h"
#include "thread.h"
#include "wine/server.h"
#include "winerror.h"
diff --git a/scheduler/sysdeps.c b/scheduler/sysdeps.c
index 9073cf7..b931e77 100644
--- a/scheduler/sysdeps.c
+++ b/scheduler/sysdeps.c
@@ -4,7 +4,7 @@
* Copyright 1998 Alexandre Julliard
*/
-#include "config.h"
+#include "wine/port.h"
#include <signal.h>
#include <stdio.h>
@@ -20,7 +20,6 @@
#ifdef HAVE_UCONTEXT_H
# include <ucontext.h>
#endif
-#include "wine/port.h"
#include "thread.h"
#include "wine/server.h"
#include "winbase.h"
diff --git a/scheduler/thread.c b/scheduler/thread.c
index 0a413ec..b3ce6f3 100644
--- a/scheduler/thread.c
+++ b/scheduler/thread.c
@@ -4,7 +4,7 @@
* Copyright 1996 Alexandre Julliard
*/
-#include "config.h"
+#include "wine/port.h"
#include <assert.h>
#include <fcntl.h>
@@ -14,7 +14,6 @@
#endif
#include <unistd.h>
#include "wine/winbase16.h"
-#include "wine/port.h"
#include "thread.h"
#include "task.h"
#include "module.h"
diff --git a/server/request.c b/server/request.c
index 6a5cca9..1867ddf 100644
--- a/server/request.c
+++ b/server/request.c
@@ -4,7 +4,7 @@
* Copyright (C) 1998 Alexandre Julliard
*/
-#include "config.h"
+#include "wine/port.h"
#include <assert.h>
#include <errno.h>
@@ -32,7 +32,6 @@
#include "process.h"
#define WANT_REQUEST_HANDLERS
#include "request.h"
-#include "wine/port.h"
/* Some versions of glibc don't define this */
#ifndef SCM_RIGHTS
diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c
index 214941e..12807fb 100644
--- a/tools/winebuild/spec16.c
+++ b/tools/winebuild/spec16.c
@@ -8,11 +8,11 @@
* Copyright 1999 Ulrich Weigand
*/
+#include "wine/port.h"
+
#include <assert.h>
#include <ctype.h>
-#include "config.h"
-#include "wine/port.h"
#include "wine/exception.h"
#include "builtin16.h"
#include "module.h"
diff --git a/win32/device.c b/win32/device.c
index 0ecaeb3..d95d279 100644
--- a/win32/device.c
+++ b/win32/device.c
@@ -7,7 +7,7 @@
*
*/
-#include "config.h"
+#include "wine/port.h"
#include <stdlib.h>
#include <unistd.h>
@@ -15,7 +15,7 @@
#include <string.h>
#include <stdarg.h>
#include <time.h>
-#include "wine/port.h"
+
#include "windef.h"
#include "winbase.h"
#include "winreg.h"
diff --git a/windows/class.c b/windows/class.c
index 0f01e71..1ec7797 100644
--- a/windows/class.c
+++ b/windows/class.c
@@ -12,15 +12,17 @@
* classes are getting registered with wrong hInstance.
*/
+#include "wine/port.h"
+
#include <stdlib.h>
#include <string.h>
+
#include "wine/winbase16.h"
#include "winerror.h"
#include "windef.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "wine/unicode.h"
-#include "wine/port.h"
#include "heap.h"
#include "win.h"
#include "user.h"
diff --git a/windows/dialog.c b/windows/dialog.c
index 3d30a76..76551ee 100644
--- a/windows/dialog.c
+++ b/windows/dialog.c
@@ -4,6 +4,8 @@
* Copyright 1993, 1994, 1996 Alexandre Julliard
*/
+#include "wine/port.h"
+
#include <ctype.h>
#include <errno.h>
#include <limits.h>
@@ -20,7 +22,6 @@
#include "wine/winuser16.h"
#include "wine/winbase16.h"
#include "wine/unicode.h"
-#include "wine/port.h"
#include "controls.h"
#include "heap.h"
#include "win.h"
