include: Switch to #pragma once pattern

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>

35 files changed, 35 insertions, 142 deletions

diff --git a/include/osmocom/gsm/a5.h b/include/osmocom/gsm/a5.h
index 2f78a92b..c0767346 100644
--- a/include/osmocom/gsm/a5.h
+++ b/include/osmocom/gsm/a5.h
@@ -20,8 +20,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef __OSMO_A5_H__
-#define __OSMO_A5_H__
+#pragma once
 
 #include <stdint.h>
 
@@ -59,5 +58,3 @@ void osmo_a5_1(const uint8_t *key, uint32_t fn, ubit_t *dl, ubit_t *ul);
 void osmo_a5_2(const uint8_t *key, uint32_t fn, ubit_t *dl, ubit_t *ul);
 
 /*! @} */
-
-#endif /* __OSMO_A5_H__ */
diff --git a/include/osmocom/gsm/abis_nm.h b/include/osmocom/gsm/abis_nm.h
index 86b97eb5..bc13ffe0 100644
--- a/include/osmocom/gsm/abis_nm.h
+++ b/include/osmocom/gsm/abis_nm.h
@@ -1,5 +1,4 @@
-#ifndef _OSMO_GSM_ABIS_NM_H
-#define _OSMO_GSM_ABIS_NM_H
+#pragma once
 
 /*! \defgroup oml A-bis OML
  *  @{
@@ -47,5 +46,3 @@ int abis_nm_chcomb4pchan(enum gsm_phys_chan_config pchan);
 enum gsm_phys_chan_config abis_nm_pchan4chcomb(uint8_t chcomb);
 
 /*! @} */
-
-#endif /* _OSMO_GSM_ABIS_NM_H */
diff --git a/include/osmocom/gsm/comp128.h b/include/osmocom/gsm/comp128.h
index e4587d4f..33b997aa 100644
--- a/include/osmocom/gsm/comp128.h
+++ b/include/osmocom/gsm/comp128.h
@@ -4,8 +4,7 @@
  * See comp128.c for details
  */
 
-#ifndef __COMP128_H__
-#define __COMP128_H__
+#pragma once
 
 #include <stdint.h>
 
@@ -17,6 +16,3 @@
  * kc    : uint8_t [8]
  */
 void comp128(const uint8_t *ki, const uint8_t *srand, uint8_t *sres, uint8_t *kc);
-
-#endif /* __COMP128_H__ */
-
diff --git a/include/osmocom/gsm/comp128v23.h b/include/osmocom/gsm/comp128v23.h
index bebeb597..31d39335 100644
--- a/include/osmocom/gsm/comp128v23.h
+++ b/include/osmocom/gsm/comp128v23.h
@@ -4,8 +4,7 @@
  * See comp128v23.c for details
  */
 
-#ifndef __COMP128V23_H__
-#define __COMP128V23_H__
+#pragma once
 
 #include <stdint.h>
 
@@ -19,5 +18,3 @@
  */
 int comp128v2(const uint8_t *ki, const uint8_t *rand, uint8_t *sres, uint8_t *kc);
 int comp128v3(const uint8_t *ki, const uint8_t *rand, uint8_t *sres, uint8_t *kc);
-
-#endif /* __COMP128V23_H__ */
diff --git a/include/osmocom/gsm/gan.h b/include/osmocom/gsm/gan.h
index ab4c1e4e..6f2b5351 100644
--- a/include/osmocom/gsm/gan.h
+++ b/include/osmocom/gsm/gan.h
@@ -1,9 +1,6 @@
-#ifndef _OSMO_GSM_GAN_H
-#define  _OSMO_GSM_GAN_H
+#pragma once
 
 #include <osmocom/core/utils.h>
 
 extern const struct value_string gan_msgt_vals[];
 static const struct value_string gan_pdisc_vals[];
-
-#endif
diff --git a/include/osmocom/gsm/gsm0411_smc.h b/include/osmocom/gsm/gsm0411_smc.h
index 239ee13c..89964fa1 100644
--- a/include/osmocom/gsm/gsm0411_smc.h
+++ b/include/osmocom/gsm/gsm0411_smc.h
@@ -1,5 +1,4 @@
-#ifndef _GSM0411_SMC_H
-#define _GSM0411_SMC_H
+#pragma once
 
 #include <osmocom/core/timer.h>
 #include <osmocom/gsm/protocol/gsm_04_11.h>
@@ -60,5 +59,3 @@ int gsm411_smc_send(struct gsm411_smc_inst *inst, int msg_type,
 /* message from lower layer */
 int gsm411_smc_recv(struct gsm411_smc_inst *inst, int msg_type,
 	struct msgb *msg, int cp_msg_type);
-
-#endif /* _GSM0411_SMC_H */
diff --git a/include/osmocom/gsm/gsm0411_smr.h b/include/osmocom/gsm/gsm0411_smr.h
index b0614924..bc908a75 100644
--- a/include/osmocom/gsm/gsm0411_smr.h
+++ b/include/osmocom/gsm/gsm0411_smr.h
@@ -1,5 +1,4 @@
-#ifndef _GSM0411_SMR_H
-#define _GSM0411_SMR_H
+#pragma once
 
 #include <osmocom/gsm/protocol/gsm_04_11.h>
 
@@ -41,6 +40,3 @@ int gsm411_smr_send(struct gsm411_smr_inst *inst, int msg_type,
 /* message from lower layer */
 int gsm411_smr_recv(struct gsm411_smr_inst *inst, int msg_type,
 	struct msgb *msg);
-
-#endif /* _GSM0411_SMR_H */
-
diff --git a/include/osmocom/gsm/gsm0411_utils.h b/include/osmocom/gsm/gsm0411_utils.h
index ad368e67..70050105 100644
--- a/include/osmocom/gsm/gsm0411_utils.h
+++ b/include/osmocom/gsm/gsm0411_utils.h
@@ -1,5 +1,4 @@
-#ifndef _GSM0411_UTILS_H
-#define _GSM0411_UTILS_H
+#pragma once
 
 #include <time.h>
 
@@ -34,5 +33,3 @@ int gsm411_push_rp_header(struct msgb *msg, uint8_t rp_msg_type,
 /* Prefix msg with a 04.08/04.11 CP header */
 int gsm411_push_cp_header(struct msgb *msg, uint8_t proto, uint8_t trans,
 			     uint8_t msg_type);
-
-#endif /* _GSM0411_UTILS_H */
diff --git a/include/osmocom/gsm/gsm0480.h b/include/osmocom/gsm/gsm0480.h
index d6626d60..b1281629 100644
--- a/include/osmocom/gsm/gsm0480.h
+++ b/include/osmocom/gsm/gsm0480.h
@@ -1,5 +1,4 @@
-#ifndef gsm0480_h
-#define gsm0480_h
+#pragma once
 
 #include <osmocom/core/msgb.h>
 #include <osmocom/gsm/protocol/gsm_04_08.h>
@@ -22,5 +21,3 @@ struct msgb *gsm0480_create_notifySS(const char *text);
 
 int gsm0480_wrap_invoke(struct msgb *msg, int op, int link_id);
 int gsm0480_wrap_facility(struct msgb *msg);
-
-#endif
diff --git a/include/osmocom/gsm/gsm0502.h b/include/osmocom/gsm/gsm0502.h
index 46b629e4..6ee5a600 100644
--- a/include/osmocom/gsm/gsm0502.h
+++ b/include/osmocom/gsm/gsm0502.h
@@ -1,5 +1,4 @@
-#ifndef OSMOCOM_GSM_0502_H
-#define OSMOCOM_GSM_0502_H
+#pragma once
 
 #include <stdint.h>
 
@@ -34,5 +33,3 @@ gsm0502_get_paging_group(uint64_t imsi, unsigned int bs_cc_chans,
 
 unsigned int
 gsm0502_calc_paging_group(struct gsm48_control_channel_descr *chan_desc, uint64_t imsi);
-
-#endif
diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h
index 5127c003..a7e102c6 100644
--- a/include/osmocom/gsm/gsm0808.h
+++ b/include/osmocom/gsm/gsm0808.h
@@ -17,8 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  */
-#ifndef OSMOCORE_GSM0808_H
-#define OSMOCORE_GSM0808_H
+#pragma once
 
 #include "tlv.h"
 
@@ -47,5 +46,3 @@ const struct tlv_definition *gsm0808_att_tlvdef(void);
 
 const char *gsm0808_bssmap_name(uint8_t msg_type);
 const char *gsm0808_bssap_name(uint8_t msg_type);
-
-#endif
diff --git a/include/osmocom/gsm/gsm48.h b/include/osmocom/gsm/gsm48.h
index 1e7498a9..151b14e7 100644
--- a/include/osmocom/gsm/gsm48.h
+++ b/include/osmocom/gsm/gsm48.h
@@ -1,5 +1,4 @@
-#ifndef _OSMOCORE_GSM48_H
-#define _OSMOCORE_GSM48_H
+#pragma once
 
 #include <osmocom/gsm/tlv.h>
 #include <osmocom/gsm/protocol/gsm_04_08.h>
@@ -36,5 +35,3 @@ void gsm48_parse_ra(struct gprs_ra_id *raid, const uint8_t *buf);
 int gsm48_construct_ra(uint8_t *buf, const struct gprs_ra_id *raid);
 
 int gsm48_number_of_paging_subchannels(struct gsm48_control_channel_descr *chan_desc);
-
-#endif
diff --git a/include/osmocom/gsm/gsm48_ie.h b/include/osmocom/gsm/gsm48_ie.h
index f4fce25c..84454865 100644
--- a/include/osmocom/gsm/gsm48_ie.h
+++ b/include/osmocom/gsm/gsm48_ie.h
@@ -1,5 +1,4 @@
-#ifndef _OSMOCORE_GSM48_IE_H
-#define _OSMOCORE_GSM48_IE_H
+#pragma once
 
 #include <stdint.h>
 #include <string.h>
@@ -113,5 +112,3 @@ struct gsm_sysinfo_freq {
 /* decode "Cell Channel Description" (10.5.2.1b) and other frequency lists */
 int gsm48_decode_freq_list(struct gsm_sysinfo_freq *f, uint8_t *cd,
 			   uint8_t len, uint8_t mask, uint8_t frqt);
-
-#endif
diff --git a/include/osmocom/gsm/gsm_utils.h b/include/osmocom/gsm/gsm_utils.h
index 02bfe4cb..6eab7acb 100644
--- a/include/osmocom/gsm/gsm_utils.h
+++ b/include/osmocom/gsm/gsm_utils.h
@@ -22,8 +22,7 @@
  *
  */
 
-#ifndef GSM_UTILS_H
-#define GSM_UTILS_H
+#pragma once
 
 #include <stddef.h>
 #include <stdint.h>
@@ -203,6 +202,3 @@ int gsm_7bit_decode_ussd(char *decoded, const uint8_t *user_data, uint8_t length
 int gsm_7bit_encode(uint8_t *result, const char *data) OSMO_DEPRECATED("Use gsm_7bit_encode_n() instead");
 int gsm_7bit_encode_ussd(uint8_t *result, const char *data, int *octets_written) OSMO_DEPRECATED("Use gsm_7bit_encode_n_ussd() instead");
 int gsm_7bit_encode_oct(uint8_t *result, const char *data, int *octets_written) OSMO_DEPRECATED("Use gsm_7bit_encode_n() instead");
-
-
-#endif
diff --git a/include/osmocom/gsm/l1sap.h b/include/osmocom/gsm/l1sap.h
index c21abe5e..9f3fe98c 100644
--- a/include/osmocom/gsm/l1sap.h
+++ b/include/osmocom/gsm/l1sap.h
@@ -1,5 +1,4 @@
-#ifndef _OSMOCOM_L1SAP_H
-#define _OSMOCOM_L1SAP_H
+#pragma once
 
 #include <osmocom/core/prim.h>
 
@@ -121,5 +120,3 @@ struct osmo_phsap_prim {
 		struct mph_info_param info;
 	} u;			/*!< \brief request-specific data */
 };
-
-#endif /* _OSMOCOM_L1SAP_H */
diff --git a/include/osmocom/gsm/lapd_core.h b/include/osmocom/gsm/lapd_core.h
index f88fb112..42ef417e 100644
--- a/include/osmocom/gsm/lapd_core.h
+++ b/include/osmocom/gsm/lapd_core.h
@@ -1,5 +1,4 @@
-#ifndef _OSMOCOM_LAPD_H
-#define _OSMOCOM_LAPD_H
+#pragma once
 
 #include <stdint.h>
 
@@ -170,5 +169,3 @@ int lapd_ph_data_ind(struct msgb *msg, struct lapd_msg_ctx *lctx);
 int lapd_recv_dlsap(struct osmo_dlsap_prim *dp, struct lapd_msg_ctx *lctx);
 
 /*! @} */
-
-#endif /* _OSMOCOM_LAPD_H */
diff --git a/include/osmocom/gsm/lapdm.h b/include/osmocom/gsm/lapdm.h
index 93934068..84d109d5 100644
--- a/include/osmocom/gsm/lapdm.h
+++ b/include/osmocom/gsm/lapdm.h
@@ -1,5 +1,4 @@
-#ifndef _OSMOCOM_LAPDM_H
-#define _OSMOCOM_LAPDM_H
+#pragma once
 
 #include <osmocom/gsm/l1sap.h>
 #include <osmocom/gsm/lapd_core.h>
@@ -112,5 +111,3 @@ void lapdm_channel_set_flags(struct lapdm_channel *lc, unsigned int flags);
 int lapdm_phsap_dequeue_prim(struct lapdm_entity *le, struct osmo_phsap_prim *pp);
 
 /*! @} */
-
-#endif /* _OSMOCOM_LAPDM_H */
diff --git a/include/osmocom/gsm/meas_rep.h b/include/osmocom/gsm/meas_rep.h
index bd24bbed..09c2c4f2 100644
--- a/include/osmocom/gsm/meas_rep.h
+++ b/include/osmocom/gsm/meas_rep.h
@@ -1,5 +1,4 @@
-#ifndef _OSMO_MEAS_REP_H
-#define _OSMO_MEAS_REP_H
+#pragma once
 
 #include <stdint.h>
 
@@ -25,5 +24,3 @@ enum meas_rep_field {
 	MEAS_REP_UL_RXQUAL_FULL,
 	MEAS_REP_UL_RXQUAL_SUB,
 };
-
-#endif
diff --git a/include/osmocom/gsm/mncc.h b/include/osmocom/gsm/mncc.h
index a51267e0..171db7ab 100644
--- a/include/osmocom/gsm/mncc.h
+++ b/include/osmocom/gsm/mncc.h
@@ -1,5 +1,4 @@
-#ifndef _OSMOCORE_MNCC_H
-#define _OSMOCORE_MNCC_H
+#pragma once
 
 #include <osmocom/gsm/protocol/gsm_04_08.h>
 
@@ -81,5 +80,3 @@ enum {
 	GSM_MNCC_BCAP_OTHER_ITC = 5,
 	GSM_MNCC_BCAP_RESERVED	= 7,
 };
-
-#endif
diff --git a/include/osmocom/gsm/prim.h b/include/osmocom/gsm/prim.h
index 5beb2007..5f61dc7c 100644
--- a/include/osmocom/gsm/prim.h
+++ b/include/osmocom/gsm/prim.h
@@ -1,5 +1,4 @@
-#ifndef OSMO_GSM_PRIM_H
-#define OSMO_GSM_PRIM_H
+#pragma once
 
 #include <osmocom/core/prim.h>
 
@@ -14,5 +13,3 @@ enum osmo_gsm_sap {
 	SAP_BSSGP_NM,
 	SAP_BSSGP_PFM,
 };
-
-#endif
diff --git a/include/osmocom/gsm/protocol/gsm_03_41.h b/include/osmocom/gsm/protocol/gsm_03_41.h
index 54365cbc..b6efb5e9 100644
--- a/include/osmocom/gsm/protocol/gsm_03_41.h
+++ b/include/osmocom/gsm/protocol/gsm_03_41.h
@@ -1,5 +1,4 @@
-#ifndef PROTO_GSM_03_41_H
-#define PROTO_GSM_03_41_H
+#pragma once
 
 #include <stdint.h>
 
@@ -47,5 +46,3 @@ struct gsm341_etws_message {
 #define GSM341_GS_PLMN_WIDE		1
 #define GSM341_GS_LA_WIDE		2
 #define GSM341_GS_CELL_WIDE		3
-
-#endif /* PROTO_GSM_03_41_H */
diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h
index 8fa5d9a1..9fcdddc2 100644
--- a/include/osmocom/gsm/protocol/gsm_04_08.h
+++ b/include/osmocom/gsm/protocol/gsm_04_08.h
@@ -1,5 +1,4 @@
-#ifndef PROTO_GSM_04_08_H
-#define PROTO_GSM_04_08_H
+#pragma once
 
 #include <stdint.h>
 
@@ -1336,5 +1335,3 @@ struct gsm48_ra_id {
 
 #define GSM_MACBLOCK_LEN	23
 #define GSM_MACBLOCK_PADDING	0x2b
-
-#endif /* PROTO_GSM_04_08_H */
diff --git a/include/osmocom/gsm/protocol/gsm_04_11.h b/include/osmocom/gsm/protocol/gsm_04_11.h
index 38dd5536..651adcaa 100644
--- a/include/osmocom/gsm/protocol/gsm_04_11.h
+++ b/include/osmocom/gsm/protocol/gsm_04_11.h
@@ -1,5 +1,4 @@
-#ifndef PROTO_GSM_04_11_H
-#define PROTO_GSM_04_11_H
+#pragma once
 
 #include <stdint.h>
 
@@ -186,5 +185,3 @@ enum sms_alphabet {
 #define GSM338_DCS_1111_CLASS1_ME	1
 #define GSM338_DCS_1111_CLASS2_SIM	2
 #define GSM338_DCS_1111_CLASS3_TE	3	/* See TS 07.05 */
-
-#endif /* PROTO_GSM_04_11_H */
diff --git a/include/osmocom/gsm/protocol/gsm_04_12.h b/include/osmocom/gsm/protocol/gsm_04_12.h
index 9b1538a5..aa40648c 100644
--- a/include/osmocom/gsm/protocol/gsm_04_12.h
+++ b/include/osmocom/gsm/protocol/gsm_04_12.h
@@ -1,5 +1,4 @@
-#ifndef PROTO_GSM_04_12_H
-#define PROTO_GSM_04_12_H
+#pragma once
 
 #include <stdint.h>
 
@@ -27,5 +26,3 @@ struct gsm412_sched_msg {
 	uint8_t cbsms_msg_map[6];
 	uint8_t data[0];
 } __attribute__((packed));
-
-#endif
diff --git a/include/osmocom/gsm/protocol/gsm_04_80.h b/include/osmocom/gsm/protocol/gsm_04_80.h
index fa5c9451..2aebb46e 100644
--- a/include/osmocom/gsm/protocol/gsm_04_80.h
+++ b/include/osmocom/gsm/protocol/gsm_04_80.h
@@ -1,5 +1,4 @@
-#ifndef PROTO_GSM_04_80_H
-#define PROTO_GSM_04_80_H
+#pragma once
 
 /* GSM TS 04.80  definitions (Supplementary Services Specification, Formats and Coding) */
 
@@ -122,5 +121,3 @@
 #define ASN1_PRINTABLE_STRING_TAG	0x13
 #define ASN1_IA5_STRING_TAG		0x16
 #define ASN1_UNICODE_STRING_TAG		0x1E
-
-#endif /* PROTO_GSM_04_80_H */
diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h
index 6b8f9359..bf408eb6 100644
--- a/include/osmocom/gsm/protocol/gsm_08_08.h
+++ b/include/osmocom/gsm/protocol/gsm_08_08.h
@@ -1,7 +1,6 @@
 /* From GSM08.08 */
 
-#ifndef GSM_0808_H
-#define GSM_0808_H
+#pragma once
 
 #include <stdlib.h>
 
@@ -299,5 +298,3 @@ enum gsm0808_permitted_speech {
 	GSM0808_PERM_HR2	= GSM0808_PERM_FR2 | 0x4,
 	GSM0808_PERM_HR3	= GSM0808_PERM_FR3 | 0x4,
 };
-
-#endif
diff --git a/include/osmocom/gsm/protocol/gsm_08_58.h b/include/osmocom/gsm/protocol/gsm_08_58.h
index 89aafb87..3f01a926 100644
--- a/include/osmocom/gsm/protocol/gsm_08_58.h
+++ b/include/osmocom/gsm/protocol/gsm_08_58.h
@@ -1,5 +1,4 @@
-#ifndef PROTO_GSM_08_58_H
-#define PROTO_GSM_08_58_H
+#pragma once
 
 /* GSM Radio Signalling Link messages on the A-bis interface 
  * 3GPP TS 08.58 version 8.6.0 Release 1999 / ETSI TS 100 596 V8.6.0 */
@@ -579,5 +578,3 @@ enum rsl_rel_mode {
 };
 
 /*! @} */
-
-#endif /* PROTO_GSM_08_58_H */
diff --git a/include/osmocom/gsm/protocol/gsm_12_21.h b/include/osmocom/gsm/protocol/gsm_12_21.h
index ad0890c7..4e8e72b9 100644
--- a/include/osmocom/gsm/protocol/gsm_12_21.h
+++ b/include/osmocom/gsm/protocol/gsm_12_21.h
@@ -1,5 +1,4 @@
-#ifndef PROTO_GSM_12_21_H
-#define PROTO_GSM_12_21_H
+#pragma once
 
 /* GSM Network Management messages on the A-bis interface 
  * 3GPP TS 12.21 version 8.0.0 Release 1999 / ETSI TS 100 623 V8.0.0 */
@@ -748,5 +747,3 @@ enum ipac_bcch_info_type {
 };
 
 /*! @} */
-
-#endif /* PROTO_GSM_12_21_H */
diff --git a/include/osmocom/gsm/protocol/gsm_44_318.h b/include/osmocom/gsm/protocol/gsm_44_318.h
index cd5ec05a..5d7f8787 100644
--- a/include/osmocom/gsm/protocol/gsm_44_318.h
+++ b/include/osmocom/gsm/protocol/gsm_44_318.h
@@ -1,5 +1,4 @@
-#ifndef PROTO_GSM_44_318_H
-#define PROTO_GSM_44_318_H
+#pragma once
 
 #include <stdint.h>
 
@@ -197,4 +196,3 @@ struct gan_cch_desc_ie {
 #endif
 	uint8_t access_class[2];
 } __attribute__((packed));
-#endif /* PROTO_GSM_44_318_H */
diff --git a/include/osmocom/gsm/protocol/ipaccess.h b/include/osmocom/gsm/protocol/ipaccess.h
index 5d98a21f..254c2bcd 100644
--- a/include/osmocom/gsm/protocol/ipaccess.h
+++ b/include/osmocom/gsm/protocol/ipaccess.h
@@ -1,5 +1,4 @@
-#ifndef _OSMO_PROTO_IPACCESS_H
-#define _OSMO_PROTO_IPACCESS_H
+#pragma once
 
 #include <stdint.h>
 
@@ -90,5 +89,3 @@ struct sdp_header_entry {
 	uint32_t addr2;
 	uint32_t start;
 } __attribute__((packed));
-
-#endif /* _OSMO_PROTO_IPACCESS_H */
diff --git a/include/osmocom/gsm/protocol/smpp34_osmocom.h b/include/osmocom/gsm/protocol/smpp34_osmocom.h
index 20e9206e..cff6adba 100644
--- a/include/osmocom/gsm/protocol/smpp34_osmocom.h
+++ b/include/osmocom/gsm/protocol/smpp34_osmocom.h
@@ -1,5 +1,4 @@
-#ifndef _SMPP34_OSMOCOM_H
-#define _SMPP34_OSMOCOM_H
+#pragma once
 /* Osmocom SMPP extensions */
 
 /* Osmocom specific new TLV definitions */
@@ -44,5 +43,3 @@
  * 	TLVID_osmo_rxqual_dl
  * 	TLVID_osmo_imei
  */
-
-#endif
diff --git a/include/osmocom/gsm/rsl.h b/include/osmocom/gsm/rsl.h
index b8e4157a..753dd191 100644
--- a/include/osmocom/gsm/rsl.h
+++ b/include/osmocom/gsm/rsl.h
@@ -1,5 +1,4 @@
-#ifndef _OSMOCORE_RSL_H
-#define _OSMOCORE_RSL_H
+#pragma once
 
 #include <stdint.h>
 #include <osmocom/core/utils.h>
@@ -51,5 +50,3 @@ struct msgb *rsl_rll_simple(uint8_t msg_type, uint8_t chan_nr,
 			    uint8_t link_id, int transparent);
 
 /*! @} */
-
-#endif /* _OSMOCORE_RSL_H */
diff --git a/include/osmocom/gsm/rxlev_stat.h b/include/osmocom/gsm/rxlev_stat.h
index 415509dc..7183b173 100644
--- a/include/osmocom/gsm/rxlev_stat.h
+++ b/include/osmocom/gsm/rxlev_stat.h
@@ -1,5 +1,4 @@
-#ifndef _OSMOCORE_RXLEV_STATS_H
-#define _OSMOCORE_RXLEV_STATS_H
+#pragma once
 
 #define NUM_RXLEVS 32
 #define NUM_ARFCNS 1024
@@ -18,5 +17,3 @@ int16_t rxlev_stat_get_next(const struct rxlev_stats *st, uint8_t rxlev, int16_t
 void rxlev_stat_reset(struct rxlev_stats *st);
 
 void rxlev_stat_dump(const struct rxlev_stats *st);
-
-#endif /* _OSMOCORE_RXLEV_STATS_H */
diff --git a/include/osmocom/gsm/sysinfo.h b/include/osmocom/gsm/sysinfo.h
index 06feb1de..7d1fe2bc 100644
--- a/include/osmocom/gsm/sysinfo.h
+++ b/include/osmocom/gsm/sysinfo.h
@@ -1,5 +1,4 @@
-#ifndef _OSMO_GSM_SYSINFO_H
-#define _OSMO_GSM_SYSINFO_H
+#pragma once
 
 #include <osmocom/core/utils.h>
 #include <osmocom/gsm/protocol/gsm_04_08.h>
@@ -39,5 +38,3 @@ extern const struct value_string osmo_sitype_strs[_MAX_SYSINFO_TYPE];
 
 uint8_t osmo_sitype2rsl(enum osmo_sysinfo_type si_type);
 enum osmo_sysinfo_type osmo_rsl2sitype(uint8_t rsl_si);
-
-#endif /* _OSMO_GSM_SYSINFO_H */
diff --git a/include/osmocom/gsm/tlv.h b/include/osmocom/gsm/tlv.h
index a70b0f9c..fda1810e 100644
--- a/include/osmocom/gsm/tlv.h
+++ b/include/osmocom/gsm/tlv.h
@@ -1,5 +1,4 @@
-#ifndef _TLV_H
-#define _TLV_H
+#pragma once
 
 #include <stdint.h>
 #include <string.h>
@@ -435,5 +434,3 @@ static inline uint32_t tlvp_val32_unal(const struct tlv_parsed *tp, int pos)
 }
 
 /*! @} */
-
-#endif /* _TLV_H */