Use '#pragma once' to avoid a lot of boilerplate

libfwupd/fwupd-client.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FWUPD_CLIENT_H
+#pragma once
-#define __FWUPD_CLIENT_H
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -129,6 +128,3 @@ FwupdRemote	*fwupd_client_get_remote_by_id		(FwupdClient	*client,
 							 GError		**error);
 
 G_END_DECLS
-
-#endif /* __FWUPD_CLIENT_H */
-

libfwupd/fwupd-common-private.h

@@ -4,13 +4,10 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FWUPD_COMMON_PRIVATE_H
+#pragma once
-#define __FWUPD_COMMON_PRIVATE_H
 
 #include <glib.h>
 
 #include "fwupd-common.h"
 
 gchar		*fwupd_checksum_format_for_display	(const gchar	*checksum);
-
-#endif /* __FWUPD_COMMON_PRIVATE_H */

libfwupd/fwupd-common.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FWUPD_COMMON_H
+#pragma once
-#define __FWUPD_COMMON_H
 
 #include <glib.h>
 
@@ -68,5 +67,3 @@ gchar		*fwupd_guid_hash_string			(const gchar	*str);
 gchar		*fwupd_guid_hash_data			(const guint8	*data,
 							 gsize		 datasz,
 							 FwupdGuidFlags	 flags);
-
-#endif /* __FWUPD_COMMON_H */

libfwupd/fwupd-deprecated.h

@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FWUPD_DEPRECATED_H
+#pragma once
-#define __FWUPD_DEPRECATED_H
 
 /* indeed, nothing */
-
-#endif /* __FWUPD_DEPRECATED_H */

libfwupd/fwupd-device-private.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FWUPD_DEVICE_PRIVATE_H
+#pragma once
-#define __FWUPD_DEVICE_PRIVATE_H
 
 #include <glib-object.h>
 
@@ -22,5 +21,3 @@ void		 fwupd_device_incorporate		(FwupdDevice	*self,
 
 G_END_DECLS
 
-#endif /* __FWUPD_DEVICE_PRIVATE_H */
-

libfwupd/fwupd-device.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FWUPD_DEVICE_H
+#pragma once
-#define __FWUPD_DEVICE_H
 
 #include <glib-object.h>
 
@@ -128,6 +127,3 @@ gint		 fwupd_device_compare			(FwupdDevice	*device1,
 							 FwupdDevice	*device2);
 
 G_END_DECLS
-
-#endif /* __FWUPD_DEVICE_H */
-

libfwupd/fwupd-enums-private.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FWUPD_ENUMS_PRIVATE_H
+#pragma once
-#define __FWUPD_ENUMS_PRIVATE_H
 
 #define FWUPD_RESULT_KEY_APPSTREAM_ID		"AppstreamId"	/* s */
 #define FWUPD_RESULT_KEY_CHECKSUM		"Checksum"	/* as */
@@ -45,5 +44,3 @@
 #define FWUPD_RESULT_KEY_VERSION_BOOTLOADER	"VersionBootloader"	/* s */
 #define FWUPD_RESULT_KEY_VERSION_LOWEST		"VersionLowest"	/* s */
 #define FWUPD_RESULT_KEY_VERSION		"Version"	/* s */
-
-#endif /* __FWUPD_ENUMS_PRIVATE_H */

libfwupd/fwupd-enums.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FWUPD_ENUMS_H
+#pragma once
-#define __FWUPD_ENUMS_H
 
 #include <glib.h>
 
@@ -183,5 +182,3 @@ const gchar	*fwupd_trust_flag_to_string		(FwupdTrustFlags trust_flag);
 FwupdTrustFlags	 fwupd_trust_flag_from_string		(const gchar	*trust_flag);
 FwupdKeyringKind fwupd_keyring_kind_from_string		(const gchar	*keyring_kind);
 const gchar	*fwupd_keyring_kind_to_string		(FwupdKeyringKind keyring_kind);
-
-#endif /* __FWUPD_ENUMS_H */

libfwupd/fwupd-error.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FWUPD_ERROR_H
+#pragma once
-#define __FWUPD_ERROR_H
 
 #include <glib.h>
 
@@ -52,5 +51,3 @@ typedef enum {
 GQuark		 fwupd_error_quark			(void);
 const gchar	*fwupd_error_to_string			(FwupdError	 error);
 FwupdError	 fwupd_error_from_string		(const gchar	*error);
-
-#endif /* __FWUPD_ERROR_H */

libfwupd/fwupd-release-private.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FWUPD_RELEASE_PRIVATE_H
+#pragma once
-#define __FWUPD_RELEASE_PRIVATE_H
 
 #include <glib-object.h>
 
@@ -18,5 +17,3 @@ GVariant	*fwupd_release_to_variant		(FwupdRelease	*release);
 
 G_END_DECLS
 
-#endif /* __FWUPD_RELEASE_PRIVATE_H */
-

libfwupd/fwupd-release.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FWUPD_RELEASE_H
+#pragma once
-#define __FWUPD_RELEASE_H
 
 #include <glib-object.h>
 
@@ -101,6 +100,3 @@ void		 fwupd_release_set_update_message	(FwupdRelease	*release,
 							 const gchar	*update_message);
 
 G_END_DECLS
-
-#endif /* __FWUPD_RELEASE_H */
-

libfwupd/fwupd-remote-private.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FWUPD_REMOTE_PRIVATE_H
+#pragma once
-#define __FWUPD_REMOTE_PRIVATE_H
 
 #include "fwupd-remote.h"
 
@@ -27,6 +26,3 @@ gchar		**fwupd_remote_get_order_after		(FwupdRemote	*self);
 gchar		**fwupd_remote_get_order_before		(FwupdRemote	*self);
 
 G_END_DECLS
-
-#endif /* __FWUPD_REMOTE_PRIVATE_H */
-

libfwupd/fwupd-remote.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FWUPD_REMOTE_H
+#pragma once
-#define __FWUPD_REMOTE_H
 
 #include "fwupd-enums.h"
 
@@ -71,6 +70,3 @@ gchar		*fwupd_remote_build_firmware_uri	(FwupdRemote	*self,
 							 GError		**error);
 
 G_END_DECLS
-
-#endif /* __FWUPD_REMOTE_H */
-

libfwupd/fwupd-version.h.in

@@ -3,6 +3,9 @@
  *
  * SPDX-License-Identifier: LGPL-2.1+
  */
+
+#pragma once
+
 /**
  * SECTION:fwupd-version
  * @short_description: Obtains the version for the installed fwupd
@@ -15,9 +18,6 @@
 #error "Only <fwupd.h> can be included directly."
 #endif
 
-#ifndef __FWUPD_VERSION_H
-#define __FWUPD_VERSION_H
-
 /**
  * FWUPD_MAJOR_VERSION:
  *
@@ -59,5 +59,3 @@
      (FWUPD_MAJOR_VERSION == (major) && FWUPD_MINOR_VERSION > (minor)) || \
      (FWUPD_MAJOR_VERSION == (major) && FWUPD_MINOR_VERSION == (minor) && \
       FWUPD_MICRO_VERSION >= (micro)))
-
-#endif /* __FWUPD_VERSION_H */

libfwupd/fwupd.h

@@ -4,14 +4,13 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
+#pragma once
+
 /**
  * SECTION:fwupd
  * @short_description: Helper objects for accessing fwupd
  */
 
-#ifndef __FWUPD_H__
-#define __FWUPD_H__
-
 #define __FWUPD_H_INSIDE__
 
 #include <libfwupd/fwupd-client.h>
@@ -28,6 +27,3 @@
 #endif
 
 #undef __FWUPD_H_INSIDE__
-
-#endif /* __FWUPD_H__ */
-

plugins/altos/fu-altos-device.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_ALTOS_DEVICE_H
+#pragma once
-#define __FU_ALTOS_DEVICE_H
 
 #include "fu-plugin.h"
 
@@ -35,5 +34,3 @@ const gchar	*fu_altos_device_kind_to_string		(FuAltosDeviceKind kind);
 FuAltosDeviceKind fu_altos_device_get_kind		(FuAltosDevice	*device);
 
 G_END_DECLS
-
-#endif /* __FU_ALTOS_DEVICE_H */

plugins/altos/fu-altos-firmware.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_ALTOS_FIRMWARE_H
+#pragma once
-#define __FU_ALTOS_FIRMWARE_H
 
 G_BEGIN_DECLS
 
@@ -21,5 +20,3 @@ gboolean	 fu_altos_firmware_parse	(FuAltosFirmware	*self,
 						 GError			**error);
 
 G_END_DECLS
-
-#endif /* __FU_ALTOS_FIRMWARE_H */

plugins/ata/fu-ata-device.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_ATA_DEVICE_H
+#pragma once
-#define __FU_ATA_DEVICE_H
 
 #include "fu-plugin.h"
 
@@ -24,5 +23,3 @@ guint8		 fu_ata_device_get_transfer_mode	(FuAtaDevice	*self);
 guint16		 fu_ata_device_get_transfer_blocks	(FuAtaDevice	*self);
 
 G_END_DECLS
-
-#endif /* __FU_ATA_DEVICE_H */

plugins/colorhug/fu-colorhug-common.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_COLORHUG_COMMON_H
+#pragma once
-#define __FU_COLORHUG_COMMON_H
 
 #include <glib-object.h>
 
@@ -54,5 +53,3 @@ typedef enum {
 const gchar	*ch_strerror			(ChError	 error_enum);
 
 G_END_DECLS
-
-#endif /* __FU_COLORHUG_COMMON_H */

plugins/colorhug/fu-colorhug-device.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_COLORHUG_DEVICE_H
+#pragma once
-#define __FU_COLORHUG_DEVICE_H
 
 #include "fu-plugin.h"
 
@@ -22,5 +21,3 @@ gboolean	 fu_colorhug_device_set_flash_success	(FuColorhugDevice	*device,
 							 GError			**error);
 
 G_END_DECLS
-
-#endif /* __FU_COLORHUG_DEVICE_H */

plugins/csr/fu-csr-device.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_CSR_DEVICE_H
+#pragma once
-#define __FU_CSR_DEVICE_H
 
 #include "fu-plugin.h"
 
@@ -17,5 +16,3 @@ G_DECLARE_FINAL_TYPE (FuCsrDevice, fu_csr_device, FU, CSR_DEVICE, FuUsbDevice)
 FuCsrDevice	*fu_csr_device_new		(FuUsbDevice		*device);
 
 G_END_DECLS
-
-#endif /* __FU_CSR_DEVICE_H */

plugins/dell-dock/fu-dell-dock-common.h

@@ -13,8 +13,7 @@
  * SPDX-License-Identifier: LGPL-2.1+ OR MIT
  */
 
-#ifndef __FU_DELL_DOCK_COMMON_H
+#pragma once
-#define __FU_DELL_DOCK_COMMON_H
 
 #include "config.h"
 
@@ -36,5 +35,3 @@ gboolean	fu_dell_dock_set_power		(FuDevice *device,
 void		 fu_dell_dock_will_replug	(FuDevice *device);
 
 void		 fu_dell_dock_clone_updatable	(FuDevice *device);
-
-#endif /* __FU_DELL_DOCK_COMMON_H */

plugins/dell-dock/fu-dell-dock-hid.h

@@ -14,8 +14,7 @@
  * SPDX-License-Identifier: LGPL-2.1+ OR MIT
  */
 
-#ifndef __FU_DELL_DOCK_HID_H
+#pragma once
-#define __FU_DELL_DOCK_HID_H
 
 #include "config.h"
 
@@ -92,5 +91,3 @@ gboolean	fu_dell_dock_hid_tbt_write		(FuDevice *self,
 gboolean	fu_dell_dock_hid_tbt_authenticate	(FuDevice *self,
 							 const FuHIDI2CParameters *parameters,
 							 GError **error);
-
-#endif /* __FU_DELL_DOCK_HID_H */

plugins/dell-dock/fu-dell-dock-hub.h

@@ -13,8 +13,7 @@
  * SPDX-License-Identifier: LGPL-2.1+ OR MIT
  */
 
-#ifndef __FU_DELL_DOCK_HUB_H
+#pragma once
-#define __FU_DELL_DOCK_HUB_H
 
 #include "config.h"
 
@@ -28,5 +27,3 @@ G_DECLARE_FINAL_TYPE (FuDellDockHub, fu_dell_dock_hub, FU, DELL_DOCK_HUB, FuUsbD
 FuDellDockHub 	*fu_dell_dock_hub_new		(FuUsbDevice *device);
 
 G_END_DECLS
-
-#endif /* __FU_DELL_DOCK_HUB_H */

plugins/dell-dock/fu-dell-dock-i2c-ec.h

@@ -13,8 +13,7 @@
  * SPDX-License-Identifier: LGPL-2.1+ OR MIT
  */
 
-#ifndef __FU_DELL_DOCK_EC_H
+#pragma once
-#define __FU_DELL_DOCK_EC_H
 
 #include "config.h"
 
@@ -48,5 +47,3 @@ gboolean	 fu_dell_dock_ec_commit_package 	(FuDevice *device,
 							 GBytes *blob_fw,
 							 GError **error);
 FuDevice 	*fu_dell_dock_ec_get_symbiote		(FuDevice *device);
-
-#endif /* __FU_DELL_DOCK_EC_H */

plugins/dell-dock/fu-dell-dock-i2c-mst.h

@@ -13,8 +13,7 @@
  * SPDX-License-Identifier: LGPL-2.1+ OR MIT
  */
 
-#ifndef __FU_DELL_DOCK_I2C_MST_H
+#pragma once
-#define __FU_DELL_DOCK_I2C_MST_H
 
 #include "config.h"
 
@@ -28,5 +27,3 @@ G_DECLARE_FINAL_TYPE (FuDellDockMst, fu_dell_dock_mst, FU, DELL_DOCK_MST, FuDevi
 FuDellDockMst 	*fu_dell_dock_mst_new	(void);
 
 G_END_DECLS
-
-#endif /* __FU_DELL_DOCK_I2C_MST_H */

plugins/dell-dock/fu-dell-dock-i2c-tbt.h

@@ -14,8 +14,7 @@
  * SPDX-License-Identifier: LGPL-2.1+ OR MIT
  */
 
-#ifndef __FU_DELLDOCK_I2C_TBT_H
+#pragma once
-#define __FU_DELLDOCK_I2C_TBT_H
 
 #include "config.h"
 
@@ -29,6 +28,3 @@ G_DECLARE_FINAL_TYPE (FuDellDockTbt, fu_dell_dock_tbt, FU, DELL_DOCK_TBT, FuDevi
 FuDellDockTbt 	*fu_dell_dock_tbt_new	(void);
 
 G_END_DECLS
-
-
-#endif /* __FU_DELLDOCK_I2C_TBT_H */

plugins/dell-dock/fu-dell-dock-status.h

@@ -13,8 +13,7 @@
  * SPDX-License-Identifier: LGPL-2.1+ OR MIT
  */
 
-#ifndef __FU_DELL_DOCK_STATUS_H
+#pragma once
-#define __FU_DELL_DOCK_STATUS_H
 
 #include "config.h"
 
@@ -28,5 +27,3 @@ G_DECLARE_FINAL_TYPE (FuDellDockStatus, fu_dell_dock_status, FU, DELL_DOCK_STATU
 FuDellDockStatus	*fu_dell_dock_status_new	(void);
 
 G_END_DECLS
-
-#endif /* __FU_DELL_DOCK_STATUS_H */

plugins/dell/fu-dell-smi.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_DELL_COMMON_H
+#pragma once
-#define __FU_DELL_COMMON_H
 
 #include "fu-device.h"
 #include <smbios_c/smi.h>
@@ -126,5 +125,3 @@ fu_dell_toggle_host_mode (FuDellSmiObj *smi_obj, const efi_guid_t guid, int mode
 /* VID/PID of ethernet controller on dock */
 #define DOCK_NIC_VID		0x0bda
 #define DOCK_NIC_PID		0x8153
-
-#endif /* __FU_DELL_COMMON_H */

plugins/dell/fu-plugin-dell.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_PLUGIN_DELL_H
+#pragma once
-#define __FU_PLUGIN_DELL_H
 
 #include "fu-plugin.h"
 #include "fu-dell-smi.h"
@@ -40,5 +39,3 @@ struct tpm_status {
 #define TPM_TYPE_MASK	0x0F00
 #define TPM_1_2_MODE	0x0001
 #define TPM_2_0_MODE	0x0002
-
-#endif /* __FU_PLUGIN_DELL_H */

plugins/dfu/dfu-cipher-xtea.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_FORMAT_XTEA_H
+#pragma once
-#define __DFU_FORMAT_XTEA_H
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -22,5 +21,3 @@ gboolean		 dfu_cipher_decrypt_xtea	(const gchar	*key,
 							 GError		**error);
 
 G_END_DECLS
-
-#endif /* __DFU_FORMAT_XTEA_H */

plugins/dfu/dfu-common.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_COMMON_H
+#pragma once
-#define __DFU_COMMON_H
 
 #include <glib.h>
 #include <gusb.h>
@@ -171,5 +170,3 @@ gchar		**dfu_utils_strnsplit			(const gchar	*str,
 							 gint		 max_tokens);
 
 G_END_DECLS
-
-#endif /* __DFU_COMMON_H */

plugins/dfu/dfu-device-private.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_DEVICE_PRIVATE_H
+#pragma once
-#define __DFU_DEVICE_PRIVATE_H
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -26,5 +25,3 @@ gboolean	 dfu_device_ensure_interface		(DfuDevice	*device,
 							 GError		**error);
 
 G_END_DECLS
-
-#endif /* __DFU_DEVICE_PRIVATE_H */

plugins/dfu/dfu-device.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_DEVICE_H
+#pragma once
-#define __DFU_DEVICE_H
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -162,5 +161,3 @@ void		 dfu_device_set_usb_context		(DfuDevice	*device,
 GUsbContext	*dfu_device_get_usb_context		(DfuDevice	*device);
 
 G_END_DECLS
-
-#endif /* __DFU_DEVICE_H */

plugins/dfu/dfu-element.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_ELEMENT_H
+#pragma once
-#define __DFU_ELEMENT_H
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -41,5 +40,3 @@ void		 dfu_element_set_padding_value	(DfuElement	*element,
 gchar		*dfu_element_to_string		(DfuElement	*element);
 
 G_END_DECLS
-
-#endif /* __DFU_ELEMENT_H */

plugins/dfu/dfu-firmware.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_FIRMWARE_H
+#pragma once
-#define __DFU_FIRMWARE_H
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -120,5 +119,3 @@ void		 dfu_firmware_remove_metadata	(DfuFirmware	*firmware,
 						 const gchar	*key);
 
 G_END_DECLS
-
-#endif /* __DFU_FIRMWARE_H */

plugins/dfu/dfu-format-dfu.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_FORMAT_DFU_H
+#pragma once
-#define __DFU_FORMAT_DFU_H
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -23,5 +22,3 @@ gboolean		 dfu_firmware_from_dfu		(DfuFirmware	*firmware,
 							GError		**error);
 
 G_END_DECLS
-
-#endif /* __DFU_FORMAT_DFU_H */

plugins/dfu/dfu-format-dfuse.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_FORMAT_DFUSE_H
+#pragma once
-#define __DFU_FORMAT_DFUSE_H
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -23,5 +22,3 @@ gboolean		 dfu_firmware_from_dfuse	(DfuFirmware	*firmware,
 							 GError		**error);
 
 G_END_DECLS
-
-#endif /* __DFU_FORMAT_DFUSE_H */

plugins/dfu/dfu-format-ihex.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_FORMAT_IHEX_H
+#pragma once
-#define __DFU_FORMAT_IHEX_H
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -23,5 +22,3 @@ gboolean		 dfu_firmware_from_ihex		(DfuFirmware	*firmware,
 							GError		**error);
 
 G_END_DECLS
-
-#endif /* __DFU_FORMAT_IHEX_H */

plugins/dfu/dfu-format-metadata.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_FORMAT_METADATA_H
+#pragma once
-#define __DFU_FORMAT_METADATA_H
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -22,5 +21,3 @@ gboolean		 dfu_firmware_from_metadata	(DfuFirmware	*firmware,
 							 GError		**error);
 
 G_END_DECLS
-
-#endif /* __DFU_FORMAT_METADATA_H */

plugins/dfu/dfu-format-raw.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_FORMAT_RAW_H
+#pragma once
-#define __DFU_FORMAT_RAW_H
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -23,5 +22,3 @@ gboolean		 dfu_firmware_from_raw		(DfuFirmware	*firmware,
 							GError		**error);
 
 G_END_DECLS
-
-#endif /* __DFU_FORMAT_RAW_H */

plugins/dfu/dfu-format-srec.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_FORMAT_SREC_H
+#pragma once
-#define __DFU_FORMAT_SREC_H
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -28,5 +27,3 @@ gboolean		 dfu_image_from_srec		(DfuImage	*image,
 							 GError		**error);
 
 G_END_DECLS
-
-#endif /* __DFU_FORMAT_SREC_H */

plugins/dfu/dfu-image.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_IMAGE_H
+#pragma once
-#define __DFU_IMAGE_H
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -43,5 +42,3 @@ void		 dfu_image_set_name		(DfuImage	*image,
 gchar		*dfu_image_to_string		(DfuImage	*image);
 
 G_END_DECLS
-
-#endif /* __DFU_IMAGE_H */

plugins/dfu/dfu-patch.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_PATCH_H
+#pragma once
-#define __DFU_PATCH_H
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -54,5 +53,3 @@ GBytes		*dfu_patch_get_checksum_old	(DfuPatch	*self);
 GBytes		*dfu_patch_get_checksum_new	(DfuPatch	*self);
 
 G_END_DECLS
-
-#endif /* __DFU_PATCH_H */

plugins/dfu/dfu-sector-private.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_SECTOR_PRIVATE_H
+#pragma once
-#define __DFU_SECTOR_PRIVATE_H
 
 #include "dfu-sector.h"
 
@@ -19,5 +18,3 @@ DfuSector	*dfu_sector_new		(guint32	 address,
 					 DfuSectorCap	 cap);
 
 G_END_DECLS
-
-#endif /* __DFU_SECTOR_PRIVATE_H */

plugins/dfu/dfu-sector.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_SECTOR_H
+#pragma once
-#define __DFU_SECTOR_H
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -49,5 +48,3 @@ gboolean	 dfu_sector_has_cap		(DfuSector	*sector,
 gchar		*dfu_sector_to_string		(DfuSector	*sector);
 
 G_END_DECLS
-
-#endif /* __DFU_SECTOR_H */

plugins/dfu/dfu-target-avr.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_TARGET_AVR_H
+#pragma once
-#define __DFU_TARGET_AVR_H
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -25,5 +24,3 @@ struct _DfuTargetAvrClass
 DfuTarget	*dfu_target_avr_new		(void);
 
 G_END_DECLS
-
-#endif /* __DFU_TARGET_AVR_H */

plugins/dfu/dfu-target-private.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_TARGET_PRIVATE_H
+#pragma once
-#define __DFU_TARGET_PRIVATE_H
 
 #include <gusb.h>
 
@@ -56,5 +55,3 @@ gboolean	 dfu_target_parse_sectors		(DfuTarget	*target,
 							 GError		**error);
 
 G_END_DECLS
-
-#endif /* __DFU_TARGET_PRIVATE_H */

plugins/dfu/dfu-target-stm.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_TARGET_STM_H
+#pragma once
-#define __DFU_TARGET_STM_H
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -25,5 +24,3 @@ struct _DfuTargetStmClass
 DfuTarget	*dfu_target_stm_new		(void);
 
 G_END_DECLS
-
-#endif /* __DFU_TARGET_STM_H */

plugins/dfu/dfu-target.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_TARGET_H
+#pragma once
-#define __DFU_TARGET_H
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -91,5 +90,3 @@ gboolean	 dfu_target_mass_erase			(DfuTarget	*target,
 DfuCipherKind	 dfu_target_get_cipher_kind		(DfuTarget	*target);
 
 G_END_DECLS
-
-#endif /* __DFU_TARGET_H */

plugins/ebitdo/fu-ebitdo-common.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_EBITDO_COMMON_H
+#pragma once
-#define __FU_EBITDO_COMMON_H
 
 #include <glib.h>
 
@@ -70,5 +69,3 @@ const gchar	*fu_ebitdo_pkt_cmd_to_string	(FuEbitdoPktCmd		 cmd);
 const gchar	*fu_ebitdo_pkt_type_to_string	(FuEbitdoPktType	 type);
 void		 fu_ebitdo_dump_firmware_header	(FuEbitdoFirmwareHeader	*hdr);
 void		 fu_ebitdo_dump_pkt		(FuEbitdoPkt		*hdr);
-
-#endif /* __FU_EBITDO_COMMON_H */

plugins/ebitdo/fu-ebitdo-device.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_EBITDO_DEVICE_H
+#pragma once
-#define __FU_EBITDO_DEVICE_H
 
 #include "fu-plugin.h"
 
@@ -20,5 +19,3 @@ FuEbitdoDevice	*fu_ebitdo_device_new			(FuUsbDevice	*device);
 const guint32	*fu_ebitdo_device_get_serial		(FuEbitdoDevice	*device);
 
 G_END_DECLS
-
-#endif /* __FU_EBITDO_DEVICE_H */

plugins/fastboot/fu-fastboot-device.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_FASTBOOT_DEVICE_H
+#pragma once
-#define __FU_FASTBOOT_DEVICE_H
 
 #include "fu-plugin.h"
 
@@ -17,5 +16,3 @@ G_DECLARE_FINAL_TYPE (FuFastbootDevice, fu_fastboot_device, FU, FASTBOOT_DEVICE,
 FuFastbootDevice	*fu_fastboot_device_new	(FuUsbDevice	*device);
 
 G_END_DECLS
-
-#endif /* __FU_FASTBOOT_DEVICE_H */

plugins/nitrokey/fu-nitrokey-common.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_NITROKEY_COMMON_H
+#pragma once
-#define __FU_NITROKEY_COMMON_H
 
 #include <glib.h>
 
@@ -65,5 +64,3 @@ typedef struct __attribute__((packed)) {
 } NitrokeyGetDeviceStatusPayload;
 
 G_END_DECLS
-
-#endif /* __FU_NITROKEY_COMMON_H */

plugins/nitrokey/fu-nitrokey-device.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_NITROKEY_DEVICE_H
+#pragma once
-#define __FU_NITROKEY_DEVICE_H
 
 #include "fu-plugin.h"
 
@@ -22,5 +21,3 @@ struct _FuNitrokeyDeviceClass
 FuNitrokeyDevice *fu_nitrokey_device_new	(FuUsbDevice		*device);
 
 G_END_DECLS
-
-#endif /* __FU_NITROKEY_DEVICE_H */

plugins/nvme/fu-nvme-common.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_NVME_COMMON_H
+#pragma once
-#define __FU_NVME_COMMON_H
 
 #include <glib.h>
 
@@ -125,5 +124,3 @@ enum {
 const gchar	*fu_nvme_status_to_string	(guint32	 status);
 
 G_END_DECLS
-
-#endif /* __FU_NVME_COMMON_H */

plugins/nvme/fu-nvme-device.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_NVME_DEVICE_H
+#pragma once
-#define __FU_NVME_DEVICE_H
 
 #include "fu-plugin.h"
 
@@ -20,5 +19,3 @@ FuNvmeDevice	*fu_nvme_device_new_from_blob		(const guint8	*buf,
 							 GError		**error);
 
 G_END_DECLS
-
-#endif /* __FU_NVME_DEVICE_H */

plugins/redfish/fu-redfish-client.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_REDFISH_CLIENT_H
+#pragma once
-#define __FU_REDFISH_CLIENT_H
 
 #include <gio/gio.h>
 
@@ -40,7 +39,3 @@ gboolean	 fu_redfish_client_coldplug	(FuRedfishClient	*self,
 GPtrArray	*fu_redfish_client_get_devices	(FuRedfishClient	*self);
 
 G_END_DECLS
-
-#endif /* __FU_REDFISH_CLIENT_H */
-
-/* vim: set noexpandtab: */

plugins/redfish/fu-redfish-common.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_REDFISH_COMMON_H
+#pragma once
-#define __FU_REDFISH_COMMON_H
 
 #include <gio/gio.h>
 #include <efivar.h>
@@ -49,7 +48,3 @@ gchar		*fu_redfish_common_buffer_to_ipv4	(const guint8	*buffer);
 gchar		*fu_redfish_common_buffer_to_ipv6	(const guint8	*buffer);
 
 G_END_DECLS
-
-#endif /* __FU_REDFISH_COMMON_H */
-
-/* vim: set noexpandtab: */

plugins/rts54hid/fu-rts54hid-common.h

@@ -6,8 +6,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_RTS54HID_COMMON_H
+#pragma once
-#define __FU_RTS54HID_COMMON_H
 
 #define FU_RTS54HID_TRANSFER_BLOCK_SIZE			0x80
 #define FU_RTS54HID_REPORT_LENGTH			0xc0
@@ -68,5 +67,3 @@ typedef enum {
 	/* <private >*/
 	FU_RTS54HID_EXT_LAST,
 } FuRts54HidExt;
-
-#endif /* __FU_RTS54HID_COMMON_H */

plugins/rts54hid/fu-rts54hid-device.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_RTS54HID_DEVICE_H
+#pragma once
-#define __FU_RTS54HID_DEVICE_H
 
 #include "fu-plugin.h"
 
@@ -25,5 +24,3 @@ gboolean		 fu_rts54hid_device_get_report	(FuRts54HidDevice		*self,
 							 GError			**error);
 
 G_END_DECLS
-
-#endif /* __FU_RTS54HID_DEVICE_H */

plugins/rts54hid/fu-rts54hid-module.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_RTS54HID_MODULE_H
+#pragma once
-#define __FU_RTS54HID_MODULE_H
 
 #include "fu-plugin.h"
 
@@ -17,5 +16,3 @@ G_DECLARE_FINAL_TYPE (FuRts54HidModule, fu_rts54hid_module, FU, RTS54HID_MODULE,
 FuRts54HidModule	*fu_rts54hid_module_new		(void);
 
 G_END_DECLS
-
-#endif /* __FU_RTS54HID_MODULE_H */

plugins/rts54hub/fu-rts54hub-device.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_RTS54HUB_DEVICE_H
+#pragma once
-#define __FU_RTS54HUB_DEVICE_H
 
 #include "fu-plugin.h"
 
@@ -17,5 +16,3 @@ G_DECLARE_FINAL_TYPE (FuRts54HubDevice, fu_rts54hub_device, FU, RTS54HUB_DEVICE,
 FuRts54HubDevice	*fu_rts54hub_device_new		(FuUsbDevice		*device);
 
 G_END_DECLS
-
-#endif /* __FU_RTS54HUB_DEVICE_H */

plugins/steelseries/fu-steelseries-device.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_STEELSERIES_DEVICE_H
+#pragma once
-#define __FU_STEELSERIES_DEVICE_H
 
 #include "fu-plugin.h"
 
@@ -22,5 +21,3 @@ struct _FuSteelseriesDeviceClass
 FuSteelseriesDevice	*fu_steelseries_device_new	(FuUsbDevice	*device);
 
 G_END_DECLS
-
-#endif /* __FU_STEELSERIES_DEVICE_H */

plugins/superio/fu-superio-common.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_SUPERIO_COMMON_H
+#pragma once
-#define __FU_SUPERIO_COMMON_H
 
 #include "fu-plugin.h"
 
@@ -47,5 +46,3 @@ gboolean	 fu_superio_set_ldn	(gint		 fd,
 					 GError		**error);
 
 G_END_DECLS
-
-#endif /* __FU_SUPERIO_COMMON_H */

plugins/superio/fu-superio-device.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_SUPERIO_DEVICE_H
+#pragma once
-#define __FU_SUPERIO_DEVICE_H
 
 #include "fu-plugin.h"
 
@@ -19,5 +18,3 @@ FuSuperioDevice	*fu_superio_device_new		(const gchar		*chipset,
 						 guint16		 port);
 
 G_END_DECLS
-
-#endif /* __FU_SUPERIO_DEVICE_H */

plugins/synapticsmst/synapticsmst-common.h

@@ -5,8 +5,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __SYNAPTICSMST_COMMON_H
+#pragma once
-#define __SYNAPTICSMST_COMMON_H
 
 #include <glib.h>
 #include <gio/gio.h>
@@ -108,5 +107,3 @@ gboolean	 synapticsmst_common_disable_remote_control	(SynapticsMSTConnection *co
 #pragma clang diagnostic ignored "-Wunused-function"
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(SynapticsMSTConnection, synapticsmst_common_free)
 #pragma clang diagnostic pop
-
-#endif /* __SYNAPTICSMST_COMMON_H */

plugins/synapticsmst/synapticsmst-device.h

@@ -6,8 +6,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __SYNAPTICSMST_DEVICE_H
+#pragma once
-#define __SYNAPTICSMST_DEVICE_H
 
 #include <gio/gio.h>
 
@@ -86,5 +85,3 @@ gboolean	 synapticsmst_device_write_firmware		(SynapticsMSTDevice *device,
 								 GError	**error);
 
 G_END_DECLS
-
-#endif /* __SYNAPTICSMST_DEVICE_H */

plugins/thunderbolt/fu-thunderbolt-image.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_THUNDERBOLT_IMAGE_H__
+#pragma once
-#define __FU_THUNDERBOLT_IMAGE_H__
 
 #include <glib.h>
 
@@ -26,5 +25,3 @@ FuPluginValidation	fu_thunderbolt_image_validate		(GBytes  *controller_fw,
 gboolean	fu_thunderbolt_image_controller_is_native	(GBytes    *controller_fw,
 								 gboolean  *is_native,
 								 GError   **error);
-
-#endif /* __FU_THUNDERBOLT_IMAGE_H__ */

plugins/udev/fu-rom.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_ROM_H
+#pragma once
-#define __FU_ROM_H
 
 #include <gio/gio.h>
 
@@ -54,6 +53,3 @@ guint16		 fu_rom_get_model			(FuRom		*self);
 const gchar	*fu_rom_kind_to_string			(FuRomKind	 kind);
 
 G_END_DECLS
-
-#endif /* __FU_ROM_H */
-

plugins/uefi/efi/fwup-cleanups.h

@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
+#pragma once
+
 #define _DEFINE_CLEANUP_FUNCTION0(Type, name, func) \
   static inline VOID name(VOID *v) \
   { \

plugins/uefi/efi/fwup-common.h

@@ -5,8 +5,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef _FWUP_COMMON_H
+#pragma once
-#define _FWUP_COMMON_H
 
 #include "fwup-efi.h"
 
@@ -22,5 +21,3 @@ VOID		*fwup_malloc0		(UINTN			 size);
 
 #define fwup_new(struct_type, n)	((struct_type*)fwup_malloc((n)*sizeof(struct_type)))
 #define fwup_new0(struct_type, n)	((struct_type*)fwup_malloc0((n)*sizeof(struct_type)))
-
-#endif /* _FWUP_COMMON_H */

plugins/uefi/efi/fwup-debug.h

@@ -5,8 +5,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef _FWUP_DEBUG_H
+#pragma once
-#define _FWUP_DEBUG_H
 
 typedef enum {
 	FWUP_DEBUG_LEVEL_DEBUG,
@@ -28,5 +27,3 @@ VOID		 fwup_debug_set_enabled	(BOOLEAN	 val);
 #define fwup_debug(fmt, args...) fwup_log(FWUP_DEBUG_LEVEL_DEBUG, __func__, __FILE__, __LINE__, fmt, ## args )
 #define fwup_info(fmt, args...) fwup_log(FWUP_DEBUG_LEVEL_INFO, __func__, __FILE__, __LINE__, fmt, ## args )
 #define fwup_warning(fmt, args...) fwup_log(FWUP_DEBUG_LEVEL_WARNING, __func__, __FILE__, __LINE__, fmt, ## args )
-
-#endif /* _FWUP_DEBUG_H */

plugins/uefi/efi/fwup-efi.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef _FWUP_EFI_H
+#pragma once
-#define _FWUP_EFI_H
 
 #define FWUPDATE_ATTEMPT_UPDATE		0x00000001
 #define FWUPDATE_ATTEMPTED		0x00000002
@@ -68,5 +67,3 @@ EFI_STATUS	 fwup_get_variable	(CHAR16		*name,
 					 VOID		**buf_out,
 					 UINTN		*buf_size_out,
 					 UINT32		*attrs_out);
-
-#endif /* _FWUP_EFI_H */

plugins/uefi/fu-ucs2.h

@@ -5,8 +5,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UCS2_H
+#pragma once
-#define __FU_UCS2_H
 
 #include <glib.h>
 
@@ -16,5 +15,3 @@ guint16		*fu_uft8_to_ucs2		(const gchar	*str,
 						 gssize		 max);
 gchar		*fu_ucs2_to_uft8		(const guint16	*str,
 						 gssize		 max);
-
-#endif /* __FU_UCS2_H */

plugins/uefi/fu-uefi-bgrt.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UEFI_BGRT_H
+#pragma once
-#define __FU_UEFI_BGRT_H
 
 G_BEGIN_DECLS
 
@@ -22,5 +21,3 @@ guint32		 fu_uefi_bgrt_get_width		(FuUefiBgrt	*self);
 guint32		 fu_uefi_bgrt_get_height	(FuUefiBgrt	*self);
 
 G_END_DECLS
-
-#endif /* __FU_UEFI_BGRT_H */

plugins/uefi/fu-uefi-bootmgr.h

@@ -5,8 +5,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UEFI_BOOTMGR_H
+#pragma once
-#define __FU_UEFI_BOOTMGR_H
 
 #include <glib.h>
 #include <efivar.h>
@@ -25,5 +24,3 @@ gboolean	 fu_uefi_bootmgr_bootnext	(const gchar		*esp_path,
 						 GError			**error);
 
 G_END_DECLS
-
-#endif /* __FU_UEFI_BOOTMGR_H */

plugins/uefi/fu-uefi-common.h

@@ -5,8 +5,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UEFI_COMMON_H
+#pragma once
-#define __FU_UEFI_COMMON_H
 
 #include <glib.h>
 #include <efivar.h>
@@ -87,5 +86,3 @@ guint64		 fu_uefi_read_file_as_uint64	(const gchar	*path,
 gboolean	 fu_uefi_prefix_efi_errors	(GError		**error);
 
 G_END_DECLS
-
-#endif /* __FU_UEFI_COMMON_H */

plugins/uefi/fu-uefi-device.h

@@ -5,8 +5,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UEFI_DEVICE_H
+#pragma once
-#define __FU_UEFI_DEVICE_H
 
 #include "fu-plugin.h"
 #include "fu-uefi-device.h"
@@ -60,5 +59,3 @@ FuUefiUpdateInfo *fu_uefi_device_load_update_info	(FuUefiDevice	*self,
 gboolean	 fu_uefi_missing_capsule_header		(FuDevice *device);
 
 G_END_DECLS
-
-#endif /* __FU_UEFI_DEVICE_H */

plugins/uefi/fu-uefi-pcrs.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UEFI_PCRS_H
+#pragma once
-#define __FU_UEFI_PCRS_H
 
 G_BEGIN_DECLS
 
@@ -19,5 +18,3 @@ GPtrArray	*fu_uefi_pcrs_get_checksums	(FuUefiPcrs	*self,
 						 guint		 idx);
 
 G_END_DECLS
-
-#endif /* __FU_UEFI_PCRS_H */

plugins/uefi/fu-uefi-update-info.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UEFI_UPDATE_INFO_H
+#pragma once
-#define __FU_UEFI_UPDATE_INFO_H
 
 G_BEGIN_DECLS
 
@@ -32,5 +31,3 @@ guint64		 fu_uefi_update_info_get_hw_inst	(FuUefiUpdateInfo	*self);
 FuUefiUpdateInfoStatus fu_uefi_update_info_get_status	(FuUefiUpdateInfo	*self);
 
 G_END_DECLS
-
-#endif /* __FU_UEFI_UPDATE_INFO_H */

plugins/uefi/fu-uefi-vars.h

@@ -5,8 +5,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UEFI_VARS_H
+#pragma once
-#define __FU_UEFI_VARS_H
 
 #include <glib.h>
 
@@ -47,5 +46,3 @@ gboolean	 fu_uefi_vars_delete_with_glob	(const gchar	*guid,
 						 GError		**error);
 
 G_END_DECLS
-
-#endif /* __FU_UEFI_VARS_H */

plugins/unifying/fu-unifying-bootloader-nordic.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UNIFYING_BOOTLOADER_NORDIC_H
+#pragma once
-#define __FU_UNIFYING_BOOTLOADER_NORDIC_H
 
 #include "fu-unifying-bootloader.h"
 
@@ -15,5 +14,3 @@ G_BEGIN_DECLS
 G_DECLARE_FINAL_TYPE (FuUnifyingBootloaderNordic, fu_unifying_bootloader_nordic, FU, UNIFYING_BOOTLOADER_NORDIC, FuUnifyingBootloader)
 
 G_END_DECLS
-
-#endif /* __FU_UNIFYING_BOOTLOADER_NORDIC_H */

plugins/unifying/fu-unifying-bootloader-texas.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UNIFYING_BOOTLOADER_TEXAS_H
+#pragma once
-#define __FU_UNIFYING_BOOTLOADER_TEXAS_H
 
 #include "fu-unifying-bootloader.h"
 
@@ -15,5 +14,3 @@ G_BEGIN_DECLS
 G_DECLARE_FINAL_TYPE (FuUnifyingBootloaderTexas, fu_unifying_bootloader_texas, FU, UNIFYING_BOOTLOADER_TEXAS, FuUnifyingBootloader)
 
 G_END_DECLS
-
-#endif /* __FU_UNIFYING_BOOTLOADER_TEXAS_H */

plugins/unifying/fu-unifying-bootloader.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UNIFYING_BOOTLOADER_H
+#pragma once
-#define __FU_UNIFYING_BOOTLOADER_H
 
 #include "fu-usb-device.h"
 
@@ -79,5 +78,3 @@ guint16		 fu_unifying_bootloader_get_addr_hi	(FuUnifyingBootloader	*self);
 guint16		 fu_unifying_bootloader_get_blocksize	(FuUnifyingBootloader	*self);
 
 G_END_DECLS
-
-#endif /* __FU_UNIFYING_BOOTLOADER_H */

plugins/unifying/fu-unifying-common.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UNIFYING_COMMON_H
+#pragma once
-#define __FU_UNIFYING_COMMON_H
 
 #include <glib.h>
 
@@ -31,5 +30,3 @@ gchar		*fu_unifying_format_version	(const gchar	*name,
 						 guint16	 build);
 
 G_END_DECLS
-
-#endif /* __FU_UNIFYING_COMMON_H */

plugins/unifying/fu-unifying-hidpp-msg.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UNIFYING_HIDPP_MSG_H
+#pragma once
-#define __FU_UNIFYING_HIDPP_MSG_H
 
 #include <glib.h>
 
@@ -57,5 +56,3 @@ const gchar	*fu_unifying_hidpp_msg_sub_id_to_string		(FuUnifyingHidppMsg	*msg);
 const gchar	*fu_unifying_hidpp_msg_fcn_id_to_string		(FuUnifyingHidppMsg	*msg);
 
 G_END_DECLS
-
-#endif /* __FU_UNIFYING_HIDPP_MSG_H */

plugins/unifying/fu-unifying-hidpp.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UNIFYING_HIDPP_H
+#pragma once
-#define __FU_UNIFYING_HIDPP_H
 
 #include <gio/gio.h>
 
@@ -151,5 +150,3 @@ gboolean	 fu_unifying_hidpp_transfer	(FuIOChannel		*self,
 						 GError			**error);
 
 G_END_DECLS
-
-#endif /* __FU_UNIFYING_HIDPP_H */

plugins/unifying/fu-unifying-peripheral.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UNIFYING_PERIPHERAL_H
+#pragma once
-#define __FU_UNIFYING_PERIPHERAL_H
 
 #include "fu-udev-device.h"
 
@@ -15,5 +14,3 @@ G_BEGIN_DECLS
 G_DECLARE_FINAL_TYPE (FuUnifyingPeripheral, fu_unifying_peripheral, FU, UNIFYING_PERIPHERAL, FuUdevDevice)
 
 G_END_DECLS
-
-#endif /* __FU_UNIFYING_PERIPHERAL_H */

plugins/unifying/fu-unifying-runtime.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UNIFYING_DEVICE_RUNTIME_H
+#pragma once
-#define __FU_UNIFYING_DEVICE_RUNTIME_H
 
 #include "fu-udev-device.h"
 
@@ -15,5 +14,3 @@ G_BEGIN_DECLS
 G_DECLARE_FINAL_TYPE (FuUnifyingRuntime, fu_unifying_runtime, FU, UNIFYING_RUNTIME, FuUdevDevice)
 
 G_END_DECLS
-
-#endif /* __FU_UNIFYING_DEVICE_RUNTIME_H */

plugins/wacom-raw/fu-wacom-aes-device.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_WACOM_AES_DEVICE_H
+#pragma once
-#define __FU_WACOM_AES_DEVICE_H
 
 #include "fu-wacom-device.h"
 
@@ -17,5 +16,3 @@ G_DECLARE_FINAL_TYPE (FuWacomAesDevice, fu_wacom_aes_device, FU, WACOM_AES_DEVIC
 FuWacomAesDevice	*fu_wacom_aes_device_new	(FuUdevDevice	*device);
 
 G_END_DECLS
-
-#endif /* __FU_WACOM_AES_DEVICE_H */

plugins/wacom-raw/fu-wacom-common.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_WACOM_COMMON_H
+#pragma once
-#define __FU_WACOM_COMMON_H
 
 #include <glib-object.h>
 
@@ -76,5 +75,3 @@ gboolean	 fu_wacom_common_block_is_empty	(const guint8	*data,
 						 guint16	 datasz);
 
 G_END_DECLS
-
-#endif /* __FU_WACOM_COMMON_H */

plugins/wacom-raw/fu-wacom-device.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_WACOM_DEVICE_H
+#pragma once
-#define __FU_WACOM_DEVICE_H
 
 #include "fu-wacom-common.h"
 #include "fu-udev-device.h"
@@ -52,5 +51,3 @@ guint		 fu_wacom_device_get_block_sz	(FuWacomDevice	*self);
 guint		 fu_wacom_device_get_base_addr	(FuWacomDevice	*self);
 
 G_END_DECLS
-
-#endif /* __FU_WACOM_DEVICE_H */

plugins/wacom-raw/fu-wacom-emr-device.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_WACOM_EMR_DEVICE_H
+#pragma once
-#define __FU_WACOM_EMR_DEVICE_H
 
 #include "fu-wacom-device.h"
 
@@ -17,5 +16,3 @@ G_DECLARE_FINAL_TYPE (FuWacomEmrDevice, fu_wacom_emr_device, FU, WACOM_EMR_DEVIC
 FuWacomEmrDevice	*fu_wacom_emr_device_new	(FuUdevDevice	*device);
 
 G_END_DECLS
-
-#endif /* __FU_WACOM_EMR_DEVICE_H */

plugins/wacom-usb/fu-wac-common.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_WAC_HID_H
+#pragma once
-#define __FU_WAC_HID_H
 
 #include <glib-object.h>
 
@@ -50,5 +49,3 @@ void		 fu_wac_buffer_dump			(const gchar	*title,
 							 gsize		 sz);
 
 G_END_DECLS
-
-#endif /* __FU_WAC_HID_H */

plugins/wacom-usb/fu-wac-device.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_WAC_DEVICE_H
+#pragma once
-#define __FU_WAC_DEVICE_H
 
 #include "fu-plugin.h"
 
@@ -35,5 +34,3 @@ gboolean	 fu_wac_device_set_feature_report	(FuWacDevice	*self,
 							 GError		**error);
 
 G_END_DECLS
-
-#endif /* __FU_WAC_DEVICE_H */

plugins/wacom-usb/fu-wac-firmware.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_WAC_FIRMWARE_H
+#pragma once
-#define __FU_WAC_FIRMWARE_H
 
 #include <gio/gio.h>
 
@@ -19,5 +18,3 @@ gboolean	 fu_wac_firmware_parse_data	(DfuFirmware	*firmware,
 						 GError		**error);
 
 G_END_DECLS
-
-#endif /* __FU_WAC_FIRMWARE_H */

plugins/wacom-usb/fu-wac-module-bluetooth.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_WAC_MODULE_BLUETOOTH_H
+#pragma once
-#define __FU_WAC_MODULE_BLUETOOTH_H
 
 #include "fu-wac-module.h"
 
@@ -17,5 +16,3 @@ G_DECLARE_FINAL_TYPE (FuWacModuleBluetooth, fu_wac_module_bluetooth, FU, WAC_MOD
 FuWacModule	*fu_wac_module_bluetooth_new	(GUsbDevice	*usb_device);
 
 G_END_DECLS
-
-#endif /* __FU_WAC_MODULE_BLUETOOTH_H */

plugins/wacom-usb/fu-wac-module-touch.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_WAC_MODULE_TOUCH_H
+#pragma once
-#define __FU_WAC_MODULE_TOUCH_H
 
 #include "fu-wac-module.h"
 
@@ -17,5 +16,3 @@ G_DECLARE_FINAL_TYPE (FuWacModuleTouch, fu_wac_module_touch, FU, WAC_MODULE_TOUC
 FuWacModule	*fu_wac_module_touch_new	(GUsbDevice	*usb_device);
 
 G_END_DECLS
-
-#endif /* __FU_WAC_MODULE_TOUCH_H */

plugins/wacom-usb/fu-wac-module.h

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_WAC_MODULE_H
+#pragma once
-#define __FU_WAC_MODULE_H
 
 #include "fu-plugin.h"
 
@@ -35,5 +34,3 @@ gboolean	 fu_wac_module_set_feature	(FuWacModule		*self,
 						 GError			**error);
 
 G_END_DECLS
-
-#endif /* __FU_WAC_MODULE_H */