gdi32: Rename gdi_private.h to ntgdi_private.h.

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);
 

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);

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);

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);

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);

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);

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);

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"

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"

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"

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"

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"

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"

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"

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);

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 */
 

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"
 

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);

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"

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"
 

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);

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"
 

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);

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);

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"
 

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 */
 

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);

dlls/gdi32/gdi_private.h → 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 */

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;

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);
 

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);

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);

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);

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);

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);
 

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);

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.@)