diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c
index 388de0b56c2162cd6f8501a327b48ae97e805d6f..ab9c990c045abef65c102c5be78b4618a401f49f 100644
--- a/dlls/d3d12/d3d12_main.c
+++ b/dlls/d3d12/d3d12_main.c
@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #define COBJMACROS
 #define VK_NO_PROTOTYPES
diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c
index 72f1a2df6b164b089d2d5c61f2aa838e2f97e3e5..e38fef5fa4f16fcf54332b55025a61a853f4f517 100644
--- a/dlls/dxgi/adapter.c
+++ b/dlls/dxgi/adapter.c
@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "dxgi_private.h"
 
diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c
index 07773052582e7fa6465cf7528532dc242a6bc688..b2635c3f582dbb6099eae714fd8a3a3efe76eff5 100644
--- a/dlls/dxgi/device.c
+++ b/dlls/dxgi/device.c
@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "dxgi_private.h"
 
diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c
index 83c3f3734a774d3884cfff757c0455d652d5ba26..3ac62f6b65c4d1e9e1861bf30535c01c524f70a7 100644
--- a/dlls/dxgi/dxgi_main.c
+++ b/dlls/dxgi/dxgi_main.c
@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #define DXGI_INIT_GUID
 #include "dxgi_private.h"
diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c
index e3aa554ae85e00d40475727a1f23fadc696dcc4b..f57ed7df48ffb490fb0902e626dd8ff3ce923d04 100644
--- a/dlls/dxgi/factory.c
+++ b/dlls/dxgi/factory.c
@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "dxgi_private.h"
 
diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c
index f341388766caf56169584a5d4e3add2b412dfb41..bbe394b65566f0eeecaae1da961d1f6e84f7a50a 100644
--- a/dlls/dxgi/output.c
+++ b/dlls/dxgi/output.c
@@ -17,7 +17,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "dxgi_private.h"
 
diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c
index ad2c0d7ff1e5767b5445d14c96406e4ccfc5f5ef..663ae30af941c6adde8667978b41810d868c7c34 100644
--- a/dlls/dxgi/surface.c
+++ b/dlls/dxgi/surface.c
@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "dxgi_private.h"
 
diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c
index 5df483f261547b0b621678061ea490afe9f739d4..209af340136025460d06472207cd3452ea815b7c 100644
--- a/dlls/dxgi/swapchain.c
+++ b/dlls/dxgi/swapchain.c
@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "dxgi_private.h"
 
@@ -29,6 +28,7 @@
 #define VKD3D_NO_WIN32_TYPES
 #ifndef USE_WIN32_VULKAN
 #define WINE_VK_HOST
+#include <dlfcn.h>
 #endif
 #include "wine/vulkan.h"
 #include "wine/vulkan_driver.h"
diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c
index af72f83b6b06df4d7b859a2225a8ac99834df0bb..35beaa4be1f8a033b1b1fe234b7c4e7ada6f306a 100644
--- a/dlls/dxgi/utils.c
+++ b/dlls/dxgi/utils.c
@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "dxgi_private.h"
 
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index e2b514ffca91129bfa38191309c82b7440986d61..bd7f7d22e98731921beba1f85b960aa41a34fd5b 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -19,11 +19,11 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
 #include <math.h>
 
 #include "windef.h"
diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c
index 6ddb4b741ebe356bbe844ab641c52ddecd279a53..30bc474ae1906ff7a944d6b3062bfec487000ec7 100644
--- a/dlls/wineandroid.drv/device.c
+++ b/dlls/wineandroid.drv/device.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <errno.h>
diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c
index 180a6650ffd8d2eb77ba6e8835dbd608beabc80a..2d7e446983194bcd126566a02d0e2f27521ac603 100644
--- a/dlls/wineandroid.drv/init.c
+++ b/dlls/wineandroid.drv/init.c
@@ -21,10 +21,10 @@
 #define NONAMELESSSTRUCT
 #define NONAMELESSUNION
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdarg.h>
 #include <string.h>
+#include <dlfcn.h>
 #include <link.h>
 
 #include "windef.h"
diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c
index 269f93115b76c229e91b9b8ea3d42d47bea40394..d6ba1072b9cff9f9d2ab40db12c2667eb0d60ee9 100644
--- a/dlls/wineandroid.drv/mmdevdrv.c
+++ b/dlls/wineandroid.drv/mmdevdrv.c
@@ -19,7 +19,6 @@
 #define NONAMELESSUNION
 #define COBJMACROS
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdarg.h>
 #include <errno.h>
@@ -33,6 +32,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <math.h>
+#include <dlfcn.h>
 
 #include <SLES/OpenSLES.h>
 #include <SLES/OpenSLES_Android.h>
diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c
index 281f63219afa9755a222e8d70dd06f0a4b97ae15..3d18f99fb1a8bfdf20e182363d2e9e1ffe9385d7 100644
--- a/dlls/wineandroid.drv/opengl.c
+++ b/dlls/wineandroid.drv/opengl.c
@@ -25,12 +25,12 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
+#include <dlfcn.h>
 #ifdef HAVE_EGL_EGL_H
 #include <EGL/egl.h>
 #endif
diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c
index 480871f337029874b59acacff206384f8dc754b7..c907001c159d5ce433b95ac63e9d8d1550e338c0 100644
--- a/dlls/wineandroid.drv/window.c
+++ b/dlls/wineandroid.drv/window.c
@@ -24,7 +24,6 @@
 #define NONAMELESSSTRUCT
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <fcntl.h>
diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c
index 85b40b19896f0c97c40f6c1e8de0df434dc0ce67..9864093c9995bb27a8e12a2cc067e6afeb234f9d 100644
--- a/dlls/wined3d/adapter_gl.c
+++ b/dlls/wined3d/adapter_gl.c
@@ -22,7 +22,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 
diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c
index f9a31265cd38a6d18b200393edb627e7701e2b69..c6e7f5d252de5a638654642a8398dc8ca256eff1 100644
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -17,7 +17,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 #include "wined3d_private.h"
 
 #include "wine/vulkan_driver.h"
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index eeb51448b01d15902c6f2c380a3b83d30f9f04e7..1abc64ccdd171c437ef6bf8c8c9115b06962af03 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -28,7 +28,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 
diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c
index 08fb2c81507885bb6944d325cc215cffa80f29b5..3317fdb6b68028252432f7944590b8d7c3419f67 100644
--- a/dlls/wined3d/ati_fragment_shader.c
+++ b/dlls/wined3d/ati_fragment_shader.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 
diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
index e5bc4c92e6b043f33ea85d7b32809df947215e46..2539401bf43c95ec36edb9469a37660583057638 100644
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "wined3d_private.h"
 
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index a44e979d32cc254026ad2d351637bdba2719e0ac..ed7fa32f74c3293e133e8c50177d84360845c509 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -25,7 +25,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "wined3d_private.h"
 
diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c
index f02a0f400a676f8ea247404182aab34d87f76d6d..dcb4ab7a0aff6235021089a42c298f272d00de93 100644
--- a/dlls/wined3d/context_gl.c
+++ b/dlls/wined3d/context_gl.c
@@ -25,7 +25,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "wined3d_private.h"
 
diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c
index 56b2da5306020f9cb4522533a4f370a3302990a0..06162d0c0e8dba57b7f16471692b2c1db09413cc 100644
--- a/dlls/wined3d/context_vk.c
+++ b/dlls/wined3d/context_vk.c
@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "wined3d_private.h"
 
diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index 9bdd2c8ed98c060b14202a1b4ece422bbc343a2e..2c94b7aed768971b7fa469e7dc4f6b48323482d4 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -17,7 +17,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 7fb8a7ec3a6e9e0cd89b98fa74111e5917b82c22..c516594c2696ad80ab374773b854495bbf9b5db1 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -25,11 +25,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
-
-#ifdef HAVE_FLOAT_H
-# include <float.h>
-#endif
 
 #include "wined3d_private.h"
 
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 40567cf1a2c9c0d617947680655eb8c41d25f161..b2925eb97e9cebf3c0775792180a0e06e6202766 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -22,7 +22,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "wined3d_private.h"
 #include "winternl.h"
diff --git a/dlls/wined3d/gl_compat.c b/dlls/wined3d/gl_compat.c
index b8323b7e226eb85ad3ce29d55d9a981650eb51e7..99e7cf0fd0e75f91e3a747c91239fb0bf490e0c9 100644
--- a/dlls/wined3d/gl_compat.c
+++ b/dlls/wined3d/gl_compat.c
@@ -19,12 +19,8 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
-#ifdef HAVE_FLOAT_H
-# include <float.h>
-#endif
 
 #include "wined3d_private.h"
 
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 327e73796c8ad559cf7b10254f019132abefdf82..7983aeddcec2865424e9f417bf6ffece96584d3d 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -30,7 +30,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <limits.h>
 #include <stdio.h>
diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c
index 10f35e61d59f8965d7911f4b7baa429631534125..dacd9031719341b0de3e9ba1c11d8e9d0794cecc 100644
--- a/dlls/wined3d/nvidia_texture_shader.c
+++ b/dlls/wined3d/nvidia_texture_shader.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>
 
diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c
index 4bc453bde795d3e8b4664f30d10a5b3dfff4c31c..506535af1b82a149cbb8de894f63fabe826f1592 100644
--- a/dlls/wined3d/palette.c
+++ b/dlls/wined3d/palette.c
@@ -18,8 +18,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 "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c
index 1b38eb5e3119ac36a14fe6061fb6e93e47c49fba..864a3b82f0af076317fd3b869b1935eb9223827f 100644
--- a/dlls/wined3d/query.c
+++ b/dlls/wined3d/query.c
@@ -18,9 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-
 #include "config.h"
-#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
index c8fb4cf2e29234e3a7d92861c9f7adbfc2a79efb..94d024ce87ddb6f9b7fa89435c291c4964f14c53 100644
--- a/dlls/wined3d/resource.c
+++ b/dlls/wined3d/resource.c
@@ -22,7 +22,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c
index bba3165316ebc57e2cea397f1636b52529da9db1..a6259bd3f8224196999c9b46d2c5d545a8396054 100644
--- a/dlls/wined3d/sampler.c
+++ b/dlls/wined3d/sampler.c
@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "wined3d_private.h"
 
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 957710dbd43043a11321a479bf7d2284caceba68..24d08a02a38a845dce0b5f91d7012893f02a83a8 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c
index 0c6bb933174c2999ddd223a39d653c099a2fec9d..6dedc83684ce6c4430a0bcb9a30c1e0d435e0f15 100644
--- a/dlls/wined3d/shader_sm1.c
+++ b/dlls/wined3d/shader_sm1.c
@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "wined3d_private.h"
 
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 005be96a51fa5f52d3442c6c17966b5c841f68b8..80564641eab517e85f26bd1007e37fde37a62cad 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -17,7 +17,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "wined3d_private.h"
 
diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c
index a101b7beb24bbde9a63f9d050cf171d95c046ed5..1e6a03040b986e0944520519f9ec20d12ce03693 100644
--- a/dlls/wined3d/shader_spirv.c
+++ b/dlls/wined3d/shader_spirv.c
@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "wined3d_private.h"
 
@@ -26,6 +25,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag);
 
 #ifdef SONAME_LIBVKD3D_SHADER
 
+#include <dlfcn.h>
 #define VKD3D_SHADER_NO_PROTOTYPES
 #include <vkd3d_shader.h>
 
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index c76e0c2b604317bee7d966682a44daaf4eeeade9..bc214f73b633bb02ddc14b16993422f642e4f7a5 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -26,12 +26,8 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
-#ifdef HAVE_FLOAT_H
-# include <float.h>
-#endif
 
 #include "wined3d_private.h"
 
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index 8590a2a1c1fc805320577ebbff8119b33a7c9140..6d174652b4ab5211c251bc715fd637e65b5bde37 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 9a5b4cbff72640d04bc8e0150672f890648f6238..3309df951dc718748dc5f44657d00217fd7f5787 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -27,7 +27,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
index 3ae698649cff277c647adc42f220ab06d65c9327..49a40f3e1d693b0a55e946e2c448821ea59b4dd7 100644
--- a/dlls/wined3d/swapchain.c
+++ b/dlls/wined3d/swapchain.c
@@ -21,7 +21,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index f0ef42065d3bc6bbd167bb971513424998b782db..851c3c36b82474ffff2ee459eb64bb4af5389408 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -21,7 +21,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index b7afa7215875d8d6b3cc59294b28d0a6717ab51a..ef2e28b545ae33a9699443ff4e9cc17a1c146223 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -25,7 +25,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 
diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c
index a778352d2cf5b4b22562efe9952f542b55583957..da5d294ee9745f8c10ef7cf98ec63d2f4dcbe295 100644
--- a/dlls/wined3d/vertexdeclaration.c
+++ b/dlls/wined3d/vertexdeclaration.c
@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_decl);
diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
index 5905a4bcfb588ba86310f578e44f19a5e487ede9..d6f58309b328f471f2feb7c32e7c743e25d016db 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "wined3d_private.h"
 #include "wined3d_shaders.h"
diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
index a360eadecc9040256e117568c4207e746bbab93a..699794558d64516e09e2aa9b9ec0cc133d671751 100644
--- a/dlls/wined3d/wined3d_main.c
+++ b/dlls/wined3d/wined3d_main.c
@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "initguid.h"
 #include "wined3d_private.h"
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index e1df3d07f992e8dbd232bbd5d261f653578cf06e..b30a4108b0bb790089bd1f47014a8e287d62d176 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -34,6 +34,7 @@
 #include <assert.h>
 #include <stdarg.h>
 #include <stdbool.h>
+#include <sys/types.h>
 #include <math.h>
 #include <limits.h>
 #include "ntstatus.h"
diff --git a/dlls/winejoystick.drv/joystick_linux.c b/dlls/winejoystick.drv/joystick_linux.c
index 4e7e18e9e64887c14e02dd4f8657dfe32658651c..7fd2c95aff1b28e80919031ee67e6214738fb94c 100644
--- a/dlls/winejoystick.drv/joystick_linux.c
+++ b/dlls/winejoystick.drv/joystick_linux.c
@@ -36,7 +36,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #ifdef HAVE_LINUX_22_JOYSTICK_API
 
diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c
index 33132de741509242314491b4389276334b13eeb9..daf194c2aec194153716aa94d66e75618cd94d1e 100644
--- a/dlls/winemac.drv/opengl.c
+++ b/dlls/winemac.drv/opengl.c
@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "macdrv.h"
 
diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c
index f546e3ccfa5f8411fd3aa5a615e62c6cca5899e0..3665e0023b7931f6c3f1a43909b2c38a73235510 100644
--- a/dlls/winemac.drv/vulkan.c
+++ b/dlls/winemac.drv/vulkan.c
@@ -22,15 +22,11 @@
  * the other drivers. */
 
 #include "config.h"
-#include "wine/port.h"
-#include "macdrv.h"
 
 #include <stdarg.h>
 #include <stdio.h>
 
-#include "windef.h"
-#include "winbase.h"
-
+#include "macdrv.h"
 #include "wine/debug.h"
 #include "wine/heap.h"
 
diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c
index 553b2ff6ea910412aa487d5ba15b5e6d68409e68..7128d07ec506b70167f1748e98236971934533da 100644
--- a/dlls/wineoss.drv/midi.c
+++ b/dlls/wineoss.drv/midi.c
@@ -40,15 +40,13 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <sys/types.h>
+#include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #ifdef HAVE_SYS_IOCTL_H
diff --git a/dlls/wineoss.drv/mmaux.c b/dlls/wineoss.drv/mmaux.c
index 9554ee72dbccb1e6ff20be5b2a0e9e01f7c051fd..26fea510eaeff6b463948423cac1880cd88025b9 100644
--- a/dlls/wineoss.drv/mmaux.c
+++ b/dlls/wineoss.drv/mmaux.c
@@ -19,14 +19,12 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <sys/types.h>
+#include <unistd.h>
 #include <fcntl.h>
 #ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c
index b511af3f69152fb010ee766e0fedabf7cbb69d40..4e3320f8ed5b19348ce07aa330196ff6c96813c1 100644
--- a/dlls/winex11.drv/clipboard.c
+++ b/dlls/winex11.drv/clipboard.c
@@ -64,7 +64,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <string.h>
 #include <stdarg.h>
@@ -74,6 +73,7 @@
 # include <unistd.h>
 #endif
 #include <fcntl.h>
+#include <dlfcn.h>
 #include <limits.h>
 #include <time.h>
 #include <assert.h>
diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c
index 8cc30f0736de15d3527fa08dd46dedf4d387e60e..9e56e080bda776db294984517fd883f55cf35861 100644
--- a/dlls/winex11.drv/mouse.c
+++ b/dlls/winex11.drv/mouse.c
@@ -20,10 +20,9 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <math.h>
-
+#include <dlfcn.h>
 #include <X11/Xlib.h>
 #include <X11/cursorfont.h>
 #include <stdarg.h>
diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index 791787cfd3a41d045fa26e6050d5209b4d217a34..d46cac58593654d2e56ed750beb82bdb70d3c83e 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -24,12 +24,11 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-
+#include <dlfcn.h>
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c
index 6f67d9a8a19ac6cd55ba4067212d9bc31035c813..619b0ecec1ee6c9adbc119b765e104977b3922c9 100644
--- a/dlls/winex11.drv/vulkan.c
+++ b/dlls/winex11.drv/vulkan.c
@@ -21,10 +21,10 @@
  * the other drivers. */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdarg.h>
 #include <stdio.h>
+#include <dlfcn.h>
 
 #include "windef.h"
 #include "winbase.h"
diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index b4b7357f2454d8653ec0e4cca69232c4f67918a3..a9fcfb0e2952985ddae2f28c58b542f3a1becefc 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -21,7 +21,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c
index c141ae88e7102ee83b3d67ea36b578146ed1c697..331601c3325459a8350d9df475f56a67948e09b2 100644
--- a/dlls/winex11.drv/wintab.c
+++ b/dlls/winex11.drv/wintab.c
@@ -19,11 +19,11 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdlib.h>
 #include <stdarg.h>
 #include <math.h>
+#include <dlfcn.h>
 
 #include "windef.h"
 #include "winbase.h"
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
index c29d081a0a5f75e0615698cb0bb4022a40220049..e55921843377f6a9f94205e37e3e74a008a429bc 100644
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <fcntl.h>
 #include <stdarg.h>
@@ -33,6 +32,7 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
+#include <dlfcn.h>
 #include <X11/cursorfont.h>
 #include <X11/Xlib.h>
 #ifdef HAVE_XKB
diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c
index 9eee4bee1ac5a14c17bbacd4e05cdcdf12471fa1..b72a168adcec2d7218ac3e95c6d6ef2480c4fec1 100644
--- a/dlls/winex11.drv/xdnd.c
+++ b/dlls/winex11.drv/xdnd.c
@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <string.h>
 #ifdef HAVE_UNISTD_H
diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c
index 5794bcb4f74f4e5ca32b84e17a663eaa0d5759f6..b707574a0ab97ec5c822cf2a53bbc2f3aa78b1d9 100644
--- a/dlls/winex11.drv/xinerama.c
+++ b/dlls/winex11.drv/xinerama.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdarg.h>
 #include <stdlib.h>
@@ -27,6 +26,7 @@
 #ifdef HAVE_X11_EXTENSIONS_XINERAMA_H
 #include <X11/extensions/Xinerama.h>
 #endif
+#include <dlfcn.h>
 #include "x11drv.h"
 #include "wine/debug.h"
 #include "wine/heap.h"
diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c
index 561ef9e506ae9530b952057d5e2509b699ce554b..fb7a4405a1e09e2e5b7b2c26445ee69c9d12624f 100644
--- a/dlls/winex11.drv/xrandr.c
+++ b/dlls/winex11.drv/xrandr.c
@@ -21,7 +21,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #define NONAMELESSSTRUCT
 #define NONAMELESSUNION
@@ -38,6 +37,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag);
 #include <assert.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/Xrandr.h>
+#include <dlfcn.h>
 #include "x11drv.h"
 
 #define VK_NO_PROTOTYPES
diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c
index ac19af79e100385de2c02fb6df36f10cd3769ac8..5e5e83489f4f9bc0decd78b3490da9810d06f03a 100644
--- a/dlls/winex11.drv/xrender.c
+++ b/dlls/winex11.drv/xrender.c
@@ -22,13 +22,14 @@
  * 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 <assert.h>
 #include <stdarg.h>
 #include <string.h>
 #include <stdlib.h>
+#include <dlfcn.h>
 
 #include "windef.h"
 #include "winbase.h"
diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c
index 79cf2e32dc5270833a7e8ce3726aff38635c2959..d0be58342a5efb69bb53ab3c74026f60be8db34d 100644
--- a/dlls/winex11.drv/xvidmode.c
+++ b/dlls/winex11.drv/xvidmode.c
@@ -20,12 +20,12 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
 #include <math.h>
+#include <dlfcn.h>
 
 #define NONAMELESSSTRUCT
 #define NONAMELESSUNION
diff --git a/include/wine/port.h b/include/wine/port.h
deleted file mode 100644
index 0405b8d63ad72c670a60c0c99f613cb895f88065..0000000000000000000000000000000000000000
--- a/include/wine/port.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Wine porting definitions
- *
- * Copyright 1996 Alexandre Julliard
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef __WINE_WINE_PORT_H
-#define __WINE_WINE_PORT_H
-
-#ifndef __WINE_CONFIG_H
-# error You must include config.h to use this header
-#endif
-
-#ifdef __WINE_BASETSD_H
-# 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>
-
-
-/****************************************************************
- * Hard-coded values for the Windows platform
- */
-
-#ifdef _WIN32
-
-#include <errno.h>
-
-#define dlopen(name,flags)   NULL
-#define dlsym(handle,name)   NULL
-static inline int dlclose(void *handle) { return 0; }
-static inline const char *dlerror(void) { return "No dlopen support on Windows"; }
-static inline int symlink(const char *from, const char *to) { errno = ENOSYS; return -1; }
-
-#ifdef _MSC_VER
-/* The UCRT headers in the Windows SDK #error out if we #define snprintf.
- * The C headers that came with previous Visual Studio versions do not have
- * snprintf. Check for VS 2015, which appears to be the first version to
- * use the UCRT headers by default. */
-#if _MSC_VER < 1900
-# define snprintf _snprintf
-#endif
-#endif
-
-#else
-
-#include <dlfcn.h>
-
-#endif  /* _WIN32 */
-
-#endif /* !defined(__WINE_WINE_PORT_H) */
diff --git a/include/winsock2.h b/include/winsock2.h
index abc82554d8efa9f127fcd10d216e14af4bd8703d..f1d43acad404a5897501a0726b4f04c53efa3387 100644
--- a/include/winsock2.h
+++ b/include/winsock2.h
@@ -303,7 +303,6 @@ extern "C" {
 
 /* Constants for WSAPoll() */
 #ifndef USE_WS_PREFIX
-#ifndef __WINE_WINE_PORT_H
 #define POLLERR                    0x0001
 #define POLLHUP                    0x0002
 #define POLLNVAL                   0x0004
@@ -314,7 +313,6 @@ extern "C" {
 #define POLLPRI                    0x0400
 #define POLLIN                     (POLLRDNORM|POLLRDBAND)
 #define POLLOUT                    (POLLWRNORM)
-#endif
 #else
 #define WS_POLLERR                 0x0001
 #define WS_POLLHUP                 0x0002
diff --git a/tools/widl/parser.l b/tools/widl/parser.l
index d01a9ece3bb6afff6fe66c1105ef766aa3b2f3de..6070d7e7a1fa9ab6e7d0b6e16d9b65ae80e4c4c0 100644
--- a/tools/widl/parser.l
+++ b/tools/widl/parser.l
@@ -43,7 +43,6 @@ double	[0-9]+\.[0-9]+([eE][+-]?[0-9]+)*
 %{
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/wrc/ppl.l b/tools/wrc/ppl.l
index ee5a4f97a1e23e7f0c6ef278b8e306c998acbfc0..632bb61a66554db0a30d742e51fb3db79563f6b1 100644
--- a/tools/wrc/ppl.l
+++ b/tools/wrc/ppl.l
@@ -113,7 +113,6 @@
 
 %top{
 #include "config.h"
-#include "wine/port.h"
 }
 
 /*