Minimize the amount of inclusions in public headers

Public headers should mainly include gdktypes.h, which already include
the symbol visibility and versioning macros; we can also modify
gdktypes.h to include the enumerations.

46 files changed, 28 insertions, 84 deletions

diff --git a/gdk/gdkapplaunchcontext.h b/gdk/gdkapplaunchcontext.h
index 3687402cc6..989fc654d5 100644
--- a/gdk/gdkapplaunchcontext.h
+++ b/gdk/gdkapplaunchcontext.h
@@ -24,7 +24,6 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS
diff --git a/gdk/gdkcairo.c b/gdk/gdkcairo.c
index d69b9bc602..fec75fb8b5 100644
--- a/gdk/gdkcairo.c
+++ b/gdk/gdkcairo.c
@@ -1,5 +1,5 @@
 /* GDK - The GIMP Drawing Kit
- * Copyright (C) 2005 Red Hat, Inc. 
+ * Copyright (C) 2005 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,6 +19,9 @@
 
 #include "gdkcairoprivate.h"
 
+#include "gdkrgba.h"
+#include "gdktexture.h"
+
 #include <math.h>
 
 /**
diff --git a/gdk/gdkcairo.h b/gdk/gdkcairo.h
index 37d1d2cb75..10591ab8fa 100644
--- a/gdk/gdkcairo.h
+++ b/gdk/gdkcairo.h
@@ -1,5 +1,5 @@
 /* GDK - The GIMP Drawing Kit
- * Copyright (C) 2005 Red Hat, Inc. 
+ * Copyright (C) 2005 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,8 +21,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/version/gdkversionmacros.h>
-#include <gdk/gdkrgba.h>
+#include <gdk/gdktypes.h>
 #include <gdk/gdkpixbuf.h>
 #include <pango/pangocairo.h>
 
diff --git a/gdk/gdkcairocontext.h b/gdk/gdkcairocontext.h
index d696cd5685..2f58eb8e2b 100644
--- a/gdk/gdkcairocontext.h
+++ b/gdk/gdkcairocontext.h
@@ -24,11 +24,8 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 
-#include <cairo.h>
-
 G_BEGIN_DECLS
 
 #define GDK_TYPE_CAIRO_CONTEXT             (gdk_cairo_context_get_type ())
diff --git a/gdk/gdkclipboard.h b/gdk/gdkclipboard.h
index 11b638b4e0..5814ef09d8 100644
--- a/gdk/gdkclipboard.h
+++ b/gdk/gdkclipboard.h
@@ -22,10 +22,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
-#include <gio/gio.h>
-
 
 G_BEGIN_DECLS
 
diff --git a/gdk/gdkcontentdeserializer.h b/gdk/gdkcontentdeserializer.h
index fe756a2225..cace164fef 100644
--- a/gdk/gdkcontentdeserializer.h
+++ b/gdk/gdkcontentdeserializer.h
@@ -21,8 +21,6 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-
-#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS
diff --git a/gdk/gdkcontentformats.h b/gdk/gdkcontentformats.h
index e20c900b6d..ddb85b3ec5 100644
--- a/gdk/gdkcontentformats.h
+++ b/gdk/gdkcontentformats.h
@@ -21,8 +21,6 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-
-#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS
diff --git a/gdk/gdkcontentprovider.h b/gdk/gdkcontentprovider.h
index c291ca9158..f9a62ef5d3 100644
--- a/gdk/gdkcontentprovider.h
+++ b/gdk/gdkcontentprovider.h
@@ -22,10 +22,8 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 
-
 G_BEGIN_DECLS
 
 #define GDK_TYPE_CONTENT_PROVIDER            (gdk_content_provider_get_type ())
diff --git a/gdk/gdkcontentproviderimpl.h b/gdk/gdkcontentproviderimpl.h
index 8e608411c7..8c7c802292 100644
--- a/gdk/gdkcontentproviderimpl.h
+++ b/gdk/gdkcontentproviderimpl.h
@@ -22,7 +22,6 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS
diff --git a/gdk/gdkcontentserializer.h b/gdk/gdkcontentserializer.h
index 137d0993cc..7bf8854f33 100644
--- a/gdk/gdkcontentserializer.h
+++ b/gdk/gdkcontentserializer.h
@@ -21,8 +21,6 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-
-#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS
diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h
index e7277487cf..64240db7e2 100644
--- a/gdk/gdkcursor.h
+++ b/gdk/gdkcursor.h
@@ -28,7 +28,6 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS
diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h
index 5124f49ffb..21d8703986 100644
--- a/gdk/gdkdevice.h
+++ b/gdk/gdkdevice.h
@@ -21,12 +21,10 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 #include <gdk/gdkdevicetool.h>
 #include <gdk/gdkenums.h>
 
-
 G_BEGIN_DECLS
 
 #define GDK_TYPE_DEVICE         (gdk_device_get_type ())
diff --git a/gdk/gdkdevicepad.h b/gdk/gdkdevicepad.h
index 050ec1772a..1e95313fbd 100644
--- a/gdk/gdkdevicepad.h
+++ b/gdk/gdkdevicepad.h
@@ -23,7 +23,6 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS
diff --git a/gdk/gdkdevicetool.h b/gdk/gdkdevicetool.h
index 29718e95d9..5a60ff15fa 100644
--- a/gdk/gdkdevicetool.h
+++ b/gdk/gdkdevicetool.h
@@ -21,10 +21,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/gdkenums.h>
 #include <gdk/gdktypes.h>
-#include <gdk/version/gdkversionmacros.h>
-
 
 G_BEGIN_DECLS
 
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 1bdf40c711..ddfbb908d5 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -1,7 +1,7 @@
 /* GDK - The GIMP Drawing Kit
  * gdkdisplay.c
- * 
- * Copyright 2001 Sun Microsystems Inc. 
+ *
+ * Copyright 2001 Sun Microsystems Inc.
  *
  * Erwann Chenede <erwann.chenede@sun.com>
  *
@@ -31,10 +31,11 @@
 #include "gdkclipboardprivate.h"
 #include "gdkdeviceprivate.h"
 #include "gdkdisplaymanagerprivate.h"
-#include "gdkframeclockidleprivate.h"
 #include "gdkeventsprivate.h"
+#include "gdkframeclockidleprivate.h"
 #include "gdkglcontextprivate.h"
 #include "gdkmonitorprivate.h"
+#include "gdkrectangle.h"
 
 #ifdef HAVE_EGL
 #include <epoxy/egl.h>
@@ -175,7 +176,7 @@ gdk_display_default_rate_egl_config (GdkDisplay *display,
 
   return distance;
 }
-    
+
 static GdkSeat *
 gdk_display_real_get_default_seat (GdkDisplay *display)
 {
@@ -418,10 +419,10 @@ gdk_display_close (GdkDisplay *display)
   if (!display->closed)
     {
       display->closed = TRUE;
-      
+
       g_signal_emit (display, signals[CLOSED], 0, FALSE);
       g_object_run_dispose (G_OBJECT (display));
-      
+
       g_object_unref (display);
     }
 }
@@ -808,7 +809,7 @@ _gdk_display_end_device_grab (GdkDisplay *display,
       grab->implicit_ungrab = implicit;
       return l->next == NULL;
     }
-  
+
   return FALSE;
 }
 
@@ -1268,7 +1269,7 @@ gdk_display_init_gl (GdkDisplay *self)
  * Note that even if this function succeeds, creating a `GdkGLContext`
  * may still fail.
  *
- * This function is idempotent. Calling it multiple times will just 
+ * This function is idempotent. Calling it multiple times will just
  * return the same value or error.
  *
  * You never need to call this function, GDK will call it automatically
diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index a49dc4bba5..eb559b17b2 100644
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -25,7 +25,6 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 #include <gdk/gdkevents.h>
 #include <gdk/gdkseat.h>
diff --git a/gdk/gdkdrag.h b/gdk/gdkdrag.h
index bb4dd3ceb7..2c1cfbde20 100644
--- a/gdk/gdkdrag.h
+++ b/gdk/gdkdrag.h
@@ -28,10 +28,9 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
+#include <gdk/gdktypes.h>
 #include <gdk/gdkdevice.h>
-#include <gdk/gdkenums.h>
 #include <gdk/gdkevents.h>
-#include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/gdkdragsurfacesize.h b/gdk/gdkdragsurfacesize.h
index 95a343dddc..433a136a31 100644
--- a/gdk/gdkdragsurfacesize.h
+++ b/gdk/gdkdragsurfacesize.h
@@ -23,7 +23,6 @@
 #endif
 
 #include <gdk/gdktypes.h>
-#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/gdkdrawcontext.h b/gdk/gdkdrawcontext.h
index be3ec256e1..dd3e347b8e 100644
--- a/gdk/gdkdrawcontext.h
+++ b/gdk/gdkdrawcontext.h
@@ -24,7 +24,6 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS
diff --git a/gdk/gdkdrop.h b/gdk/gdkdrop.h
index edd97badad..842c2ba65b 100644
--- a/gdk/gdkdrop.h
+++ b/gdk/gdkdrop.h
@@ -24,9 +24,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/gdkenums.h>
 #include <gdk/gdktypes.h>
-#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/gdkenums.h b/gdk/gdkenums.h
index 9fc4a640b1..b0407a2757 100644
--- a/gdk/gdkenums.h
+++ b/gdk/gdkenums.h
@@ -345,4 +345,3 @@ typedef enum {
 } GdkMemoryFormat;
 
 G_END_DECLS
-
diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h
index ba0a86499f..fa5884f44d 100644
--- a/gdk/gdkevents.h
+++ b/gdk/gdkevents.h
@@ -28,12 +28,10 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
+#include <gdk/gdktypes.h>
 #include <gdk/gdkdevice.h>
 #include <gdk/gdkdevicetool.h>
 #include <gdk/gdkdrag.h>
-#include <gdk/gdkenums.h>
-#include <gdk/gdktypes.h>
-#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/gdkframetimings.h b/gdk/gdkframetimings.h
index e030f3c98c..24bae8da29 100644
--- a/gdk/gdkframetimings.h
+++ b/gdk/gdkframetimings.h
@@ -21,8 +21,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <glib-object.h>
-#include <gdk/version/gdkversionmacros.h>
+#include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/gdkglcontext.h b/gdk/gdkglcontext.h
index 101d4f8868..cceed86ca8 100644
--- a/gdk/gdkglcontext.h
+++ b/gdk/gdkglcontext.h
@@ -1,7 +1,7 @@
 /* GDK - The GIMP Drawing Kit
  *
  * gdkglcontext.h: GL context abstraction
- * 
+ *
  * Copyright © 2014  Emmanuele Bassi
  *
  * This library is free software; you can redistribute it and/or
@@ -24,9 +24,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/gdkenums.h>
 #include <gdk/gdktypes.h>
-#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/gdkgltexture.h b/gdk/gdkgltexture.h
index 6f1cebdf47..68fa03fe4a 100644
--- a/gdk/gdkgltexture.h
+++ b/gdk/gdkgltexture.h
@@ -22,6 +22,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
+#include <gdk/gdktypes.h>
 #include <gdk/gdkglcontext.h>
 #include <gdk/gdktexture.h>
 
diff --git a/gdk/gdkgltexturebuilder.h b/gdk/gdkgltexturebuilder.h
index acac39cd90..8bf105064b 100644
--- a/gdk/gdkgltexturebuilder.h
+++ b/gdk/gdkgltexturebuilder.h
@@ -23,9 +23,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/gdkenums.h>
 #include <gdk/gdktypes.h>
-#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/gdkkeys.h b/gdk/gdkkeys.h
index 48158799d6..bc88400ead 100644
--- a/gdk/gdkkeys.h
+++ b/gdk/gdkkeys.h
@@ -28,7 +28,6 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS
diff --git a/gdk/gdkmemorytexture.h b/gdk/gdkmemorytexture.h
index 1f56b93578..21ecc6a96b 100644
--- a/gdk/gdkmemorytexture.h
+++ b/gdk/gdkmemorytexture.h
@@ -23,7 +23,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/gdkenums.h>
+#include <gdk/gdktypes.h>
 #include <gdk/gdktexture.h>
 
 G_BEGIN_DECLS
diff --git a/gdk/gdkmonitor.c b/gdk/gdkmonitor.c
index 96d7fe4416..b99408696e 100644
--- a/gdk/gdkmonitor.c
+++ b/gdk/gdkmonitor.c
@@ -24,6 +24,7 @@
 #include "gdkmonitorprivate.h"
 #include "gdkdisplay.h"
 #include "gdkenumtypes.h"
+#include "gdkrectangle.h"
 
 /**
  * GdkMonitor:
diff --git a/gdk/gdkmonitor.h b/gdk/gdkmonitor.h
index 9d304fd503..1cdb4f9a3e 100644
--- a/gdk/gdkmonitor.h
+++ b/gdk/gdkmonitor.h
@@ -25,8 +25,6 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/version/gdkversionmacros.h>
-#include <gdk/gdkrectangle.h>
 #include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS
diff --git a/gdk/gdkpaintable.h b/gdk/gdkpaintable.h
index 27ac5609c2..7b1d34f37f 100644
--- a/gdk/gdkpaintable.h
+++ b/gdk/gdkpaintable.h
@@ -24,7 +24,6 @@
 #endif
 
 #include <gdk/gdktypes.h>
-#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/gdkpango.h b/gdk/gdkpango.h
index fafae5459a..acdfbf6505 100644
--- a/gdk/gdkpango.h
+++ b/gdk/gdkpango.h
@@ -1,5 +1,5 @@
 /* GDK - The GIMP Drawing Kit
- * Copyright (C) 2000 Red Hat, Inc. 
+ * Copyright (C) 2000 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,7 +22,6 @@
 #endif
 
 #include <gdk/gdktypes.h>
-#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/gdkpipeiostreamprivate.h b/gdk/gdkpipeiostreamprivate.h
index 79b47c3d19..495de6d28b 100644
--- a/gdk/gdkpipeiostreamprivate.h
+++ b/gdk/gdkpipeiostreamprivate.h
@@ -18,14 +18,11 @@
 
 #pragma once
 
-#include <gdk/version/gdkversionmacros.h>
-#include <gio/gio.h>
+#include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS
 
-
 GIOStream *             gdk_pipe_io_stream_new                          (void);
 
-
 G_END_DECLS
 
diff --git a/gdk/gdkpixbuf.h b/gdk/gdkpixbuf.h
index 664c8d24d6..8ddd1d1da6 100644
--- a/gdk/gdkpixbuf.h
+++ b/gdk/gdkpixbuf.h
@@ -28,12 +28,8 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <cairo.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdktypes.h>
-#include <gdk/version/gdkversionmacros.h>
-#include <gdk/gdktexture.h>
-
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/gdkpopuplayout.c b/gdk/gdkpopuplayout.c
index c58c455e7e..5b6c30d339 100644
--- a/gdk/gdkpopuplayout.c
+++ b/gdk/gdkpopuplayout.c
@@ -20,6 +20,7 @@
 
 #include "gdkpopuplayout.h"
 
+#include "gdkrectangle.h"
 #include "gdksurface.h"
 
 /**
diff --git a/gdk/gdkpopuplayout.h b/gdk/gdkpopuplayout.h
index f9e4b3b754..437be0a699 100644
--- a/gdk/gdkpopuplayout.h
+++ b/gdk/gdkpopuplayout.h
@@ -22,9 +22,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/gdkenums.h>
 #include <gdk/gdktypes.h>
-#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/gdkrectangle.h b/gdk/gdkrectangle.h
index 8033a2fe09..2d045c6d08 100644
--- a/gdk/gdkrectangle.h
+++ b/gdk/gdkrectangle.h
@@ -29,7 +29,6 @@
 #endif
 
 #include <gdk/gdktypes.h>
-#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/gdkrgba.h b/gdk/gdkrgba.h
index 716a1f0d04..36b6b285a8 100644
--- a/gdk/gdkrgba.h
+++ b/gdk/gdkrgba.h
@@ -29,7 +29,6 @@
 #endif
 
 #include <gdk/gdktypes.h>
-#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/gdksnapshot.h b/gdk/gdksnapshot.h
index b0c31ad5a6..c48b25e8e5 100644
--- a/gdk/gdksnapshot.h
+++ b/gdk/gdksnapshot.h
@@ -24,7 +24,6 @@
 #endif
 
 #include <gdk/gdktypes.h>
-#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/gdksurface.h b/gdk/gdksurface.h
index 39ce04f979..50c1efe779 100644
--- a/gdk/gdksurface.h
+++ b/gdk/gdksurface.h
@@ -28,7 +28,6 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 #include <gdk/gdkevents.h>
 #include <gdk/gdkframeclock.h>
diff --git a/gdk/gdktexture.h b/gdk/gdktexture.h
index 3b3f312419..c359e56179 100644
--- a/gdk/gdktexture.h
+++ b/gdk/gdktexture.h
@@ -22,8 +22,6 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/version/gdkversionmacros.h>
-#include <gdk/gdkenums.h>
 #include <gdk/gdktypes.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
diff --git a/gdk/gdktexturedownloader.h b/gdk/gdktexturedownloader.h
index 1c439c6d0e..e8c7df9a8b 100644
--- a/gdk/gdktexturedownloader.h
+++ b/gdk/gdktexturedownloader.h
@@ -21,9 +21,6 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-
-#include <gdk/version/gdkversionmacros.h>
-#include <gdk/gdkenums.h>
 #include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS
diff --git a/gdk/gdktoplevellayout.h b/gdk/gdktoplevellayout.h
index 3e3f2ea118..3c9d0a84d9 100644
--- a/gdk/gdktoplevellayout.h
+++ b/gdk/gdktoplevellayout.h
@@ -22,9 +22,8 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/gdkmonitor.h>
 #include <gdk/gdktypes.h>
-#include <gdk/version/gdkversionmacros.h>
+#include <gdk/gdkmonitor.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/gdktoplevelsize.h b/gdk/gdktoplevelsize.h
index c5e1b5c6c7..06357ae9ca 100644
--- a/gdk/gdktoplevelsize.h
+++ b/gdk/gdktoplevelsize.h
@@ -23,7 +23,6 @@
 #endif
 
 #include <gdk/gdktypes.h>
-#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index e54ae74f0b..489ca9cbcc 100644
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -42,6 +42,7 @@
  * (or GTK). One such setting is what windowing API backend is in use.
  */
 #include <gdk/gdkconfig.h>
+#include <gdk/gdkenums.h>
 #include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
diff --git a/gdk/gdkvulkancontext.h b/gdk/gdkvulkancontext.h
index b1b3dc1e52..55a347861b 100644
--- a/gdk/gdkvulkancontext.h
+++ b/gdk/gdkvulkancontext.h
@@ -24,7 +24,6 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 
 #ifdef GDK_RENDERING_VULKAN