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.

diff --git a/gdk/gdkapplaunchcontext.h b/gdk/gdkapplaunchcontext.h
index 3687402cc67e8428ccf6df35c74221f96c0241df..989fc654d52c87e68e198addb6fb98eef43f3eb3 100644 (file)
--- 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 d69b9bc602178c328bd689ded4262b83efd599ce..fec75fb8b570290798a129c5902de9733e42584b 100644 (file)
--- 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 37d1d2cb753cc9198a63a14e63c438120a916352..10591ab8fa53b4dffd3e90f802129f4d8d5d8df2 100644 (file)
--- 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 d696cd56850d2ca068934bdb178c3d4c87faffc7..2f58eb8e2b15c0c95a0590553a31789056038459 100644 (file)
--- 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 11b638b4e04874f10ddae7f8bca4df76ea3efa5b..5814ef09d83c3286b6f21f2574eed921f575052d 100644 (file)
--- 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 fe756a22259c9a9678b386d88e102f615b2e36e9..cace164fefc903c8de0429cb778b2255c24f18e7 100644 (file)
--- 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 e20c900b6da241c39e1c7adc6aaf8562b5699386..ddb85b3ec5455353ded074edb80b644cadfd2c0a 100644 (file)
--- 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 c291ca9158562167ad08eb183481fd2e44a354bb..f9a62ef5d3a285ec85ce1025e92e431722e54fc3 100644 (file)
--- 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 8e608411c7ae838dbddf6e3bb7290939e2468f3e..8c7c802292b75aa7ef8e2444601a4ff65a62f34b 100644 (file)
--- 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 137d0993cc1bc1ff9911cc2eb4c5f849c4d4050d..7bf8854f334dd3bcad070c8badb6ad980b44fc65 100644 (file)
--- 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 e7277487cf9cbb61a88e215711c00182589fe63e..64240db7e238724273cef4de635ed4f1528bb36e 100644 (file)
--- 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 5124f49ffbd5a93b459ec25eb279347238dbfb56..21d87039861b85899ba07c96b7b3fb57bca278dc 100644 (file)
--- 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 050ec1772a193fef4a84401722672fa0c2b64a9b..1e95313fbd170120c2de51820e310ab7a083cc02 100644 (file)
--- 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 29718e95d9ef63254e98eb3facfdedd7748dff97..5a60ff15fa1b0d56e1dbccb1c97b6369314d6d97 100644 (file)
--- 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 1bdf40c711cec24da1b706a595c32fcc7c2642c9..ddfbb908d5e0e80151d97856da7eba3b4e87d218 100644 (file)
--- 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 a49dc4bba5e0acab0560783b28508eff92ec8b32..eb559b17b20192d130f6231ab452efb08dcaa100 100644 (file)
--- 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 bb4dd3ceb726088a79922368789b4e4b2402e62f..2c1cfbde209f0372e7a895e7e61a8dbc20760714 100644 (file)
--- 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 95a343dddc186c85ff25477f3abd82709ed5d0f9..433a136a313b43994386a8bbf019bf294b08eca2 100644 (file)
--- 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 be3ec256e1203318dba0bc9da37e8e65550c9b09..dd3e347b8ebe78419e513ce44a4ff74fcf27fb9b 100644 (file)
--- 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 edd97badad0848e33d0d35014f6f8f9d8420df73..842c2ba65b2e0585f5d439a26053b488a03b7c52 100644 (file)
--- 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 9fc4a640b1040aef58cf2e7d1b1f9e60debcab19..b0407a2757fc03d5b148b270051c5d054b6e2557 100644 (file)
--- 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 ba0a86499f1f5f82be66d92e9c9f2b74b0f13768..fa5884f44d2a64e53f4d6d5b79776578c5d7dd4f 100644 (file)
--- 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 e030f3c98ca73ed2498710929929ec3ab27e34ef..24bae8da2950ee82e99ed43330b55840a16b5a94 100644 (file)
--- 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 101d4f88684be6b91e62a88e38145824dea98bf0..cceed86ca82efe20d8316aea92485b39d4f31345 100644 (file)
--- 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 6f1cebdf475c89c0f581ad0e64ee887683ab3c37..68fa03fe4a00633f277834aa4e865a260e2d2de3 100644 (file)
--- 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 acac39cd906e00566e55fc67f0fbdcce1b89ee76..8bf105064b0bc0d6dd618fce19c6740bcd671951 100644 (file)
--- 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 48158799d69939add18b54ddc132ce6cd253ba64..bc88400eadb7f8e951c567eaf8c1116351fd913d 100644 (file)
--- 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 1f56b93578f43d5f31bfa9f41edd8d19078faf67..21ecc6a96beafccbb96a115bae8ff433fa8128e6 100644 (file)
--- 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 96d7fe4416956bd6c622b6aaac300df26b3e0c9f..b99408696ea352cb59558fc5553c85ebb87816f4 100644 (file)
--- 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 9d304fd5034ec2f4f6269d8a55c2055bd7b7c983..1cdb4f9a3ec8599be154b90776f4b7902b019480 100644 (file)
--- 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 27ac5609c264046bbae492d409af7793f1bebf16..7b1d34f37f22697e2b96cc33f7afe99ce5dde3b9 100644 (file)
--- 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 fafae5459a9bb4f1567444e261a3d6fe1745ed25..acdfbf65059af349f061220fc9edd17e328ddf81 100644 (file)
--- 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 79b47c3d199fb75b044729fb90a0a64c316bd4ff..495de6d28b03c8ae4e63d4129a6d1dd817e3299b 100644 (file)
--- 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 664c8d24d699414d69ded2320f061f3cd82fec35..8ddd1d1da6dda7aad110c431eda935fd91de711f 100644 (file)
--- 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 c58c455e7ec345a259cdd95c12613e0b17d90fed..5b6c30d33944e827a601096081568b8fe208d791 100644 (file)
--- 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 f9e4b3b754ce6a09db60bc6d6d8d01cae4df25af..437be0a699645acc64112155e10d33bb1a05e7db 100644 (file)
--- 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 8033a2fe09ade1bea60f0e76ae7fa4d6512df631..2d045c6d08f15fdb0c83fcd00195ad3485ea33f4 100644 (file)
--- 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 716a1f0d04d1c6fbde8eca28d06fd38b15005a24..36b6b285a8f7f84a89a498a5d3511787d7a880a4 100644 (file)
--- 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 b0c31ad5a66b8d12aa981b7d8197fa6ff2eb079f..c48b25e8e5d73ba435319c2e8034a4adfaf8e5d9 100644 (file)
--- 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 39ce04f979cd35e38f9f5aecaf9c0d65b9024844..50c1efe779e30eb31e2ea87a446c015739d64b90 100644 (file)
--- 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 3b3f312419e6b8bebffceb9af57d6394cb9bdb86..c359e56179edfeff72b18f6cddd6451d9109a15b 100644 (file)
--- 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 1c439c6d0ec0399ba429b276b470653f10ee7008..e8c7df9a8bb157a0e9c7327240bb0435de13ce64 100644 (file)
--- 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 3e3f2ea11835d700f2bbf004ae806a7b746d39a2..3c9d0a84d96756cb31f1e854f075d4123f671369 100644 (file)
--- 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 c5e1b5c6c73873940d3c059ddacc6ea8b137c56d..06357ae9ca09b1f6606ffdf2525118a28ff6998e 100644 (file)
--- 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 e54ae74f0b8e11eef87ea88c64a887a01a38c722..489ca9cbccb77d813e6b035831c5e8f0770f968f 100644 (file)
--- 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 b1b3dc1e522be67b012347eb6a3432331c9477d4..55a347861b9bfb3bcedda3ba56594865bd24938d 100644 (file)
--- 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