diff --git a/tools/make_xftmpl.c b/tools/make_xftmpl.c
index 686beeb449c48ab9ded49473f5e846090b4dfbbc..b7f964c28d777f6a328cee11614912cdebdf50e3 100644
--- a/tools/make_xftmpl.c
+++ b/tools/make_xftmpl.c
@@ -19,15 +19,11 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 
 #include "windef.h"
 #include "guiddef.h"
diff --git a/tools/sfnt2fon/sfnt2fon.c b/tools/sfnt2fon/sfnt2fon.c
index 303293c18e5ca09babb31950784190f932ebc991..0be1ce658b3756ec972d49e168270a2ba4c157fe 100644
--- a/tools/sfnt2fon/sfnt2fon.c
+++ b/tools/sfnt2fon/sfnt2fon.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <ctype.h>
diff --git a/tools/widl/client.c b/tools/widl/client.c
index 6ecae4187d3167d96ca90cd2214b582a4eb12487..1ce7d245311c922aff24c208f41d758c8bebc1d5 100644
--- a/tools/widl/client.c
+++ b/tools/widl/client.c
@@ -19,13 +19,9 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 #include <string.h>
 #include <ctype.h>
 
diff --git a/tools/widl/header.c b/tools/widl/header.c
index b149b8e2b9c1ec3965aef7a9b6697caa2aa1bd01..2a745b8a767385b80e491926a66fc1303d5872a7 100644
--- a/tools/widl/header.c
+++ b/tools/widl/header.c
@@ -23,9 +23,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 #include <string.h>
 #include <ctype.h>
 
diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c
index 457f29a2650127645aff7ef1848ae7d5ff29c52c..382f39d121fc94383d49a6a910c1a17a942fba36 100644
--- a/tools/widl/proxy.c
+++ b/tools/widl/proxy.c
@@ -20,13 +20,9 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 #include <string.h>
 #include <ctype.h>
 
diff --git a/tools/widl/register.c b/tools/widl/register.c
index e13d8451f9ea107a665b75455c71340908935d7d..634ddfbb87b0c43b106aefef682aec8fdf411cbd 100644
--- a/tools/widl/register.c
+++ b/tools/widl/register.c
@@ -19,13 +19,9 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 #include <string.h>
 #include <ctype.h>
 
diff --git a/tools/widl/server.c b/tools/widl/server.c
index cce880bbf6600495e339483dcdb6112f2a45ef88..58abc0dabe3f08a8d3112bcbcbee88aa1ad6f467 100644
--- a/tools/widl/server.c
+++ b/tools/widl/server.c
@@ -19,13 +19,9 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 #include <string.h>
 #include <ctype.h>
 
diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c
index 2c1017b9f2b9fc67382086ae3a0245c7b27de00d..f1c7db9c0e87688d8b948d096786598da912acd9 100644
--- a/tools/widl/typegen.c
+++ b/tools/widl/typegen.c
@@ -20,13 +20,9 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c
index 7f34aa4efcfba4eaa7c53d68fb0f314e5408051b..85cb140b7a6fc8d4115326025d5cdbefbfd7dd8d 100644
--- a/tools/widl/typelib.c
+++ b/tools/widl/typelib.c
@@ -20,21 +20,16 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 #include <string.h>
 #include <ctype.h>
 
+#include "widl.h"
 #include "windef.h"
 #include "winbase.h"
-
-#include "widl.h"
 #include "utils.h"
 #include "wpp_private.h"
 #include "parser.h"
diff --git a/tools/widl/utils.c b/tools/widl/utils.c
index c11a7e40901837ca673612a455975cb78fbe272b..81558011d66df5afdb4990bc8934c3c90199438a 100644
--- a/tools/widl/utils.c
+++ b/tools/widl/utils.c
@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/tools/widl/widl.c b/tools/widl/widl.c
index 97a26743cf3517b433ce0f418c79d7b55328993a..e5a772e87bd36a876085c61602f12f494541f097 100644
--- a/tools/widl/widl.c
+++ b/tools/widl/widl.c
@@ -20,15 +20,11 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c
index 228f58e26490ae69b94b536bccfa342e0be4907e..311b501704982a65f29473bc85a7e7c6a7ab1a85 100644
--- a/tools/widl/write_msft.c
+++ b/tools/widl/write_msft.c
@@ -28,7 +28,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -39,12 +38,11 @@
 
 #define NONAMELESSUNION
 
+#include "widl.h"
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"
 #include "winnls.h"
-
-#include "widl.h"
 #include "typelib.h"
 #include "typelib_struct.h"
 #include "utils.h"
diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c
index 6a07ff08a94d1ba7ca5c39b02264972f1835f226..104397716f17dd9e6a792aa08d6c36db750dddb0 100644
--- a/tools/winebuild/import.c
+++ b/tools/winebuild/import.c
@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <ctype.h>
@@ -28,12 +27,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 
 #include "wine/list.h"
 #include "build.h"
diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c
index 7b4a9b8ae7152c9e523700ecb4659ec7107e87ff..45e21f8c4628f91739fafa4f37662b6c00f67558 100644
--- a/tools/winebuild/main.c
+++ b/tools/winebuild/main.c
@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c
index 2e6424fe76a2bd8d353373ed67012095529493aa..c9a9f1b09f3cd78e5cb091194b64427330caa1eb 100644
--- a/tools/winebuild/parser.c
+++ b/tools/winebuild/parser.c
@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <ctype.h>
diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c
index 43a35af211c72efde01fe89aa0652d5c1b0a23cc..b86a88aae242f9868d53f2bba90bc380841eda9a 100644
--- a/tools/winebuild/relay.c
+++ b/tools/winebuild/relay.c
@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <ctype.h>
 #include <stdarg.h>
diff --git a/tools/winebuild/res16.c b/tools/winebuild/res16.c
index 216d25308025c37dc3541f1a0ce8f22ae7665f7a..732af0151990ea339003c819f97b24823e77e7ee 100644
--- a/tools/winebuild/res16.c
+++ b/tools/winebuild/res16.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <ctype.h>
@@ -27,10 +26,6 @@
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <fcntl.h>
 
 #include "build.h"
 
diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c
index 2c39a3502e35965341ce76cf3b3f87d205cf24d7..3b74f098e837cc844bdf300c14b70ed5540f547d 100644
--- a/tools/winebuild/res32.c
+++ b/tools/winebuild/res32.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <ctype.h>
@@ -27,10 +26,6 @@
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <fcntl.h>
 
 #include "build.h"
 
diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c
index daa9c63a8c919904299edcf2a97b68d7eabbc58e..e82f5f81d9a1247152d770b5f58f9076149cd836 100644
--- a/tools/winebuild/spec16.c
+++ b/tools/winebuild/spec16.c
@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <ctype.h>
diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c
index 65da570ec6d1a230f5631f107b0717066f83a484..89feb0db5d355e30d07a21256437d70a33244829 100644
--- a/tools/winebuild/spec32.c
+++ b/tools/winebuild/spec32.c
@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <ctype.h>
diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c
index 0f6ea1bc929db9b0e12c6ea1400a844c0b1dd471..16b1fc2d968141122a7a88092e4cd3c949f72f07 100644
--- a/tools/winebuild/utils.c
+++ b/tools/winebuild/utils.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <ctype.h>
@@ -27,12 +26,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
 
 #include "build.h"
 
diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c
index 10694c57ea08d261fad521587d8d4b6f59fe3c13..c2efeb243402cf1083673e1fefd1e1bbf46f6502 100644
--- a/tools/winedump/debug.c
+++ b/tools/winedump/debug.c
@@ -21,25 +21,11 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 #include <time.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-#include <fcntl.h>
 
 #include "../tools.h"
 #include "windef.h"
diff --git a/tools/winedump/dos.c b/tools/winedump/dos.c
index 2ec38b71be47a0c3e49d7ef984341f2e9a147836..aa94cfe46de89e5d2de7afcf42b8b0d769891c37 100644
--- a/tools/winedump/dos.c
+++ b/tools/winedump/dos.c
@@ -19,24 +19,11 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 #include <time.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
 #include <fcntl.h>
 
 #include "windef.h"
diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c
index e825c592cbaea14b68cede68a0989b2a1da23a79..33c98648d8c694b2a3fb513b18bdf7bce7459434 100644
--- a/tools/winedump/dump.c
+++ b/tools/winedump/dump.c
@@ -19,22 +19,11 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 #include <time.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#include <fcntl.h>
 
 #include "../tools.h"
 #include "windef.h"
diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c
index 50c3ad092ea1df6ea675ea1e415db2a7d41ca830..0aa776efbb514282de1fdfc6417a265bf2826317 100644
--- a/tools/winedump/emf.c
+++ b/tools/winedump/emf.c
@@ -19,19 +19,12 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
-#include "winedump.h"
 
 #include <stdio.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
 #include <fcntl.h>
 #include <stdarg.h>
 
+#include "winedump.h"
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
diff --git a/tools/winedump/font.c b/tools/winedump/font.c
index 3257fce9d801adf5d3dd9346ec8c80f95bd1929c..58441975d3acce41a83c8d8d7e9c5f6c2150ed7b 100644
--- a/tools/winedump/font.c
+++ b/tools/winedump/font.c
@@ -19,20 +19,10 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
 #include <fcntl.h>
 
 #include "windef.h"
diff --git a/tools/winedump/le.c b/tools/winedump/le.c
index ee043f2a3e4de116631a21e37902c27597171dc7..14e3e84185eb99a7f7ebda60043cec55c84f8f57 100644
--- a/tools/winedump/le.c
+++ b/tools/winedump/le.c
@@ -19,14 +19,10 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 
 #include "windef.h"
 #include "winbase.h"
diff --git a/tools/winedump/lib.c b/tools/winedump/lib.c
index 5a7c33aa8b839c62b92f80e4c0f034b8e3e37cc5..430ec2d4de72c25b665aa2f476e10b471f9b212d 100644
--- a/tools/winedump/lib.c
+++ b/tools/winedump/lib.c
@@ -19,20 +19,10 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
 #include <fcntl.h>
 
 #define NONAMELESSUNION
diff --git a/tools/winedump/lnk.c b/tools/winedump/lnk.c
index 0a06b49a118289931ad671edbad119188618c672..e9f7229b5ae7c93390edba98c0a5eb109daeede9 100644
--- a/tools/winedump/lnk.c
+++ b/tools/winedump/lnk.c
@@ -19,22 +19,15 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
-#include "winedump.h"
 
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <fcntl.h>
 #include <stdarg.h>
+#include <fcntl.h>
 
 #include "windef.h"
 #include "winbase.h"
+#include "winedump.h"
 
 #include "pshpack1.h"
 
diff --git a/tools/winedump/main.c b/tools/winedump/main.c
index b60868d0d89a30cb84be9564b1ee2dba461b428b..fd5b44d637dcdb20f529391d668d1572e552142f 100644
--- a/tools/winedump/main.c
+++ b/tools/winedump/main.c
@@ -19,9 +19,7 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
-#include "../tools.h"
 #include "winedump.h"
 
 _globals globals; /* All global variables */
diff --git a/tools/winedump/mf.c b/tools/winedump/mf.c
index 37869d3bb8ae37b0228139779fce79e8882deb6c..aa108d2d96c1fcf947767225e2c75c7e38ac0915 100644
--- a/tools/winedump/mf.c
+++ b/tools/winedump/mf.c
@@ -19,9 +19,8 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
-#include "winedump.h"
 
+#include "winedump.h"
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c
index da1369cbf840dbae51d727bfb2a89331061d64a4..228c593f5dda12df5d8e456a787c20007ee4bd7a 100644
--- a/tools/winedump/minidump.c
+++ b/tools/winedump/minidump.c
@@ -23,11 +23,9 @@
 
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
-#include "windef.h"
-#include "winbase.h"
+#include "winedump.h"
 #include "winver.h"
 #include "dbghelp.h"
-#include "winedump.h"
 
 static void dump_mdmp_data(const MINIDUMP_LOCATION_DESCRIPTOR* md, const char* pfx)
 {
diff --git a/tools/winedump/misc.c b/tools/winedump/misc.c
index de46d65ae8a020c4612aa07058fff49b1323da64..62a5962547add30437cf2b39d6d63b59b7a51c47 100644
--- a/tools/winedump/misc.c
+++ b/tools/winedump/misc.c
@@ -19,9 +19,7 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
-#include "../tools.h"
 #include "winedump.h"
 
 
diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c
index 557f46b07031c00da766fd710573e598f6010380..2c3d406347e39ee18522c7b9150546941a26f2a1 100644
--- a/tools/winedump/msc.c
+++ b/tools/winedump/msc.c
@@ -19,27 +19,13 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 #include <time.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
 #include <fcntl.h>
 
-#include "../tools.h"
 #include "windef.h"
 #include "winbase.h"
 #include "winedump.h"
diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c
index cf26a073b4b2addabec766093596a3b4b4307b53..d22f47159375c5c586fed23d34e9c4f3b0ded092 100644
--- a/tools/winedump/msmangle.c
+++ b/tools/winedump/msmangle.c
@@ -19,9 +19,7 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
-#include "../tools.h"
 #include "winedump.h"
 
 /* Type for parsing mangled types */
diff --git a/tools/winedump/ne.c b/tools/winedump/ne.c
index b4f4f89275292537d674316e4d9a7cc1e13379e2..ec73d16ce0d04759c0b05b9fbb0a2d8143c78ce3 100644
--- a/tools/winedump/ne.c
+++ b/tools/winedump/ne.c
@@ -19,14 +19,10 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
-#include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
+#include <fcntl.h>
 
 #include "windef.h"
 #include "winbase.h"
diff --git a/tools/winedump/nls.c b/tools/winedump/nls.c
index 731d42761f4f0ad3c46210d7739ae5c54f688f61..9fe0d26773c5177d9fbe29a8449c34be3c7e172d 100644
--- a/tools/winedump/nls.c
+++ b/tools/winedump/nls.c
@@ -19,13 +19,11 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 
-#include "../tools.h"
 #include "windef.h"
 #include "winedump.h"
 
diff --git a/tools/winedump/output.c b/tools/winedump/output.c
index ad3a70c3b0f2d8ddc9921e2338899451e61eb7b2..b039f5d71ad6a485fa83916e9192585d4896aeb5 100644
--- a/tools/winedump/output.c
+++ b/tools/winedump/output.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "winedump.h"
 
diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c
index 30001d224da330786556c45ab158e4cd463f378c..71a2bc49cc88a6fadc217a7fa1f1c37558f6fce8 100644
--- a/tools/winedump/pdb.c
+++ b/tools/winedump/pdb.c
@@ -19,29 +19,15 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 #include <time.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
 #include <fcntl.h>
 
 #define NONAMELESSUNION
 
-#include "../tools.h"
 #include "windef.h"
 #include "winbase.h"
 #include "winedump.h"
diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c
index 4455ab61bd0cc26893d35d85289ddd2d8f4139dd..04e017551712989aec2acaf564aa8e33d6751fd8 100644
--- a/tools/winedump/pe.c
+++ b/tools/winedump/pe.c
@@ -19,29 +19,15 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 #include <time.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
 #include <fcntl.h>
 
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
-#include "../tools.h"
 #include "windef.h"
 #include "winbase.h"
 #include "winedump.h"
diff --git a/tools/winedump/search.c b/tools/winedump/search.c
index c957a2c2ce5d0e5dcf604d730eaa5dec2de6b87c..21f9986d0a6d43b997d8ae584b1ba3ca1a6372ea 100644
--- a/tools/winedump/search.c
+++ b/tools/winedump/search.c
@@ -19,9 +19,7 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
-#include "../tools.h"
 #include "winedump.h"
 
 static char *grep_buff = NULL;
diff --git a/tools/winedump/symbol.c b/tools/winedump/symbol.c
index 57a23df7bf95bd8c2451992e27e84ab3f15dc42c..90d34e3375617cf976eef6c41e84407dede09ae8 100644
--- a/tools/winedump/symbol.c
+++ b/tools/winedump/symbol.c
@@ -19,9 +19,7 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
-#include "../tools.h"
 #include "winedump.h"
 
 
diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c
index 7e0f664f77860735638974225b22efae9a9e39a5..9992cc762f133ff53d69c100f9fec1452a1303ef 100644
--- a/tools/winedump/tlb.c
+++ b/tools/winedump/tlb.c
@@ -20,13 +20,11 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 
-#include "../tools.h"
 #include "winedump.h"
 
 #define MSFT_MAGIC 0x5446534d
diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h
index df1d6e24105622a8dd979e58dd68b7bcf121aed9..236ce6dede3767e215ac2948eb317aa2b46975f4 100644
--- a/tools/winedump/winedump.h
+++ b/tools/winedump/winedump.h
@@ -42,6 +42,7 @@
 #include <assert.h>
 #include <stdarg.h>
 
+#include "../tools.h"
 #include "windef.h"
 #include "winbase.h"
 
diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c
index 00aa8607304b2b038edf7bad54be71cb2be9affb..f378a17976aa603a16cf68038e12af57e570ce2e 100644
--- a/tools/winegcc/utils.c
+++ b/tools/winegcc/utils.c
@@ -19,8 +19,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index 1fa7f59cfaadcbbcb5a19996c6a17901bb916ec4..5204553f739a4c1ac4a43a17973c3090f435e53a 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -87,7 +87,6 @@
  */ 
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/tools/wmc/po.c b/tools/wmc/po.c
index d0a053cfb67ddbb1998e00712e43b0f767a22f05..28bcea91f59480fb2306570783e8efd358cd6583 100644
--- a/tools/wmc/po.c
+++ b/tools/wmc/po.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/wmc/utils.c b/tools/wmc/utils.c
index 5a91d420cb4f4cb9cbf7e18f0b7066dbbe96d1eb..d9d803413dac83f1ab5e7add565f1285e286905d 100644
--- a/tools/wmc/utils.c
+++ b/tools/wmc/utils.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c
index 618a6ab24721b04b99a10dc3a01fe1b060baeffc..864c969b1366038b252bc663d0c4e3b7733d0ccf 100644
--- a/tools/wmc/wmc.c
+++ b/tools/wmc/wmc.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/wmc/write.c b/tools/wmc/write.c
index 361d1a9943e117817b2b9ef9a86ebe0d777645d2..69ebf24b6b9a5ec72ed8d63e921ddc6139cc1847 100644
--- a/tools/wmc/write.c
+++ b/tools/wmc/write.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y
index 7daa4581f23df59721f62b9fcca6dcd0ded98159..2efd7ee7e5ce708e10013155f1329dffdcf64252 100644
--- a/tools/wrc/parser.y
+++ b/tools/wrc/parser.y
@@ -120,8 +120,8 @@
  *			- Corrected syntax problems with an old yacc (;)
  *			- Added extra comment about grammar
  */
+
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/wrc/po.c b/tools/wrc/po.c
index 8c77b5ccbfa9005269d1172eaf7e69428034e3a7..520c7de266b681f82f28ec8a0affc61bc15ef931 100644
--- a/tools/wrc/po.c
+++ b/tools/wrc/po.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/wrc/ppy.y b/tools/wrc/ppy.y
index 50561cbe1aacde2d83b22ffa478c792978f4d412..a4b834d7f6c8648d53e9f3a662d30ad37d8ab67f 100644
--- a/tools/wrc/ppy.y
+++ b/tools/wrc/ppy.y
@@ -21,7 +21,6 @@
 
 %{
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c
index 68e920dd14d70fab7b09eee690887f806511bee6..f6f36260617431d124ef90760dd17ef1228e7cc2 100644
--- a/tools/wrc/utils.c
+++ b/tools/wrc/utils.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/tools/wrc/wpp.c b/tools/wrc/wpp.c
index 990edeb1563105df87bff7101481628cfbd14a25..9ad09f25da26937d386f8585a711ced513ace25c 100644
--- a/tools/wrc/wpp.c
+++ b/tools/wrc/wpp.c
@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <ctype.h>
@@ -30,9 +29,6 @@
 #include <string.h>
 #include <stdarg.h>
 #include <time.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 
 #include "../tools.h"
 #include "utils.h"
diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c
index 69faaf370a46f8020bf9514ea906900580497d44..8cdb91195cfefc77a9971097e8501d2f423b053a 100644
--- a/tools/wrc/wrc.c
+++ b/tools/wrc/wrc.c
@@ -20,13 +20,9 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
diff --git a/tools/wrc/writeres.c b/tools/wrc/writeres.c
index 07d4f748fe3defec20901d7744f3383aca5a9ee1..7a75cb1e0d658422c9912544fd67d3fb720448c9 100644
--- a/tools/wrc/writeres.c
+++ b/tools/wrc/writeres.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 #include <stdlib.h>