GdkWindow -> GdkSurface: File renames

Rename all *window.[ch] source files.

This is an automatic operation, done by the following commands:

for i in $(git ls-files gdk | grep window); do
    git mv $i $(echo $i | sed s/window/surface/);
    git sed -f g $(basename $i) $(basename $i | sed s/window/surface/) ;
done

git checkout NEWS* po-properties po

77 files changed, 92 insertions, 92 deletions

diff --git a/demos/gtk-demo/list_store.c b/demos/gtk-demo/list_store.c
index 0662fd1979..53c30a2b72 100644
--- a/demos/gtk-demo/list_store.c
+++ b/demos/gtk-demo/list_store.c
@@ -37,7 +37,7 @@ enum
 static Bug data[] =
 {
   { FALSE, 60482, "Normal",     "scrollable notebooks and hidden tabs" },
-  { FALSE, 60620, "Critical",   "gdk_surface_clear_area (gdkwindow-win32.c) is not thread-safe" },
+  { FALSE, 60620, "Critical",   "gdk_surface_clear_area (gdksurface-win32.c) is not thread-safe" },
   { FALSE, 50214, "Major",      "Xft support does not clean up correctly" },
   { TRUE,  52877, "Major",      "GtkFileSelection needs a refresh method. " },
   { FALSE, 56070, "Normal",     "Can't click button after setting in sensitive" },
diff --git a/gdk/broadway/gdkbroadway.h b/gdk/broadway/gdkbroadway.h
index 3e72be0f3b..33a7bff89d 100644
--- a/gdk/broadway/gdkbroadway.h
+++ b/gdk/broadway/gdkbroadway.h
@@ -30,7 +30,7 @@
 #define __GDKBROADWAY_H_INSIDE__
 
 #include <gdk/broadway/gdkbroadwaydisplay.h>
-#include <gdk/broadway/gdkbroadwaywindow.h>
+#include <gdk/broadway/gdkbroadwaysurface.h>
 #include <gdk/broadway/gdkbroadwaycursor.h>
 #include <gdk/broadway/gdkbroadwaymonitor.h>
 
diff --git a/gdk/broadway/gdkbroadwaywindow.h b/gdk/broadway/gdkbroadwaysurface.h
index 12ce448c51..12ce448c51 100644
--- a/gdk/broadway/gdkbroadwaywindow.h
+++ b/gdk/broadway/gdkbroadwaysurface.h
diff --git a/gdk/broadway/gdkdevice-broadway.c b/gdk/broadway/gdkdevice-broadway.c
index fda10591ac..8158871b64 100644
--- a/gdk/broadway/gdkdevice-broadway.c
+++ b/gdk/broadway/gdkdevice-broadway.c
@@ -20,7 +20,7 @@
 
 #include "gdkdevice-broadway.h"
 
-#include "gdkwindow.h"
+#include "gdksurface.h"
 #include "gdkprivate-broadway.h"
 
 static gboolean gdk_broadway_device_get_history (GdkDevice      *device,
diff --git a/gdk/broadway/gdkdisplay-broadway.h b/gdk/broadway/gdkdisplay-broadway.h
index 51d59ae077..25a962ac66 100644
--- a/gdk/broadway/gdkdisplay-broadway.h
+++ b/gdk/broadway/gdkdisplay-broadway.h
@@ -26,7 +26,7 @@
 
 #include "gdkdisplayprivate.h"
 #include "gdkkeys.h"
-#include "gdkwindow.h"
+#include "gdksurface.h"
 #include "gdkinternals.h"
 #include "gdkbroadway-server.h"
 #include "gdkmonitorprivate.h"
diff --git a/gdk/broadway/gdkprivate-broadway.h b/gdk/broadway/gdkprivate-broadway.h
index abbdaadce9..8f1a9237eb 100644
--- a/gdk/broadway/gdkprivate-broadway.h
+++ b/gdk/broadway/gdkprivate-broadway.h
@@ -31,11 +31,11 @@
 
 #include <gdk/gdkcursor.h>
 #include <gdk/gdkinternals.h>
-#include "gdkwindow-broadway.h"
+#include "gdksurface-broadway.h"
 #include "gdkdisplay-broadway.h"
 
 #include "gdkbroadwaycursor.h"
-#include "gdkbroadwaywindow.h"
+#include "gdkbroadwaysurface.h"
 
 void _gdk_broadway_resync_windows (void);
 
diff --git a/gdk/broadway/gdkwindow-broadway.c b/gdk/broadway/gdksurface-broadway.c
index 9b7dbcf60f..30777d8756 100644
--- a/gdk/broadway/gdkwindow-broadway.c
+++ b/gdk/broadway/gdksurface-broadway.c
@@ -25,12 +25,12 @@
 
 #include "config.h"
 
-#include "gdkwindow-broadway.h"
+#include "gdksurface-broadway.h"
 
 #include "gdkbroadwaydisplay.h"
 #include "gdkdisplay.h"
-#include "gdkwindow.h"
-#include "gdkwindowimpl.h"
+#include "gdksurface.h"
+#include "gdksurfaceimpl.h"
 #include "gdkdisplay-broadway.h"
 #include "gdkprivate-broadway.h"
 #include "gdkinternals.h"
diff --git a/gdk/broadway/gdkwindow-broadway.h b/gdk/broadway/gdksurface-broadway.h
index d6239319d2..00fa539645 100644
--- a/gdk/broadway/gdkwindow-broadway.h
+++ b/gdk/broadway/gdksurface-broadway.h
@@ -25,7 +25,7 @@
 #ifndef __GDK_SURFACE_BROADWAY_H__
 #define __GDK_SURFACE_BROADWAY_H__
 
-#include <gdk/gdkwindowimpl.h>
+#include <gdk/gdksurfaceimpl.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/broadway/meson.build b/gdk/broadway/meson.build
index 970b6c8e6c..81e29cc9c1 100644
--- a/gdk/broadway/meson.build
+++ b/gdk/broadway/meson.build
@@ -12,12 +12,12 @@ gdk_broadway_sources = files([
   'gdkkeys-broadway.c',
   'gdkmonitor-broadway.c',
   'gdkselection-broadway.c',
-  'gdkwindow-broadway.c',
+  'gdksurface-broadway.c',
 ])
 
 gdk_broadway_public_headers = [
   'gdkbroadwaydisplay.h',
-  'gdkbroadwaywindow.h',
+  'gdkbroadwaysurface.h',
   'gdkbroadwaycursor.h',
   'gdkbroadwaymonitor.h',
 ]
diff --git a/gdk/gdk.h b/gdk/gdk.h
index 6bb48e004a..921e93690d 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -67,7 +67,7 @@
 #include <gdk/gdktexture.h>
 #include <gdk/gdktypes.h>
 #include <gdk/gdkvulkancontext.h>
-#include <gdk/gdkwindow.h>
+#include <gdk/gdksurface.h>
 
 #include <gdk/gdk-autocleanup.h>
 
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index cfcffcec6a..2e9f0abd23 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -31,7 +31,7 @@
 #include "gdkdeviceprivate.h"
 #include "gdkdisplaymanagerprivate.h"
 #include "gdkevents.h"
-#include "gdkwindowimpl.h"
+#include "gdksurfaceimpl.h"
 #include "gdkinternals.h"
 #include "gdkmonitorprivate.h"
 
diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h
index dc206b9070..db52472a3c 100644
--- a/gdk/gdkdisplayprivate.h
+++ b/gdk/gdkdisplayprivate.h
@@ -19,7 +19,7 @@
 #define __GDK_DISPLAY_PRIVATE_H__
 
 #include "gdkdisplay.h"
-#include "gdkwindow.h"
+#include "gdksurface.h"
 #include "gdkcursor.h"
 #include "gdkmonitor.h"
 #include "gdkinternals.h"
diff --git a/gdk/gdkdnd.c b/gdk/gdkdnd.c
index f3197e6d75..7d6d453d2f 100644
--- a/gdk/gdkdnd.c
+++ b/gdk/gdkdnd.c
@@ -26,7 +26,7 @@
 
 #include "gdkdndprivate.h"
 #include "gdkdisplay.h"
-#include "gdkwindow.h"
+#include "gdksurface.h"
 #include "gdkintl.h"
 #include "gdkcontentformats.h"
 #include "gdkcontentprovider.h"
diff --git a/gdk/gdkdrawingcontext.c b/gdk/gdkdrawingcontext.c
index eecf58a23a..b47aaf35a4 100644
--- a/gdk/gdkdrawingcontext.c
+++ b/gdk/gdkdrawingcontext.c
@@ -49,7 +49,7 @@
 #include "gdkinternals.h"
 #include "gdkintl.h"
 #include "gdkframeclockidle.h"
-#include "gdkwindowimpl.h"
+#include "gdksurfaceimpl.h"
 #include "gdkglcontextprivate.h"
 #include "gdk-private.h"
 
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 97c54b01e2..c55353448a 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -28,7 +28,7 @@
 #define __GDK_INTERNALS_H__
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include "gdkwindowimpl.h"
+#include "gdksurfaceimpl.h"
 #include "gdkdisplay.h"
 #include "gdkeventsprivate.h"
 #include "gdkenumtypes.h"
diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c
index c8a2c20376..fd4fa5a97a 100644
--- a/gdk/gdkpixbuf-drawable.c
+++ b/gdk/gdkpixbuf-drawable.c
@@ -24,7 +24,7 @@
 
 #include "gdkpixbuf.h"
 
-#include "gdkwindow.h"
+#include "gdksurface.h"
 #include "gdkinternals.h"
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/gdk/gdkseat.h b/gdk/gdkseat.h
index f5e6a0336e..c9a0a4c220 100644
--- a/gdk/gdkseat.h
+++ b/gdk/gdkseat.h
@@ -25,7 +25,7 @@
 #endif
 
 #include <glib-object.h>
-#include <gdk/gdkwindow.h>
+#include <gdk/gdksurface.h>
 #include <gdk/gdkevents.h>
 #include <gdk/gdktypes.h>
 
diff --git a/gdk/gdkwindow.c b/gdk/gdksurface.c
index 3eea4914ba..d37a5ac464 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdksurface.c
@@ -27,7 +27,7 @@
 
 #include <cairo-gobject.h>
 
-#include "gdkwindow.h"
+#include "gdksurface.h"
 
 #include "gdkrectangle.h"
 #include "gdkinternals.h"
@@ -36,7 +36,7 @@
 #include "gdkdeviceprivate.h"
 #include "gdkmarshalers.h"
 #include "gdkframeclockidle.h"
-#include "gdkwindowimpl.h"
+#include "gdksurfaceimpl.h"
 #include "gdkglcontextprivate.h"
 #include "gdkdrawingcontextprivate.h"
 #include "gdk-private.h"
diff --git a/gdk/gdkwindow.h b/gdk/gdksurface.h
index ea5ca92858..9cc1b57030 100644
--- a/gdk/gdkwindow.h
+++ b/gdk/gdksurface.h
@@ -157,7 +157,7 @@ typedef enum
 } GdkWMFunction;
 
 /* Currently, these are the same values numerically as in the
- * X protocol. If you change that, gdkwindow-x11.c/gdk_surface_set_geometry_hints()
+ * X protocol. If you change that, gdksurface-x11.c/gdk_surface_set_geometry_hints()
  * will need fixing.
  */
 /**
diff --git a/gdk/gdkwindowimpl.c b/gdk/gdksurfaceimpl.c
index d182a40cfc..f5c329688a 100644
--- a/gdk/gdkwindowimpl.c
+++ b/gdk/gdksurfaceimpl.c
@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#include "gdkwindowimpl.h"
+#include "gdksurfaceimpl.h"
 
 #include "gdkinternals.h"
 
diff --git a/gdk/gdkwindowimpl.h b/gdk/gdksurfaceimpl.h
index 076feff090..7a1dcb4bb0 100644
--- a/gdk/gdkwindowimpl.h
+++ b/gdk/gdksurfaceimpl.h
@@ -25,7 +25,7 @@
 #ifndef __GDK_SURFACE_IMPL_H__
 #define __GDK_SURFACE_IMPL_H__
 
-#include <gdk/gdkwindow.h>
+#include <gdk/gdksurface.h>
 #include <gdk/gdkproperty.h>
 
 G_BEGIN_DECLS
diff --git a/gdk/meson.build b/gdk/meson.build
index 8f69e1ca24..d562d6c84f 100644
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -42,8 +42,8 @@ gdk_public_sources = files([
   'gdksnapshot.c',
   'gdktexture.c',
   'gdkvulkancontext.c',
-  'gdkwindow.c',
-  'gdkwindowimpl.c',
+  'gdksurface.c',
+  'gdksurfaceimpl.c',
 ])
 
 gdk_public_headers = files([
@@ -86,7 +86,7 @@ gdk_public_headers = files([
   'gdktexture.h',
   'gdktypes.h',
   'gdkvulkancontext.h',
-  'gdkwindow.h',
+  'gdksurface.h',
 ])
 install_headers(gdk_public_headers, subdir: 'gtk-4.0/gdk/')
 
diff --git a/gdk/quartz/GdkQuartzNSWindow.c b/gdk/quartz/GdkQuartzNSWindow.c
index bdb86011ab..60067f5c7a 100644
--- a/gdk/quartz/GdkQuartzNSWindow.c
+++ b/gdk/quartz/GdkQuartzNSWindow.c
@@ -18,7 +18,7 @@
 
 #include "config.h"
 #import "GdkQuartzNSWindow.h"
-#include "gdkquartzwindow.h"
+#include "gdkquartzsurface.h"
 #include "gdkdnd-quartz.h"
 #include "gdkprivate-quartz.h"
 
diff --git a/gdk/quartz/GdkQuartzView.c b/gdk/quartz/GdkQuartzView.c
index fc2f13458e..39d3821406 100644
--- a/gdk/quartz/GdkQuartzView.c
+++ b/gdk/quartz/GdkQuartzView.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #import "GdkQuartzView.h"
-#include "gdkquartzwindow.h"
+#include "gdkquartzsurface.h"
 #include "gdkprivate-quartz.h"
 #include "gdkquartz.h"
 
diff --git a/gdk/quartz/gdkdevice-core-quartz.c b/gdk/quartz/gdkdevice-core-quartz.c
index 9a2e270e08..c42680e3ac 100644
--- a/gdk/quartz/gdkdevice-core-quartz.c
+++ b/gdk/quartz/gdkdevice-core-quartz.c
@@ -22,7 +22,7 @@
 #include <gdk/gdkdisplayprivate.h>
 
 #import "GdkQuartzView.h"
-#include "gdkquartzwindow.h"
+#include "gdkquartzsurface.h"
 #include "gdkquartzcursor.h"
 #include "gdkprivate-quartz.h"
 #include "gdkquartzdevice-core.h"
diff --git a/gdk/quartz/gdkdisplay-quartz.c b/gdk/quartz/gdkdisplay-quartz.c
index 781437d1c0..1bfb4459dd 100644
--- a/gdk/quartz/gdkdisplay-quartz.c
+++ b/gdk/quartz/gdkdisplay-quartz.c
@@ -23,7 +23,7 @@
 
 #include "gdkprivate-quartz.h"
 #include "gdkquartzscreen.h"
-#include "gdkquartzwindow.h"
+#include "gdkquartzsurface.h"
 #include "gdkquartzdisplay.h"
 #include "gdkquartzdevicemanager-core.h"
 #include "gdkmonitorprivate.h"
diff --git a/gdk/quartz/gdkdisplay-quartz.h b/gdk/quartz/gdkdisplay-quartz.h
index 10d249e5a3..4e25106879 100644
--- a/gdk/quartz/gdkdisplay-quartz.h
+++ b/gdk/quartz/gdkdisplay-quartz.h
@@ -22,7 +22,7 @@
 
 #include "gdkdisplayprivate.h"
 #include "gdkkeys.h"
-#include "gdkwindow.h"
+#include "gdksurface.h"
 #include "gdkinternals.h"
 
 G_BEGIN_DECLS
diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
index d1f520b9cc..c85f071c18 100644
--- a/gdk/quartz/gdkevents-quartz.c
+++ b/gdk/quartz/gdkevents-quartz.c
@@ -624,7 +624,7 @@ find_toplevel_under_pointer (GdkDisplay *display,
        * under the pointer and we thus return NULL. This can occur when
        * toplevel under pointer has not yet been updated due to a very recent
        * window resize. Alternatively, we should no longer be relying on
-       * the toplevel_under_pointer value which is maintained in gdkwindow.c.
+       * the toplevel_under_pointer value which is maintained in gdksurface.c.
        */
       if (*x < 0 || *y < 0 || *x >= toplevel->width || *y >= toplevel->height)
         return NULL;
diff --git a/gdk/quartz/gdkglcontext-quartz.h b/gdk/quartz/gdkglcontext-quartz.h
index 86946a1df8..080316e5bc 100644
--- a/gdk/quartz/gdkglcontext-quartz.h
+++ b/gdk/quartz/gdkglcontext-quartz.h
@@ -24,7 +24,7 @@
 #define __GDK_QUARTZ_GL_CONTEXT__
 
 #include "gdkglcontextprivate.h"
-#include "gdkwindow.h"
+#include "gdksurface.h"
 #include "gdkinternals.h"
 
 G_BEGIN_DECLS
diff --git a/gdk/quartz/gdkprivate-quartz.h b/gdk/quartz/gdkprivate-quartz.h
index 48f5950d4c..e65a5f227f 100644
--- a/gdk/quartz/gdkprivate-quartz.h
+++ b/gdk/quartz/gdkprivate-quartz.h
@@ -1,4 +1,4 @@
-/* gdkwindow-quartz.c
+/* gdksurface-quartz.c
  *
  * Copyright (C) 2005-2007 Imendio AB
  *
@@ -26,7 +26,7 @@
 #include <gdk/quartz/gdkdevicemanager-core-quartz.h>
 #include <gdk/quartz/gdkdnd-quartz.h>
 #include <gdk/quartz/gdkscreen-quartz.h>
-#include <gdk/quartz/gdkwindow-quartz.h>
+#include <gdk/quartz/gdksurface-quartz.h>
 
 #include <gdk/gdk.h>
 
diff --git a/gdk/quartz/gdkquartz.h b/gdk/quartz/gdkquartz.h
index 0479c72303..132245d09f 100644
--- a/gdk/quartz/gdkquartz.h
+++ b/gdk/quartz/gdkquartz.h
@@ -80,7 +80,7 @@ G_END_DECLS
 #include <gdk/quartz/gdkquartzmonitor.h>
 #include <gdk/quartz/gdkquartzscreen.h>
 #include <gdk/quartz/gdkquartzutils.h>
-#include <gdk/quartz/gdkquartzwindow.h>
+#include <gdk/quartz/gdkquartzsurface.h>
 
 #undef __GDKQUARTZ_H_INSIDE__
 
diff --git a/gdk/quartz/gdkquartzwindow.h b/gdk/quartz/gdkquartzsurface.h
index 56ff424b76..a37cb37c1d 100644
--- a/gdk/quartz/gdkquartzwindow.h
+++ b/gdk/quartz/gdkquartzsurface.h
@@ -1,4 +1,4 @@
-/* gdkquartzwindow.h
+/* gdkquartzsurface.h
  *
  * Copyright (C) 2005  Imendio AB
  * Copyright (C) 2010  Kristian Rietveld  <kris@gtk.org>
diff --git a/gdk/quartz/gdkscreen-quartz.c b/gdk/quartz/gdkscreen-quartz.c
index e9d2d6b094..f8094354a0 100644
--- a/gdk/quartz/gdkscreen-quartz.c
+++ b/gdk/quartz/gdkscreen-quartz.c
@@ -55,7 +55,7 @@
  * coordinate space.  Such coordinates are mapped to their respective
  * position in the GdkScreen root window (_gdk_quartz_surface_xy_to_gdk_xy)
  * and vice versa (_gdk_quartz_surface_gdk_xy_to_xy).  Both functions can
- * be found in gdkwindow-quartz.c.  Note that Cocoa coordinates can have
+ * be found in gdksurface-quartz.c.  Note that Cocoa coordinates can have
  * negative values (in case a monitor is located left or below of screen 0),
  * but GDK coordinates can *not*!
  */
diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdksurface-quartz.c
index 170950a7da..f3676cee47 100644
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdksurface-quartz.c
@@ -1,4 +1,4 @@
-/* gdkwindow-quartz.c
+/* gdksurface-quartz.c
  *
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  * Copyright (C) 2005-2007 Imendio AB
@@ -23,7 +23,7 @@
 #include <gdk/gdkdeviceprivate.h>
 #include <gdk/gdkdisplayprivate.h>
 
-#include "gdkwindowimpl.h"
+#include "gdksurfaceimpl.h"
 #include "gdkprivate-quartz.h"
 #include "gdkglcontext-quartz.h"
 #include "gdkquartzscreen.h"
diff --git a/gdk/quartz/gdkwindow-quartz.h b/gdk/quartz/gdksurface-quartz.h
index cbadd75153..ca4dd0d249 100644
--- a/gdk/quartz/gdkwindow-quartz.h
+++ b/gdk/quartz/gdksurface-quartz.h
@@ -21,7 +21,7 @@
 
 #import <gdk/quartz/GdkQuartzView.h>
 #import <gdk/quartz/GdkQuartzNSWindow.h>
-#include "gdk/gdkwindowimpl.h"
+#include "gdk/gdksurfaceimpl.h"
 
 G_BEGIN_DECLS
 
diff --git a/gdk/quartz/meson.build b/gdk/quartz/meson.build
index acacd791a8..8d2e0fc2c3 100644
--- a/gdk/quartz/meson.build
+++ b/gdk/quartz/meson.build
@@ -16,7 +16,7 @@ gdk_quartz_sources = files([
   'gdkscreen-quartz.c',
   'gdkselection-quartz.c',
   'gdkutils-quartz.c',
-  'gdkwindow-quartz.c',
+  'gdksurface-quartz.c',
 ])
 
 gdk_quartz_public_headers = files([
@@ -29,7 +29,7 @@ gdk_quartz_public_headers = files([
   'gdkquartzkeys.h',
   'gdkquartzscreen.h',
   'gdkquartzutils.h',
-  'gdkquartzwindow.h',
+  'gdkquartzsurface.h',
 ])
 
 install_headers(gdk_quartz_public_headers, subdir: 'gtk-4.0/gdk/quartz/')
diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
index 7e9de9b08b..d4bbd2ef0d 100644
--- a/gdk/wayland/gdkdevice-wayland.c
+++ b/gdk/wayland/gdkdevice-wayland.c
@@ -22,7 +22,7 @@
 #include <errno.h>
 
 #include <string.h>
-#include <gdk/gdkwindow.h>
+#include <gdk/gdksurface.h>
 #include <gdk/gdktypes.h>
 #include "gdkclipboard-wayland.h"
 #include "gdkclipboardprivate.h"
diff --git a/gdk/wayland/gdkdisplay-wayland.h b/gdk/wayland/gdkdisplay-wayland.h
index 5b0fa7918b..625b5e2f4a 100644
--- a/gdk/wayland/gdkdisplay-wayland.h
+++ b/gdk/wayland/gdkdisplay-wayland.h
@@ -37,7 +37,7 @@
 
 #include <glib.h>
 #include <gdk/gdkkeys.h>
-#include <gdk/gdkwindow.h>
+#include <gdk/gdksurface.h>
 #include <gdk/gdkinternals.h>
 #include <gdk/gdk.h>		/* For gdk_get_program_class() */
 
diff --git a/gdk/wayland/gdkglcontext-wayland.c b/gdk/wayland/gdkglcontext-wayland.c
index 6df899156a..9fe7d8447e 100644
--- a/gdk/wayland/gdkglcontext-wayland.c
+++ b/gdk/wayland/gdkglcontext-wayland.c
@@ -26,7 +26,7 @@
 
 #include "gdkwaylanddisplay.h"
 #include "gdkwaylandglcontext.h"
-#include "gdkwaylandwindow.h"
+#include "gdkwaylandsurface.h"
 #include "gdkprivate-wayland.h"
 
 #include "gdkinternals.h"
diff --git a/gdk/wayland/gdkglcontext-wayland.h b/gdk/wayland/gdkglcontext-wayland.h
index 3b98c3b7cf..e402994979 100644
--- a/gdk/wayland/gdkglcontext-wayland.h
+++ b/gdk/wayland/gdkglcontext-wayland.h
@@ -24,7 +24,7 @@
 
 #include "gdkglcontextprivate.h"
 #include "gdkdisplayprivate.h"
-#include "gdkwindow.h"
+#include "gdksurface.h"
 #include "gdkinternals.h"
 
 #include <epoxy/egl.h>
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdksurface-wayland.c
index ead400fe6d..99d02bf971 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdksurface-wayland.c
@@ -23,8 +23,8 @@
 #include "gdk.h"
 #include "gdkwayland.h"
 
-#include "gdkwindow.h"
-#include "gdkwindowimpl.h"
+#include "gdksurface.h"
+#include "gdksurfaceimpl.h"
 #include "gdkdisplay-wayland.h"
 #include "gdkglcontext-wayland.h"
 #include "gdkframeclockprivate.h"
diff --git a/gdk/wayland/gdkvulkancontext-wayland.c b/gdk/wayland/gdkvulkancontext-wayland.c
index cdac207635..a5f721ec64 100644
--- a/gdk/wayland/gdkvulkancontext-wayland.c
+++ b/gdk/wayland/gdkvulkancontext-wayland.c
@@ -28,7 +28,7 @@
 
 #include "gdkinternals.h"
 #include "gdkwaylanddisplay.h"
-#include "gdkwaylandwindow.h"
+#include "gdkwaylandsurface.h"
 #include "gdkprivate-wayland.h"
 
 G_DEFINE_TYPE (GdkWaylandVulkanContext, gdk_wayland_vulkan_context, GDK_TYPE_VULKAN_CONTEXT)
diff --git a/gdk/wayland/gdkwayland.h b/gdk/wayland/gdkwayland.h
index 14f25d1d1d..9179d58e77 100644
--- a/gdk/wayland/gdkwayland.h
+++ b/gdk/wayland/gdkwayland.h
@@ -32,7 +32,7 @@
 #include <gdk/wayland/gdkwaylanddevice.h>
 #include <gdk/wayland/gdkwaylanddisplay.h>
 #include <gdk/wayland/gdkwaylandmonitor.h>
-#include <gdk/wayland/gdkwaylandwindow.h>
+#include <gdk/wayland/gdkwaylandsurface.h>
 #include <gdk/wayland/gdkwaylandglcontext.h>
 
 #undef __GDKWAYLAND_H_INSIDE__
diff --git a/gdk/wayland/gdkwaylandwindow.h b/gdk/wayland/gdkwaylandsurface.h
index b9747b6ca8..b9747b6ca8 100644
--- a/gdk/wayland/gdkwaylandwindow.h
+++ b/gdk/wayland/gdkwaylandsurface.h
diff --git a/gdk/wayland/meson.build b/gdk/wayland/meson.build
index fec3d2c74e..6390e57c19 100644
--- a/gdk/wayland/meson.build
+++ b/gdk/wayland/meson.build
@@ -12,7 +12,7 @@ gdk_wayland_sources = files([
   'gdkprimary-wayland.c',
   'gdkselection-wayland.c',
   'gdkvulkancontext-wayland.c',
-  'gdkwindow-wayland.c',
+  'gdksurface-wayland.c',
   'wm-button-layout-translation.c',
 ])
 
@@ -21,7 +21,7 @@ gdk_wayland_public_headers = files([
   'gdkwaylanddisplay.h',
   'gdkwaylandglcontext.h',
   'gdkwaylandmonitor.h',
-  'gdkwaylandwindow.h'
+  'gdkwaylandsurface.h'
 ])
 
 install_headers(gdk_wayland_public_headers, subdir: 'gtk-4.0/gdk/wayland/')
diff --git a/gdk/win32/gdkcursor-win32.c b/gdk/win32/gdkcursor-win32.c
index adeec0d8b0..8e83cfae30 100644
--- a/gdk/win32/gdkcursor-win32.c
+++ b/gdk/win32/gdkcursor-win32.c
@@ -934,7 +934,7 @@ _gdk_win32_display_get_maximal_cursor_size (GdkDisplay *display,
 
 /* Convert a pixbuf to an HICON (or HCURSOR).  Supports alpha under
  * Windows XP, thresholds alpha otherwise.  Also used from
- * gdkwindow-win32.c for creating application icons.
+ * gdksurface-win32.c for creating application icons.
  */
 
 static HBITMAP
diff --git a/gdk/win32/gdkdevice-virtual.c b/gdk/win32/gdkdevice-virtual.c
index f5658e137b..95f6fdd871 100644
--- a/gdk/win32/gdkdevice-virtual.c
+++ b/gdk/win32/gdkdevice-virtual.c
@@ -17,7 +17,7 @@
 
 #include "config.h"
 
-#include <gdk/gdkwindow.h>
+#include <gdk/gdksurface.h>
 
 #include <windowsx.h>
 #include <objbase.h>
diff --git a/gdk/win32/gdkdevice-win32.c b/gdk/win32/gdkdevice-win32.c
index 580506a971..86218dc02c 100644
--- a/gdk/win32/gdkdevice-win32.c
+++ b/gdk/win32/gdkdevice-win32.c
@@ -17,7 +17,7 @@
 
 #include "config.h"
 
-#include <gdk/gdkwindow.h>
+#include <gdk/gdksurface.h>
 
 #include <windowsx.h>
 #include <objbase.h>
diff --git a/gdk/win32/gdkdevice-wintab.c b/gdk/win32/gdkdevice-wintab.c
index a8a41785c7..73bf2b1773 100644
--- a/gdk/win32/gdkdevice-wintab.c
+++ b/gdk/win32/gdkdevice-wintab.c
@@ -17,7 +17,7 @@
 
 #include "config.h"
 
-#include <gdk/gdkwindow.h>
+#include <gdk/gdksurface.h>
 
 #include <windowsx.h>
 #include <objbase.h>
diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index 47891e6a0f..e546e4b1be 100644
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -28,7 +28,7 @@
 #include "gdkglcontext-win32.h"
 #include "gdkwin32display.h"
 #include "gdkwin32screen.h"
-#include "gdkwin32window.h"
+#include "gdkwin32surface.h"
 #include "gdkmonitor-win32.h"
 #include "gdkwin32.h"
 #include "gdkvulkancontext-win32.h"
diff --git a/gdk/win32/gdkglcontext-win32.c b/gdk/win32/gdkglcontext-win32.c
index d406080968..ed3db37eac 100644
--- a/gdk/win32/gdkglcontext-win32.c
+++ b/gdk/win32/gdkglcontext-win32.c
@@ -23,7 +23,7 @@
 #include "config.h"
 
 #include "gdkprivate-win32.h"
-#include "gdkwindow-win32.h"
+#include "gdksurface-win32.h"
 #include "gdkglcontext-win32.h"
 #include "gdkdisplay-win32.h"
 
@@ -31,10 +31,10 @@
 #include "gdkwin32glcontext.h"
 #include "gdkwin32misc.h"
 #include "gdkwin32screen.h"
-#include "gdkwin32window.h"
+#include "gdkwin32surface.h"
 
 #include "gdkglcontext.h"
-#include "gdkwindow.h"
+#include "gdksurface.h"
 #include "gdkinternals.h"
 #include "gdkintl.h"
 
diff --git a/gdk/win32/gdkglcontext-win32.h b/gdk/win32/gdkglcontext-win32.h
index 77b656592a..8549679559 100644
--- a/gdk/win32/gdkglcontext-win32.h
+++ b/gdk/win32/gdkglcontext-win32.h
@@ -26,7 +26,7 @@
 
 #include "gdkglcontextprivate.h"
 #include "gdkdisplayprivate.h"
-#include "gdkwindow.h"
+#include "gdksurface.h"
 #include "gdkinternals.h"
 
 G_BEGIN_DECLS
diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index 8249a60b65..f22fa69634 100644
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -35,7 +35,7 @@
 #endif
 
 #include <gdk/gdkcursorprivate.h>
-#include <gdk/win32/gdkwindow-win32.h>
+#include <gdk/win32/gdksurface-win32.h>
 #include <gdk/win32/gdkwin32display.h>
 #include <gdk/win32/gdkwin32screen.h>
 #include <gdk/win32/gdkwin32keys.h>
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdksurface-win32.c
index 7d51af76fc..f41534f451 100644
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdksurface-win32.c
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 
 #include "gdk.h"
-#include "gdkwindowimpl.h"
+#include "gdksurfaceimpl.h"
 #include "gdkprivate-win32.h"
 #include "gdkdeviceprivate.h"
 #include "gdkdevicemanager-win32.h"
@@ -37,7 +37,7 @@
 #include "gdkwin32.h"
 #include "gdkdisplayprivate.h"
 #include "gdkmonitorprivate.h"
-#include "gdkwin32window.h"
+#include "gdkwin32surface.h"
 #include "gdkglcontext-win32.h"
 #include "gdkdisplay-win32.h"
 
diff --git a/gdk/win32/gdkwindow-win32.h b/gdk/win32/gdksurface-win32.h
index 4856287611..684690f65d 100644
--- a/gdk/win32/gdkwindow-win32.h
+++ b/gdk/win32/gdksurface-win32.h
@@ -26,7 +26,7 @@
 #define __GDK_SURFACE_WIN32_H__
 
 #include "gdk/win32/gdkprivate-win32.h"
-#include "gdk/gdkwindowimpl.h"
+#include "gdk/gdksurfaceimpl.h"
 #include "gdk/gdkcursor.h"
 
 #include <windows.h>
diff --git a/gdk/win32/gdkwin32.h b/gdk/win32/gdkwin32.h
index e098366e0f..f4001dabb5 100644
--- a/gdk/win32/gdkwin32.h
+++ b/gdk/win32/gdkwin32.h
@@ -33,7 +33,7 @@
 #include <gdk/win32/gdkwin32dnd.h>
 #include <gdk/win32/gdkwin32keys.h>
 #include <gdk/win32/gdkwin32screen.h>
-#include <gdk/win32/gdkwin32window.h>
+#include <gdk/win32/gdkwin32surface.h>
 #include <gdk/win32/gdkwin32misc.h>
 #include <gdk/win32/gdkwin32monitor.h>
 #include <gdk/win32/gdkwin32glcontext.h>
diff --git a/gdk/win32/gdkwin32window.h b/gdk/win32/gdkwin32surface.h
index 9dda179353..9dda179353 100644
--- a/gdk/win32/gdkwin32window.h
+++ b/gdk/win32/gdkwin32surface.h
diff --git a/gdk/win32/meson.build b/gdk/win32/meson.build
index c99f60981b..d609ca8d03 100644
--- a/gdk/win32/meson.build
+++ b/gdk/win32/meson.build
@@ -21,7 +21,7 @@ gdk_win32_sources = files([
   'gdkwin32cursor.h',
   'gdkwin32display.h',
   'gdkwin32id.c',
-  'gdkwindow-win32.c',
+  'gdksurface-win32.c',
 ])
 
 gdk_win32_public_headers = files([
@@ -34,7 +34,7 @@ gdk_win32_public_headers = files([
   'gdkwin32misc.h',
   'gdkwin32monitor.h',
   'gdkwin32screen.h',
-  'gdkwin32window.h',
+  'gdkwin32surface.h',
 ])
 
 install_headers(gdk_win32_public_headers, subdir: 'gtk-4.0/gdk/win32/')
diff --git a/gdk/x11/gdkdevice-core-x11.c b/gdk/x11/gdkdevice-core-x11.c
index 6bbdda6693..055fa593ac 100644
--- a/gdk/x11/gdkdevice-core-x11.c
+++ b/gdk/x11/gdkdevice-core-x11.c
@@ -22,7 +22,7 @@
 #include "gdkdeviceprivate.h"
 
 #include "gdkinternals.h"
-#include "gdkwindow.h"
+#include "gdksurface.h"
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"
 #include "gdkasync.h"
diff --git a/gdk/x11/gdkdisplay-x11.h b/gdk/x11/gdkdisplay-x11.h
index ed08da2ff1..c4cc9e61b7 100644
--- a/gdk/x11/gdkdisplay-x11.h
+++ b/gdk/x11/gdkdisplay-x11.h
@@ -24,7 +24,7 @@
 
 #include "gdkdisplayprivate.h"
 #include "gdkkeys.h"
-#include "gdkwindow.h"
+#include "gdksurface.h"
 #include "gdkinternals.h"
 #include "gdkx11devicemanager.h"
 #include "gdkx11display.h"
diff --git a/gdk/x11/gdkeventsource.c b/gdk/x11/gdkeventsource.c
index 2a26669c1a..168e33cfb8 100644
--- a/gdk/x11/gdkeventsource.c
+++ b/gdk/x11/gdkeventsource.c
@@ -20,7 +20,7 @@
 #include "gdkeventsource.h"
 
 #include "gdkinternals.h"
-#include "gdkwindow-x11.h"
+#include "gdksurface-x11.h"
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"
 #include "xsettings-client.h"
diff --git a/gdk/x11/gdkeventtranslator.c b/gdk/x11/gdkeventtranslator.c
index 96c2ed9957..579c59ae23 100644
--- a/gdk/x11/gdkeventtranslator.c
+++ b/gdk/x11/gdkeventtranslator.c
@@ -18,7 +18,7 @@
 #include "config.h"
 
 #include "gdkeventtranslator.h"
-#include "gdkwindow-x11.h"
+#include "gdksurface-x11.h"
 
 typedef GdkEventTranslatorIface GdkEventTranslatorInterface;
 G_DEFINE_INTERFACE (GdkEventTranslator, _gdk_x11_event_translator, G_TYPE_OBJECT);
diff --git a/gdk/x11/gdkgeometry-x11.c b/gdk/x11/gdkgeometry-x11.c
index 208704c360..d75acffbd6 100644
--- a/gdk/x11/gdkgeometry-x11.c
+++ b/gdk/x11/gdkgeometry-x11.c
@@ -22,7 +22,7 @@
 #include "gdkprivate-x11.h"
 #include "gdkscreen-x11.h"
 #include "gdkdisplay-x11.h"
-#include "gdkwindow-x11.h"
+#include "gdksurface-x11.h"
 
 
 typedef struct _GdkSurfaceQueueItem GdkSurfaceQueueItem;
diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c
index 682df01b39..0405d0588a 100644
--- a/gdk/x11/gdkglcontext-x11.c
+++ b/gdk/x11/gdkglcontext-x11.c
@@ -28,7 +28,7 @@
 #include "gdkx11display.h"
 #include "gdkx11glcontext.h"
 #include "gdkx11screen.h"
-#include "gdkx11window.h"
+#include "gdkx11surface.h"
 #include "gdkvisual-x11.h"
 #include "gdkx11property.h"
 #include <X11/Xatom.h>
diff --git a/gdk/x11/gdkglcontext-x11.h b/gdk/x11/gdkglcontext-x11.h
index 61dbadef1f..89d1131fcc 100644
--- a/gdk/x11/gdkglcontext-x11.h
+++ b/gdk/x11/gdkglcontext-x11.h
@@ -30,7 +30,7 @@
 #include "gdkglcontextprivate.h"
 #include "gdkdisplayprivate.h"
 #include "gdkvisual-x11.h"
-#include "gdkwindow.h"
+#include "gdksurface.h"
 #include "gdkinternals.h"
 
 G_BEGIN_DECLS
diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index 90d6ecaafe..e784b1f1b7 100644
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -32,7 +32,7 @@
 #include "gdkcursor.h"
 #include "gdkinternals.h"
 #include "gdkx.h"
-#include "gdkwindow-x11.h"
+#include "gdksurface-x11.h"
 #include "gdkscreen-x11.h"
 
 #include <X11/Xlib.h>
diff --git a/gdk/x11/gdkselectioninputstream-x11.c b/gdk/x11/gdkselectioninputstream-x11.c
index c3ae895344..55f83b4975 100644
--- a/gdk/x11/gdkselectioninputstream-x11.c
+++ b/gdk/x11/gdkselectioninputstream-x11.c
@@ -27,7 +27,7 @@
 #include "gdkintl.h"
 #include "gdkx11display.h"
 #include "gdkx11property.h"
-#include "gdkx11window.h"
+#include "gdkx11surface.h"
 
 typedef struct GdkX11SelectionInputStreamPrivate  GdkX11SelectionInputStreamPrivate;
 
diff --git a/gdk/x11/gdkselectionoutputstream-x11.c b/gdk/x11/gdkselectionoutputstream-x11.c
index 106c6b780c..5f35cdf6be 100644
--- a/gdk/x11/gdkselectionoutputstream-x11.c
+++ b/gdk/x11/gdkselectionoutputstream-x11.c
@@ -29,7 +29,7 @@
 #include "gdktextlistconverter-x11.h"
 #include "gdkx11display.h"
 #include "gdkx11property.h"
-#include "gdkx11window.h"
+#include "gdkx11surface.h"
 
 typedef struct _GdkX11PendingSelectionNotify GdkX11PendingSelectionNotify;
 typedef struct _GdkX11SelectionOutputStreamPrivate  GdkX11SelectionOutputStreamPrivate;
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdksurface-x11.c
index c78c5c1840..21f1d14bf1 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdksurface-x11.c
@@ -25,10 +25,10 @@
 
 #include "config.h"
 
-#include "gdkwindow-x11.h"
+#include "gdksurface-x11.h"
 
-#include "gdkwindow.h"
-#include "gdkwindowimpl.h"
+#include "gdksurface.h"
+#include "gdksurfaceimpl.h"
 #include "gdkvisual-x11.h"
 #include "gdkinternals.h"
 #include "gdkdeviceprivate.h"
diff --git a/gdk/x11/gdkwindow-x11.h b/gdk/x11/gdksurface-x11.h
index b824240ffc..15993af589 100644
--- a/gdk/x11/gdkwindow-x11.h
+++ b/gdk/x11/gdksurface-x11.h
@@ -26,7 +26,7 @@
 #define __GDK_SURFACE_X11_H__
 
 #include "gdk/x11/gdkprivate-x11.h"
-#include "gdk/gdkwindowimpl.h"
+#include "gdk/gdksurfaceimpl.h"
 
 #include <X11/Xlib.h>
 
diff --git a/gdk/x11/gdkvulkancontext-x11.c b/gdk/x11/gdkvulkancontext-x11.c
index 0e88ec6d63..b27c407bd4 100644
--- a/gdk/x11/gdkvulkancontext-x11.c
+++ b/gdk/x11/gdkvulkancontext-x11.c
@@ -28,7 +28,7 @@
 
 #include "gdkinternals.h"
 #include "gdkdisplay-x11.h"
-#include "gdkwindow-x11.h"
+#include "gdksurface-x11.h"
 
 G_DEFINE_TYPE (GdkX11VulkanContext, gdk_x11_vulkan_context, GDK_TYPE_VULKAN_CONTEXT)
 
diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index 153b4a501e..9fa9cb0711 100644
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -48,7 +48,7 @@
 #include <gdk/x11/gdkx11screen.h>
 #include <gdk/x11/gdkx11selection.h>
 #include <gdk/x11/gdkx11utils.h>
-#include <gdk/x11/gdkx11window.h>
+#include <gdk/x11/gdkx11surface.h>
 
 #include <gdk/x11/gdkx-autocleanups.h>
 
diff --git a/gdk/x11/gdkx11window.h b/gdk/x11/gdkx11surface.h
index d2fc1e4a60..d2fc1e4a60 100644
--- a/gdk/x11/gdkx11window.h
+++ b/gdk/x11/gdkx11surface.h
diff --git a/gdk/x11/meson.build b/gdk/x11/meson.build
index 53213818fb..3912031c18 100644
--- a/gdk/x11/meson.build
+++ b/gdk/x11/meson.build
@@ -26,7 +26,7 @@ gdk_x11_sources = files([
   'gdktextlistconverter-x11.c',
   'gdkvisual-x11.c',
   'gdkvulkancontext-x11.c',
-  'gdkwindow-x11.c',
+  'gdksurface-x11.c',
   'gdkxftdefaults.c',
   'gdkxid.c',
   'xsettings-client.c',
@@ -50,7 +50,7 @@ gdk_x11_public_headers = files([
   'gdkx11screen.h',
   'gdkx11selection.h',
   'gdkx11utils.h',
-  'gdkx11window.h',
+  'gdkx11surface.h',
 ])
 
 install_headers(gdk_x11_public_headers, subdir: 'gtk-4.0/gdk/x11/')
diff --git a/gdk/x11/xsettings-client.c b/gdk/x11/xsettings-client.c
index 5713882320..9adfcf27d4 100644
--- a/gdk/x11/xsettings-client.c
+++ b/gdk/x11/xsettings-client.c
@@ -28,7 +28,7 @@
 #include <gdk/x11/gdkx11display.h>
 #include <gdk/x11/gdkx11property.h>
 #include <gdk/x11/gdkx11screen.h>
-#include <gdk/x11/gdkx11window.h>
+#include <gdk/x11/gdkx11surface.h>
 #include <gdk/x11/gdkprivate-x11.h>
 #include <gdk/x11/gdkdisplay-x11.h>
 #include <gdk/x11/gdkscreen-x11.h>
diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c
index 01cb0238bf..a91235b7d8 100644
--- a/gtk/gtkdnd-quartz.c
+++ b/gtk/gtkdnd-quartz.c
@@ -1091,7 +1091,7 @@ gtk_drag_begin_idle (gpointer arg)
 }
 /* Fake protocol to let us call GdkNSView gdkWindow without including
  * gdk/GdkNSView.h (which we can’t because it pulls in the internal-only
- * gdkwindow.h).
+ * gdksurface.h).
  */
 @protocol GdkNSView
 - (GdkSurface *)gdkWindow;
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 2331030054..ec5ded38f4 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -5974,7 +5974,7 @@ gtk_window_finalize (GObject *object)
   G_OBJECT_CLASS (gtk_window_parent_class)->finalize (object);
 }
 
-/* copied from gdkwindow-x11.c */
+/* copied from gdksurface-x11.c */
 static const gchar *
 get_default_title (void)
 {