When including 'wine/port.h', include it first.
Remove redundant 'config.h' includes.
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"
