diff --git a/server/atom.c b/server/atom.c
index 8d0ffbb05f3..ff0799f5880 100644
--- a/server/atom.c
+++ b/server/atom.c
@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/server/change.c b/server/change.c
index 5edeebf89d3..4fdb0394922 100644
--- a/server/change.c
+++ b/server/change.c
@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <fcntl.h>
@@ -32,6 +31,7 @@
 #include <limits.h>
 #include <dirent.h>
 #include <errno.h>
+#include <unistd.h>
 #ifdef HAVE_POLL_H
 # include <poll.h>
 #endif
diff --git a/server/class.c b/server/class.c
index 92cbfa2d7e3..e1e180bd97c 100644
--- a/server/class.c
+++ b/server/class.c
@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/server/clipboard.c b/server/clipboard.c
index eb9bd4f7020..8118a467dd8 100644
--- a/server/clipboard.c
+++ b/server/clipboard.c
@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/server/completion.c b/server/completion.c
index eb0d256ad09..6933195e72d 100644
--- a/server/completion.c
+++ b/server/completion.c
@@ -27,7 +27,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/server/console.c b/server/console.c
index 3a5b1270116..977c428cf9f 100644
--- a/server/console.c
+++ b/server/console.c
@@ -22,7 +22,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/server/debugger.c b/server/debugger.c
index ca84a88258f..48adb244b09 100644
--- a/server/debugger.c
+++ b/server/debugger.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <signal.h>
diff --git a/server/device.c b/server/device.c
index f61f24ea4ea..d6288920bf4 100644
--- a/server/device.c
+++ b/server/device.c
@@ -19,8 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
-#include "wine/rbtree.h"
 
 #include <assert.h>
 #include <fcntl.h>
@@ -33,6 +31,7 @@
 #include "windef.h"
 #include "winternl.h"
 #include "ddk/wdm.h"
+#include "wine/rbtree.h"
 
 #include "object.h"
 #include "file.h"
diff --git a/server/directory.c b/server/directory.c
index ec8187b425a..70a34d3f1bb 100644
--- a/server/directory.c
+++ b/server/directory.c
@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <stdarg.h>
diff --git a/server/event.c b/server/event.c
index ccdd465dd5b..c7424dfe8ff 100644
--- a/server/event.c
+++ b/server/event.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/server/fd.c b/server/fd.c
index ad1b7a1bd4a..37e2eddeaba 100644
--- a/server/fd.c
+++ b/server/fd.c
@@ -20,7 +20,6 @@
 
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <dirent.h>
diff --git a/server/file.c b/server/file.c
index 08b0b59beb0..7cf6f3c0472 100644
--- a/server/file.c
+++ b/server/file.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <fcntl.h>
diff --git a/server/handle.c b/server/handle.c
index 15da701ee99..6a5416bcb84 100644
--- a/server/handle.c
+++ b/server/handle.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <limits.h>
diff --git a/server/hook.c b/server/hook.c
index c048908c295..5abdf39ad37 100644
--- a/server/hook.c
+++ b/server/hook.c
@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <stdarg.h>
diff --git a/server/mach.c b/server/mach.c
index 20bc3878560..77f1fdcdb86 100644
--- a/server/mach.c
+++ b/server/mach.c
@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <errno.h>
diff --git a/server/mailslot.c b/server/mailslot.c
index 1f4cb87d0fc..4048461a58f 100644
--- a/server/mailslot.c
+++ b/server/mailslot.c
@@ -21,9 +21,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
 
 #include <assert.h>
 #include <fcntl.h>
@@ -33,7 +30,7 @@
 #include <stdlib.h>
 #include <sys/time.h>
 #include <sys/types.h>
-
+#include <unistd.h>
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
@@ -43,6 +40,9 @@
 #ifdef HAVE_SYS_FILIO_H
 #include <sys/filio.h>
 #endif
+
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winternl.h"
 
diff --git a/server/mapping.c b/server/mapping.c
index 8a53c2d89d3..93dae94b7c4 100644
--- a/server/mapping.c
+++ b/server/mapping.c
@@ -19,12 +19,13 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
+#include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/types.h>
 #include <sys/stat.h>
 #ifdef HAVE_SYS_MMAN_H
 # include <sys/mman.h>
diff --git a/server/mutex.c b/server/mutex.c
index 75ff5117d3f..906e1c060e9 100644
--- a/server/mutex.c
+++ b/server/mutex.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/server/named_pipe.c b/server/named_pipe.c
index f964ae19637..6964ab1b2ee 100644
--- a/server/named_pipe.c
+++ b/server/named_pipe.c
@@ -21,7 +21,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/server/object.c b/server/object.c
index b2779fd61fe..e438a6d41ba 100644
--- a/server/object.c
+++ b/server/object.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <limits.h>
diff --git a/server/process.c b/server/process.c
index 8109fbe8de4..d8d09698558 100644
--- a/server/process.c
+++ b/server/process.c
@@ -19,16 +19,17 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <limits.h>
 #include <signal.h>
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/types.h>
 #include <sys/time.h>
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
diff --git a/server/ptrace.c b/server/ptrace.c
index b2d23d89aaf..bcd0fe48f16 100644
--- a/server/ptrace.c
+++ b/server/ptrace.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <errno.h>
diff --git a/server/queue.c b/server/queue.c
index e4903bcb79f..f38c7e9fb17 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -19,12 +19,12 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 #ifdef HAVE_POLL_H
 # include <poll.h>
 #endif
diff --git a/server/registry.c b/server/registry.c
index 427da8a5883..4ba5c86ae58 100644
--- a/server/registry.c
+++ b/server/registry.c
@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <ctype.h>
diff --git a/server/request.c b/server/request.c
index 29b63600f15..4733cef6511 100644
--- a/server/request.c
+++ b/server/request.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <errno.h>
diff --git a/server/semaphore.c b/server/semaphore.c
index 543d5883ec8..6a8b871940f 100644
--- a/server/semaphore.c
+++ b/server/semaphore.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/server/serial.c b/server/serial.c
index bdc27de8e4f..81926f6d412 100644
--- a/server/serial.c
+++ b/server/serial.c
@@ -21,7 +21,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <fcntl.h>
diff --git a/server/symlink.c b/server/symlink.c
index 3879bb685f7..fa97d9155fa 100644
--- a/server/symlink.c
+++ b/server/symlink.c
@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <stdarg.h>
diff --git a/server/thread.c b/server/thread.c
index 9d412106809..90f3c5492f8 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -19,8 +19,8 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
+#define _GNU_SOURCE /* sched_affinity */
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/server/timer.c b/server/timer.c
index 5e265d2ddf6..96dc9d00ca1 100644
--- a/server/timer.c
+++ b/server/timer.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/server/trace.c b/server/trace.c
index 11e3eb25da6..a007cb280f0 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <ctype.h>
 #include <stdarg.h>
diff --git a/server/unicode.c b/server/unicode.c
index 55f9954f4f4..67698d7639c 100644
--- a/server/unicode.c
+++ b/server/unicode.c
@@ -19,11 +19,12 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <ctype.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdarg.h>
+#include <unistd.h>
 
 #include "windef.h"
 #include "winternl.h"
diff --git a/server/window.c b/server/window.c
index 3a88b7f34fa..c94c745bd3c 100644
--- a/server/window.c
+++ b/server/window.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <stdarg.h>
diff --git a/server/winstation.c b/server/winstation.c
index 61f9f77c73f..6f2dfcf4e31 100644
--- a/server/winstation.c
+++ b/server/winstation.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 #include <stdarg.h>