Convert headers to #pragma once

The conversion was done by guard2one.
author: Matthias Clasen <mclasen@redhat.com> 2023-03-31 15:11:10 -0400
committer: Matthias Clasen <mclasen@redhat.com> 2023-03-31 15:11:10 -0400
commit: a1c5a806b3985b442d78506f0afae476567e597a (patch)
tree: 43cc71a014eafe1308912667c42bbb2924f67451 /gdk
parent: 515f39f161d73e4e58fcb58ed330db11c3bc8642 (diff)
download: gtk+-a1c5a806b3985b442d78506f0afae476567e597a.tar.gz
223 files changed, 223 insertions, 669 deletions
diff --git a/gdk/broadway/broadway-output.h b/gdk/broadway/broadway-output.h
index 58c1005727..b260e5f6c8 100644
--- a/gdk/broadway/broadway-output.h
+++ b/gdk/broadway/broadway-output.h
@@ -1,5 +1,4 @@
-#ifndef __BROADWAY_H__
-#define __BROADWAY_H__
+#pragma once
 
 #include <glib.h>
 #include <gio/gio.h>
@@ -74,4 +73,3 @@ void            broadway_output_pong                (BroadwayOutput *output);
 void            broadway_output_set_show_keyboard   (BroadwayOutput *output,
                                                      gboolean        show);
 
-#endif /* __BROADWAY_H__ */
diff --git a/gdk/broadway/broadway-protocol.h b/gdk/broadway/broadway-protocol.h
index f99e239a7e..34f87c1f6b 100644
--- a/gdk/broadway/broadway-protocol.h
+++ b/gdk/broadway/broadway-protocol.h
@@ -1,5 +1,4 @@
-#ifndef __BROADWAY_PROTOCOL_H__
-#define __BROADWAY_PROTOCOL_H__
+#pragma once
 
 #include <glib.h>
 
@@ -370,4 +369,3 @@ typedef union {
   BroadwayReplyUngrabPointer ungrab_pointer;
 } BroadwayReply;
 
-#endif /* __BROADWAY_PROTOCOL_H__ */
diff --git a/gdk/broadway/broadway-server.h b/gdk/broadway/broadway-server.h
index dc562b7056..e72023e276 100644
--- a/gdk/broadway/broadway-server.h
+++ b/gdk/broadway/broadway-server.h
@@ -1,5 +1,4 @@
-#ifndef __BROADWAY_SERVER__
-#define __BROADWAY_SERVER__
+#pragma once
 
 #include "broadway-protocol.h"
 #include <glib-object.h>
@@ -136,4 +135,3 @@ void                broadway_server_surface_set_modal_hint    (BroadwayServer *s
                                                                gboolean        modal_hint);
 
 
-#endif /* __BROADWAY_SERVER__ */
diff --git a/gdk/broadway/gdkbroadway-server.h b/gdk/broadway/gdkbroadway-server.h
index 3fac98a75b..2d0bdce2e3 100644
--- a/gdk/broadway/gdkbroadway-server.h
+++ b/gdk/broadway/gdkbroadway-server.h
@@ -1,5 +1,4 @@
-#ifndef __GDK_BROADWAY_SERVER__
-#define __GDK_BROADWAY_SERVER__
+#pragma once
 
 #include <gdk/gdktypes.h>
 
@@ -82,4 +81,3 @@ void               _gdk_broadway_server_surface_set_modal_hint   (GdkBroadwaySer
                                                                   int                id,
                                                                   gboolean           modal_hint);
 
-#endif /* __GDK_BROADWAY_SERVER__ */
diff --git a/gdk/broadway/gdkbroadway.h b/gdk/broadway/gdkbroadway.h
index 33a7bff89d..7c9c37df44 100644
--- a/gdk/broadway/gdkbroadway.h
+++ b/gdk/broadway/gdkbroadway.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_BROADWAY_H__
-#define __GDK_BROADWAY_H__
+#pragma once
 
 #include <gdk/gdk.h>
 
@@ -36,4 +35,3 @@
 
 #undef __GDKBROADWAY_H_INSIDE__
 
-#endif /* __GDK_BROADWAY_H__ */
diff --git a/gdk/broadway/gdkbroadwaycursor.h b/gdk/broadway/gdkbroadwaycursor.h
index 2ca1a76134..eff8215bc5 100644
--- a/gdk/broadway/gdkbroadwaycursor.h
+++ b/gdk/broadway/gdkbroadwaycursor.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#ifndef __GDK_BROADWAY_CURSOR_H__
-#define __GDK_BROADWAY_CURSOR_H__
+#pragma once
 
 #if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/broadway/gdkbroadway.h> can be included directly."
@@ -52,4 +51,3 @@ GType    gdk_broadway_cursor_get_type          (void);
 
 G_END_DECLS
 
-#endif /* __GDK_BROADWAY_CURSOR_H__ */
diff --git a/gdk/broadway/gdkbroadwaydisplay.h b/gdk/broadway/gdkbroadwaydisplay.h
index 767b8b8a9d..99ac949320 100644
--- a/gdk/broadway/gdkbroadwaydisplay.h
+++ b/gdk/broadway/gdkbroadwaydisplay.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_BROADWAY_DISPLAY_H__
-#define __GDK_BROADWAY_DISPLAY_H__
+#pragma once
 
 #if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/broadway/gdkbroadway.h> can be included directly."
@@ -56,4 +55,3 @@ void                    gdk_broadway_display_set_surface_scale   (GdkDisplay *di
 
 G_END_DECLS
 
-#endif /* __GDK_BROADWAY_DISPLAY_H__ */
diff --git a/gdk/broadway/gdkbroadwaydisplaymanager.h b/gdk/broadway/gdkbroadwaydisplaymanager.h
index ac453291df..50fca95d2e 100644
--- a/gdk/broadway/gdkbroadwaydisplaymanager.h
+++ b/gdk/broadway/gdkbroadwaydisplaymanager.h
@@ -17,8 +17,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_BROADWAY_DISPLAY_MANAGER_H__
-#define __GDK_BROADWAY_DISPLAY_MANAGER_H__
+#pragma once
 
 #if !defined(__GDKBROADWAY_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/broadway/gdkbroadway.h> can be included directly."
@@ -43,4 +42,3 @@ GType gdk_broadway_display_manager_get_type (void);
 
 G_END_DECLS
 
-#endif /* __GDK_BROADWAY_DISPLAY_MANAGER_H__ */
diff --git a/gdk/broadway/gdkbroadwaymonitor.h b/gdk/broadway/gdkbroadwaymonitor.h
index 30bc96844b..c756fde794 100644
--- a/gdk/broadway/gdkbroadwaymonitor.h
+++ b/gdk/broadway/gdkbroadwaymonitor.h
@@ -19,8 +19,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_BROADWAY_MONITOR_H__
-#define __GDK_BROADWAY_MONITOR_H__
+#pragma once
 
 #if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/broadway/gdkbroadway.h> can be included directly."
@@ -42,5 +41,4 @@ GType             gdk_broadway_monitor_get_type            (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif  /* __GDK_BROADWAY_MONITOR_H__ */
 
diff --git a/gdk/broadway/gdkbroadwaysurface.h b/gdk/broadway/gdkbroadwaysurface.h
index 0e937d0a8d..213a8b99de 100644
--- a/gdk/broadway/gdkbroadwaysurface.h
+++ b/gdk/broadway/gdkbroadwaysurface.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#ifndef __GDK_BROADWAY_SURFACE_H__
-#define __GDK_BROADWAY_SURFACE_H__
+#pragma once
 
 #include <gdk/gdk.h>
 
@@ -48,4 +47,3 @@ GType    gdk_broadway_surface_get_type          (void);
 
 G_END_DECLS
 
-#endif /* __GDK_BROADWAY_SURFACE_H__ */
diff --git a/gdk/broadway/gdkcairocontext-broadway.h b/gdk/broadway/gdkcairocontext-broadway.h
index fb607f9c8a..a78733b2ab 100644
--- a/gdk/broadway/gdkcairocontext-broadway.h
+++ b/gdk/broadway/gdkcairocontext-broadway.h
@@ -16,8 +16,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_BROADWAY_CAIRO_CONTEXT__
-#define __GDK_BROADWAY_CAIRO_CONTEXT__
+#pragma once
 
 #include "gdkconfig.h"
 
@@ -52,4 +51,3 @@ GType gdk_broadway_cairo_context_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* __GDK_BROADWAY_CAIRO_CONTEXT__ */
diff --git a/gdk/broadway/gdkdevice-broadway.h b/gdk/broadway/gdkdevice-broadway.h
index cde76b4c6e..c359e3a570 100644
--- a/gdk/broadway/gdkdevice-broadway.h
+++ b/gdk/broadway/gdkdevice-broadway.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_DEVICE_BROADWAY_H__
-#define __GDK_DEVICE_BROADWAY_H__
+#pragma once
 
 #include <gdk/gdkdeviceprivate.h>
 
@@ -53,4 +52,3 @@ void gdk_broadway_device_query_state (GdkDevice        *device,
 
 G_END_DECLS
 
-#endif /* __GDK_DEVICE_BROADWAY_H__ */
diff --git a/gdk/broadway/gdkdisplay-broadway.h b/gdk/broadway/gdkdisplay-broadway.h
index fddf89bb74..38fc16851b 100644
--- a/gdk/broadway/gdkdisplay-broadway.h
+++ b/gdk/broadway/gdkdisplay-broadway.h
@@ -19,8 +19,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_BROADWAY_DISPLAY__
-#define __GDK_BROADWAY_DISPLAY__
+#pragma once
 
 #include "gdkbroadwaydisplay.h"
 
@@ -70,4 +69,3 @@ struct _GdkBroadwayDisplayClass
 
 G_END_DECLS
 
-#endif				/* __GDK_BROADWAY_DISPLAY__ */
diff --git a/gdk/broadway/gdkdrawcontext-broadway.h b/gdk/broadway/gdkdrawcontext-broadway.h
index ccb0e0961b..017250aefe 100644
--- a/gdk/broadway/gdkdrawcontext-broadway.h
+++ b/gdk/broadway/gdkdrawcontext-broadway.h
@@ -16,8 +16,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_BROADWAY_DRAW_CONTEXT__
-#define __GDK_BROADWAY_DRAW_CONTEXT__
+#pragma once
 
 #include "gdkconfig.h"
 
@@ -55,4 +54,3 @@ GdkBroadwayDrawContext *gdk_broadway_draw_context_context (GdkSurface *surface);
 
 G_END_DECLS
 
-#endif /* __GDK_BROADWAY_DRAW_CONTEXT__ */
diff --git a/gdk/broadway/gdkeventsource.h b/gdk/broadway/gdkeventsource.h
index 073b18b3c0..1ad5a8f530 100644
--- a/gdk/broadway/gdkeventsource.h
+++ b/gdk/broadway/gdkeventsource.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_BROADWAY_EVENT_SOURCE_H__
-#define __GDK_BROADWAY_EVENT_SOURCE_H__
+#pragma once
 
 #include "gdkprivate-broadway.h"
 
@@ -29,4 +28,3 @@ GSource * _gdk_broadway_event_source_new            (GdkDisplay *display);
 
 G_END_DECLS
 
-#endif /* __GDK_BROADWAY_EVENT_SOURCE_H__ */
diff --git a/gdk/broadway/gdkmonitor-broadway.h b/gdk/broadway/gdkmonitor-broadway.h
index 96b175195d..fc9b32b2c2 100644
--- a/gdk/broadway/gdkmonitor-broadway.h
+++ b/gdk/broadway/gdkmonitor-broadway.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_BROADWAY_MONITOR_PRIVATE_H__
-#define __GDK_BROADWAY_MONITOR_PRIVATE_H__
+#pragma once
 
 #include <glib.h>
 #include <gio/gio.h>
@@ -35,4 +34,3 @@ struct _GdkBroadwayMonitorClass {
   GdkMonitorClass parent_class;
 };
 
-#endif
diff --git a/gdk/broadway/gdkprivate-broadway.h b/gdk/broadway/gdkprivate-broadway.h
index 0437cac3bf..394b0990ab 100644
--- a/gdk/broadway/gdkprivate-broadway.h
+++ b/gdk/broadway/gdkprivate-broadway.h
@@ -26,8 +26,7 @@
  * Private uninstalled header defining things local to X windowing code
  */
 
-#ifndef __GDK_PRIVATE_BROADWAY_H__
-#define __GDK_PRIVATE_BROADWAY_H__
+#pragma once
 
 #include <gdk/gdkcursor.h>
 #include "gdksurface-broadway.h"
@@ -124,4 +123,3 @@ void _gdk_broadway_surface_resize_surface        (GdkSurface *surface);
 void _gdk_broadway_cursor_update_theme (GdkCursor *cursor);
 void _gdk_broadway_cursor_display_finalize (GdkDisplay *display);
 
-#endif /* __GDK_PRIVATE_BROADWAY_H__ */
diff --git a/gdk/broadway/gdksurface-broadway.h b/gdk/broadway/gdksurface-broadway.h
index bdeb960162..7048289168 100644
--- a/gdk/broadway/gdksurface-broadway.h
+++ b/gdk/broadway/gdksurface-broadway.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#ifndef __GDK_SURFACE_BROADWAY_H__
-#define __GDK_SURFACE_BROADWAY_H__
+#pragma once
 
 #include <gdk/gdksurfaceprivate.h>
 #include "gdkbroadwaysurface.h"
@@ -80,4 +79,3 @@ GType gdk_surface_broadway_get_type (void);
 
 G_END_DECLS
 
-#endif /* __GDK_SURFACE_BROADWAY_H__ */
diff --git a/gdk/filetransferportalprivate.h b/gdk/filetransferportalprivate.h
index 37bc3009cf..1a4bb50952 100644
--- a/gdk/filetransferportalprivate.h
+++ b/gdk/filetransferportalprivate.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __FILE_TRANSFER_PROTOCOL_H__
-#define __FILE_TRANSFER_PROTOCOL_H__
+#pragma once
 
 
 void     file_transfer_portal_register              (void);
@@ -37,4 +36,3 @@ gboolean file_transfer_portal_retrieve_files_finish (GAsyncResult          *resu
                                                      GError               **error);
 
 
-#endif
diff --git a/gdk/gdk.h b/gdk/gdk.h
index 4e8f31880d..49667bafce 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_H__
-#define __GDK_H__
+#pragma once
 
 #define __GDK_H_INSIDE__
 
@@ -80,4 +79,3 @@
 
 #undef __GDK_H_INSIDE__
 
-#endif /* __GDK_H__ */
diff --git a/gdk/gdkapplaunchcontext.h b/gdk/gdkapplaunchcontext.h
index b8e15a752e..364a2a941c 100644
--- a/gdk/gdkapplaunchcontext.h
+++ b/gdk/gdkapplaunchcontext.h
@@ -18,8 +18,7 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
-#ifndef __GDK_APP_LAUNCH_CONTEXT_H__
-#define __GDK_APP_LAUNCH_CONTEXT_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -58,4 +57,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkAppLaunchContext, g_object_unref)
 
 G_END_DECLS
 
-#endif /* __GDK_APP_LAUNCH_CONTEXT_H__ */
diff --git a/gdk/gdkapplaunchcontextprivate.h b/gdk/gdkapplaunchcontextprivate.h
index e4262f1b5f..147406d9da 100644
--- a/gdk/gdkapplaunchcontextprivate.h
+++ b/gdk/gdkapplaunchcontextprivate.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_APP_LAUNCH_CONTEXT_PRIVATE_H__
-#define __GDK_APP_LAUNCH_CONTEXT_PRIVATE_H__
+#pragma once
 
 #include "gdkapplaunchcontext.h"
 #include "gdktypes.h"
@@ -43,4 +42,3 @@ struct _GdkAppLaunchContext
 
 G_END_DECLS
 
-#endif
diff --git a/gdk/gdkcairo.h b/gdk/gdkcairo.h
index f2dfa3177e..24af5939d8 100644
--- a/gdk/gdkcairo.h
+++ b/gdk/gdkcairo.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_CAIRO_H__
-#define __GDK_CAIRO_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -63,4 +62,3 @@ void       gdk_cairo_draw_from_gl (cairo_t              *cr,
 
 G_END_DECLS
 
-#endif /* __GDK_CAIRO_H__ */
diff --git a/gdk/gdkcairocontext.h b/gdk/gdkcairocontext.h
index d5e3967cfc..a230b2e663 100644
--- a/gdk/gdkcairocontext.h
+++ b/gdk/gdkcairocontext.h
@@ -18,8 +18,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_CAIRO_CONTEXT__
-#define __GDK_CAIRO_CONTEXT__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -46,4 +45,3 @@ cairo_t *               gdk_cairo_context_cairo_create                  (GdkCair
 
 G_END_DECLS
 
-#endif /* __GDK_CAIRO_CONTEXT__ */
diff --git a/gdk/gdkcairocontextprivate.h b/gdk/gdkcairocontextprivate.h
index fd45c38573..282843d301 100644
--- a/gdk/gdkcairocontextprivate.h
+++ b/gdk/gdkcairocontextprivate.h
@@ -18,8 +18,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_CAIRO_CONTEXT_PRIVATE__
-#define __GDK_CAIRO_CONTEXT_PRIVATE__
+#pragma once
 
 #include "gdkcairocontext.h"
 
@@ -49,4 +48,3 @@ struct _GdkCairoContextClass
 
 G_END_DECLS
 
-#endif /* __GDK__CAIRO_CONTEXT_PRIVATE__ */
diff --git a/gdk/gdkcairoprivate.h b/gdk/gdkcairoprivate.h
index 654dec25fa..06a9eef9f2 100644
--- a/gdk/gdkcairoprivate.h
+++ b/gdk/gdkcairoprivate.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_CAIRO_PRIVATE_H__
-#define __GDK_CAIRO_PRIVATE_H__
+#pragma once
 
 #include "gdkcairo.h"
 
@@ -36,4 +35,3 @@ cairo_region_t *gdk_cairo_region_from_clip       (cairo_t         *cr);
 
 G_END_DECLS
 
-#endif /* __GDK_CAIRO_PRIVATE_H__ */
diff --git a/gdk/gdkclipboard.h b/gdk/gdkclipboard.h
index f8f4178d5e..f10c95c32b 100644
--- a/gdk/gdkclipboard.h
+++ b/gdk/gdkclipboard.h
@@ -16,8 +16,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_CLIPBOARD_H__
-#define __GDK_CLIPBOARD_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -124,4 +123,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkClipboard, g_object_unref)
 
 G_END_DECLS
 
-#endif /* __GDK_CLIPBOARD_H__ */
diff --git a/gdk/gdkclipboardprivate.h b/gdk/gdkclipboardprivate.h
index 5a774e4684..6ff1f38b82 100644
--- a/gdk/gdkclipboardprivate.h
+++ b/gdk/gdkclipboardprivate.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_CLIPBOARD_PRIVATE_H__
-#define __GDK_CLIPBOARD_PRIVATE_H__
+#pragma once
 
 #include <gdk/gdkclipboard.h>
 
@@ -82,4 +81,3 @@ gboolean                gdk_clipboard_write_finish              (GdkClipboard
 
 G_END_DECLS
 
-#endif /* __GDK_CLIPBOARD_PRIVATE_H__ */
diff --git a/gdk/gdkcontentdeserializer.h b/gdk/gdkcontentdeserializer.h
index 9c3946e0a1..be10880434 100644
--- a/gdk/gdkcontentdeserializer.h
+++ b/gdk/gdkcontentdeserializer.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GTK_CONTENT_DESERIALIZER_H__
-#define __GTK_CONTENT_DESERIALIZER_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -103,4 +102,3 @@ gboolean                gdk_content_deserialize_finish                  (GAsyncR
 
 G_END_DECLS
 
-#endif /* __GDK_CONTENT_DESERIALIZER_H__ */
diff --git a/gdk/gdkcontentformats.h b/gdk/gdkcontentformats.h
index 3fd1657675..ff9b116db7 100644
--- a/gdk/gdkcontentformats.h
+++ b/gdk/gdkcontentformats.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GTK_CONTENT_FORMATS_H__
-#define __GTK_CONTENT_FORMATS_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -132,4 +131,3 @@ GdkFileList *   gdk_file_list_new_from_array (GFile **files,
 
 G_END_DECLS
 
-#endif /* __GTK_CONTENT_FORMATS_H__ */
diff --git a/gdk/gdkcontentformatsprivate.h b/gdk/gdkcontentformatsprivate.h
index cfc8f2e75c..e6955a9f81 100644
--- a/gdk/gdkcontentformatsprivate.h
+++ b/gdk/gdkcontentformatsprivate.h
@@ -17,8 +17,7 @@
  */
 
 
-#ifndef __GTK_CONTENT_FORMATS_PRIVATE_H__
-#define __GTK_CONTENT_FORMATS_PRIVATE_H__
+#pragma once
 
 #include "gdkcontentformats.h"
 
@@ -29,4 +28,3 @@ G_BEGIN_DECLS
 
 G_END_DECLS
 
-#endif /* __GTK_CONTENT_FORMATS_PRIVATE_H__ */
diff --git a/gdk/gdkcontentprovider.h b/gdk/gdkcontentprovider.h
index f3e40c4ce3..9293a17aea 100644
--- a/gdk/gdkcontentprovider.h
+++ b/gdk/gdkcontentprovider.h
@@ -16,8 +16,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_CONTENT_PROVIDER_H__
-#define __GDK_CONTENT_PROVIDER_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -116,4 +115,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkContentProvider, g_object_unref)
 
 G_END_DECLS
 
-#endif /* __GDK_CONTENT_PROVIDER_H__ */
diff --git a/gdk/gdkcontentproviderimpl.h b/gdk/gdkcontentproviderimpl.h
index 6490839bd5..94c3ffb6fb 100644
--- a/gdk/gdkcontentproviderimpl.h
+++ b/gdk/gdkcontentproviderimpl.h
@@ -16,8 +16,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_CONTENT_PROVIDER_IMPL_H__
-#define __GDK_CONTENT_PROVIDER_IMPL_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -44,4 +43,3 @@ GdkContentProvider *    gdk_content_provider_new_for_bytes              (const c
 
 G_END_DECLS
 
-#endif /* __GDK_CONTENT_PROVIDER_IMPL_H__ */
diff --git a/gdk/gdkcontentproviderprivate.h b/gdk/gdkcontentproviderprivate.h
index 5d4d1c94fe..9440fb26e6 100644
--- a/gdk/gdkcontentproviderprivate.h
+++ b/gdk/gdkcontentproviderprivate.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_CONTENT_PROVIDER_PRIVATE_H__
-#define __GDK_CONTENT_PROVIDER_PRIVATE_H__
+#pragma once
 
 #include <gdk/gdkcontentprovider.h>
 
@@ -30,4 +29,3 @@ void                    gdk_content_provider_detach_clipboard   (GdkContentProvi
 
 G_END_DECLS
 
-#endif /* __GDK_CONTENT_PROVIDER_PRIVATE_H__ */
diff --git a/gdk/gdkcontentserializer.h b/gdk/gdkcontentserializer.h
index f7dedccebf..1322d17a51 100644
--- a/gdk/gdkcontentserializer.h
+++ b/gdk/gdkcontentserializer.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GTK_CONTENT_SERIALIZER_H__
-#define __GTK_CONTENT_SERIALIZER_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -102,4 +101,3 @@ gboolean                gdk_content_serialize_finish                    (GAsyncR
 
 G_END_DECLS
 
-#endif /* __GDK_CONTENT_SERIALIZER_H__ */
diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h
index 66de6e531b..f8eb2d7d9a 100644
--- a/gdk/gdkcursor.h
+++ b/gdk/gdkcursor.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_CURSOR_H__
-#define __GDK_CURSOR_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -68,4 +67,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkCursor, g_object_unref)
 
 G_END_DECLS
 
-#endif /* __GDK_CURSOR_H__ */
diff --git a/gdk/gdkcursorprivate.h b/gdk/gdkcursorprivate.h
index aaac3169fb..7eeb6278ca 100644
--- a/gdk/gdkcursorprivate.h
+++ b/gdk/gdkcursorprivate.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_CURSOR_PRIVATE_H__
-#define __GDK_CURSOR_PRIVATE_H__
+#pragma once
 
 #include <gdk/gdkcursor.h>
 
@@ -58,4 +57,3 @@ gboolean                gdk_cursor_equal                        (gconstpointer
 
 G_END_DECLS
 
-#endif /* __GDK_CURSOR_PRIVATE_H__ */
diff --git a/gdk/gdkdebugprivate.h b/gdk/gdkdebugprivate.h
index dab4d890d2..bbcf2d4630 100644
--- a/gdk/gdkdebugprivate.h
+++ b/gdk/gdkdebugprivate.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_DEBUG_PRIVATE_H__
-#define __GDK_DEBUG_PRIVATE_H__
+#pragma once
 
 #include <glib.h>
 
@@ -99,4 +98,3 @@ guint gdk_parse_debug_var (const char        *variable,
                            const GdkDebugKey *keys,
                            guint              nkeys);
 
-#endif  /* __GDK_DEBUG_PRIVATE_H__ */
diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h
index dbf29147e4..28d0c04c8b 100644
--- a/gdk/gdkdevice.h
+++ b/gdk/gdkdevice.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_DEVICE_H__
-#define __GDK_DEVICE_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -131,4 +130,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDevice, g_object_unref)
 
 G_END_DECLS
 
-#endif /* __GDK_DEVICE_H__ */
diff --git a/gdk/gdkdevicepad.h b/gdk/gdkdevicepad.h
index f8d6da1a76..aa6d56871c 100644
--- a/gdk/gdkdevicepad.h
+++ b/gdk/gdkdevicepad.h
@@ -17,8 +17,7 @@
  * Author: Carlos Garnacho <carlosg@gnome.org>
  */
 
-#ifndef __GDK_DEVICE_PAD_H__
-#define __GDK_DEVICE_PAD_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -71,4 +70,3 @@ int   gdk_device_pad_get_feature_group (GdkDevicePad        *pad,
 
 G_END_DECLS
 
-#endif /* __GDK_DEVICE_PAD_H__ */
diff --git a/gdk/gdkdevicepadprivate.h b/gdk/gdkdevicepadprivate.h
index 7a4371f9bd..8fa245d295 100644
--- a/gdk/gdkdevicepadprivate.h
+++ b/gdk/gdkdevicepadprivate.h
@@ -17,8 +17,7 @@
  * Author: Carlos Garnacho <carlosg@gnome.org>
  */
 
-#ifndef __GDK_DEVICE_PAD_PRIVATE_H__
-#define __GDK_DEVICE_PAD_PRIVATE_H__
+#pragma once
 
 #include "gdkdevicepad.h"
 
@@ -42,4 +41,3 @@ struct _GdkDevicePadInterface {
 
 G_END_DECLS
 
-#endif /* __GDK_DEVICE_PAD_PRIVATE_H__ */
diff --git a/gdk/gdkdeviceprivate.h b/gdk/gdkdeviceprivate.h
index bdc8ea3564..fb7eadc876 100644
--- a/gdk/gdkdeviceprivate.h
+++ b/gdk/gdkdeviceprivate.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_DEVICE_PRIVATE_H__
-#define __GDK_DEVICE_PRIVATE_H__
+#pragma once
 
 #include "gdkdevice.h"
 #include "gdkdevicetool.h"
@@ -201,4 +200,3 @@ gboolean gdk_device_grab_info (GdkDisplay  *display,
 
 G_END_DECLS
 
-#endif /* __GDK_DEVICE_PRIVATE_H__ */
diff --git a/gdk/gdkdevicetool.h b/gdk/gdkdevicetool.h
index b63f8a8d67..0accd67816 100644
--- a/gdk/gdkdevicetool.h
+++ b/gdk/gdkdevicetool.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_DEVICE_TOOL_H__
-#define __GDK_DEVICE_TOOL_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -77,4 +76,3 @@ GdkAxisFlags        gdk_device_tool_get_axes        (GdkDeviceTool *tool);
 
 G_END_DECLS
 
-#endif /* __GDK_DEVICE_TOOL_H__ */
diff --git a/gdk/gdkdevicetoolprivate.h b/gdk/gdkdevicetoolprivate.h
index 63d06366c3..3b6446608c 100644
--- a/gdk/gdkdevicetoolprivate.h
+++ b/gdk/gdkdevicetoolprivate.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_DEVICE_TOOL_PRIVATE_H__
-#define __GDK_DEVICE_TOOL_PRIVATE_H__
+#pragma once
 
 #include "gdkdevicetool.h"
 
@@ -45,4 +44,3 @@ GdkDeviceTool *gdk_device_tool_new    (guint64            serial,
 
 G_END_DECLS
 
-#endif /* __GDK_DEVICE_TOOL_PRIVATE_H__ */
diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index b6bfa2c6cf..54b514f8cf 100644
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -19,8 +19,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_DISPLAY_H__
-#define __GDK_DISPLAY_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -140,4 +139,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDisplay, g_object_unref)
 
 G_END_DECLS
 
-#endif  /* __GDK_DISPLAY_H__ */
diff --git a/gdk/gdkdisplaymanager.h b/gdk/gdkdisplaymanager.h
index c6ed7f34ad..90c1cf3c4e 100644
--- a/gdk/gdkdisplaymanager.h
+++ b/gdk/gdkdisplaymanager.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_DISPLAY_MANAGER_H__
-#define __GDK_DISPLAY_MANAGER_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -61,4 +60,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDisplayManager, g_object_unref)
 
 G_END_DECLS
 
-#endif /* __GDK_DISPLAY_MANAGER_H__ */
diff --git a/gdk/gdkdisplaymanagerprivate.h b/gdk/gdkdisplaymanagerprivate.h
index 5ec3f01cb7..9c063b6ef1 100644
--- a/gdk/gdkdisplaymanagerprivate.h
+++ b/gdk/gdkdisplaymanagerprivate.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_DISPLAY_MANAGER_PRIVATE_H__
-#define __GDK_DISPLAY_MANAGER_PRIVATE_H__
+#pragma once
 
 #include "gdkdisplaymanager.h"
 
@@ -53,4 +52,3 @@ void            _gdk_display_manager_remove_display     (GdkDisplayManager
 
 G_END_DECLS
 
-#endif
diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h
index df88bec6ac..5fe690d9d0 100644
--- a/gdk/gdkdisplayprivate.h
+++ b/gdk/gdkdisplayprivate.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_DISPLAY_PRIVATE_H__
-#define __GDK_DISPLAY_PRIVATE_H__
+#pragma once
 
 #include "gdkdisplay.h"
 #include "gdksurface.h"
@@ -270,4 +269,3 @@ void gdk_display_set_cursor_theme          (GdkDisplay   *display,
 
 G_END_DECLS
 
-#endif  /* __GDK_DISPLAY_PRIVATE_H__ */
diff --git a/gdk/gdkdrag.h b/gdk/gdkdrag.h
index 0eb865a2ee..bb4dd3ceb7 100644
--- a/gdk/gdkdrag.h
+++ b/gdk/gdkdrag.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_DND_H__
-#define __GDK_DND_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -103,4 +102,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDrag, g_object_unref)
 
 G_END_DECLS
 
-#endif /* __GDK_DND_H__ */
diff --git a/gdk/gdkdragprivate.h b/gdk/gdkdragprivate.h
index 2532caad8b..7050072b33 100644
--- a/gdk/gdkdragprivate.h
+++ b/gdk/gdkdragprivate.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_DND_PRIVATE_H__
-#define __GDK_DND_PRIVATE_H__
+#pragma once
 
 #include "gdkdrag.h"
 
@@ -83,4 +82,3 @@ gboolean gdk_drag_write_finish        (GdkDrag             *drag,
 
 G_END_DECLS
 
-#endif
diff --git a/gdk/gdkdragsurface.h b/gdk/gdkdragsurface.h
index bc20416777..9ca3c6dde7 100644
--- a/gdk/gdkdragsurface.h
+++ b/gdk/gdkdragsurface.h
@@ -17,8 +17,7 @@
  * Authors: Matthias Clasen <mclasen@redhat.com>
  */
 
-#ifndef __GDK_DRAG_SURFACE_H__
-#define __GDK_DRAG_SURFACE_H__
+#pragma once
 
 #if !defined(__GDK_H_INSIDE__) && !defined(GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -40,4 +39,3 @@ gboolean gdk_drag_surface_present (GdkDragSurface *drag_surface,
 
 G_END_DECLS
 
-#endif /* __GDK_DRAG_SURFACE_H__ */
diff --git a/gdk/gdkdragsurfaceprivate.h b/gdk/gdkdragsurfaceprivate.h
index d565b8418d..01d5d1eb3b 100644
--- a/gdk/gdkdragsurfaceprivate.h
+++ b/gdk/gdkdragsurfaceprivate.h
@@ -1,5 +1,4 @@
-#ifndef __GDK_DRAG_SURFACE_PRIVATE_H__
-#define __GDK_DRAG_SURFACE_PRIVATE_H__
+#pragma once
 
 #include "gdkdragsurface.h"
 #include "gdkdragsurfacesize.h"
@@ -21,4 +20,3 @@ void gdk_drag_surface_notify_compute_size (GdkDragSurface     *surface,
 
 G_END_DECLS
 
-#endif /* __GDK_DRAG_SURFACE_PRIVATE_H__ */
diff --git a/gdk/gdkdrawcontext.h b/gdk/gdkdrawcontext.h
index e255c059e0..e414ede92c 100644
--- a/gdk/gdkdrawcontext.h
+++ b/gdk/gdkdrawcontext.h
@@ -18,8 +18,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_DRAW_CONTEXT__
-#define __GDK_DRAW_CONTEXT__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -56,4 +55,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDrawContext, g_object_unref)
 
 G_END_DECLS
 
-#endif /* __GDK_DRAW_CONTEXT__ */
diff --git a/gdk/gdkdrawcontextprivate.h b/gdk/gdkdrawcontextprivate.h
index 4674d25f30..e7ab10898c 100644
--- a/gdk/gdkdrawcontextprivate.h
+++ b/gdk/gdkdrawcontextprivate.h
@@ -18,8 +18,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_DRAW_CONTEXT_PRIVATE__
-#define __GDK_DRAW_CONTEXT_PRIVATE__
+#pragma once
 
 #include "gdkdrawcontext.h"
 
@@ -55,4 +54,3 @@ void                    gdk_draw_context_begin_frame_full       (GdkDrawContext
                                                                  const cairo_region_t   *region);
 G_END_DECLS
 
-#endif /* __GDK__DRAW_CONTEXT_PRIVATE__ */
diff --git a/gdk/gdkdrop.h b/gdk/gdkdrop.h
index 6ce0e95ae3..8f4236007c 100644
--- a/gdk/gdkdrop.h
+++ b/gdk/gdkdrop.h
@@ -18,8 +18,7 @@
  */
 
 
-#ifndef __GDK_DROP_H__
-#define __GDK_DROP_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -87,4 +86,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDrop, g_object_unref)
 
 G_END_DECLS
 
-#endif /* __GDK_DROP_H__ */
diff --git a/gdk/gdkdropprivate.h b/gdk/gdkdropprivate.h
index 6dbf8a0acf..2d93c5812b 100644
--- a/gdk/gdkdropprivate.h
+++ b/gdk/gdkdropprivate.h
@@ -17,8 +17,7 @@
  * Authors: Benjamin Otte <otte@gnome.org>
  */
 
-#ifndef __GDK_DROP_PRIVATE_H__
-#define __GDK_DROP_PRIVATE_H__
+#pragma once
 
 #include "gdkdrop.h"
 
@@ -81,4 +80,3 @@ void                    gdk_drop_emit_drop_event                (GdkDrop
 
 G_END_DECLS
 
-#endif
diff --git a/gdk/gdkenums.h b/gdk/gdkenums.h
index 11654a513f..783bf8906f 100644
--- a/gdk/gdkenums.h
+++ b/gdk/gdkenums.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_ENUMS_H__
-#define __GDK_ENUMS_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -333,4 +332,3 @@ typedef enum {
 
 G_END_DECLS
 
-#endif /* __GDK_ENUMS_H__ */
diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h
index f2b6748bfa..7b75a3f3d6 100644
--- a/gdk/gdkevents.h
+++ b/gdk/gdkevents.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_EVENTS_H__
-#define __GDK_EVENTS_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -555,4 +554,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkEvent, gdk_event_unref)
 
 G_END_DECLS
 
-#endif /* __GDK_EVENTS_H__ */
diff --git a/gdk/gdkeventsprivate.h b/gdk/gdkeventsprivate.h
index aad8218b37..5bec813762 100644
--- a/gdk/gdkeventsprivate.h
+++ b/gdk/gdkeventsprivate.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_EVENTS_PRIVATE_H__
-#define __GDK_EVENTS_PRIVATE_H__
+#pragma once
 
 #include <gdk/gdktypes.h>
 #include <gdk/gdkdrag.h>
@@ -635,4 +634,3 @@ double * gdk_event_dup_axes (GdkEvent *event);
 
 G_END_DECLS
 
-#endif /* __GDK_EVENTS_PRIVATE_H__ */
diff --git a/gdk/gdkframeclock.h b/gdk/gdkframeclock.h
index 6a1013f675..f526ed2941 100644
--- a/gdk/gdkframeclock.h
+++ b/gdk/gdkframeclock.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_FRAME_CLOCK_H__
-#define __GDK_FRAME_CLOCK_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -110,4 +109,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkFrameClock, g_object_unref)
 
 G_END_DECLS
 
-#endif /* __GDK_FRAME_CLOCK_H__ */
diff --git a/gdk/gdkframeclockidleprivate.h b/gdk/gdkframeclockidleprivate.h
index 42f765f768..108ae8704a 100644
--- a/gdk/gdkframeclockidleprivate.h
+++ b/gdk/gdkframeclockidleprivate.h
@@ -24,8 +24,7 @@
 
 /* Uninstalled header, internal to GDK */
 
-#ifndef __GDK_FRAME_CLOCK_IDLE_H__
-#define __GDK_FRAME_CLOCK_IDLE_H__
+#pragma once
 
 #include "gdkframeclockprivate.h"
 
@@ -62,4 +61,3 @@ GdkFrameClock *_gdk_frame_clock_idle_new            (void);
 
 G_END_DECLS
 
-#endif /* __GDK_FRAME_CLOCK_IDLE_H__ */
diff --git a/gdk/gdkframeclockprivate.h b/gdk/gdkframeclockprivate.h
index 010aa4564f..e9d5b1e2b9 100644
--- a/gdk/gdkframeclockprivate.h
+++ b/gdk/gdkframeclockprivate.h
@@ -24,8 +24,7 @@
 
 /* Uninstalled header, internal to GDK */
 
-#ifndef __GDK_FRAME_CLOCK_PRIVATE_H__
-#define __GDK_FRAME_CLOCK_PRIVATE_H__
+#pragma once
 
 #include <gdk/gdkframeclock.h>
 #include <gdk/gdkprofilerprivate.h>
@@ -129,4 +128,3 @@ void _gdk_frame_clock_emit_resume_events (GdkFrameClock *frame_clock);
 
 G_END_DECLS
 
-#endif /* __GDK_FRAME_CLOCK_PRIVATE_H__ */
diff --git a/gdk/gdkframetimings.h b/gdk/gdkframetimings.h
index 0bf7822ac2..c3cfe184a5 100644
--- a/gdk/gdkframetimings.h
+++ b/gdk/gdkframetimings.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_FRAME_TIMINGS_H__
-#define __GDK_FRAME_TIMINGS_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -55,4 +54,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkFrameTimings, gdk_frame_timings_unref)
 
 G_END_DECLS
 
-#endif /* __GDK_FRAME_TIMINGS_H__ */
diff --git a/gdk/gdkglcontext.h b/gdk/gdkglcontext.h
index 777bfd0117..5d4b614069 100644
--- a/gdk/gdkglcontext.h
+++ b/gdk/gdkglcontext.h
@@ -18,8 +18,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_GL_CONTEXT_H__
-#define __GDK_GL_CONTEXT_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -118,4 +117,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkGLContext, g_object_unref)
 
 G_END_DECLS
 
-#endif /* __GDK_GL_CONTEXT_H__ */
diff --git a/gdk/gdkglcontextprivate.h b/gdk/gdkglcontextprivate.h
index 2ed799d6f7..2f19e96b1c 100644
--- a/gdk/gdkglcontextprivate.h
+++ b/gdk/gdkglcontextprivate.h
@@ -18,8 +18,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_GL_CONTEXT_PRIVATE_H__
-#define __GDK_GL_CONTEXT_PRIVATE_H__
+#pragma once
 
 #include "gdkglcontext.h"
 #include "gdkdrawcontextprivate.h"
@@ -170,4 +169,3 @@ gboolean                gdk_gl_context_has_vertex_half_float    (GdkGLContext
 
 G_END_DECLS
 
-#endif /* __GDK_GL_CONTEXT_PRIVATE_H__ */
diff --git a/gdk/gdkgltexture.h b/gdk/gdkgltexture.h
index a692ebdd24..55e379d8c4 100644
--- a/gdk/gdkgltexture.h
+++ b/gdk/gdkgltexture.h
@@ -16,8 +16,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_GL_TEXTURE_H__
-#define __GDK_GL_TEXTURE_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -54,4 +53,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkGLTexture, g_object_unref)
 
 G_END_DECLS
 
-#endif /* __GDK_GL_TEXTURE_H__ */
diff --git a/gdk/gdkgltextureprivate.h b/gdk/gdkgltextureprivate.h
index f00fecd4bd..47fa71bd0a 100644
--- a/gdk/gdkgltextureprivate.h
+++ b/gdk/gdkgltextureprivate.h
@@ -1,5 +1,4 @@
-#ifndef __GDK_GL_TEXTURE_PRIVATE_H__
-#define __GDK_GL_TEXTURE_PRIVATE_H__
+#pragma once
 
 #include "gdkgltexture.h"
 
@@ -13,4 +12,3 @@ gboolean                gdk_gl_texture_has_mipmap       (GdkGLTexture
 
 G_END_DECLS
 
-#endif /* __GDK_GL_TEXTURE_PRIVATE_H__ */
diff --git a/gdk/gdkhslaprivate.h b/gdk/gdkhslaprivate.h
index 8239e8e775..baf43184b0 100644
--- a/gdk/gdkhslaprivate.h
+++ b/gdk/gdkhslaprivate.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GTK_HSLA_PRIVATE_H__
-#define __GTK_HSLA_PRIVATE_H__
+#pragma once
 
 #include <gdk/gdkrgba.h>
 
@@ -43,4 +42,3 @@ void            _gdk_hsla_shade             (GdkHSLA          *dest,
 
 G_END_DECLS
 
-#endif /* __GTK_HSLA_PRIVATE_H__ */
diff --git a/gdk/gdkkeys.h b/gdk/gdkkeys.h
index 0f75a2affc..dd82c938dd 100644
--- a/gdk/gdkkeys.h
+++ b/gdk/gdkkeys.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_KEYS_H__
-#define __GDK_KEYS_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -60,4 +59,3 @@ guint    gdk_unicode_to_keyval   (guint32      wc) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* __GDK_KEYS_H__ */
diff --git a/gdk/gdkkeysprivate.h b/gdk/gdkkeysprivate.h
index 29d2fcd670..ff92eeabcc 100644
--- a/gdk/gdkkeysprivate.h
+++ b/gdk/gdkkeysprivate.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_KEYS_PRIVATE_H__
-#define __GDK_KEYS_PRIVATE_H__
+#pragma once
 
 #include "gdkkeys.h"
 
@@ -123,4 +122,3 @@ void           gdk_keymap_get_cached_entries_for_keyval (GdkKeymap     *keymap,
 
 G_END_DECLS
 
-#endif
diff --git a/gdk/gdkkeysyms.h b/gdk/gdkkeysyms.h
index 3482d635d1..6f0480eeca 100644
--- a/gdk/gdkkeysyms.h
+++ b/gdk/gdkkeysyms.h
@@ -32,8 +32,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_KEYSYMS_H__
-#define __GDK_KEYSYMS_H__
+#pragma once
 
 
 #define GDK_KEY_VoidSymbol 0xffffff
@@ -2315,4 +2314,3 @@
 #define GDK_KEY_LogWindowTree 0x1008fe24
 #define GDK_KEY_LogGrabInfo 0x1008fe25
 
-#endif /* __GDK_KEYSYMS_H__ */
diff --git a/gdk/gdkmemoryformatprivate.h b/gdk/gdkmemoryformatprivate.h
index 3618852f02..0d3a87b24d 100644
--- a/gdk/gdkmemoryformatprivate.h
+++ b/gdk/gdkmemoryformatprivate.h
@@ -17,8 +17,7 @@
  * Authors: Benjamin Otte <otte@gnome.org>
  */
 
-#ifndef __GDK_MEMORY_CONVERT_PRIVATE_H__
-#define __GDK_MEMORY_CONVERT_PRIVATE_H__
+#pragma once
 
 #include "gdkenums.h"
 
@@ -52,4 +51,3 @@ void                    gdk_memory_convert                  (guchar
 
 G_END_DECLS
 
-#endif /* __GDK_MEMORY_CONVERT_PRIVATE_H__ */
diff --git a/gdk/gdkmemorytexture.h b/gdk/gdkmemorytexture.h
index 9a76c7be82..1f56b93578 100644
--- a/gdk/gdkmemorytexture.h
+++ b/gdk/gdkmemorytexture.h
@@ -17,8 +17,7 @@
  * Authors: Benjamin Otte <otte@gnome.org>
  */
 
-#ifndef __GDK_MEMORY_TEXTURE__H__
-#define __GDK_MEMORY_TEXTURE__H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -72,4 +71,3 @@ GdkTexture *            gdk_memory_texture_new              (int
 
 G_END_DECLS
 
-#endif /* __GDK_MEMORY_TEXTURE_H__ */
diff --git a/gdk/gdkmemorytextureprivate.h b/gdk/gdkmemorytextureprivate.h
index f182f7fbd9..168f05bf46 100644
--- a/gdk/gdkmemorytextureprivate.h
+++ b/gdk/gdkmemorytextureprivate.h
@@ -17,8 +17,7 @@
  * Authors: Benjamin Otte <otte@gnome.org>
  */
 
-#ifndef __GDK_MEMORY_TEXTURE_PRIVATE_H__
-#define __GDK_MEMORY_TEXTURE_PRIVATE_H__
+#pragma once
 
 #include "gdkmemorytexture.h"
 
@@ -43,4 +42,3 @@ GBytes *                gdk_memory_texture_get_bytes        (GdkMemoryTexture  *
 
 G_END_DECLS
 
-#endif /* __GDK_MEMORY_TEXTURE_PRIVATE_H__ */
diff --git a/gdk/gdkmonitor.h b/gdk/gdkmonitor.h
index 11f91640c6..ed199cba08 100644
--- a/gdk/gdkmonitor.h
+++ b/gdk/gdkmonitor.h
@@ -19,8 +19,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_MONITOR_H__
-#define __GDK_MONITOR_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -93,4 +92,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkMonitor, g_object_unref)
 
 G_END_DECLS
 
-#endif  /* __GDK_MONITOR_H__ */
diff --git a/gdk/gdkmonitorprivate.h b/gdk/gdkmonitorprivate.h
index 275ae91391..2a48ae1e28 100644
--- a/gdk/gdkmonitorprivate.h
+++ b/gdk/gdkmonitorprivate.h
@@ -19,8 +19,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_MONITOR_PRIVATE_H__
-#define __GDK_MONITOR_PRIVATE_H__
+#pragma once
 
 #include "gdkmonitor.h"
 
@@ -76,4 +75,3 @@ void            gdk_monitor_set_description     (GdkMonitor *monitor,
 
 G_END_DECLS
 
-#endif  /* __GDK_MONITOR_PRIVATE_H__ */
diff --git a/gdk/gdkpaintable.h b/gdk/gdkpaintable.h
index 92847a07e3..c5c3afc325 100644
--- a/gdk/gdkpaintable.h
+++ b/gdk/gdkpaintable.h
@@ -17,8 +17,7 @@
  * Authors: Benjamin Otte <otte@gnome.org>
  */
 
-#ifndef __GDK_PAINTABLE_H__
-#define __GDK_PAINTABLE_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -146,4 +145,3 @@ GdkPaintable *  gdk_paintable_new_empty                 (int
 
 G_END_DECLS
 
-#endif /* __GDK_PAINTABLE_H__ */
diff --git a/gdk/gdkpango.h b/gdk/gdkpango.h
index 5a674bc3d8..806597df2a 100644
--- a/gdk/gdkpango.h
+++ b/gdk/gdkpango.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_PANGO_H__
-#define __GDK_PANGO_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -48,4 +47,3 @@ cairo_region_t    *gdk_pango_layout_get_clip_region      (PangoLayout     *layou
 
 G_END_DECLS
 
-#endif /* __GDK_PANGO_H__ */
diff --git a/gdk/gdkpipeiostreamprivate.h b/gdk/gdkpipeiostreamprivate.h
index 50af59defe..e88154e038 100644
--- a/gdk/gdkpipeiostreamprivate.h
+++ b/gdk/gdkpipeiostreamprivate.h
@@ -16,8 +16,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_PIPE_IO_STREAM_H__
-#define __GDK_PIPE_IO_STREAM_H__
+#pragma once
 
 #include <gdk/gdkversionmacros.h>
 #include <gio/gio.h>
@@ -30,4 +29,3 @@ GIOStream *             gdk_pipe_io_stream_new                          (void);
 
 G_END_DECLS
 
-#endif /* __GDK_PIPE_IO_STREAM_H__ */
diff --git a/gdk/gdkpixbuf.h b/gdk/gdkpixbuf.h
index 65db8ebbc8..b05a279935 100644
--- a/gdk/gdkpixbuf.h
+++ b/gdk/gdkpixbuf.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_PIXBUF_H__
-#define __GDK_PIXBUF_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -49,4 +48,3 @@ GdkPixbuf *gdk_pixbuf_get_from_texture (GdkTexture      *texture);
 
 G_END_DECLS
 
-#endif /* __GDK_PIXBUF_H__ */
diff --git a/gdk/gdkpopup.h b/gdk/gdkpopup.h
index ba8a2782a7..1b6d121203 100644
--- a/gdk/gdkpopup.h
+++ b/gdk/gdkpopup.h
@@ -17,8 +17,7 @@
  * Authors: Matthias Clasen <mclasen@redhat.com>
  */
 
-#ifndef __GDK_POPUP_H__
-#define __GDK_POPUP_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -60,4 +59,3 @@ gboolean        gdk_popup_get_autohide          (GdkPopup       *popup);
 
 G_END_DECLS
 
-#endif /* __GDK_POPUP_H__ */
diff --git a/gdk/gdkpopuplayout.h b/gdk/gdkpopuplayout.h
index 1243323416..34a58c5850 100644
--- a/gdk/gdkpopuplayout.h
+++ b/gdk/gdkpopuplayout.h
@@ -16,8 +16,7 @@
  *
  */
 
-#ifndef __GDK_POPUP_LAYOUT_H__
-#define __GDK_POPUP_LAYOUT_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -150,4 +149,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkPopupLayout, gdk_popup_layout_unref)
 
 G_END_DECLS
 
-#endif /* __GDK_POPUP_LAYOUT_H__ */
diff --git a/gdk/gdkpopupprivate.h b/gdk/gdkpopupprivate.h
index 2d9c18e7c8..08617fed46 100644
--- a/gdk/gdkpopupprivate.h
+++ b/gdk/gdkpopupprivate.h
@@ -1,5 +1,4 @@
-#ifndef __GDK_POPUP_PRIVATE_H__
-#define __GDK_POPUP_PRIVATE_H__
+#pragma once
 
 #include "gdkpopup.h"
 
@@ -32,4 +31,3 @@ guint gdk_popup_install_properties (GObjectClass *object_class,
 
 G_END_DECLS
 
-#endif /* __GDK_POPUP_PRIVATE_H__ */
diff --git a/gdk/gdkprivate.h b/gdk/gdkprivate.h
index b93e1800f5..e1a59c5921 100644
--- a/gdk/gdkprivate.h
+++ b/gdk/gdkprivate.h
@@ -1,5 +1,4 @@
-#ifndef __GDK__PRIVATE_H__
-#define __GDK__PRIVATE_H__
+#pragma once
 
 #include "gdk/gdktypes.h"
 
@@ -42,4 +41,3 @@ g_set_str (char       **str_pointer,
 }
 #endif
 
-#endif /* __GDK__PRIVATE_H__ */
diff --git a/gdk/gdkprofilerprivate.h b/gdk/gdkprofilerprivate.h
index 897f4f804e..f244b85865 100644
--- a/gdk/gdkprofilerprivate.h
+++ b/gdk/gdkprofilerprivate.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_PROFILER_PRIVATE_H__
-#define __GDK_PROFILER_PRIVATE_H__
+#pragma once
 
 #include "gdk/gdkframeclock.h"
 #include "gdk/gdkdisplay.h"
@@ -94,4 +93,3 @@ void    gdk_profiler_set_int_counter    (guint  id,
 
 G_END_DECLS
 
-#endif  /* __GDK_PROFILER_PRIVATE_H__ */
diff --git a/gdk/gdkrectangle.h b/gdk/gdkrectangle.h
index 0f28fa6f4b..e3325aee23 100644
--- a/gdk/gdkrectangle.h
+++ b/gdk/gdkrectangle.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_RECTANGLE_H__
-#define __GDK_RECTANGLE_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -61,4 +60,3 @@ GType gdk_rectangle_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* __GDK__RECTANGLE_H__ */
diff --git a/gdk/gdkrgba.h b/gdk/gdkrgba.h
index 4ecb4b7805..b8aca3dab9 100644
--- a/gdk/gdkrgba.h
+++ b/gdk/gdkrgba.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_RGBA_H__
-#define __GDK_RGBA_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -73,4 +72,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkRGBA, gdk_rgba_free)
 
 G_END_DECLS
 
-#endif /* __GDK_RGBA_H__ */
diff --git a/gdk/gdkrgbaprivate.h b/gdk/gdkrgbaprivate.h
index 7701479bcc..b37e1f3ad9 100644
--- a/gdk/gdkrgbaprivate.h
+++ b/gdk/gdkrgbaprivate.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_RGBA_PRIVATE_H__
-#define __GDK_RGBA_PRIVATE_H__
+#pragma once
 
 #include "gdkrgba.h"
 
@@ -41,4 +40,3 @@ gboolean               gdk_rgba_parser_parse                    (GtkCssParser
 
 G_END_DECLS
 
-#endif
diff --git a/gdk/gdkseat.h b/gdk/gdkseat.h
index 45cb9ab64f..5c4f09c770 100644
--- a/gdk/gdkseat.h
+++ b/gdk/gdkseat.h
@@ -17,8 +17,7 @@
  * Author: Carlos Garnacho <carlosg@gnome.org>
  */
 
-#ifndef __GDK_SEAT_H__
-#define __GDK_SEAT_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -90,4 +89,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkSeat, g_object_unref)
 
 G_END_DECLS
 
-#endif /* __GDK_SEAT_H__ */
diff --git a/gdk/gdkseatdefaultprivate.h b/gdk/gdkseatdefaultprivate.h
index 5e49ef6ec9..9886d37f7f 100644
--- a/gdk/gdkseatdefaultprivate.h
+++ b/gdk/gdkseatdefaultprivate.h
@@ -17,8 +17,7 @@
  * Author: Carlos Garnacho <carlosg@gnome.org>
  */
 
-#ifndef __GDK_SEAT_DEFAULT_PRIVATE_H__
-#define __GDK_SEAT_DEFAULT_PRIVATE_H__
+#pragma once
 
 #include "gdkseat.h"
 #include "gdkseatprivate.h"
@@ -61,4 +60,3 @@ void      gdk_seat_default_remove_tool                  (GdkSeatDefault *seat,
 
 G_END_DECLS
 
-#endif /* __GDK_SEAT_DEFAULT_PRIVATE_H__ */
diff --git a/gdk/gdkseatprivate.h b/gdk/gdkseatprivate.h
index 228740dbaf..baae4c2db6 100644
--- a/gdk/gdkseatprivate.h
+++ b/gdk/gdkseatprivate.h
@@ -17,8 +17,7 @@
  * Author: Carlos Garnacho <carlosg@gnome.org>
  */
 
-#ifndef __GDK_SEAT_PRIVATE_H__
-#define __GDK_SEAT_PRIVATE_H__
+#pragma once
 
 typedef struct _GdkSeatClass GdkSeatClass;
 
@@ -91,4 +90,3 @@ GdkGrabStatus  gdk_seat_grab             (GdkSeat                *seat,
 void           gdk_seat_ungrab           (GdkSeat                *seat);
 
 
-#endif /* __GDK_SEAT_PRIVATE_H__ */
diff --git a/gdk/gdksnapshot.h b/gdk/gdksnapshot.h
index 615219c69a..31e0755bf4 100644
--- a/gdk/gdksnapshot.h
+++ b/gdk/gdksnapshot.h
@@ -17,8 +17,7 @@
  * Authors: Benjamin Otte <otte@gnome.org>
  */
 
-#ifndef __GDK_SNAPSHOT_H__
-#define __GDK_SNAPSHOT_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -43,4 +42,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkSnapshot, g_object_unref)
 
 G_END_DECLS
 
-#endif /* __GDK_SNAPSHOT_H__ */
diff --git a/gdk/gdksnapshotprivate.h b/gdk/gdksnapshotprivate.h
index b7cdc761e3..32571d40cd 100644
--- a/gdk/gdksnapshotprivate.h
+++ b/gdk/gdksnapshotprivate.h
@@ -1,5 +1,4 @@
-#ifndef __GDK_SNAPSHOT_PRIVATE_H__
-#define __GDK_SNAPSHOT_PRIVATE_H__
+#pragma once
 
 #include "gdksnapshot.h"
 
@@ -20,4 +19,3 @@ struct _GdkSnapshotClass {
 
 G_END_DECLS
 
-#endif /* __GDK_SNAPSHOT_PRIVATE_H__ */
diff --git a/gdk/gdksurface.h b/gdk/gdksurface.h
index 4e083ec07b..f7f3e0273d 100644
--- a/gdk/gdksurface.h
+++ b/gdk/gdksurface.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_SURFACE_H__
-#define __GDK_SURFACE_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -142,4 +141,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (GdkSurface, g_object_unref)
 
 G_END_DECLS
 
-#endif /* __GDK_SURFACE_H__ */
diff --git a/gdk/gdksurfaceprivate.h b/gdk/gdksurfaceprivate.h
index 8847511bff..f4a37af4e3 100644
--- a/gdk/gdksurfaceprivate.h
+++ b/gdk/gdksurfaceprivate.h
@@ -17,8 +17,7 @@
 
 /* Uninstalled header defining types and functions internal to GDK */
 
-#ifndef __GDK_SURFACE_PRIVATE_H__
-#define __GDK_SURFACE_PRIVATE_H__
+#pragma once
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include "gdkenumtypes.h"
@@ -351,4 +350,3 @@ gboolean       gdk_surface_supports_edge_constraints    (GdkSurface *surface);
 
 G_END_DECLS
 
-#endif /* __GDK_SURFACE_PRIVATE_H__ */
diff --git a/gdk/gdktexture.h b/gdk/gdktexture.h
index 5a28f55ad0..c79904420e 100644
--- a/gdk/gdktexture.h
+++ b/gdk/gdktexture.h
@@ -16,8 +16,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_TEXTURE_H__
-#define __GDK_TEXTURE_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -105,4 +104,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkTexture, g_object_unref)
 
 G_END_DECLS
 
-#endif /* __GDK_TEXTURE_H__ */
diff --git a/gdk/gdktexturedownloader.h b/gdk/gdktexturedownloader.h
index 0bdb75b573..31d97ef17b 100644
--- a/gdk/gdktexturedownloader.h
+++ b/gdk/gdktexturedownloader.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GTK_TEXTURE_DOWNLOADER_H__
-#define __GTK_TEXTURE_DOWNLOADER_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -66,4 +65,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkTextureDownloader, gdk_texture_downloader_free)
 
 G_END_DECLS
 
-#endif /* __GTK_TEXTURE_DOWNLOADER_H__ */
diff --git a/gdk/gdktexturedownloaderprivate.h b/gdk/gdktexturedownloaderprivate.h
index ca83889210..867788d3fb 100644
--- a/gdk/gdktexturedownloaderprivate.h
+++ b/gdk/gdktexturedownloaderprivate.h
@@ -17,8 +17,7 @@
  */
 
 
-#ifndef __GTK_TEXTURE_DOWNLOADER_PRIVATE_H__
-#define __GTK_TEXTURE_DOWNLOADER_PRIVATE_H__
+#pragma once
 
 #include "gdktexturedownloader.h"
 
@@ -38,4 +37,3 @@ void                    gdk_texture_downloader_finish            (GdkTextureDown
 
 G_END_DECLS
 
-#endif /* __GTK_TEXTURE_DOWNLOADER_PRIVATE_H__ */
diff --git a/gdk/gdktextureprivate.h b/gdk/gdktextureprivate.h
index 3a2330c373..fccf380d7c 100644
--- a/gdk/gdktextureprivate.h
+++ b/gdk/gdktextureprivate.h
@@ -1,5 +1,4 @@
-#ifndef __GDK_TEXTURE_PRIVATE_H__
-#define __GDK_TEXTURE_PRIVATE_H__
+#pragma once
 
 #include "gdktexture.h"
 
@@ -53,4 +52,3 @@ gpointer                gdk_texture_get_render_data     (GdkTexture
 
 G_END_DECLS
 
-#endif /* __GDK_TEXTURE_PRIVATE_H__ */
diff --git a/gdk/gdktoplevel.h b/gdk/gdktoplevel.h
index 346edcc77f..17b48802df 100644
--- a/gdk/gdktoplevel.h
+++ b/gdk/gdktoplevel.h
@@ -17,8 +17,7 @@
  * Authors: Matthias Clasen <mclasen@redhat.com>
  */
 
-#ifndef __GDK_TOPLEVEL_H__
-#define __GDK_TOPLEVEL_H__
+#pragma once
 
 #if !defined(__GDK_H_INSIDE__) && !defined(GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -217,4 +216,3 @@ gboolean      gdk_toplevel_titlebar_gesture          (GdkToplevel        *toplev
 
 G_END_DECLS
 
-#endif /* __GDK_TOPLEVEL_H__ */
diff --git a/gdk/gdktoplevellayout.h b/gdk/gdktoplevellayout.h
index f1a6dc457a..aa2e1046d7 100644
--- a/gdk/gdktoplevellayout.h
+++ b/gdk/gdktoplevellayout.h
@@ -16,8 +16,7 @@
  *
  */
 
-#ifndef __GDK_TOPLEVEL_LAYOUT_H__
-#define __GDK_TOPLEVEL_LAYOUT_H__
+#pragma once
 
 #if !defined(__GDK_H_INSIDE__) && !defined(GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -82,4 +81,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkToplevelLayout, gdk_toplevel_layout_unref)
 
 G_END_DECLS
 
-#endif /* __GDK_TOPLEVEL_LAYOUT_H__ */
diff --git a/gdk/gdktoplevelprivate.h b/gdk/gdktoplevelprivate.h
index f202b1797f..8f0f8d6f8e 100644
--- a/gdk/gdktoplevelprivate.h
+++ b/gdk/gdktoplevelprivate.h
@@ -1,5 +1,4 @@
-#ifndef __GDK_TOPLEVEL_PRIVATE_H__
-#define __GDK_TOPLEVEL_PRIVATE_H__
+#pragma once
 
 #include "gdktoplevel.h"
 #include "gdktoplevelsizeprivate.h"
@@ -87,4 +86,3 @@ void  gdk_toplevel_unexport_handle      (GdkToplevel          *toplevel);
 
 G_END_DECLS
 
-#endif /* __GDK_TOPLEVEL_PRIVATE_H__ */
diff --git a/gdk/gdktoplevelsize.h b/gdk/gdktoplevelsize.h
index 882bd8ba43..536b1a34eb 100644
--- a/gdk/gdktoplevelsize.h
+++ b/gdk/gdktoplevelsize.h
@@ -16,8 +16,7 @@
  *
  */
 
-#ifndef __GDK_TOPLEVEL_SIZE_H__
-#define __GDK_TOPLEVEL_SIZE_H__
+#pragma once
 
 #if !defined(__GDK_H_INSIDE__) && !defined(GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -58,4 +57,3 @@ void                    gdk_toplevel_size_set_shadow_width (GdkToplevelSize    *
 
 G_END_DECLS
 
-#endif /* __GDK_TOPLEVEL_SIZE_H__ */
diff --git a/gdk/gdktoplevelsizeprivate.h b/gdk/gdktoplevelsizeprivate.h
index bba34cc7d7..70f817ab57 100644
--- a/gdk/gdktoplevelsizeprivate.h
+++ b/gdk/gdktoplevelsizeprivate.h
@@ -16,8 +16,7 @@
  *
  */
 
-#ifndef __GDK_TOPLEVEL_SIZE_PRIVATE_H__
-#define __GDK_TOPLEVEL_SIZE_PRIVATE_H__
+#pragma once
 
 #include "gdktoplevelsize.h"
 
@@ -46,4 +45,3 @@ void gdk_toplevel_size_init (GdkToplevelSize *size,
 
 void gdk_toplevel_size_validate (GdkToplevelSize *size);
 
-#endif /* __GDK_TOPLEVEL_SIZE_PRIVATE_H__ */
diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index fc3b16e3c7..69136f7ab0 100644
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_TYPES_H__
-#define __GDK_TYPES_H__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -162,4 +161,3 @@ struct _GdkKeymapKey
 
 G_END_DECLS
 
-#endif /* __GDK_TYPES_H__ */
diff --git a/gdk/gdkvulkancontext.h b/gdk/gdkvulkancontext.h
index 8f2214f3c3..d6531a414a 100644
--- a/gdk/gdkvulkancontext.h
+++ b/gdk/gdkvulkancontext.h
@@ -18,8 +18,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_VULKAN_CONTEXT__
-#define __GDK_VULKAN_CONTEXT__
+#pragma once
 
 #if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
@@ -81,4 +80,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkVulkanContext, g_object_unref)
 
 G_END_DECLS
 
-#endif /* __GDK_VULKAN_CONTEXT__ */
diff --git a/gdk/gdkvulkancontextprivate.h b/gdk/gdkvulkancontextprivate.h
index 2088edc27e..7a59485675 100644
--- a/gdk/gdkvulkancontextprivate.h
+++ b/gdk/gdkvulkancontextprivate.h
@@ -18,8 +18,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_VULKAN_CONTEXT_PRIVATE__
-#define __GDK_VULKAN_CONTEXT_PRIVATE__
+#pragma once
 
 #include "gdkvulkancontext.h"
 
@@ -92,4 +91,3 @@ gdk_display_ref_vulkan (GdkDisplay  *display,
 
 G_END_DECLS
 
-#endif /* __GDK__VULKAN_CONTEXT_PRIVATE__ */
diff --git a/gdk/loaders/gdkjpegprivate.h b/gdk/loaders/gdkjpegprivate.h
index 28e7b90f28..1513173d5b 100644
--- a/gdk/loaders/gdkjpegprivate.h
+++ b/gdk/loaders/gdkjpegprivate.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_JPEG_PRIVATE_H__
-#define __GDK_JPEG_PRIVATE_H__
+#pragma once
 
 #include "gdkmemorytexture.h"
 #include <gio/gio.h>
@@ -40,4 +39,3 @@ gdk_is_jpeg (GBytes *bytes)
          memcmp (data, JPEG_SIGNATURE, strlen (JPEG_SIGNATURE)) == 0;
 }
 
-#endif
diff --git a/gdk/loaders/gdkpngprivate.h b/gdk/loaders/gdkpngprivate.h
index cbe073b315..45d58b7425 100644
--- a/gdk/loaders/gdkpngprivate.h
+++ b/gdk/loaders/gdkpngprivate.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_PNG_PRIVATE_H__
-#define __GDK_PNG_PRIVATE_H__
+#pragma once
 
 #include "gdktexture.h"
 #include <gio/gio.h>
@@ -40,4 +39,3 @@ gdk_is_png (GBytes *bytes)
          memcmp (data, PNG_SIGNATURE, strlen (PNG_SIGNATURE)) == 0;
 }
 
-#endif
diff --git a/gdk/loaders/gdktiffprivate.h b/gdk/loaders/gdktiffprivate.h
index 839e8855f0..a085e4a270 100644
--- a/gdk/loaders/gdktiffprivate.h
+++ b/gdk/loaders/gdktiffprivate.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_TIFF_PRIVATE_H__
-#define __GDK_TIFF_PRIVATE_H__
+#pragma once
 
 #include "gdktexture.h"
 #include <gio/gio.h>
@@ -43,4 +42,3 @@ gdk_is_tiff (GBytes *bytes)
           memcmp (data, TIFF_SIGNATURE2, strlen (TIFF_SIGNATURE2)) == 0);
 }
 
-#endif
diff --git a/gdk/macos/edgesnapping.h b/gdk/macos/edgesnapping.h
index b7ffd8a176..be30f75b44 100644
--- a/gdk/macos/edgesnapping.h
+++ b/gdk/macos/edgesnapping.h
@@ -18,8 +18,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __EDGE_SNAPPING_H__
-#define __EDGE_SNAPPING_H__
+#pragma once
 
 #include "gdktypes.h"
 #include "gdkmacosutils-private.h"
@@ -48,4 +47,3 @@ void _edge_snapping_set_monitor (EdgeSnapping       *self,
 
 G_END_DECLS
 
-#endif /* __EDGE_SNAPPING_H__ */
diff --git a/gdk/macos/gdkdisplaylinksource.h b/gdk/macos/gdkdisplaylinksource.h
index 6f465907a2..f83b27d79d 100644
--- a/gdk/macos/gdkdisplaylinksource.h
+++ b/gdk/macos/gdkdisplaylinksource.h
@@ -19,8 +19,7 @@
  *   Christian Hergert <christian@hergert.me>
  */
 
-#ifndef GDK_DISPLAY_LINK_SOURCE_H
-#define GDK_DISPLAY_LINK_SOURCE_H
+#pragma once
 
 #include <glib.h>
 
@@ -49,4 +48,3 @@ void     gdk_display_link_source_unpause (GdkDisplayLinkSource *source);
 
 G_END_DECLS
 
-#endif /* GDK_DISPLAY_LINK_SOURCE_H */
diff --git a/gdk/macos/gdkmacos.h b/gdk/macos/gdkmacos.h
index 7d7d348752..bee9aa9812 100644
--- a/gdk/macos/gdkmacos.h
+++ b/gdk/macos/gdkmacos.h
@@ -17,8 +17,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __GDK_MACOS_H__
-#define __GDK_MACOS_H__
+#pragma once
 
 #include <gdk/gdk.h>
 
@@ -29,4 +28,3 @@
 #include "gdkmacosmonitor.h"
 #include "gdkmacossurface.h"
 
-#endif /* __GDK_MACOS_H__ */
diff --git a/gdk/macos/gdkmacosbuffer-private.h b/gdk/macos/gdkmacosbuffer-private.h
index 4b446a7212..6adf74c359 100644
--- a/gdk/macos/gdkmacosbuffer-private.h
+++ b/gdk/macos/gdkmacosbuffer-private.h
@@ -17,8 +17,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __GDK_MACOS_BUFFER_PRIVATE_H__
-#define __GDK_MACOS_BUFFER_PRIVATE_H__
+#pragma once
 
 #include <CoreGraphics/CoreGraphics.h>
 #include <Foundation/Foundation.h>
@@ -57,4 +56,3 @@ void                  _gdk_macos_buffer_set_flipped      (GdkMacosBuffer  *self,
 
 G_END_DECLS
 
-#endif /* __GDK_MACOS_BUFFER_PRIVATE_H__ */
diff --git a/gdk/macos/gdkmacoscairocontext-private.h b/gdk/macos/gdkmacoscairocontext-private.h
index 1afede8591..0d9d2a1a4e 100644
--- a/gdk/macos/gdkmacoscairocontext-private.h
+++ b/gdk/macos/gdkmacoscairocontext-private.h
@@ -17,8 +17,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __GDK_MACOS_CAIRO_CONTEXT_PRIVATE_H__
-#define __GDK_MACOS_CAIRO_CONTEXT_PRIVATE_H__
+#pragma once
 
 #include "gdkcairocontextprivate.h"
 
@@ -35,4 +34,3 @@ GType _gdk_macos_cairo_context_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* __GDK_MACOS_CAIRO_CONTEXT_PRIVATE_H__ */
diff --git a/gdk/macos/gdkmacosclipboard-private.h b/gdk/macos/gdkmacosclipboard-private.h
index ef70ee3e33..5679b13a36 100644
--- a/gdk/macos/gdkmacosclipboard-private.h
+++ b/gdk/macos/gdkmacosclipboard-private.h
@@ -17,8 +17,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __GDK_MACOS_CLIPBOARD_PRIVATE_H__
-#define __GDK_MACOS_CLIPBOARD_PRIVATE_H__
+#pragma once
 
 #include <AppKit/AppKit.h>
 
@@ -45,4 +44,3 @@ void               _gdk_macos_clipboard_register_drag_types       (NSWindow
 
 G_END_DECLS
 
-#endif /* __GDK_MACOS_CLIPBOARD_PRIVATE_H__ */
diff --git a/gdk/macos/gdkmacoscursor-private.h b/gdk/macos/gdkmacoscursor-private.h
index b3e5bac70d..3b6e25b74b 100644
--- a/gdk/macos/gdkmacoscursor-private.h
+++ b/gdk/macos/gdkmacoscursor-private.h
@@ -17,8 +17,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_MACOS_CURSOR_PRIVATE_H__
-#define __GDK_MACOS_CURSOR_PRIVATE_H__
+#pragma once
 
 #include <AppKit/AppKit.h>
 #include <gdk/gdk.h>
@@ -29,4 +28,3 @@ NSCursor *_gdk_macos_cursor_get_ns_cursor (GdkCursor *cursor);
 
 G_END_DECLS
 
-#endif /* __GDK_MACOS_CURSOR_PRIVATE_H__ */
diff --git a/gdk/macos/gdkmacosdevice-private.h b/gdk/macos/gdkmacosdevice-private.h
index 6daafa8135..683fac46e0 100644
--- a/gdk/macos/gdkmacosdevice-private.h
+++ b/gdk/macos/gdkmacosdevice-private.h
@@ -17,8 +17,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __GDK_MACOS_DEVICE_PRIVATE_H__
-#define __GDK_MACOS_DEVICE_PRIVATE_H__
+#pragma once
 
 #include "gdkdeviceprivate.h"
 
@@ -33,4 +32,3 @@ void gdk_macos_device_query_state (GdkDevice        *device,
 
 G_END_DECLS
 
-#endif /* __GDK_MACOS_DEVICE_PRIVATE_H__ */
diff --git a/gdk/macos/gdkmacosdevice.h b/gdk/macos/gdkmacosdevice.h
index c81fde5d1a..e9181d5166 100644
--- a/gdk/macos/gdkmacosdevice.h
+++ b/gdk/macos/gdkmacosdevice.h
@@ -17,8 +17,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __GDK_MACOS_DEVICE_H__
-#define __GDK_MACOS_DEVICE_H__
+#pragma once
 
 #if !defined (__GDKMACOS_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/macos/gdkmacos.h> can be included directly."
@@ -40,4 +39,3 @@ GType gdk_macos_device_get_type (void);
 
 G_END_DECLS
 
-#endif /* __GDK_MACOS_DEVICE_H__ */
diff --git a/gdk/macos/gdkmacosdisplay-private.h b/gdk/macos/gdkmacosdisplay-private.h
index 9fc910ec2e..95f61bbe17 100644
--- a/gdk/macos/gdkmacosdisplay-private.h
+++ b/gdk/macos/gdkmacosdisplay-private.h
@@ -17,8 +17,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __GDK_MACOS_DISPLAY_PRIVATE_H__
-#define __GDK_MACOS_DISPLAY_PRIVATE_H__
+#pragma once
 
 #include <AppKit/AppKit.h>
 
@@ -179,4 +178,3 @@ void             _gdk_macos_display_position_surface               (GdkMacosDisp
 
 G_END_DECLS
 
-#endif /* __GDK_MACOS_DISPLAY_PRIVATE_H__ */
diff --git a/gdk/macos/gdkmacosdisplay.h b/gdk/macos/gdkmacosdisplay.h
index 7c5730d0c7..2844c588bd 100644
--- a/gdk/macos/gdkmacosdisplay.h
+++ b/gdk/macos/gdkmacosdisplay.h
@@ -17,8 +17,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __GDK_MACOS_DISPLAY_H__
-#define __GDK_MACOS_DISPLAY_H__
+#pragma once
 
 #if !defined (__GDKMACOS_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/macos/gdkmacos.h> can be included directly."
@@ -44,4 +43,3 @@ GType gdk_macos_display_get_type (void);
 
 G_END_DECLS
 
-#endif /* __GDK_MACOS_DISPLAY_H__ */
diff --git a/gdk/macos/gdkmacosdrag-private.h b/gdk/macos/gdkmacosdrag-private.h
index bdcbbbe23d..560aee7394 100644
--- a/gdk/macos/gdkmacosdrag-private.h
+++ b/gdk/macos/gdkmacosdrag-private.h
@@ -17,8 +17,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __GDK_MACOS_DRAG_PRIVATE_H__
-#define __GDK_MACOS_DRAG_PRIVATE_H__
+#pragma once
 
 #include "gdkdragprivate.h"
 
@@ -80,4 +79,3 @@ void            _gdk_macos_drag_set_actions        (GdkMacosDrag   *self,
 
 G_END_DECLS
 
-#endif /* __GDK_MACOS_DRAG_PRIVATE_H__ */
diff --git a/gdk/macos/gdkmacosdragsurface-private.h b/gdk/macos/gdkmacosdragsurface-private.h
index bc84e3d30f..bb9bea97e1 100644
--- a/gdk/macos/gdkmacosdragsurface-private.h
+++ b/gdk/macos/gdkmacosdragsurface-private.h
@@ -17,8 +17,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __GDK_MACOS_DRAG_SURFACE_PRIVATE_H__
-#define __GDK_MACOS_DRAG_SURFACE_PRIVATE_H__
+#pragma once
 
 #include "gdkmacossurface-private.h"
 
@@ -41,4 +40,3 @@ GdkMacosSurface *_gdk_macos_drag_surface_new      (GdkMacosDisplay *display,
 
 G_END_DECLS
 
-#endif /* __GDK_MACOS_DRAG_SURFACE_PRIVATE_H__ */
diff --git a/gdk/macos/gdkmacosdrop-private.h b/gdk/macos/gdkmacosdrop-private.h
index 8472e87c23..3102b62d38 100644
--- a/gdk/macos/gdkmacosdrop-private.h
+++ b/gdk/macos/gdkmacosdrop-private.h
@@ -17,8 +17,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __GDK_MACOS_DROP_PRIVATE_H__
-#define __GDK_MACOS_DROP_PRIVATE_H__
+#pragma once
 
 #include <AppKit/AppKit.h>
 
@@ -63,4 +62,3 @@ void             _gdk_macos_drop_update_actions (GdkMacosDrop       *self,
 
 G_END_DECLS
 
-#endif /* __GDK_MACOS_DROP_PRIVATE_H__ */
diff --git a/gdk/macos/gdkmacoseventsource-private.h b/gdk/macos/gdkmacoseventsource-private.h
index 09853a18ac..5224068875 100644
--- a/gdk/macos/gdkmacoseventsource-private.h
+++ b/gdk/macos/gdkmacoseventsource-private.h
@@ -17,8 +17,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __GDK_MACOS_EVENT_SOURCE_PRIVATE_H__
-#define __GDK_MACOS_EVENT_SOURCE_PRIVATE_H__
+#pragma once
 
 #include <AppKit/AppKit.h>
 
@@ -37,4 +36,3 @@ gboolean  _gdk_macos_event_source_check_pending (void);
 
 G_END_DECLS
 
-#endif /* __GDK_MACOS_EVENT_SOURCE_PRIVATE_H__ */
diff --git a/gdk/macos/gdkmacosglcontext-private.h b/gdk/macos/gdkmacosglcontext-private.h
index 7355ffef90..4e83e5cb0e 100644
--- a/gdk/macos/gdkmacosglcontext-private.h
+++ b/gdk/macos/gdkmacosglcontext-private.h
@@ -16,8 +16,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_MACOS_GL_CONTEXT_PRIVATE_H__
-#define __GDK_MACOS_GL_CONTEXT_PRIVATE_H__
+#pragma once
 
 #include "gdkmacosglcontext.h"
 
@@ -56,4 +55,3 @@ struct _GdkMacosGLContextClass
 
 G_END_DECLS
 
-#endif /* __GDK_MACOS_GL_CONTEXT_PRIVATE_H__ */
diff --git a/gdk/macos/gdkmacosglcontext.h b/gdk/macos/gdkmacosglcontext.h
index e4add89502..5a2c5994ff 100644
--- a/gdk/macos/gdkmacosglcontext.h
+++ b/gdk/macos/gdkmacosglcontext.h
@@ -17,8 +17,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __GDK_MACOS_GL_CONTEXT_H__
-#define __GDK_MACOS_GL_CONTEXT_H__
+#pragma once
 
 #if !defined (__GDKMACOS_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/macos/gdkmacos.h> can be included directly."
@@ -40,4 +39,3 @@ GType gdk_macos_gl_context_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* __GDK_MACOS_GL_CONTEXT_H__ */
diff --git a/gdk/macos/gdkmacoskeymap-private.h b/gdk/macos/gdkmacoskeymap-private.h
index ac0f2dd691..8f13882b6c 100644
--- a/gdk/macos/gdkmacoskeymap-private.h
+++ b/gdk/macos/gdkmacoskeymap-private.h
@@ -17,8 +17,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __GDK_MACOS_KEYMAP_PRIVATE_H__
-#define __GDK_MACOS_KEYMAP_PRIVATE_H__
+#pragma once
 
 #include <AppKit/AppKit.h>
 
@@ -34,4 +33,3 @@ gunichar        _gdk_macos_keymap_get_equivalent (guint            key);
 
 G_END_DECLS
 
-#endif /* __GDK_MACOS_KEYMAP_PRIVATE_H__ */
diff --git a/gdk/macos/gdkmacoskeymap.h b/gdk/macos/gdkmacoskeymap.h
index 6a8a7e288f..6530d52e9b 100644
--- a/gdk/macos/gdkmacoskeymap.h
+++ b/gdk/macos/gdkmacoskeymap.h
@@ -17,8 +17,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __GDK_MACOS_KEYMAP_H__
-#define __GDK_MACOS_KEYMAP_H__
+#pragma once
 
 #if !defined (__GDKMACOS_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/macos/gdkmacos.h> can be included directly."
@@ -40,4 +39,3 @@ GType gdk_macos_keymap_get_type (void);
 
 G_END_DECLS
 
-#endif /* __GDK_MACOS_KEYMAP_H__ */
diff --git a/gdk/macos/gdkmacosmonitor-private.h b/gdk/macos/gdkmacosmonitor-private.h
index 1a4e197f76..a1a62cbb3d 100644
--- a/gdk/macos/gdkmacosmonitor-private.h
+++ b/gdk/macos/gdkmacosmonitor-private.h
@@ -17,8 +17,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __GDK_MACOS_MONITOR_PRIVATE_H__
-#define __GDK_MACOS_MONITOR_PRIVATE_H__
+#pragma once
 
 #include <AppKit/AppKit.h>
 
@@ -46,4 +45,3 @@ void               _gdk_macos_monitor_clamp                 (GdkMacosMonitor   *
 
 G_END_DECLS
 
-#endif /* __GDK_MACOS_MONITOR_PRIVATE_H__ */
diff --git a/gdk/macos/gdkmacosmonitor.h b/gdk/macos/gdkmacosmonitor.h
index b25ed9ae8b..c333520a77 100644
--- a/gdk/macos/gdkmacosmonitor.h
+++ b/gdk/macos/gdkmacosmonitor.h
@@ -17,8 +17,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __GDK_MACOS_MONITOR_H__
-#define __GDK_MACOS_MONITOR_H__
+#pragma once
 
 #if !defined (__GDKMACOS_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/macos/gdkmacos.h> can be included directly."
@@ -46,4 +45,3 @@ void  gdk_macos_monitor_get_workarea (GdkMonitor   *self,
 
 G_END_DECLS
 
-#endif /* __GDK_MACOS_MONITOR_H__ */
diff --git a/gdk/macos/gdkmacospasteboard-private.h b/gdk/macos/gdkmacospasteboard-private.h
index fdeb936535..cac18a8fde 100644
--- a/gdk/macos/gdkmacospasteboard-private.h
+++ b/gdk/macos/gdkmacospasteboard-private.h
@@ -17,8 +17,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __GDK_MACOS_PASTEBOARD_PRIVATE_H__
-#define __GDK_MACOS_PASTEBOARD_PRIVATE_H__
+#pragma once
 
 #include <AppKit/AppKit.h>
 #include <gio/gio.h>
@@ -71,4 +70,3 @@ GInputStream      *_gdk_macos_pasteboard_read_finish         (GObject
 
 G_END_DECLS
 
-#endif /* __GDK_MACOS_PASTEBOARD_PRIVATE_H__ */
diff --git a/gdk/macos/gdkmacospopupsurface-private.h b/gdk/macos/gdkmacospopupsurface-private.h
index 8c63d4f6a0..dfa6a77318 100644
--- a/gdk/macos/gdkmacospopupsurface-private.h
+++ b/gdk/macos/gdkmacospopupsurface-private.h
@@ -17,8 +17,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __GDK_MACOS_POPUP_SURFACE_PRIVATE_H__
-#define __GDK_MACOS_POPUP_SURFACE_PRIVATE_H__
+#pragma once
 
 #include "gdkmacossurface-private.h"
 
@@ -45,4 +44,3 @@ void             _gdk_macos_popup_surface_reposition         (GdkMacosPopupSurfa
 
 G_END_DECLS
 
-#endif /* __GDK_MACOS_POPUP_SURFACE_PRIVATE_H__ */
diff --git a/gdk/macos/gdkmacosseat-private.h b/gdk/macos/gdkmacosseat-private.h
index 889051e74a..fba0220044 100644
--- a/gdk/macos/gdkmacosseat-private.h
+++ b/gdk/macos/gdkmacosseat-private.h
@@ -17,8 +17,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __GDK_MACOS_SEAT_PRIVATE_H__
-#define __GDK_MACOS_SEAT_PRIVATE_H__
+#pragma once
 
 #include <AppKit/AppKit.h>
 
@@ -43,4 +42,3 @@ double *_gdk_macos_seat_get_tablet_axes_from_nsevent (GdkMacosSeat *seat,
 
 G_END_DECLS
 
-#endif /* __GDK_MACOS_SEAT_PRIVATE_H__ */
diff --git a/gdk/macos/gdkmacossurface-private.h b/gdk/macos/gdkmacossurface-private.h
index 5f1f551f93..fdd08f4249 100644
--- a/gdk/macos/gdkmacossurface-private.h
+++ b/gdk/macos/gdkmacossurface-private.h
@@ -17,8 +17,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __GDK_MACOS_SURFACE_PRIVATE_H__
-#define __GDK_MACOS_SURFACE_PRIVATE_H__
+#pragma once
 
 #include <AppKit/AppKit.h>
 #include <cairo.h>
@@ -152,4 +151,3 @@ void               _gdk_macos_surface_swap_buffers            (GdkMacosSurface
 
 G_END_DECLS
 
-#endif /* __GDK_MACOS_SURFACE_PRIVATE_H__ */
diff --git a/gdk/macos/gdkmacossurface.h b/gdk/macos/gdkmacossurface.h
index 64ea4c733d..654dff3355 100644
--- a/gdk/macos/gdkmacossurface.h
+++ b/gdk/macos/gdkmacossurface.h
@@ -17,8 +17,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __GDK_MACOS_SURFACE_H__
-#define __GDK_MACOS_SURFACE_H__
+#pragma once
 
 #if !defined (__GDKMACOS_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/macos/gdkmacos.h> can be included directly."
@@ -42,4 +41,3 @@ gpointer gdk_macos_surface_get_native_window (GdkMacosSurface *self);
 
 G_END_DECLS
 
-#endif /* __GDK_MACOS_SURFACE_H__ */
diff --git a/gdk/macos/gdkmacostoplevelsurface-private.h b/gdk/macos/gdkmacostoplevelsurface-private.h
index 1404aa14fe..2742cf06ca 100644
--- a/gdk/macos/gdkmacostoplevelsurface-private.h
+++ b/gdk/macos/gdkmacostoplevelsurface-private.h
@@ -17,8 +17,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __GDK_MACOS_TOPLEVEL_SURFACE_PRIVATE_H__
-#define __GDK_MACOS_TOPLEVEL_SURFACE_PRIVATE_H__
+#pragma once
 
 #include "gdkmacossurface-private.h"
 
@@ -58,4 +57,3 @@ void             _gdk_macos_toplevel_surface_detach_from_parent (GdkMacosTopleve
 
 G_END_DECLS
 
-#endif /* __GDK_MACOS_TOPLEVEL_SURFACE_PRIVATE_H__ */
diff --git a/gdk/macos/gdkmacosutils-private.h b/gdk/macos/gdkmacosutils-private.h
index dd8d3b296a..e81000d542 100644
--- a/gdk/macos/gdkmacosutils-private.h
+++ b/gdk/macos/gdkmacosutils-private.h
@@ -17,8 +17,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __GDK_MACOS_UTILS_PRIVATE_H__
-#define __GDK_MACOS_UTILS_PRIVATE_H__
+#pragma once
 
 #include <AppKit/AppKit.h>
 #include <gdk/gdk.h>
@@ -72,4 +71,3 @@ convert_nspoint_to_screen (NSWindow *window,
 #endif
 }
 
-#endif /* __GDK_MACOS_UTILS_PRIVATE_H__ */
diff --git a/gdk/wayland/cursor/os-compatibility.h b/gdk/wayland/cursor/os-compatibility.h
index d0e69acd93..24032f62e9 100644
--- a/gdk/wayland/cursor/os-compatibility.h
+++ b/gdk/wayland/cursor/os-compatibility.h
@@ -23,12 +23,10 @@
  * SOFTWARE.
  */
 
-#ifndef OS_COMPATIBILITY_H
-#define OS_COMPATIBILITY_H
+#pragma once
 
 #include <sys/types.h>
 
 int
 os_create_anonymous_file(off_t size);
 
-#endif /* OS_COMPATIBILITY_H */
diff --git a/gdk/wayland/cursor/wayland-cursor.h b/gdk/wayland/cursor/wayland-cursor.h
index 6a26fa785e..72c7006c4b 100644
--- a/gdk/wayland/cursor/wayland-cursor.h
+++ b/gdk/wayland/cursor/wayland-cursor.h
@@ -23,8 +23,7 @@
  * SOFTWARE.
  */
 
-#ifndef WAYLAND_CURSOR_H
-#define WAYLAND_CURSOR_H
+#pragma once
 
 #include <stdint.h>
 
@@ -69,4 +68,3 @@ wl_cursor_image_get_buffer(struct wl_cursor_image *image);
 }
 #endif
 
-#endif
diff --git a/gdk/wayland/cursor/xcursor.h b/gdk/wayland/cursor/xcursor.h
index 34feb0cf36..c5202257fd 100644
--- a/gdk/wayland/cursor/xcursor.h
+++ b/gdk/wayland/cursor/xcursor.h
@@ -23,8 +23,7 @@
  * SOFTWARE.
  */
 
-#ifndef XCURSOR_H
-#define XCURSOR_H
+#pragma once
 
 typedef int		XcursorBool;
 typedef unsigned int	XcursorUInt;
@@ -58,4 +57,3 @@ xcursor_images_destroy (XcursorImages *images);
 XcursorImages *
 xcursor_load_images (const char *path, int size);
 
-#endif
diff --git a/gdk/wayland/gdkcairocontext-wayland.h b/gdk/wayland/gdkcairocontext-wayland.h
index 1cad7a6547..1cbffb501f 100644
--- a/gdk/wayland/gdkcairocontext-wayland.h
+++ b/gdk/wayland/gdkcairocontext-wayland.h
@@ -16,8 +16,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_WAYLAND_CAIRO_CONTEXT__
-#define __GDK_WAYLAND_CAIRO_CONTEXT__
+#pragma once
 
 #include "gdkconfig.h"
 
@@ -54,4 +53,3 @@ GType gdk_wayland_cairo_context_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* __GDK_WAYLAND_CAIRO_CONTEXT__ */
diff --git a/gdk/wayland/gdkclipboard-wayland.h b/gdk/wayland/gdkclipboard-wayland.h
index 5e5eba8a65..62e78c7893 100644
--- a/gdk/wayland/gdkclipboard-wayland.h
+++ b/gdk/wayland/gdkclipboard-wayland.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_CLIPBOARD_WAYLAND_H__
-#define __GDK_CLIPBOARD_WAYLAND_H__
+#pragma once
 
 #include "gdk/gdkclipboard.h"
 
@@ -40,4 +39,3 @@ void                    gdk_wayland_clipboard_claim_remote          (GdkWaylandC
 
 G_END_DECLS
 
-#endif /* __GDK_CLIPBOARD_WAYLAND_H__ */
diff --git a/gdk/wayland/gdkdevice-wayland-private.h b/gdk/wayland/gdkdevice-wayland-private.h
index 233270b4a3..d0dd4433a1 100644
--- a/gdk/wayland/gdkdevice-wayland-private.h
+++ b/gdk/wayland/gdkdevice-wayland-private.h
@@ -1,5 +1,4 @@
-#ifndef __GDK_DEVICE_WAYLAND_PRIVATE_H__
-#define __GDK_DEVICE_WAYLAND_PRIVATE_H__
+#pragma once
 
 #include "gdkwaylanddevice.h"
 #include "gdkwaylandseat.h"
@@ -264,4 +263,3 @@ gboolean gdk_wayland_device_update_surface_cursor (GdkDevice *device);
 
 GdkModifierType gdk_wayland_device_get_modifiers (GdkDevice *device);
 
-#endif
diff --git a/gdk/wayland/gdkdisplay-wayland.h b/gdk/wayland/gdkdisplay-wayland.h
index 213680361b..56e9e469b8 100644
--- a/gdk/wayland/gdkdisplay-wayland.h
+++ b/gdk/wayland/gdkdisplay-wayland.h
@@ -19,8 +19,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_WAYLAND_DISPLAY__
-#define __GDK_WAYLAND_DISPLAY__
+#pragma once
 
 #include "config.h"
 
@@ -163,4 +162,3 @@ void gdk_wayland_display_dispatch_queue (GdkDisplay            *display,
 
 G_END_DECLS
 
-#endif  /* __GDK_WAYLAND_DISPLAY__ */
diff --git a/gdk/wayland/gdkglcontext-wayland.h b/gdk/wayland/gdkglcontext-wayland.h
index c35e1e6700..0c70afd4d2 100644
--- a/gdk/wayland/gdkglcontext-wayland.h
+++ b/gdk/wayland/gdkglcontext-wayland.h
@@ -19,8 +19,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_WAYLAND_GL_CONTEXT__
-#define __GDK_WAYLAND_GL_CONTEXT__
+#pragma once
 
 #include "gdkglcontextprivate.h"
 #include "gdkdisplayprivate.h"
@@ -45,4 +44,3 @@ GdkGLContext *  gdk_wayland_display_init_gl                         (GdkDisplay
 
 G_END_DECLS
 
-#endif /* __GDK_WAYLAND_GL_CONTEXT__ */
diff --git a/gdk/wayland/gdkmonitor-wayland.h b/gdk/wayland/gdkmonitor-wayland.h
index 4397075407..a9658cd8cc 100644
--- a/gdk/wayland/gdkmonitor-wayland.h
+++ b/gdk/wayland/gdkmonitor-wayland.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_WAYLAND_MONITOR_PRIVATE_H__
-#define __GDK_WAYLAND_MONITOR_PRIVATE_H__
+#pragma once
 
 #include <glib.h>
 #include "gdkwaylandmonitor.h"
@@ -47,4 +46,3 @@ struct _GdkWaylandMonitorClass {
   GdkMonitorClass parent_class;
 };
 
-#endif
diff --git a/gdk/wayland/gdkprimary-wayland.h b/gdk/wayland/gdkprimary-wayland.h
index bce4dccc7b..26467bc9b2 100644
--- a/gdk/wayland/gdkprimary-wayland.h
+++ b/gdk/wayland/gdkprimary-wayland.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_PRIMARY_WAYLAND_H__
-#define __GDK_PRIMARY_WAYLAND_H__
+#pragma once
 
 #include "gdk/gdkclipboard.h"
 
@@ -37,4 +36,3 @@ GdkClipboard *          gdk_wayland_primary_new                 (GdkWaylandSeat
 
 G_END_DECLS
 
-#endif /* __GDK_PRIMARY_WAYLAND_H__ */
diff --git a/gdk/wayland/gdkprivate-wayland.h b/gdk/wayland/gdkprivate-wayland.h
index e010066a04..e755689887 100644
--- a/gdk/wayland/gdkprivate-wayland.h
+++ b/gdk/wayland/gdkprivate-wayland.h
@@ -26,8 +26,7 @@
  * Private uninstalled header defining things local to the Wayland backend
  */
 
-#ifndef __GDK_PRIVATE_WAYLAND_H__
-#define __GDK_PRIVATE_WAYLAND_H__
+#pragma once
 
 #include "config.h"
 
@@ -194,4 +193,3 @@ void gdk_wayland_surface_update_scale (GdkSurface *surface);
 GdkModifierType gdk_wayland_keymap_get_gdk_modifiers (GdkKeymap *keymap,
                                                       guint32    mods);
 
-#endif /* __GDK_PRIVATE_WAYLAND_H__ */
diff --git a/gdk/wayland/gdkseat-wayland.h b/gdk/wayland/gdkseat-wayland.h
index 5780f2003b..acb1c2487a 100644
--- a/gdk/wayland/gdkseat-wayland.h
+++ b/gdk/wayland/gdkseat-wayland.h
@@ -17,8 +17,7 @@
  * Author: Carlos Garnacho <carlosg@gnome.org>
  */
 
-#ifndef __GDK_WAYLAND_SEAT_H__
-#define __GDK_WAYLAND_SEAT_H__
+#pragma once
 
 #include "config.h"
 
@@ -39,4 +38,3 @@ void gdk_wayland_seat_update_cursor_scale (GdkWaylandSeat *seat);
 void gdk_wayland_seat_clear_touchpoints (GdkWaylandSeat *seat,
                                          GdkSurface     *surface);
 
-#endif /* __GDK_WAYLAND_SEAT_H__ */
diff --git a/gdk/wayland/gdkvulkancontext-wayland.h b/gdk/wayland/gdkvulkancontext-wayland.h
index dbcd5a81b0..f16ff2f76a 100644
--- a/gdk/wayland/gdkvulkancontext-wayland.h
+++ b/gdk/wayland/gdkvulkancontext-wayland.h
@@ -18,8 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_WAYLAND_VULKAN_CONTEXT__
-#define __GDK_WAYLAND_VULKAN_CONTEXT__
+#pragma once
 
 #include "gdkconfig.h"
 
@@ -58,4 +57,3 @@ G_END_DECLS
 
 #endif /* !GDK_RENDERING_VULKAN */
 
-#endif /* __GDK_WAYLAND_VULKAN_CONTEXT__ */
diff --git a/gdk/wayland/gdkwayland.h b/gdk/wayland/gdkwayland.h
index e48d6946e5..846445910e 100644
--- a/gdk/wayland/gdkwayland.h
+++ b/gdk/wayland/gdkwayland.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_WAYLAND_H__
-#define __GDK_WAYLAND_H__
+#pragma once
 
 #include <gdk/gdk.h>
 
@@ -40,4 +39,3 @@
 
 #undef __GDKWAYLAND_H_INSIDE__
 
-#endif /* __GDK_WAYLAND_H__ */
diff --git a/gdk/wayland/gdkwaylanddevice.h b/gdk/wayland/gdkwaylanddevice.h
index 1a3c119c64..b1abdc5f6e 100644
--- a/gdk/wayland/gdkwaylanddevice.h
+++ b/gdk/wayland/gdkwaylanddevice.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_WAYLAND_DEVICE_H__
-#define __GDK_WAYLAND_DEVICE_H__
+#pragma once
 
 #if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/wayland/gdkwayland.h> can be included directly."
@@ -60,4 +59,3 @@ const char          *gdk_wayland_device_get_node_path       (GdkDevice *device);
 
 G_END_DECLS
 
-#endif /* __GDK_WAYLAND_DEVICE_H__ */
diff --git a/gdk/wayland/gdkwaylanddisplay.h b/gdk/wayland/gdkwaylanddisplay.h
index a1baf9ac41..5e5d2945dc 100644
--- a/gdk/wayland/gdkwaylanddisplay.h
+++ b/gdk/wayland/gdkwaylanddisplay.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_WAYLAND_DISPLAY_H__
-#define __GDK_WAYLAND_DISPLAY_H__
+#pragma once
 
 #if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/wayland/gdkwayland.h> can be included directly."
@@ -68,4 +67,3 @@ gpointer                gdk_wayland_display_get_egl_display     (GdkDisplay  *di
 
 G_END_DECLS
 
-#endif /* __GDK_WAYLAND_DISPLAY_H__ */
diff --git a/gdk/wayland/gdkwaylandglcontext.h b/gdk/wayland/gdkwaylandglcontext.h
index 34a1e4c2a4..7b16731be7 100644
--- a/gdk/wayland/gdkwaylandglcontext.h
+++ b/gdk/wayland/gdkwaylandglcontext.h
@@ -19,8 +19,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_WAYLAND_GL_CONTEXT_H__
-#define __GDK_WAYLAND_GL_CONTEXT_H__
+#pragma once
 
 #if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/wayland/gdkwayland.h> can be included directly."
@@ -42,4 +41,3 @@ GType gdk_wayland_gl_context_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* __GDK_WAYLAND_GL_CONTEXT_H__ */
diff --git a/gdk/wayland/gdkwaylandmonitor.h b/gdk/wayland/gdkwaylandmonitor.h
index f856a1108d..e05719be2d 100644
--- a/gdk/wayland/gdkwaylandmonitor.h
+++ b/gdk/wayland/gdkwaylandmonitor.h
@@ -19,8 +19,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_WAYLAND_MONITOR_H__
-#define __GDK_WAYLAND_MONITOR_H__
+#pragma once
 
 #if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/wayland/gdkwayland.h> can be included directly."
@@ -45,4 +44,3 @@ struct wl_output *gdk_wayland_monitor_get_wl_output       (GdkMonitor *monitor);
 
 G_END_DECLS
 
-#endif  /* __GDK_WAYLAND_MONITOR_H__ */
diff --git a/gdk/wayland/gdkwaylandsurface.h b/gdk/wayland/gdkwaylandsurface.h
index 7d9e0897b2..9c031a73a4 100644
--- a/gdk/wayland/gdkwaylandsurface.h
+++ b/gdk/wayland/gdkwaylandsurface.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_WAYLAND_SURFACE_H__
-#define __GDK_WAYLAND_SURFACE_H__
+#pragma once
 
 #if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/wayland/gdkwayland.h> can be included directly."
@@ -46,4 +45,3 @@ struct wl_surface       *gdk_wayland_surface_get_wl_surface       (GdkSurface *s
 
 G_END_DECLS
 
-#endif /* __GDK_WAYLAND_SURFACE_H__ */
diff --git a/gdk/wayland/wm-button-layout-translation.h b/gdk/wayland/wm-button-layout-translation.h
index d4a39c84fb..eb83fcfc32 100644
--- a/gdk/wayland/wm-button-layout-translation.h
+++ b/gdk/wayland/wm-button-layout-translation.h
@@ -18,9 +18,7 @@
  * Author:  Florian Müllner <fmuellner@gnome.org>
  */
 
-#ifndef __WM_BUTTON_LAYOUT_TRANSLATION__
-#define __WM_BUTTON_LAYOUT_TRANSLATION__
+#pragma once
 
 void translate_wm_button_layout_to_gtk (char *layout);
 
-#endif
diff --git a/gdk/win32/gdkcairocontext-win32.h b/gdk/win32/gdkcairocontext-win32.h
index 3fd093c12d..aebca1feb8 100644
--- a/gdk/win32/gdkcairocontext-win32.h
+++ b/gdk/win32/gdkcairocontext-win32.h
@@ -16,8 +16,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_WIN32_CAIRO_CONTEXT__
-#define __GDK_WIN32_CAIRO_CONTEXT__
+#pragma once
 
 #include "gdkconfig.h"
 
@@ -71,4 +70,3 @@ GType gdk_win32_cairo_context_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* __GDK_WIN32_CAIRO_CONTEXT__ */
diff --git a/gdk/win32/gdkclipboard-win32.h b/gdk/win32/gdkclipboard-win32.h
index 1152ee17da..2987becdb7 100644
--- a/gdk/win32/gdkclipboard-win32.h
+++ b/gdk/win32/gdkclipboard-win32.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_CLIPBOARD_WIN32_H__
-#define __GDK_CLIPBOARD_WIN32_H__
+#pragma once
 
 #include "gdk/gdkclipboard.h"
 
@@ -36,4 +35,3 @@ void                    gdk_win32_clipboard_claim_remote        (GdkWin32Clipboa
 
 G_END_DECLS
 
-#endif /* __GDK_CLIPBOARD_WIN32_H__ */
diff --git a/gdk/win32/gdkclipdrop-win32.h b/gdk/win32/gdkclipdrop-win32.h
index b71ed00107..e093b38e78 100644
--- a/gdk/win32/gdkclipdrop-win32.h
+++ b/gdk/win32/gdkclipdrop-win32.h
@@ -18,8 +18,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_CLIPDROP_WIN32_H__
-#define __GDK_CLIPDROP_WIN32_H__
+#pragma once
 
 G_BEGIN_DECLS
 
@@ -275,4 +274,3 @@ void     _gdk_win32_advertise_clipboard_contentformats             (GTask
 
 
 
-#endif /* __GDK_CLIPDROP_WIN32_H__ */
diff --git a/gdk/win32/gdkdevice-virtual.h b/gdk/win32/gdkdevice-virtual.h
index 3a98dd05c1..d81e689d61 100644
--- a/gdk/win32/gdkdevice-virtual.h
+++ b/gdk/win32/gdkdevice-virtual.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_DEVICE_VIRTUAL_H__
-#define __GDK_DEVICE_VIRTUAL_H__
+#pragma once
 
 #include <gdk/gdkdeviceprivate.h>
 
@@ -60,4 +59,3 @@ gdk_device_virtual_query_state (GdkDevice        *device,
 
 G_END_DECLS
 
-#endif /* __GDK_DEVICE_VIRTUAL_H__ */
diff --git a/gdk/win32/gdkdevice-win32.h b/gdk/win32/gdkdevice-win32.h
index 478afb15bd..a131022d08 100644
--- a/gdk/win32/gdkdevice-win32.h
+++ b/gdk/win32/gdkdevice-win32.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_DEVICE_WIN32_H__
-#define __GDK_DEVICE_WIN32_H__
+#pragma once
 
 #include <gdk/gdkdeviceprivate.h>
 
@@ -58,4 +57,3 @@ void _gdk_device_win32_query_state             (GdkDevice        *device,
 
 G_END_DECLS
 
-#endif /* __GDK_DEVICE_WIN32_H__ */
diff --git a/gdk/win32/gdkdevice-winpointer.h b/gdk/win32/gdkdevice-winpointer.h
index 70d6f042c6..4af8d55d1c 100644
--- a/gdk/win32/gdkdevice-winpointer.h
+++ b/gdk/win32/gdkdevice-winpointer.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_DEVICE_WINPOINTER_H__
-#define __GDK_DEVICE_WINPOINTER_H__
+#pragma once
 
 #include <gdk/gdkdeviceprivate.h>
 
@@ -64,4 +63,3 @@ GType gdk_device_winpointer_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* __GDK_DEVICE_WINPOINTER_H__ */
diff --git a/gdk/win32/gdkdevice-wintab.h b/gdk/win32/gdkdevice-wintab.h
index bac77b5cd3..c209e91539 100644
--- a/gdk/win32/gdkdevice-wintab.h
+++ b/gdk/win32/gdkdevice-wintab.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_DEVICE_WINTAB_H__
-#define __GDK_DEVICE_WINTAB_H__
+#pragma once
 
 #include <gdk/gdkdeviceprivate.h>
 
@@ -76,4 +75,3 @@ gdk_device_wintab_query_state (GdkDevice        *device,
 
 G_END_DECLS
 
-#endif /* __GDK_DEVICE_WINTAB_H__ */
diff --git a/gdk/win32/gdkdevicemanager-win32.h b/gdk/win32/gdkdevicemanager-win32.h
index 26b5c761ac..b6458a9a88 100644
--- a/gdk/win32/gdkdevicemanager-win32.h
+++ b/gdk/win32/gdkdevicemanager-win32.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_DEVICE_MANAGER_WIN32_H__
-#define __GDK_DEVICE_MANAGER_WIN32_H__
+#pragma once
 
 G_BEGIN_DECLS
 
@@ -65,4 +64,3 @@ GdkEvent * gdk_wintab_make_event      (GdkDisplay *display,
 
 G_END_DECLS
 
-#endif /* __GDK_DEVICE_MANAGER_WIN32_H__ */
diff --git a/gdk/win32/gdkdisplay-win32.h b/gdk/win32/gdkdisplay-win32.h
index 19f11e5f9f..c197395422 100644
--- a/gdk/win32/gdkdisplay-win32.h
+++ b/gdk/win32/gdkdisplay-win32.h
@@ -19,8 +19,7 @@
 
 #include "gdkdisplayprivate.h"
 
-#ifndef __GDK_DISPLAY__WIN32_H__
-#define __GDK_DISPLAY__WIN32_H__
+#pragma once
 
 #include "gdkwin32screen.h"
 #include "gdkwin32cursor.h"
@@ -196,4 +195,3 @@ struct _GdkWin32MessageFilter
   guint ref_count;
 };
 
-#endif /* __GDK_DISPLAY__WIN32_H__ */
diff --git a/gdk/win32/gdkglcontext-win32.h b/gdk/win32/gdkglcontext-win32.h
index 787c8b1a09..8311f47768 100644
--- a/gdk/win32/gdkglcontext-win32.h
+++ b/gdk/win32/gdkglcontext-win32.h
@@ -18,8 +18,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_WIN32_GL_CONTEXT__
-#define __GDK_WIN32_GL_CONTEXT__
+#pragma once
 
 #ifndef DONT_INCLUDE_LIBEPOXY
 #include <epoxy/gl.h>
@@ -97,4 +96,3 @@ void      gdk_win32_private_wglDeleteContext     (HGLRC hglrc);
 
 G_END_DECLS
 
-#endif /* __GDK_WIN32_GL_CONTEXT__ */
diff --git a/gdk/win32/gdkhdataoutputstream-win32.h b/gdk/win32/gdkhdataoutputstream-win32.h
index 56fb786772..888b134fc3 100644
--- a/gdk/win32/gdkhdataoutputstream-win32.h
+++ b/gdk/win32/gdkhdataoutputstream-win32.h
@@ -19,8 +19,7 @@
  *         Christian Kellner <gicmo@gnome.org>
  */
 
-#ifndef __GDK_WIN32_HDATA_OUTPUT_STREAM_H__
-#define __GDK_WIN32_HDATA_OUTPUT_STREAM_H__
+#pragma once
 
 #include <gio/gio.h>
 #include "gdktypes.h"
@@ -60,4 +59,3 @@ HANDLE         gdk_win32_hdata_output_stream_get_handle (GdkWin32HDataOutputStre
 
 G_END_DECLS
 
-#endif /* __GDK_WIN32_HDATA_OUTPUT_STREAM_H__ */
diff --git a/gdk/win32/gdkinput-dmanipulation.h b/gdk/win32/gdkinput-dmanipulation.h
index 77d603c0cf..20b5a3df09 100644
--- a/gdk/win32/gdkinput-dmanipulation.h
+++ b/gdk/win32/gdkinput-dmanipulation.h
@@ -18,8 +18,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#ifndef __GDK_INPUT_DMANIPULATION_H__
-#define __GDK_INPUT_DMANIPULATION_H__
+#pragma once
 
 void gdk_dmanipulation_initialize (void);
 
@@ -29,4 +28,3 @@ void gdk_dmanipulation_finalize_surface   (GdkSurface *surface);
 void gdk_dmanipulation_maybe_add_contact  (GdkSurface *surface,
                                            MSG        *msg);
 
-#endif /* __GDK_INPUT_DMANIPULATION_H__ */
diff --git a/gdk/win32/gdkinput-winpointer.h b/gdk/win32/gdkinput-winpointer.h
index 36c1a39f0d..712f066f78 100644
--- a/gdk/win32/gdkinput-winpointer.h
+++ b/gdk/win32/gdkinput-winpointer.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_INPUT_WINPOINTER_H__
-#define __GDK_INPUT_WINPOINTER_H__
+#pragma once
 
 #include "winpointer.h"
 
@@ -40,4 +39,3 @@ gboolean gdk_winpointer_get_message_info (MSG *msg,
                                           guint32 *time_);
 void     gdk_winpointer_interaction_ended (MSG *msg);
 
-#endif /* __GDK_INPUT_WINPOINTER_H__ */
diff --git a/gdk/win32/gdkmonitor-win32.h b/gdk/win32/gdkmonitor-win32.h
index 6bfcd2bc1f..11121a660f 100644
--- a/gdk/win32/gdkmonitor-win32.h
+++ b/gdk/win32/gdkmonitor-win32.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_WIN32_MONITOR_PRIVATE_H__
-#define __GDK_WIN32_MONITOR_PRIVATE_H__
+#pragma once
 
 #include <windows.h>
 #include <glib.h>
@@ -54,4 +53,3 @@ struct _GdkWin32MonitorClass {
 
 int        _gdk_win32_monitor_compare  (GdkWin32Monitor *a, GdkWin32Monitor *b);
 
-#endif
diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index 230a537a0b..acde8a058c 100644
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_PRIVATE_WIN32_H__
-#define __GDK_PRIVATE_WIN32_H__
+#pragma once
 
 #include <gdk/gdkcursorprivate.h>
 #include <gdk/gdkdebugprivate.h>
@@ -464,4 +463,3 @@ void          gdk_win32_set_modal_dialog_libgtk_only (HWND window);
 
 gpointer      gdk_win32_handle_table_lookup_       (HWND handle);
 
-#endif /* __GDK_PRIVATE_WIN32_H__ */
diff --git a/gdk/win32/gdksurface-win32.h b/gdk/win32/gdksurface-win32.h
index 22daa8faa7..6f12eab527 100644
--- a/gdk/win32/gdksurface-win32.h
+++ b/gdk/win32/gdksurface-win32.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_SURFACE_WIN32_H__
-#define __GDK_SURFACE_WIN32_H__
+#pragma once
 
 #include "gdk/win32/gdkprivate-win32.h"
 #include "gdk/win32/gdkwin32cursor.h"
@@ -376,4 +375,3 @@ EGLSurface gdk_win32_surface_get_egl_surface (GdkSurface *surface,
 
 G_END_DECLS
 
-#endif /* __GDK_SURFACE_WIN32_H__ */
diff --git a/gdk/win32/gdkvulkancontext-win32.h b/gdk/win32/gdkvulkancontext-win32.h
index 4084e21016..3a572b5f8a 100644
--- a/gdk/win32/gdkvulkancontext-win32.h
+++ b/gdk/win32/gdkvulkancontext-win32.h
@@ -19,8 +19,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_WIN32_VULKAN_CONTEXT__
-#define __GDK_WIN32_VULKAN_CONTEXT__
+#pragma once
 
 #include "gdkconfig.h"
 
@@ -59,4 +58,3 @@ G_END_DECLS
 
 #endif /* !GDK_RENDERING_VULKAN */
 
-#endif /* __GDK_WIN32_VULKAN_CONTEXT__ */
diff --git a/gdk/win32/gdkwin32.h b/gdk/win32/gdkwin32.h
index 739624d84c..ed4a7749cd 100644
--- a/gdk/win32/gdkwin32.h
+++ b/gdk/win32/gdkwin32.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_WIN32_H__
-#define __GDK_WIN32_H__
+#pragma once
 
 #define __GDKWIN32_H_INSIDE__
 
@@ -39,4 +38,3 @@
 
 #undef __GDKWIN32_H_INSIDE__
 
-#endif /* __GDK_WIN32_H__ */
diff --git a/gdk/win32/gdkwin32cursor.h b/gdk/win32/gdkwin32cursor.h
index a9f4676623..6ffb3c5d95 100644
--- a/gdk/win32/gdkwin32cursor.h
+++ b/gdk/win32/gdkwin32cursor.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_WIN32_CURSOR_H__
-#define __GDK_WIN32_CURSOR_H__
+#pragma once
 
 #if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdkwin32.h> can be included directly."
@@ -83,4 +82,3 @@ void             _gdk_win32_display_hcursor_unref      (GdkWin32Display *display
 
 G_END_DECLS
 
-#endif /* __GDK_WIN32_CURSOR_H__ */
diff --git a/gdk/win32/gdkwin32display.h b/gdk/win32/gdkwin32display.h
index 8f59750421..72ca5d17c0 100644
--- a/gdk/win32/gdkwin32display.h
+++ b/gdk/win32/gdkwin32display.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_WIN32_DISPLAY_H__
-#define __GDK_WIN32_DISPLAY_H__
+#pragma once
 
 #if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdkwin32.h> can be included directly."
@@ -110,4 +109,3 @@ gpointer gdk_win32_display_get_egl_display         (GdkDisplay  *display);
 
 G_END_DECLS
 
-#endif /* __GDK_WIN32_DISPLAY_H__ */
diff --git a/gdk/win32/gdkwin32displaymanager.h b/gdk/win32/gdkwin32displaymanager.h
index ce7e9ffb1c..c9c159b69c 100644
--- a/gdk/win32/gdkwin32displaymanager.h
+++ b/gdk/win32/gdkwin32displaymanager.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_WIN32_DISPLAY_MANAGER_H__
-#define __GDK_WIN32_DISPLAY_MANAGER_H__
+#pragma once
 
 #if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdkwin32.h> can be included directly."
@@ -45,4 +44,3 @@ GType      gdk_win32_display_manager_get_type            (void);
 
 G_END_DECLS
 
-#endif /* __GDK_WIN32_DISPLAY_MANAGER_H__ */
diff --git a/gdk/win32/gdkwin32dnd-private.h b/gdk/win32/gdkwin32dnd-private.h
index a9c2d254fb..fb27da7a23 100644
--- a/gdk/win32/gdkwin32dnd-private.h
+++ b/gdk/win32/gdkwin32dnd-private.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_WIN32_DND_PRIVATE_H__
-#define __GDK_WIN32_DND_PRIVATE_H__
+#pragma once
 
 #if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdkwin32.h> can be included directly."
@@ -99,4 +98,3 @@ GdkDrag *_gdk_win32_find_drag_for_dest_window     (HWND             dest_window)
 
 G_END_DECLS
 
-#endif /* __GDK_WIN32_DND_PRIVATE_H__ */
diff --git a/gdk/win32/gdkwin32dnd.h b/gdk/win32/gdkwin32dnd.h
index a40aea7d96..862566564d 100644
--- a/gdk/win32/gdkwin32dnd.h
+++ b/gdk/win32/gdkwin32dnd.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_WIN32_DND_H__
-#define __GDK_WIN32_DND_H__
+#pragma once
 
 #if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdkwin32.h> can be included directly."
@@ -45,4 +44,3 @@ GType    gdk_win32_drag_get_type (void);
 
 G_END_DECLS
 
-#endif /* __GDK_WIN32_DRAG_H__ */
diff --git a/gdk/win32/gdkwin32glcontext.h b/gdk/win32/gdkwin32glcontext.h
index 825841a0bd..0135fda4f7 100644
--- a/gdk/win32/gdkwin32glcontext.h
+++ b/gdk/win32/gdkwin32glcontext.h
@@ -18,8 +18,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_WIN32_GL_CONTEXT_H__
-#define __GDK_WIN32_GL_CONTEXT_H__
+#pragma once
 
 #if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdkwin32.h> can be included directly."
@@ -46,4 +45,3 @@ gboolean        gdk_win32_display_get_wgl_version (GdkDisplay *display,
 
 G_END_DECLS
 
-#endif /* __GDK_WIN32_GL_CONTEXT_H__ */
diff --git a/gdk/win32/gdkwin32keys.h b/gdk/win32/gdkwin32keys.h
index 469ad49e2e..a15b01d22c 100644
--- a/gdk/win32/gdkwin32keys.h
+++ b/gdk/win32/gdkwin32keys.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_WIN32_KEYS_H__
-#define __GDK_WIN32_KEYS_H__
+#pragma once
 
 #if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdkwin32.h> can be included directly."
@@ -63,4 +62,3 @@ GType gdk_win32_keymap_get_type (void);
 
 G_END_DECLS
 
-#endif /* __GDK_WIN32_KEYMAP_H__ */
diff --git a/gdk/win32/gdkwin32langnotification.h b/gdk/win32/gdkwin32langnotification.h
index c67e18fc0e..dbba23e0ee 100644
--- a/gdk/win32/gdkwin32langnotification.h
+++ b/gdk/win32/gdkwin32langnotification.h
@@ -17,10 +17,8 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_WIN32_LANGNOTIFICATION_H__
-#define __GDK_WIN32_LANGNOTIFICATION_H__
+#pragma once
 
 void _gdk_win32_lang_notification_init (void);
 void _gdk_win32_lang_notification_exit (void);
 
-#endif
-\ No newline at end of file
diff --git a/gdk/win32/gdkwin32misc.h b/gdk/win32/gdkwin32misc.h
index e51d3424c8..b6cd98345e 100644
--- a/gdk/win32/gdkwin32misc.h
+++ b/gdk/win32/gdkwin32misc.h
@@ -23,8 +23,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_WIN32_MISC_H__
-#define __GDK_WIN32_MISC_H__
+#pragma once
 
 #if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdkwin32.h> can be included directly."
@@ -86,4 +85,3 @@ GdkSurface *   gdk_win32_surface_lookup_for_display (GdkDisplay *display,
 
 G_END_DECLS
 
-#endif /* __GDK_WIN32_MISC_H__ */
diff --git a/gdk/win32/gdkwin32monitor.h b/gdk/win32/gdkwin32monitor.h
index cbbf246f3e..d2e6c61589 100644
--- a/gdk/win32/gdkwin32monitor.h
+++ b/gdk/win32/gdkwin32monitor.h
@@ -20,8 +20,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_WIN32_MONITOR_H__
-#define __GDK_WIN32_MONITOR_H__
+#pragma once
 
 #if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdkwin32.h> can be included directly."
@@ -50,4 +49,3 @@ void gdk_win32_monitor_get_workarea (GdkMonitor   *monitor,
 
 G_END_DECLS
 
-#endif  /* __GDK_WIN32_MONITOR_H__ */
diff --git a/gdk/win32/gdkwin32screen.h b/gdk/win32/gdkwin32screen.h
index fa2b8daff8..d98161905d 100644
--- a/gdk/win32/gdkwin32screen.h
+++ b/gdk/win32/gdkwin32screen.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_WIN32_SCREEN_H__
-#define __GDK_WIN32_SCREEN_H__
+#pragma once
 
 #if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdkwin32.h> can be included directly."
@@ -48,4 +47,3 @@ GType    gdk_win32_screen_get_type          (void);
 
 G_END_DECLS
 
-#endif /* __GDK_WIN32_SCREEN_H__ */
diff --git a/gdk/win32/gdkwin32surface.h b/gdk/win32/gdkwin32surface.h
index 655abd0113..7766ebd656 100644
--- a/gdk/win32/gdkwin32surface.h
+++ b/gdk/win32/gdkwin32surface.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_WIN32_SURFACE_H__
-#define __GDK_WIN32_SURFACE_H__
+#pragma once
 
 #if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdkwin32.h> can be included directly."
@@ -56,4 +55,3 @@ void gdk_win32_surface_set_urgency_hint    (GdkSurface *surface,
 
 G_END_DECLS
 
-#endif /* __GDK_X11_SURFACE_H__ */
diff --git a/gdk/x11/MwmUtil.h b/gdk/x11/MwmUtil.h
index 5985b4551d..e91b0f5687 100644
--- a/gdk/x11/MwmUtil.h
+++ b/gdk/x11/MwmUtil.h
@@ -29,8 +29,7 @@
  *   when sizeof(long) == 8.
  **/
 
-#ifndef MWMUTIL_H_INCLUDED
-#define MWMUTIL_H_INCLUDED
+#pragma once
 
 #include <X11/Xmd.h>
 
@@ -131,4 +130,3 @@ typedef PropMotifWmInfo PropMwmInfo;
 
 G_END_DECLS
 
-#endif /* MWMUTIL_H_INCLUDED */
diff --git a/gdk/x11/gdkasync.h b/gdk/x11/gdkasync.h
index 009c2fae79..dc84562cc5 100644
--- a/gdk/x11/gdkasync.h
+++ b/gdk/x11/gdkasync.h
@@ -16,8 +16,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_ASYNC_H__
-#define __GDK_ASYNC_H__
+#pragma once
 
 #include "gdkdisplay.h"
 #include <X11/Xlib.h>
@@ -66,4 +65,3 @@ void _gdk_x11_roundtrip_async           (GdkDisplay           *display,
 
 G_END_DECLS
 
-#endif /* __GDK_ASYNC_H__ */
diff --git a/gdk/x11/gdkcairocontext-x11.h b/gdk/x11/gdkcairocontext-x11.h
index 34c84bf1e8..66412eb8ea 100644
--- a/gdk/x11/gdkcairocontext-x11.h
+++ b/gdk/x11/gdkcairocontext-x11.h
@@ -18,8 +18,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_X11_CAIRO_CONTEXT__
-#define __GDK_X11_CAIRO_CONTEXT__
+#pragma once
 
 #include "gdkconfig.h"
 
@@ -55,4 +54,3 @@ GType gdk_x11_cairo_context_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* __GDK_X11_CAIRO_CONTEXT__ */
diff --git a/gdk/x11/gdkclipboard-x11.h b/gdk/x11/gdkclipboard-x11.h
index 9eeea4a0c6..705c350dc0 100644
--- a/gdk/x11/gdkclipboard-x11.h
+++ b/gdk/x11/gdkclipboard-x11.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_CLIPBOARD_X11_H__
-#define __GDK_CLIPBOARD_X11_H__
+#pragma once
 
 #include "gdk/gdkclipboard.h"
 
@@ -44,4 +43,3 @@ Atom *                  gdk_x11_clipboard_formats_to_atoms      (GdkDisplay
 
 G_END_DECLS
 
-#endif /* __GDK_CLIPBOARD_X11_H__ */
diff --git a/gdk/x11/gdkdevice-xi2-private.h b/gdk/x11/gdkdevice-xi2-private.h
index b99a6735d5..c78a776a7e 100644
--- a/gdk/x11/gdkdevice-xi2-private.h
+++ b/gdk/x11/gdkdevice-xi2-private.h
@@ -18,8 +18,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_DEVICE_XI2_PRIVATE_H__
-#define __GDK_DEVICE_XI2_PRIVATE_H__
+#pragma once
 
 #include "gdkx11device-xi2.h"
 
@@ -37,4 +36,3 @@ void             gdk_x11_device_xi2_set_device_type (GdkX11DeviceXI2  *device,
 
 G_END_DECLS
 
-#endif
diff --git a/gdk/x11/gdkdevicemanagerprivate-core.h b/gdk/x11/gdkdevicemanagerprivate-core.h
index 47ea27dfd1..fa81e8c397 100644
--- a/gdk/x11/gdkdevicemanagerprivate-core.h
+++ b/gdk/x11/gdkdevicemanagerprivate-core.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_DEVICE_MANAGER_PRIVATE_CORE_H__
-#define __GDK_DEVICE_MANAGER_PRIVATE_CORE_H__
+#pragma once
 
 #include <X11/Xlib.h>
 
@@ -47,4 +46,3 @@ void            _gdk_device_manager_core_handle_focus           (GdkSurface   *w
 
 G_END_DECLS
 
-#endif /* __GDK_DEVICE_MANAGER_PRIVATE_CORE_H__ */
diff --git a/gdk/x11/gdkdisplay-x11.h b/gdk/x11/gdkdisplay-x11.h
index 654a708231..0ac0e685a3 100644
--- a/gdk/x11/gdkdisplay-x11.h
+++ b/gdk/x11/gdkdisplay-x11.h
@@ -19,8 +19,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_X11_DISPLAY__
-#define __GDK_X11_DISPLAY__
+#pragma once
 
 #include "gdkdisplayprivate.h"
 #include "gdkkeys.h"
@@ -178,4 +177,3 @@ GdkFilterReturn _gdk_wm_protocols_filter        (const XEvent   *xevent,
 
 G_END_DECLS
 
-#endif  /* __GDK_X11_DISPLAY__ */
diff --git a/gdk/x11/gdkeventsource.h b/gdk/x11/gdkeventsource.h
index 1344231525..e8a7ec591f 100644
--- a/gdk/x11/gdkeventsource.h
+++ b/gdk/x11/gdkeventsource.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_X11_EVENT_SOURCE_H__
-#define __GDK_X11_EVENT_SOURCE_H__
+#pragma once
 
 #include "gdkeventtranslator.h"
 #include "gdkx11display.h"
@@ -44,4 +43,3 @@ gboolean  gdk_event_source_xevent             (GdkX11Display  *x11_display,
 
 G_END_DECLS
 
-#endif /* __GDK_X11_EVENT_SOURCE_H__ */
diff --git a/gdk/x11/gdkeventtranslator.h b/gdk/x11/gdkeventtranslator.h
index 4fcec6db03..2a4fcbad64 100644
--- a/gdk/x11/gdkeventtranslator.h
+++ b/gdk/x11/gdkeventtranslator.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_EVENT_TRANSLATOR_H__
-#define __GDK_EVENT_TRANSLATOR_H__
+#pragma once
 
 #include "gdktypes.h"
 #include "gdkdisplay.h"
@@ -67,4 +66,3 @@ GdkSurface *  _gdk_x11_event_translator_get_surface          (GdkEventTranslator
 
 G_END_DECLS
 
-#endif /* __GDK_EVENT_TRANSLATOR_H__ */
diff --git a/gdk/x11/gdkglcontext-x11.h b/gdk/x11/gdkglcontext-x11.h
index 10b94ca54b..dc2fa38249 100644
--- a/gdk/x11/gdkglcontext-x11.h
+++ b/gdk/x11/gdkglcontext-x11.h
@@ -18,8 +18,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_X11_GL_CONTEXT__
-#define __GDK_X11_GL_CONTEXT__
+#pragma once
 
 #include "gdkx11glcontext.h"
 
@@ -80,4 +79,3 @@ GType                   gdk_x11_gl_context_egl_get_type         (void) G_GNUC_CO
 
 G_END_DECLS
 
-#endif /* __GDK_X11_GL_CONTEXT__ */
diff --git a/gdk/x11/gdkkeys-x11.h b/gdk/x11/gdkkeys-x11.h
index db53da0dcc..46c86db949 100644
--- a/gdk/x11/gdkkeys-x11.h
+++ b/gdk/x11/gdkkeys-x11.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_X11_KEYS_H__
-#define __GDK_X11_KEYS_H__
+#pragma once
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysprivate.h>
@@ -46,4 +45,3 @@ gboolean gdk_x11_keymap_key_is_modifier (GdkKeymap *keymap,
                                          guint      keycode);
 G_END_DECLS
 
-#endif /* __GDK_X11_KEYMAP_H__ */
diff --git a/gdk/x11/gdkmonitor-x11.h b/gdk/x11/gdkmonitor-x11.h
index de8b1dc4bb..c138f0295e 100644
--- a/gdk/x11/gdkmonitor-x11.h
+++ b/gdk/x11/gdkmonitor-x11.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_X11_MONITOR_PRIVATE_H__
-#define __GDK_X11_MONITOR_PRIVATE_H__
+#pragma once
 
 #include <glib.h>
 #include <gio/gio.h>
@@ -40,4 +39,3 @@ struct _GdkX11MonitorClass {
   GdkMonitorClass parent_class;
 };
 
-#endif
diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index 74a5155096..cf095b6cb2 100644
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -26,8 +26,7 @@
  * Private uninstalled header defining things local to X windowing code
  */
 
-#ifndef __GDK_PRIVATE_X11_H__
-#define __GDK_PRIVATE_X11_H__
+#pragma once
 
 #include "gdkcursor.h"
 #include "gdkx.h"
@@ -267,4 +266,3 @@ extern const int         _gdk_x11_event_mask_table_size;
 #define GDK_SURFACE_XID(win)           (GDK_X11_SURFACE (win)->xid)
 #define GDK_SCREEN_XDISPLAY(screen)   (GDK_X11_SCREEN (screen)->xdisplay)
 
-#endif /* __GDK_PRIVATE_X11_H__ */
diff --git a/gdk/x11/gdkscreen-x11.h b/gdk/x11/gdkscreen-x11.h
index 2d9c8ae677..d3775b23e5 100644
--- a/gdk/x11/gdkscreen-x11.h
+++ b/gdk/x11/gdkscreen-x11.h
@@ -19,8 +19,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_X11_SCREEN__
-#define __GDK_X11_SCREEN__
+#pragma once
 
 #include "gdkx11screen.h"
 #include <X11/X.h>
@@ -110,4 +109,3 @@ _gdk_x11_screen_get_xft_setting             (GdkX11Screen *screen,
 
 G_END_DECLS
 
-#endif /* __GDK_X11_SCREEN__ */
diff --git a/gdk/x11/gdkselectioninputstream-x11.h b/gdk/x11/gdkselectioninputstream-x11.h
index 18c0763025..465563c00c 100644
--- a/gdk/x11/gdkselectioninputstream-x11.h
+++ b/gdk/x11/gdkselectioninputstream-x11.h
@@ -19,8 +19,7 @@
  *         Christian Kellner <gicmo@gnome.org>
  */
 
-#ifndef __GDK_X11_SELECTION_INPUT_STREAM_H__
-#define __GDK_X11_SELECTION_INPUT_STREAM_H__
+#pragma once
 
 #include <gio/gio.h>
 #include "gdktypes.h"
@@ -66,4 +65,3 @@ GInputStream * gdk_x11_selection_input_stream_new_finish    (GAsyncResult
 
 G_END_DECLS
 
-#endif /* __GDK_X11_SELECTION_INPUT_STREAM_H__ */
diff --git a/gdk/x11/gdkselectionoutputstream-x11.h b/gdk/x11/gdkselectionoutputstream-x11.h
index 03a0d30029..bbc02251b8 100644
--- a/gdk/x11/gdkselectionoutputstream-x11.h
+++ b/gdk/x11/gdkselectionoutputstream-x11.h
@@ -19,8 +19,7 @@
  *         Christian Kellner <gicmo@gnome.org>
  */
 
-#ifndef __GDK_X11_SELECTION_OUTPUT_STREAM_H__
-#define __GDK_X11_SELECTION_OUTPUT_STREAM_H__
+#pragma once
 
 #include <gio/gio.h>
 #include "gdktypes.h"
@@ -66,4 +65,3 @@ void            gdk_x11_selection_output_streams_create         (GdkDisplay
 
 G_END_DECLS
 
-#endif /* __GDK_X11_SELECTION_OUTPUT_STREAM_H__ */
diff --git a/gdk/x11/gdksurface-x11.h b/gdk/x11/gdksurface-x11.h
index f338ccfc21..c548cd206a 100644
--- a/gdk/x11/gdksurface-x11.h
+++ b/gdk/x11/gdksurface-x11.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#ifndef __GDK_X11_SURFACE__
-#define __GDK_X11_SURFACE__
+#pragma once
 
 #include "gdksurfaceprivate.h"
 #include "gdkx11surface.h"
@@ -211,4 +210,3 @@ void            gdk_x11_surface_check_monitor        (GdkSurface *surface,
 
 G_END_DECLS
 
-#endif /* __GDK_X11_SURFACE__ */
diff --git a/gdk/x11/gdktextlistconverter-x11.h b/gdk/x11/gdktextlistconverter-x11.h
index 473c518eb5..c183b93f65 100644
--- a/gdk/x11/gdktextlistconverter-x11.h
+++ b/gdk/x11/gdktextlistconverter-x11.h
@@ -18,8 +18,7 @@
  * Author: Benjamin Otte <otte@gnome.org>
  */
 
-#ifndef __GDK_X11_TEXT_LIST_CONVERTER_H__
-#define __GDK_X11_TEXT_LIST_CONVERTER_H__
+#pragma once
 
 #include <gio/gio.h>
 #include <gdk/gdktypes.h>
@@ -44,4 +43,3 @@ GConverter *       gdk_x11_text_list_converter_from_utf8_new    (GdkDisplay
 
 G_END_DECLS
 
-#endif /* __GDK_X11_TEXT_LIST_CONVERTER_H__ */
diff --git a/gdk/x11/gdkvulkancontext-x11.h b/gdk/x11/gdkvulkancontext-x11.h
index c2364a8d3a..8b997bda23 100644
--- a/gdk/x11/gdkvulkancontext-x11.h
+++ b/gdk/x11/gdkvulkancontext-x11.h
@@ -18,8 +18,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_X11_VULKAN_CONTEXT__
-#define __GDK_X11_VULKAN_CONTEXT__
+#pragma once
 
 #include "gdkconfig.h"
 
@@ -58,4 +57,3 @@ G_END_DECLS
 
 #endif /* !GDK_RENDERING_VULKAN */
 
-#endif /* __GDK_X11_VULKAN_CONTEXT__ */
diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index c94f52fbb8..6bef6b6de8 100644
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GDK_X_H__
-#define __GDK_X_H__
+#pragma once
 
 #include <gdk/gdk.h>
 
@@ -51,4 +50,3 @@
 
 #undef __GDKX_H_INSIDE__
 
-#endif /* __GDK_X_H__ */
diff --git a/gdk/x11/gdkx11applaunchcontext.h b/gdk/x11/gdkx11applaunchcontext.h
index a1ef85af54..aa0b45f10c 100644
--- a/gdk/x11/gdkx11applaunchcontext.h
+++ b/gdk/x11/gdkx11applaunchcontext.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_X11_APP_LAUNCH_CONTEXT_H__
-#define __GDK_X11_APP_LAUNCH_CONTEXT_H__
+#pragma once
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/x11/gdkx.h> can be included directly."
@@ -45,4 +44,3 @@ GType    gdk_x11_app_launch_context_get_type (void);
 
 G_END_DECLS
 
-#endif /* __GDK_X11_APP_LAUNCH_CONTEXT_H__ */
diff --git a/gdk/x11/gdkx11device-xi2.h b/gdk/x11/gdkx11device-xi2.h
index bc06e71952..a5d078b4f4 100644
--- a/gdk/x11/gdkx11device-xi2.h
+++ b/gdk/x11/gdkx11device-xi2.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_X11_DEVICE_XI2_H__
-#define __GDK_X11_DEVICE_XI2_H__
+#pragma once
 
 #include <gdk/gdk.h>
 
@@ -43,4 +42,3 @@ GType gdk_x11_device_xi2_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* __GDK_X11_DEVICE_XI2_H__ */
diff --git a/gdk/x11/gdkx11device.h b/gdk/x11/gdkx11device.h
index 956375dfab..de7dd23895 100644
--- a/gdk/x11/gdkx11device.h
+++ b/gdk/x11/gdkx11device.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_X11_DEVICE_H__
-#define __GDK_X11_DEVICE_H__
+#pragma once
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/x11/gdkx.h> can be included directly."
@@ -31,4 +30,3 @@ int   gdk_x11_device_get_id  (GdkDevice *device);
 
 G_END_DECLS
 
-#endif /* __GDK_X11_DEVICE_H__ */
diff --git a/gdk/x11/gdkx11devicemanager-xi2.h b/gdk/x11/gdkx11devicemanager-xi2.h
index 9538f56f2c..ee7c2ab995 100644
--- a/gdk/x11/gdkx11devicemanager-xi2.h
+++ b/gdk/x11/gdkx11devicemanager-xi2.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_X11_DEVICE_MANAGER_XI2_H__
-#define __GDK_X11_DEVICE_MANAGER_XI2_H__
+#pragma once
 
 #include <gdk/gdk.h>
 
@@ -39,4 +38,3 @@ GType gdk_x11_device_manager_xi2_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* __GDK_X11_DEVICE_MANAGER_XI2_H__ */
diff --git a/gdk/x11/gdkx11devicemanager.h b/gdk/x11/gdkx11devicemanager.h
index 6f07b331a2..9b9f2a798a 100644
--- a/gdk/x11/gdkx11devicemanager.h
+++ b/gdk/x11/gdkx11devicemanager.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_X11_DEVICE_MANAGER_H__
-#define __GDK_X11_DEVICE_MANAGER_H__
+#pragma once
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/x11/gdkx.h> can be included directly."
@@ -36,4 +35,3 @@ GdkDevice * gdk_x11_device_manager_lookup (GdkX11DeviceManagerXI2 *device_manage
 
 G_END_DECLS
 
-#endif /* __GDK_X11_DEVICE_MANAGER_H__ */
diff --git a/gdk/x11/gdkx11display.h b/gdk/x11/gdkx11display.h
index 46b7627db5..2df0c48899 100644
--- a/gdk/x11/gdkx11display.h
+++ b/gdk/x11/gdkx11display.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#ifndef __GDK_X11_DISPLAY_H__
-#define __GDK_X11_DISPLAY_H__
+#pragma once
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/x11/gdkx.h> can be included directly."
@@ -133,4 +132,3 @@ GdkSurface * gdk_x11_display_get_default_group (GdkDisplay *display);
 
 G_END_DECLS
 
-#endif /* __GDK_X11_DISPLAY_H__ */
diff --git a/gdk/x11/gdkx11dnd.h b/gdk/x11/gdkx11dnd.h
index 4da3d31652..36c607de25 100644
--- a/gdk/x11/gdkx11dnd.h
+++ b/gdk/x11/gdkx11dnd.h
@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_X11_DND_H__
-#define __GDK_X11_DND_H__
+#pragma once
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/x11/gdkx.h> can be included directly."
@@ -45,4 +44,3 @@ GType    gdk_x11_drag_get_type (void);
 
 G_END_DECLS
 
-#endif /* __GDK_X11_DRAG_H__ */
diff --git a/gdk/x11/gdkx11glcontext.h b/gdk/x11/gdkx11glcontext.h
index 173f6acac7..36c4445644 100644
--- a/gdk/x11/gdkx11glcontext.h
+++ b/gdk/x11/gdkx11glcontext.h
@@ -18,8 +18,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_X11_GL_CONTEXT_H__
-#define __GDK_X11_GL_CONTEXT_H__
+#pragma once
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/x11/gdkx.h> can be included directly."
@@ -53,4 +52,3 @@ gpointer        gdk_x11_display_get_egl_display (GdkDisplay *display);
 
 G_END_DECLS
 
-#endif /* __GDK_X11_GL_CONTEXT_H__ */
diff --git a/gdk/x11/gdkx11monitor.h b/gdk/x11/gdkx11monitor.h
index ddfa8a3f61..51e65646f4 100644
--- a/gdk/x11/gdkx11monitor.h
+++ b/gdk/x11/gdkx11monitor.h
@@ -19,8 +19,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GDK_X11_MONITOR_H__
-#define __GDK_X11_MONITOR_H__
+#pragma once
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/x11/gdkx.h> can be included directly."
@@ -49,4 +48,3 @@ void              gdk_x11_monitor_get_workarea        (GdkMonitor   *monitor,
 
 G_END_DECLS
 
-#endif  /* __GDK_X11_MONITOR_H__ */
diff --git a/gdk/x11/gdkx11property.h b/gdk/x11/gdkx11property.h
index 905711cb76..e2b8ea3593 100644
--- a/gdk/x11/gdkx11property.h
+++ b/gdk/x11/gdkx11property.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#ifndef __GDK_X11_PROPERTY_H__
-#define __GDK_X11_PROPERTY_H__
+#pragma once
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/x11/gdkx.h> can be included directly."
@@ -45,4 +44,3 @@ const char *         gdk_x11_get_xatom_name_for_display (GdkDisplay  *display,
 
 G_END_DECLS
 
-#endif /* __GDK_X11_PROPERTY_H__ */
diff --git a/gdk/x11/gdkx11screen.h b/gdk/x11/gdkx11screen.h
index f18ddfeef8..86cac3f088 100644
--- a/gdk/x11/gdkx11screen.h
+++ b/gdk/x11/gdkx11screen.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#ifndef __GDK_X11_SCREEN_H__
-#define __GDK_X11_SCREEN_H__
+#pragma once
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/x11/gdkx.h> can be included directly."
@@ -72,4 +71,3 @@ guint32  gdk_x11_screen_get_current_desktop    (GdkX11Screen *screen);
 
 G_END_DECLS
 
-#endif /* __GDK_X11_SCREEN_H__ */
diff --git a/gdk/x11/gdkx11selection.h b/gdk/x11/gdkx11selection.h
index 2b012e0685..7fcf0985a7 100644
--- a/gdk/x11/gdkx11selection.h
+++ b/gdk/x11/gdkx11selection.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#ifndef __GDK_X11_SELECTION_H__
-#define __GDK_X11_SELECTION_H__
+#pragma once
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/x11/gdkx.h> can be included directly."
@@ -64,4 +63,3 @@ void     gdk_x11_free_compound_text                 (guchar       *ctext);
 
 G_END_DECLS
 
-#endif /* __GDK_X11_SELECTION_H__ */
diff --git a/gdk/x11/gdkx11surface.h b/gdk/x11/gdkx11surface.h
index 32fa80db76..228b59ab8b 100644
--- a/gdk/x11/gdkx11surface.h
+++ b/gdk/x11/gdkx11surface.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#ifndef __GDK_X11_SURFACE_H__
-#define __GDK_X11_SURFACE_H__
+#pragma once
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/x11/gdkx.h> can be included directly."
@@ -124,4 +123,3 @@ GdkSurface *  gdk_x11_surface_get_group    (GdkSurface *surface);
 
 G_END_DECLS
 
-#endif /* __GDK_X11_SURFACE_H__ */
diff --git a/gdk/x11/gdkx11utils.h b/gdk/x11/gdkx11utils.h
index 0ed21dfefb..a1d17f1427 100644
--- a/gdk/x11/gdkx11utils.h
+++ b/gdk/x11/gdkx11utils.h
@@ -22,8 +22,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#ifndef __GDK_X11_UTILS_H__
-#define __GDK_X11_UTILS_H__
+#pragma once
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/x11/gdkx.h> can be included directly."
@@ -58,4 +57,3 @@ G_BEGIN_DECLS
 
 G_END_DECLS
 
-#endif /* __GDK_X11_UTILS_H__ */
diff --git a/gdk/x11/xsettings-client.h b/gdk/x11/xsettings-client.h
index aab28d7732..6faa2146c8 100644
--- a/gdk/x11/xsettings-client.h
+++ b/gdk/x11/xsettings-client.h
@@ -20,8 +20,7 @@
  *
  * Author:  Owen Taylor, Red Hat, Inc.
  */
-#ifndef XSETTINGS_CLIENT_H
-#define XSETTINGS_CLIENT_H
+#pragma once
 
 #include <gdk/x11/gdkprivate-x11.h>
 #include <gdk/x11/gdkx11screen.h>
@@ -36,4 +35,3 @@ GdkFilterReturn gdk_xsettings_manager_window_filter (const XEvent *xevent,
                                                      gpointer      data);
 
 
-#endif /* XSETTINGS_CLIENT_H */
author	Matthias Clasen <mclasen@redhat.com>	2023-03-31 15:11:10 -0400
committer	Matthias Clasen <mclasen@redhat.com>	2023-03-31 15:11:10 -0400
commit	a1c5a806b3985b442d78506f0afae476567e597a (patch)
tree	43cc71a014eafe1308912667c42bbb2924f67451 /gdk
parent	515f39f161d73e4e58fcb58ed330db11c3bc8642 (diff)
download	gtk+-a1c5a806b3985b442d78506f0afae476567e597a.tar.gz