diff --git a/dlls/dinput/keyboard/main.c b/dlls/dinput/keyboard/main.c
index 6653e4f0b5635a51a095ab7e218009718dad5222..50f991f6e85a4a32c7bfe8024ae748fcae359e31 100644
--- a/dlls/dinput/keyboard/main.c
+++ b/dlls/dinput/keyboard/main.c
@@ -23,10 +23,6 @@
 #include "wine/port.h"
 
 #include <string.h>
-#ifdef HAVE_SYS_ERRNO_H
-# include <sys/errno.h>
-#endif
-
 #include "winbase.h"
 #include "winuser.h"
 #include "winerror.h"
diff --git a/dlls/dinput/mouse/main.c b/dlls/dinput/mouse/main.c
index f8b91ba158d5a1345af5748fa36898c535c0352f..8e60454e7580b190d67555348035cf945ce04682 100644
--- a/dlls/dinput/mouse/main.c
+++ b/dlls/dinput/mouse/main.c
@@ -23,9 +23,6 @@
 #include "wine/port.h"
 
 #include <string.h>
-#ifdef HAVE_SYS_ERRNO_H
-# include <sys/errno.h>
-#endif
 
 #include "winbase.h"
 #include "wingdi.h"
diff --git a/dlls/gdi/win16drv/prtdrv.c b/dlls/gdi/win16drv/prtdrv.c
index ab9165c21f527b49cdf03d4a3d14d21d7820bb6e..254a70a873f3f2365c9ca25acd4eb3302ae50116 100644
--- a/dlls/gdi/win16drv/prtdrv.c
+++ b/dlls/gdi/win16drv/prtdrv.c
@@ -27,7 +27,6 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#include <errno.h>
 #include "wine/winbase16.h"
 #include "winuser.h"
 #include "wownt32.h"
diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c
index e291e59730624c30778b112d05cccbfd8ce94108..a0e971072c038b4ea09b093ebc08f10fef00a77d 100644
--- a/dlls/ntdll/critsection.c
+++ b/dlls/ntdll/critsection.c
@@ -22,7 +22,6 @@
 #include "wine/port.h"
 
 #include <assert.h>
-#include <errno.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include "winerror.h"
diff --git a/dlls/winedos/module.c b/dlls/winedos/module.c
index 4b88f05e817674df47d92bd0a06bc8827714f8f7..46a8738efda34e55b3e7b2a209b32f74b530e449 100644
--- a/dlls/winedos/module.c
+++ b/dlls/winedos/module.c
@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
 #ifdef HAVE_UNISTD_H
diff --git a/dlls/winmm/winearts/audio.c b/dlls/winmm/winearts/audio.c
index 3838ab007186411719e7c0cea0c4850080baa68b..3c3f4ec7a461eff30e6773826a21631b754eba19 100644
--- a/dlls/winmm/winearts/audio.c
+++ b/dlls/winmm/winearts/audio.c
@@ -46,7 +46,6 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#include <errno.h>
 #include <fcntl.h>
 #include "windef.h"
 #include "wingdi.h"
diff --git a/dlls/winmm/winejack/audio.c b/dlls/winmm/winejack/audio.c
index 8d5c1caf9c848ab682d51d1078be7161476123bd..a150ca1e9e7bc7a52463b7effdbc41e83231c9d6 100644
--- a/dlls/winmm/winejack/audio.c
+++ b/dlls/winmm/winejack/audio.c
@@ -43,7 +43,6 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#include <errno.h>
 #include <fcntl.h>
 #include "windef.h"
 #include "wingdi.h"
diff --git a/dlls/winmm/winenas/audio.c b/dlls/winmm/winenas/audio.c
index dbbb7f70964e697270b3376d7b46cd710077ace3..10686e8ff7a697b1f624e99b01791cca575b7043 100644
--- a/dlls/winmm/winenas/audio.c
+++ b/dlls/winmm/winenas/audio.c
@@ -45,7 +45,6 @@
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 #endif
-#include <errno.h>
 #include <fcntl.h>
 
 #if 0
diff --git a/files/profile.c b/files/profile.c
index a66c332a65aee084d02394ae42921b832e15d69c..277e811a3bf9ab4f6f55aa5cebac6dc0c2f579b5 100644
--- a/files/profile.c
+++ b/files/profile.c
@@ -23,7 +23,6 @@
 #include "wine/port.h"
 
 #include <ctype.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/files/smb.c b/files/smb.c
index b62b2d83a9ef8b4d9b211d1440f963231b837197..56c90f17966e6ff24b5b0ca389408b301e828416 100644
--- a/files/smb.c
+++ b/files/smb.c
@@ -58,14 +58,10 @@
 
 #include <assert.h>
 #include <ctype.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#ifdef HAVE_SYS_ERRNO_H
-#include <sys/errno.h>
-#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifdef HAVE_SYS_MMAN_H
diff --git a/library/config.c b/library/config.c
index f4b8daba9a5c4b797d2a561de80b988135ca2b60..a2e3c152f7f9b017e32ccb99a4ed0340f47430bc 100644
--- a/library/config.c
+++ b/library/config.c
@@ -21,7 +21,6 @@
 #include "config.h"
 #include "wine/port.h"
 
-#include <errno.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/msdos/int21.c b/msdos/int21.c
index 86419f7f637f52c79b6f058fcecdab54e5683189..3f0381f6f5dcf7b982dd8f00323fd1de1fba8fa0 100644
--- a/msdos/int21.c
+++ b/msdos/int21.c
@@ -27,7 +27,6 @@
 
 #include <time.h>
 #include <fcntl.h>
-#include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
 #ifdef HAVE_SYS_FILE_H
diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c
index b93d94be6580735a01b6631eb2c6f850b260a523..9e0922c3fc0a6ab6f903a70715d2728614533ec1 100644
--- a/programs/wineconsole/curses.c
+++ b/programs/wineconsole/curses.c
@@ -29,7 +29,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
 #ifdef HAVE_CURSES_H
 #include <curses.h>
 #endif
diff --git a/scheduler/critsection.c b/scheduler/critsection.c
index 9977e5f1e0429333bf1eb12f84c784c65b1234d8..8fca8d4148e3f4e933376dc2203a425c3ecbf3ed 100644
--- a/scheduler/critsection.c
+++ b/scheduler/critsection.c
@@ -22,7 +22,6 @@
 #include "wine/port.h"
 
 #include <assert.h>
-#include <errno.h>
 #include <stdio.h>
 #include <sys/types.h>
 
diff --git a/server/pipe.c b/server/pipe.c
index d135a2250a78f72ac2e44755630069c002e2e067..ce6f11a2036092083a3badb199c12d2ce70be51e 100644
--- a/server/pipe.c
+++ b/server/pipe.c
@@ -25,9 +25,6 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_SYS_ERRNO_H
-#include <sys/errno.h>
-#endif
 #include <sys/time.h>
 #include <sys/types.h>
 #include <time.h>
diff --git a/server/process.c b/server/process.c
index af00451d0b9f5b0acd0398cf10e8e1967f80cb44..7d66d1b9eebe7c76b1f805318629e71a6ea809f7 100644
--- a/server/process.c
+++ b/server/process.c
@@ -22,7 +22,6 @@
 #include "wine/port.h"
 
 #include <assert.h>
-#include <errno.h>
 #include <limits.h>
 #include <signal.h>
 #include <string.h>
diff --git a/server/select.c b/server/select.c
index 6a8db7a1c13005fea1ef89a7f51332df157b2104..9b70d04fc928aede8a8fcd026b34e894f4829920 100644
--- a/server/select.c
+++ b/server/select.c
@@ -19,7 +19,6 @@
  */
 
 #include <assert.h>
-#include <errno.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/server/serial.c b/server/serial.c
index f267234904602fc60ba5e07bedeb9ffd707ebbf3..22c336f977e55e010e56a7951dcb7761ef37b89c 100644
--- a/server/serial.c
+++ b/server/serial.c
@@ -28,10 +28,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <errno.h>
-#ifdef HAVE_SYS_ERRNO_H
-#include <sys/errno.h>
-#endif
 #include <sys/time.h>
 #include <sys/types.h>
 #include <time.h>
diff --git a/server/smb.c b/server/smb.c
index 49127b0ccdb3c9e1acdd41810e73d86e758e8b9f..e9247746cd4c56bcda9dcb35e08276c819678fd5 100644
--- a/server/smb.c
+++ b/server/smb.c
@@ -29,10 +29,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <errno.h>
-#ifdef HAVE_SYS_ERRNO_H
-#include <sys/errno.h>
-#endif
 #include <sys/time.h>
 #include <sys/types.h>
 #include <time.h>
@@ -189,4 +185,3 @@ DECL_HANDLER(get_smb_info)
         release_object( smb );
     }
 }
-