diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c
index e461b0e916..bd4183eb0b 100644
--- a/gdk/win32/gdksurface-win32.c
+++ b/gdk/win32/gdksurface-win32.c
@@ -4621,7 +4621,7 @@ gdk_win32_surface_class_init (GdkWin32SurfaceClass *klass)
   impl_class->compute_size = _gdk_win32_surface_compute_size;
 }
 
-HGDIOBJ
+HWND
 gdk_win32_surface_get_handle (GdkSurface *window)
 {
   if (!GDK_IS_WIN32_SURFACE (window))
diff --git a/gdk/win32/gdkwin32misc.h b/gdk/win32/gdkwin32misc.h
index bfa356a453..1bab4ec404 100644
--- a/gdk/win32/gdkwin32misc.h
+++ b/gdk/win32/gdkwin32misc.h
@@ -78,7 +78,7 @@ GDK_AVAILABLE_IN_ALL
 gpointer      gdk_win32_handle_table_lookup (HWND handle);
 /* Translate from window to Windows handle */
 GDK_AVAILABLE_IN_ALL
-HGDIOBJ       gdk_win32_surface_get_handle (GdkSurface *window);
+HWND          gdk_win32_surface_get_handle (GdkSurface *window);
 
 GDK_AVAILABLE_IN_ALL
 GdkSurface *   gdk_win32_surface_lookup_for_display (GdkDisplay *display,
diff --git a/tests/dummy-headers/windows.h b/tests/dummy-headers/windows.h
index fefe9e8fa2..1b1d700fc3 100644
--- a/tests/dummy-headers/windows.h
+++ b/tests/dummy-headers/windows.h
@@ -1,6 +1,5 @@
 /* Dummy header for the Win32 backend. */
 
 typedef void *HDC;
-typedef void *HGDIOBJ;
 typedef void *HICON;
 typedef void *HWND;