diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c
index 8f3d31bf2ec..f3fc1dd1d44 100644
--- a/dlls/gdi32/bidi.c
+++ b/dlls/gdi32/bidi.c
@@ -48,7 +48,7 @@
 #include "winnls.h"
 #include "usp10.h"
 #include "wine/debug.h"
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(bidi);
 
diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c
index b4a222c3152..3dee59ec1cd 100644
--- a/dlls/gdi32/bitblt.c
+++ b/dlls/gdi32/bitblt.c
@@ -26,7 +26,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(bitblt);
diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c
index 39c18cad0b2..48cf876212d 100644
--- a/dlls/gdi32/bitmap.c
+++ b/dlls/gdi32/bitmap.c
@@ -26,7 +26,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(bitmap);
diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c
index 1d3e5d61f84..638e7fc7fed 100644
--- a/dlls/gdi32/brush.c
+++ b/dlls/gdi32/brush.c
@@ -24,7 +24,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(gdi);
diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c
index 9096237eff8..5eb4984d2f2 100644
--- a/dlls/gdi32/clipping.c
+++ b/dlls/gdi32/clipping.c
@@ -23,7 +23,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(clipping);
diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c
index b9022886853..3dfed269d9f 100644
--- a/dlls/gdi32/dc.c
+++ b/dlls/gdi32/dc.c
@@ -29,7 +29,7 @@
 #include "winnls.h"
 #include "winternl.h"
 #include "winerror.h"
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dc);
diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c
index 588030f72a8..f54eac2dc5c 100644
--- a/dlls/gdi32/dib.c
+++ b/dlls/gdi32/dib.c
@@ -72,7 +72,7 @@
 #include "winternl.h"
 #include "ddk/d3dkmthk.h"
 
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(bitmap);
diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c
index 8fe9104cdf9..35413ccb942 100644
--- a/dlls/gdi32/dibdrv/bitblt.c
+++ b/dlls/gdi32/dibdrv/bitblt.c
@@ -20,7 +20,7 @@
 
 #include <assert.h>
 
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "dibdrv.h"
 
 #include "wine/debug.h"
diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c
index 2c229c53d83..274fc15454d 100644
--- a/dlls/gdi32/dibdrv/dc.c
+++ b/dlls/gdi32/dibdrv/dc.c
@@ -20,7 +20,7 @@
 
 #include <assert.h>
 
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "dibdrv.h"
 
 #include "wine/wgl.h"
diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c
index 9fc41909b86..62906dcfaf0 100644
--- a/dlls/gdi32/dibdrv/graphics.c
+++ b/dlls/gdi32/dibdrv/graphics.c
@@ -19,7 +19,7 @@
  */
 
 #include <assert.h>
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "dibdrv.h"
 
 #include "wine/debug.h"
diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c
index 247eaa7df5e..aa920396463 100644
--- a/dlls/gdi32/dibdrv/objects.c
+++ b/dlls/gdi32/dibdrv/objects.c
@@ -21,7 +21,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "dibdrv.h"
 
 #include "wine/debug.h"
diff --git a/dlls/gdi32/dibdrv/opengl.c b/dlls/gdi32/dibdrv/opengl.c
index 0ef6fae7bca..d21a74474a6 100644
--- a/dlls/gdi32/dibdrv/opengl.c
+++ b/dlls/gdi32/dibdrv/opengl.c
@@ -27,7 +27,7 @@
 
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "dibdrv.h"
 #include "wine/wgl.h"
 #include "wine/wgl_driver.h"
diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c
index 5eca124b918..87f1be2d3f9 100644
--- a/dlls/gdi32/dibdrv/primitives.c
+++ b/dlls/gdi32/dibdrv/primitives.c
@@ -20,7 +20,7 @@
 
 #include <assert.h>
 
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "dibdrv.h"
 
 #include "wine/debug.h"
diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c
index 2042701dd45..b889beb7c31 100644
--- a/dlls/gdi32/driver.c
+++ b/dlls/gdi32/driver.c
@@ -38,7 +38,7 @@
 #include "setupapi.h"
 #include "ddk/d3dkmthk.h"
 
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "wine/list.h"
 #include "wine/debug.h"
 #include "wine/heap.h"
diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c
index 47650880986..75db4cb24fb 100644
--- a/dlls/gdi32/enhmetafile.c
+++ b/dlls/gdi32/enhmetafile.c
@@ -40,7 +40,7 @@
 #include "wingdi.h"
 #include "winnls.h"
 #include "winerror.h"
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile);
diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h
index fd463bd29e3..1a90f70604f 100644
--- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h
+++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h
@@ -26,7 +26,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 
 /* Enhanced Metafile driver physical DC */
 
diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c
index 56a6fafb77f..9a611e0f1bc 100644
--- a/dlls/gdi32/enhmfdrv/init.c
+++ b/dlls/gdi32/enhmfdrv/init.c
@@ -26,7 +26,7 @@
 #include "winbase.h"
 #include "wingdi.h"
 #include "winnls.h"
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "enhmfdrv/enhmetafiledrv.h"
 #include "wine/debug.h"
 
diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c
index a60ca1a3b82..86166517c19 100644
--- a/dlls/gdi32/enhmfdrv/objects.c
+++ b/dlls/gdi32/enhmfdrv/objects.c
@@ -23,7 +23,7 @@
 #include <string.h>
 
 #include "enhmfdrv/enhmetafiledrv.h"
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile);
diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index 20dff1360fe..0416609c27f 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -31,7 +31,7 @@
 #include "winnls.h"
 #include "winternl.h"
 #include "winreg.h"
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "resource.h"
 #include "wine/exception.h"
 #include "wine/heap.h"
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 6af76d6f81b..490e4c501aa 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -105,7 +105,7 @@
 #include "winerror.h"
 #include "winreg.h"
 #include "wingdi.h"
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "wine/debug.h"
 #include "wine/list.h"
 
diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c
index b52414d550c..40d67fb1b1f 100644
--- a/dlls/gdi32/gdiobj.c
+++ b/dlls/gdi32/gdiobj.c
@@ -31,7 +31,7 @@
 #include "winerror.h"
 #include "winternl.h"
 
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(gdi);
diff --git a/dlls/gdi32/icm.c b/dlls/gdi32/icm.c
index d0a42a55531..b86771a6f87 100644
--- a/dlls/gdi32/icm.c
+++ b/dlls/gdi32/icm.c
@@ -28,7 +28,7 @@
 #include "winnls.h"
 #include "winreg.h"
 
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 
 #include "wine/debug.h"
 
diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c
index 83582846486..5eb06555831 100644
--- a/dlls/gdi32/mapping.c
+++ b/dlls/gdi32/mapping.c
@@ -23,7 +23,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dc);
diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c
index 09979c81326..a4aa3d61508 100644
--- a/dlls/gdi32/metafile.c
+++ b/dlls/gdi32/metafile.c
@@ -55,7 +55,7 @@
 #include "winreg.h"
 #include "winnls.h"
 #include "winternl.h"
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(metafile);
diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c
index ecde9ab1732..f337d4ec559 100644
--- a/dlls/gdi32/mfdrv/init.c
+++ b/dlls/gdi32/mfdrv/init.c
@@ -24,7 +24,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winnls.h"
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "mfdrv/metafiledrv.h"
 #include "wine/debug.h"
 
diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h
index 429b95b3f40..6f1f9587d58 100644
--- a/dlls/gdi32/mfdrv/metafiledrv.h
+++ b/dlls/gdi32/mfdrv/metafiledrv.h
@@ -26,7 +26,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 
 /* Metafile driver physical DC */
 
diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c
index 7fd4340536c..1ba4a279d03 100644
--- a/dlls/gdi32/mfdrv/objects.c
+++ b/dlls/gdi32/mfdrv/objects.c
@@ -28,7 +28,7 @@
 #include "wingdi.h"
 #include "wine/wingdi16.h"
 #include "mfdrv/metafiledrv.h"
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(metafile);
diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/ntgdi_private.h
similarity index 99%
rename from dlls/gdi32/gdi_private.h
rename to dlls/gdi32/ntgdi_private.h
index b161dc55fc7..e78f4361bd1 100644
--- a/dlls/gdi32/gdi_private.h
+++ b/dlls/gdi32/ntgdi_private.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef __WINE_GDI_PRIVATE_H
-#define __WINE_GDI_PRIVATE_H
+#ifndef __WINE_NTGDI_PRIVATE_H
+#define __WINE_NTGDI_PRIVATE_H
 
 #include <limits.h>
 #include <math.h>
@@ -776,4 +776,4 @@ extern void CDECL free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN;
 
 extern HMODULE gdi32_module DECLSPEC_HIDDEN;
 
-#endif /* __WINE_GDI_PRIVATE_H */
+#endif /* __WINE_NTGDI_PRIVATE_H */
diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c
index 37e832d1759..c50d7bc2b43 100644
--- a/dlls/gdi32/opengl.c
+++ b/dlls/gdi32/opengl.c
@@ -30,7 +30,7 @@
 #include "winerror.h"
 #include "winternl.h"
 #include "winnt.h"
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 
 
 static HMODULE opengl32;
diff --git a/dlls/gdi32/opentype.c b/dlls/gdi32/opentype.c
index 5a22f61cbd3..10234c6d5aa 100644
--- a/dlls/gdi32/opentype.c
+++ b/dlls/gdi32/opentype.c
@@ -30,7 +30,7 @@
 
 #include "wine/debug.h"
 
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(font);
 
diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c
index 590e53b4d11..3f77650259f 100644
--- a/dlls/gdi32/painting.c
+++ b/dlls/gdi32/painting.c
@@ -28,7 +28,7 @@
 #include "winbase.h"
 #include "wingdi.h"
 #include "winerror.h"
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(gdi);
diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c
index b8b6245488c..2ec5e147555 100644
--- a/dlls/gdi32/palette.c
+++ b/dlls/gdi32/palette.c
@@ -33,7 +33,7 @@
 #include "wingdi.h"
 #include "winuser.h"
 
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(palette);
diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c
index a82b34908e1..662bd262b00 100644
--- a/dlls/gdi32/path.c
+++ b/dlls/gdi32/path.c
@@ -33,7 +33,7 @@
 #include "wingdi.h"
 #include "winerror.h"
 
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(gdi);
diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c
index d6e35114c5d..3b3ab78ecd7 100644
--- a/dlls/gdi32/pen.c
+++ b/dlls/gdi32/pen.c
@@ -26,7 +26,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(gdi);
diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c
index d2f4076746f..d9595ff7abf 100644
--- a/dlls/gdi32/printdrv.c
+++ b/dlls/gdi32/printdrv.c
@@ -30,7 +30,7 @@
 #include "winspool.h"
 #include "winerror.h"
 #include "wine/debug.h"
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(print);
 
diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c
index 1500e0d1653..502ce108a8f 100644
--- a/dlls/gdi32/region.c
+++ b/dlls/gdi32/region.c
@@ -101,7 +101,7 @@ SOFTWARE.
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(region);
diff --git a/dlls/gdi32/vulkan.c b/dlls/gdi32/vulkan.c
index 25ac7b65d25..0796763b8c4 100644
--- a/dlls/gdi32/vulkan.c
+++ b/dlls/gdi32/vulkan.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "gdi_private.h"
+#include "ntgdi_private.h"
 
 /***********************************************************************
  *      __wine_get_vulkan_driver  (GDI32.@)