From 2ae84d52408e06ef53816226a1eae7091a58dc00 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Tue, 12 Mar 2019 20:19:00 +0100
Subject: [PATCH] Avoid using Windows includes that are already handled in
 wine/port.h.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/gdi.exe16/printdrv.c | 3 ---
 dlls/ntdll/cdrom.c        | 3 ---
 dlls/ntdll/om.c           | 3 ---
 dlls/ntdll/serial.c       | 3 ---
 libs/port/pread.c         | 4 ----
 libs/port/pwrite.c        | 3 ---
 libs/wpp/preproc.c        | 3 ---
 programs/winecfg/theme.c  | 3 ---
 8 files changed, 25 deletions(-)

diff --git a/dlls/gdi.exe16/printdrv.c b/dlls/gdi.exe16/printdrv.c
index 2e1ace8e6cf..3e49af203ac 100644
--- a/dlls/gdi.exe16/printdrv.c
+++ b/dlls/gdi.exe16/printdrv.c
@@ -31,9 +31,6 @@
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
-#ifdef HAVE_IO_H
-# include <io.h>
-#endif
 #ifdef HAVE_SYS_WAIT_H
 # include <sys/wait.h>
 #endif
diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c
index 066181b1d19..4a3b84d4ad2 100644
--- a/dlls/ntdll/cdrom.c
+++ b/dlls/ntdll/cdrom.c
@@ -28,9 +28,6 @@
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
-#ifdef HAVE_IO_H
-# include <io.h>
-#endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c
index 0b562513489..0d66867496b 100644
--- a/dlls/ntdll/om.c
+++ b/dlls/ntdll/om.c
@@ -24,9 +24,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_IO_H
-# include <io.h>
-#endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c
index 830137c6295..66081d28653 100644
--- a/dlls/ntdll/serial.c
+++ b/dlls/ntdll/serial.c
@@ -30,9 +30,6 @@
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
 #endif
-#ifdef HAVE_IO_H
-# include <io.h>
-#endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
diff --git a/libs/port/pread.c b/libs/port/pread.c
index 34b63040dca..cced41683e7 100644
--- a/libs/port/pread.c
+++ b/libs/port/pread.c
@@ -26,10 +26,6 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#ifdef HAVE_IO_H
-# include <io.h>
-#endif
-
 
 /* FIXME: this is not thread-safe */
 
diff --git a/libs/port/pwrite.c b/libs/port/pwrite.c
index 1829a226514..37e5dab3b4a 100644
--- a/libs/port/pwrite.c
+++ b/libs/port/pwrite.c
@@ -26,9 +26,6 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#ifdef HAVE_IO_H
-# include <io.h>
-#endif
 
 /* FIXME: this is not thread-safe */
 
diff --git a/libs/wpp/preproc.c b/libs/wpp/preproc.c
index 21830d65fb2..1bd10cd578c 100644
--- a/libs/wpp/preproc.c
+++ b/libs/wpp/preproc.c
@@ -29,9 +29,6 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#ifdef HAVE_IO_H
-# include <io.h>
-#endif
 
 #include "wine/wpp.h"
 #include "wpp_private.h"
diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c
index 78d89a5ea8e..66d23448f6f 100644
--- a/programs/winecfg/theme.c
+++ b/programs/winecfg/theme.c
@@ -34,9 +34,6 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef HAVE_DIRECT_H
-#include <direct.h>
-#endif
 
 #define COBJMACROS