include: Don't include wine/port.h in Unix libraries.

dlls/bcrypt/gnutls.c

@@ -23,13 +23,14 @@
 #endif
 
 #include "config.h"
-#include "wine/port.h"
 
 #ifdef HAVE_GNUTLS_CIPHER_INIT
 
 #include <stdarg.h>
 #include <stdlib.h>
 #include <assert.h>
+#include <sys/types.h>
+#include <dlfcn.h>
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>
 #include <gnutls/abstract.h>

dlls/dwrite/freetype.c

@@ -23,7 +23,9 @@
 #endif
 
 #include "config.h"
-#include "wine/port.h"
+
+#include <sys/types.h>
+#include <dlfcn.h>
 
 #ifdef HAVE_FT2BUILD_H
 #include <ft2build.h>

dlls/kerberos/unixlib.c

@@ -26,10 +26,13 @@
 #endif
 
 #include "config.h"
+
 #if defined(SONAME_LIBKRB5) && defined(SONAME_LIBGSSAPI_KRB5)
-#include "wine/port.h"
 
 #include <stdarg.h>
+#include <sys/types.h>
+#include <dlfcn.h>
+
 #ifdef HAVE_KRB5_KRB5_H
 # include <krb5/krb5.h>
 #endif

dlls/netapi32/unixlib.c

@@ -24,7 +24,6 @@
 #endif
 
 #include "config.h"
-#include "wine/port.h"
 
 #ifdef SONAME_LIBNETAPI
 
@@ -32,12 +31,10 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <errno.h>
-#ifdef HAVE_SYS_WAIT_H
+#include <sys/types.h>
 #include <sys/wait.h>
-#endif
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
+#include <dlfcn.h>
 
 #include "ntstatus.h"
 #define WIN32_NO_STATUS

dlls/odbc32/unixlib.c

@@ -29,10 +29,11 @@
 #endif
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdarg.h>
 #include <stdlib.h>
+#include <sys/types.h>
+#include <dlfcn.h>
 
 #include "ntstatus.h"
 #define WIN32_NO_STATUS

dlls/secur32/schannel_gnutls.c

@@ -24,12 +24,13 @@
 #endif
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
+#include <sys/types.h>
+#include <dlfcn.h>
 #ifdef SONAME_LIBGNUTLS
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>

dlls/win32u/dibdrv/opengl.c

@@ -23,7 +23,9 @@
 #endif
 
 #include "config.h"
-#include "wine/port.h"
+
+#include <sys/types.h>
+#include <dlfcn.h>
 
 #include "ntstatus.h"
 #define WIN32_NO_STATUS

dlls/win32u/freetype.c

@@ -26,14 +26,13 @@
 #endif
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdarg.h>
 #include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <fcntl.h>
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
+#include <dlfcn.h>
 #ifdef HAVE_SYS_MMAN_H
 # include <sys/mman.h>
 #endif

dlls/winebus.sys/bus_iohid.c

@@ -22,9 +22,9 @@
 #endif
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdarg.h>
+#include <sys/types.h>
 
 #if defined(HAVE_IOKIT_HID_IOHIDLIB_H)
 #define DWORD UInt32

dlls/winebus.sys/bus_sdl.c

@@ -23,14 +23,14 @@
 #endif
 
 #include "config.h"
-#include "wine/port.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
+#include <sys/types.h>
+#include <dlfcn.h>
 #ifdef HAVE_SDL_H
 # include <SDL.h>
 #endif

include/wine/port.h

@@ -29,6 +29,10 @@
 # error You must include port.h before all other headers
 #endif
 
+#ifdef WINE_UNIX_LIB
+# error port.h should not be used in Unix libraries
+#endif
+
 #include <sys/types.h>