diff --git a/src/bmi270/accel_gyro.h b/src/bmi270/accel_gyro.h
index 55242942..2c3ea366 100644
--- a/src/bmi270/accel_gyro.h
+++ b/src/bmi270/accel_gyro.h
@@ -1,5 +1,4 @@
-#ifndef _ACCEL_GYRO_H
-#define _ACCEL_GYRO_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -24,5 +23,3 @@ float gyr_to_dps(int16_t gyr);
 #ifdef __cplusplus
 }
 #endif
-
-#endif //_ACCEL_GYRO_H
diff --git a/src/bmi270/bmi2.h b/src/bmi270/bmi2.h
index 585ffe23..261f62ea 100644
--- a/src/bmi270/bmi2.h
+++ b/src/bmi270/bmi2.h
@@ -46,8 +46,7 @@
  * @brief Sensor driver for BMI2 sensor
  */
 
-#ifndef BMI2_H_
-#define BMI2_H_
+#pragma once
 
 /*! CPP guard */
 #ifdef __cplusplus
@@ -1481,5 +1480,3 @@ int8_t bmi2_get_feat_config(uint8_t sw_page, uint8_t *feat_config, struct bmi2_d
 #ifdef __cplusplus
 }
 #endif /* End of CPP guard */
-
-#endif /* BMI2_H_ */
diff --git a/src/bmi270/bmi270.h b/src/bmi270/bmi270.h
index 96a6f724..2f0f4b01 100644
--- a/src/bmi270/bmi270.h
+++ b/src/bmi270/bmi270.h
@@ -42,8 +42,7 @@
  * @brief Sensor driver for BMI270 sensor
  */
 
-#ifndef BMI270_H_
-#define BMI270_H_
+#pragma once
 
 /*! CPP guard */
 #ifdef __cplusplus
@@ -416,5 +415,3 @@ int8_t bmi270_map_feat_int(const struct bmi2_sens_int_config *sens_int, uint8_t
 #ifdef __cplusplus
 }
 #endif /* End of CPP guard */
-
-#endif /* BMI270_H_ */
diff --git a/src/bmi270/bmi2_defs.h b/src/bmi270/bmi2_defs.h
index 031a0da2..185c5dae 100644
--- a/src/bmi270/bmi2_defs.h
+++ b/src/bmi270/bmi2_defs.h
@@ -36,9 +36,7 @@
 *
 */
 
-#ifndef BMI2_DEFS_H_
-#define BMI2_DEFS_H_
-
+#pragma once
 /******************************************************************************/
 /*! @name       Header includes                           */
 /******************************************************************************/
@@ -2654,5 +2652,3 @@ struct bmi2_hc_act_recg_sett
     /*! Minimum segments belonging to a certain activity type */
     uint16_t min_seg_conf;
 };
-
-#endif /* BMI2_DEFS_H_ */
diff --git a/src/bmi270/common.h b/src/bmi270/common.h
index 3b9668b5..d67f41e4 100644
--- a/src/bmi270/common.h
+++ b/src/bmi270/common.h
@@ -1,5 +1,4 @@
-#ifndef _COMMON_H
-#define _COMMON_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -110,5 +109,3 @@ void bmi2_error_codes_print_result(int8_t rslt);
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* _COMMON_H */
diff --git a/src/core/MadgwickAHRS.h b/src/core/MadgwickAHRS.h
index 2f83c9c6..b17cd539 100644
--- a/src/core/MadgwickAHRS.h
+++ b/src/core/MadgwickAHRS.h
@@ -10,8 +10,7 @@
 // 02/10/2011	SOH Madgwick	Optimised for reduced CPU load
 //
 //=====================================================================================================
-#ifndef MadgwickAHRS_h
-#define MadgwickAHRS_h
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -31,7 +30,6 @@ float getYaw();
 }
 #endif
 
-#endif
 //=====================================================================================================
 // End of file
 //=====================================================================================================
diff --git a/src/core/common.hh b/src/core/common.hh
index 87e4a2c3..038e1e34 100644
--- a/src/core/common.hh
+++ b/src/core/common.hh
@@ -1,5 +1,4 @@
-#ifndef __COMMON_HH__
-#define __COMMON_HH__
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -38,5 +37,3 @@ extern pthread_mutex_t lvgl_mutex;
 #ifdef __cplusplus
 }
 #endif
-
-#endif //__COMMON_HH__
diff --git a/src/core/elrs.h b/src/core/elrs.h
index 9defe344..89fcc1ba 100644
--- a/src/core/elrs.h
+++ b/src/core/elrs.h
@@ -1,5 +1,4 @@
-#ifndef __ELRS_H__
-#define __ELRS_H__
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -89,5 +88,3 @@ void msp_channel_update();
 #ifdef __cplusplus
 }
 #endif
-
-#endif //__ELRS_H__
diff --git a/src/core/esp32_flash.h b/src/core/esp32_flash.h
index 73490e6c..9b5a8e90 100644
--- a/src/core/esp32_flash.h
+++ b/src/core/esp32_flash.h
@@ -1,5 +1,4 @@
-#ifndef __ESP32_FLASH_H__
-#define __ESP32_FLASH_H__
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -14,5 +13,3 @@ void loader_port_close();
 #ifdef __cplusplus
 }
 #endif
-
-#endif //__ESP32_FLASH_H__
diff --git a/src/core/ht.h b/src/core/ht.h
index 479329bd..a3d48742 100644
--- a/src/core/ht.h
+++ b/src/core/ht.h
@@ -1,5 +1,4 @@
-#ifndef __HT_C__
-#define __HT_C__
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -62,5 +61,3 @@ int16_t *ht_get_channels();
 #ifdef __cplusplus
 }
 #endif
-
-#endif //__HT_C__
diff --git a/src/core/input_device.h b/src/core/input_device.h
index 16c21960..92e406c2 100644
--- a/src/core/input_device.h
+++ b/src/core/input_device.h
@@ -1,5 +1,4 @@
-#ifndef _INPUT_DEVICE_H
-#define _INPUT_DEVICE_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -21,5 +20,3 @@ void rbtn_click(right_button_t click_type);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/core/msp_displayport.h b/src/core/msp_displayport.h
index d66241c2..5c7faeac 100644
--- a/src/core/msp_displayport.h
+++ b/src/core/msp_displayport.h
@@ -1,5 +1,4 @@
-#ifndef __MSP_DISPLAYPORT_H
-#define __MSP_DISPLAYPORT_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -83,5 +82,3 @@ extern uint16_t last_rcv_seconds1;
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/core/osd.h b/src/core/osd.h
index e99092ef..c48f1232 100644
--- a/src/core/osd.h
+++ b/src/core/osd.h
@@ -1,5 +1,4 @@
-#ifndef _OSD_H
-#define _OSD_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -105,5 +104,3 @@ void osd_resource_path(char *buf, const char *fmt, osd_resource_t osd_resource_t
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/core/thread.h b/src/core/thread.h
index ecfe0d9f..2df0bee4 100644
--- a/src/core/thread.h
+++ b/src/core/thread.h
@@ -1,5 +1,4 @@
-#ifndef _THREAD_H
-#define _THREAD_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -23,5 +22,3 @@ int create_threads();
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/driver/TP2825.h b/src/driver/TP2825.h
index 3f6e1cbe..bd60f17b 100644
--- a/src/driver/TP2825.h
+++ b/src/driver/TP2825.h
@@ -1,5 +1,4 @@
-#ifndef _TP2825_H
-#define _TP2825_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -18,5 +17,3 @@ void TP2825_Set_Clamp(int);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/driver/dm5680.h b/src/driver/dm5680.h
index 395f75d3..343b26db 100644
--- a/src/driver/dm5680.h
+++ b/src/driver/dm5680.h
@@ -1,5 +1,4 @@
-#ifndef _DM5680_H
-#define _DM5680_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -64,5 +63,3 @@ void DM5680_OSD_parse(uint8_t *buf, uint8_t len);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/driver/dm6302.h b/src/driver/dm6302.h
index 8d40d1d0..8fb9e579 100644
--- a/src/driver/dm6302.h
+++ b/src/driver/dm6302.h
@@ -1,5 +1,4 @@
-#ifndef __DM6302_H_
-#define __DM6302_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -43,5 +42,3 @@ void SPI_Read(uint8_t page, uint16_t addr, uint32_t *dat0, uint32_t *dat1);
 #ifdef __cplusplus
 }
 #endif
-
-#endif // __DM6302_H_
diff --git a/src/driver/esp32.h b/src/driver/esp32.h
index 9d30f707..7821bbaf 100644
--- a/src/driver/esp32.h
+++ b/src/driver/esp32.h
@@ -1,5 +1,4 @@
-#ifndef __ESP32_H__
-#define __ESP32_H__
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -22,5 +21,3 @@ void esp32_handler_timeout(); // handle a character read timeout
 #ifdef __cplusplus
 }
 #endif
-
-#endif //__ESP32_H__
diff --git a/src/driver/fans.h b/src/driver/fans.h
index a2578dd9..929f8d82 100644
--- a/src/driver/fans.h
+++ b/src/driver/fans.h
@@ -1,5 +1,4 @@
-#ifndef _FANS_H
-#define _FANS_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -22,5 +21,3 @@ extern fan_speed_t fan_speed;
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/driver/hardware.h b/src/driver/hardware.h
index c64dd1dd..e4d2b1dd 100644
--- a/src/driver/hardware.h
+++ b/src/driver/hardware.h
@@ -1,5 +1,4 @@
-#ifndef _HARDWARE_H
-#define _HARDWARE_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -95,5 +94,3 @@ int Get_HAN_status();          // ret: 0=error; 1=ok
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/driver/it66021.h b/src/driver/it66021.h
index 0517d586..c5ee1133 100644
--- a/src/driver/it66021.h
+++ b/src/driver/it66021.h
@@ -1,5 +1,4 @@
-#ifndef _IT66021_H
-#define _IT66021_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -18,5 +17,3 @@ void IT66021_edid();
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/driver/it66121.h b/src/driver/it66121.h
index d5aca985..568c1a5d 100644
--- a/src/driver/it66121.h
+++ b/src/driver/it66121.h
@@ -1,5 +1,4 @@
-#ifndef _IT66121_H
-#define _IT66121_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -11,5 +10,3 @@ void IT66121_init();
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/driver/nct75.h b/src/driver/nct75.h
index 438ee17f..c353970d 100644
--- a/src/driver/nct75.h
+++ b/src/driver/nct75.h
@@ -1,5 +1,4 @@
-#ifndef _NCT75_H
-#define _NCT75_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -26,5 +25,3 @@ int nct_read_temperature(nct_type_t type);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/driver/oled.h b/src/driver/oled.h
index 2fd7caf7..d6861b99 100644
--- a/src/driver/oled.h
+++ b/src/driver/oled.h
@@ -1,5 +1,4 @@
-#ifndef _OLED_H
-#define _OLED_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -30,5 +29,3 @@ void MFPGA_SetRatio(int ratio);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/driver/uart.h b/src/driver/uart.h
index ba86e2f9..bb99d9d3 100644
--- a/src/driver/uart.h
+++ b/src/driver/uart.h
@@ -1,5 +1,4 @@
-#ifndef __UART_H_
-#define __UART_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -19,5 +18,3 @@ int uart_write(int fd, uint8_t *data, int len);
 #ifdef __cplusplus
 }
 #endif
-
-#endif // __UART_H_
diff --git a/src/player/adec2ao.h b/src/player/adec2ao.h
index 80fd0cc5..69617f33 100644
--- a/src/player/adec2ao.h
+++ b/src/player/adec2ao.h
@@ -1,5 +1,4 @@
-#ifndef __ADEC2AO_H_
-#define __ADEC2AO_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -72,5 +71,3 @@ bool adec2ao_isEOF(Adec2AoContext_t *aa);
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* __AI2AENC_H_ */
diff --git a/src/player/appmsg.h b/src/player/appmsg.h
index c61a1b7e..f6d1990f 100644
--- a/src/player/appmsg.h
+++ b/src/player/appmsg.h
@@ -1,5 +1,4 @@
-#ifndef __APPMSG_H_
-#define __APPMSG_H_
+#pragma once
 
 #if defined (__cplusplus)
 extern "C" {
@@ -54,6 +53,3 @@ typedef struct
 #if defined (__cplusplus)
 }
 #endif
-
-#endif //__APPMSG_H_
-
diff --git a/src/player/awdmx.h b/src/player/awdmx.h
index 5b4cb6a1..d9ab4c4c 100644
--- a/src/player/awdmx.h
+++ b/src/player/awdmx.h
@@ -1,5 +1,4 @@
-#ifndef __AWDMX_H_
-#define __AWDMX_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -54,5 +53,3 @@ bool awdmx_isEOF(AwdmxContext_t *dmxCtx);
 #ifdef __cplusplus
 }
 #endif /* End of #ifdef __cplusplus */
-
-#endif //__AWDMX_H_
diff --git a/src/player/gogglemsg.h b/src/player/gogglemsg.h
index 0968f4e7..9ffc1f2f 100644
--- a/src/player/gogglemsg.h
+++ b/src/player/gogglemsg.h
@@ -1,5 +1,4 @@
-#ifndef __GOGGLEMSG_H_
-#define __GOGGLEMSG_H_
+#pragma once
 
 #if defined (__cplusplus)
 extern "C" {
@@ -48,6 +47,3 @@ int gogglemsg_flush( GoggleMsgType_e mtype );
 #if defined (__cplusplus)
 }
 #endif
-
-#endif //__GOGGLEMSG_H_
-
diff --git a/src/player/media.h b/src/player/media.h
index 40868afc..e713f3b1 100644
--- a/src/player/media.h
+++ b/src/player/media.h
@@ -1,5 +1,4 @@
-#ifndef _MEDIA_H
-#define _MEDIA_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -44,5 +43,3 @@ void media_control(media_t *media, player_cmd_t *cmd);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/player/vdec2vo.h b/src/player/vdec2vo.h
index daa2b4f2..2f94aa2d 100644
--- a/src/player/vdec2vo.h
+++ b/src/player/vdec2vo.h
@@ -1,5 +1,4 @@
-#ifndef __VDEC2VO_H_
-#define __VDEC2VO_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -77,5 +76,3 @@ bool vdec2vo_isEOF(Vdec2VoContext_t *vvCtx);
 #ifdef __cplusplus
 }
 #endif /* End of #ifdef __cplusplus */
-
-#endif //__VDEC2VO_H_
diff --git a/src/player/version.h b/src/player/version.h
index 9570eff3..51ab07a9 100644
--- a/src/player/version.h
+++ b/src/player/version.h
@@ -1,5 +1,4 @@
-#ifndef __VERSION_H_
-#define __VERSION_H_
+#pragma once
 
 #if defined(__cplusplus)
 extern "C" {
@@ -13,5 +12,3 @@ extern "C" {
 #if defined(__cplusplus)
 }
 #endif
-
-#endif //__APPMSG_H_
diff --git a/src/record/ai2ao.h b/src/record/ai2ao.h
index edd029d5..477b0c27 100755
--- a/src/record/ai2ao.h
+++ b/src/record/ai2ao.h
@@ -1,5 +1,4 @@
-#ifndef __AI2AO_H_
-#define __AI2AO_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -54,6 +53,3 @@ bool      ai2ao_playing(Ai2Ao_t* aa);
 #ifdef __cplusplus
 }
 #endif
-
-#endif  /* __AI2AENC_H_ */
-
diff --git a/src/record/appmsg.h b/src/record/appmsg.h
index 967cad3b..2167cfa4 100755
--- a/src/record/appmsg.h
+++ b/src/record/appmsg.h
@@ -1,5 +1,4 @@
-#ifndef __APPMSG_H_
-#define __APPMSG_H_
+#pragma once
 
 #if defined (__cplusplus)
 extern "C" {
@@ -52,6 +51,3 @@ typedef enum {
 #if defined (__cplusplus)
 }
 #endif
-
-#endif //__APPMSG_H_
-
diff --git a/src/record/avshare.h b/src/record/avshare.h
index 9aa29369..46ab1ae8 100644
--- a/src/record/avshare.h
+++ b/src/record/avshare.h
@@ -14,8 +14,7 @@
     Modification: Created file
 
 ******************************************************************************/
-#ifndef _AVSHARE_H_
-#define _AVSHARE_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -63,5 +62,3 @@ void avshare_reset(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/record/confparser.h b/src/record/confparser.h
index 51bf8e58..eef01cee 100755
--- a/src/record/confparser.h
+++ b/src/record/confparser.h
@@ -1,5 +1,4 @@
-#ifndef __CONFIG_PARSER_H__
-#define __CONFIG_PARSER_H__
+#pragma once
 
 #ifdef __cplusplus
 extern "C"{
@@ -27,6 +26,3 @@ void conf_saveRecordParams(char* confFile, RecordParams_t* recPara);
 #ifdef __cplusplus
 }
 #endif /* End of #ifdef __cplusplus */
-
-#endif //__CONFIG_PARSER_H__
-
diff --git a/src/record/disk.h b/src/record/disk.h
index 8d2734ac..24bdd394 100644
--- a/src/record/disk.h
+++ b/src/record/disk.h
@@ -1,5 +1,4 @@
-#ifndef __DISK_H_
-#define __DISK_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -31,5 +30,3 @@ bool     disk_sdstat(uint32_t mbFull, SdcardStatus_t* sds);
 #ifdef __cplusplus
 }
 #endif
-
-#endif // __DISK_H_
diff --git a/src/record/ffpack.h b/src/record/ffpack.h
index ebb8f089..35e99d21 100755
--- a/src/record/ffpack.h
+++ b/src/record/ffpack.h
@@ -1,5 +1,4 @@
-#ifndef __FFPACK_H_
-#define __FFPACK_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -72,5 +71,3 @@ int  ffpack_setExtradata(FFPack_t* ff, int streamIndex, void* extradata, int ext
 #ifdef __cplusplus
 }
 #endif
-
-#endif //__FFPACK_H_
diff --git a/src/record/gogglemsg.h b/src/record/gogglemsg.h
index 6ba90b85..8598cc33 100755
--- a/src/record/gogglemsg.h
+++ b/src/record/gogglemsg.h
@@ -1,5 +1,4 @@
-#ifndef __GOGGLEMSG_H_
-#define __GOGGLEMSG_H_
+#pragma once
 
 #if defined (__cplusplus)
 extern "C" {
@@ -48,6 +47,3 @@ int gogglemsg_flush( GoggleMsgType_e mtype );
 #if defined (__cplusplus)
 }
 #endif
-
-#endif //__GOGGLEMSG_H_
-
diff --git a/src/record/jpegenc.h b/src/record/jpegenc.h
index 01cd28c0..469fe140 100644
--- a/src/record/jpegenc.h
+++ b/src/record/jpegenc.h
@@ -1,5 +1,4 @@
-#ifndef __JPEGENC_H_
-#define __JPEGENC_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -51,5 +50,3 @@ int jpegenc_takePicture(JpegEncIO_t* io, JpegEncConfig_t* config, int32_t s32Mil
 #ifdef __cplusplus
 }
 #endif
-
-#endif  /* __JPEGENC_H_ */
diff --git a/src/record/log.h b/src/record/log.h
index 89dc4256..4ddce434 100644
--- a/src/record/log.h
+++ b/src/record/log.h
@@ -1,7 +1,6 @@
 /** log.h **/
 
-#ifndef __LOG_H__
-#define __LOG_H__
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -46,5 +45,3 @@ void log_close(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* __LOG_H__ */
diff --git a/src/record/record.h b/src/record/record.h
index 0c49968a..3baf5b0f 100644
--- a/src/record/record.h
+++ b/src/record/record.h
@@ -1,6 +1,4 @@
-
-#ifndef __RECORD_H_
-#define __RECORD_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -103,5 +101,3 @@ typedef struct
 #ifdef __cplusplus
 }
 #endif
-
-#endif  /* __RECORD_H_ */
diff --git a/src/record/record_definitions.h b/src/record/record_definitions.h
index b46a99b4..437758dc 100644
--- a/src/record/record_definitions.h
+++ b/src/record/record_definitions.h
@@ -1,5 +1,4 @@
-#ifndef RECORD_DEFINITIONS_H_
-#define RECORD_DEFINITIONS_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -97,5 +96,3 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* RECORD_DEFINITIONS_H_ */
diff --git a/src/record/spspps_patch.h b/src/record/spspps_patch.h
index 4e0f349e..2094becf 100644
--- a/src/record/spspps_patch.h
+++ b/src/record/spspps_patch.h
@@ -1,5 +1,4 @@
-#ifndef __SPSPPS_PATCH_H_
-#define __SPSPPS_PATCH_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -11,5 +10,3 @@ int H265_Modify_SPS(uint8_t* src, int srcSize, int fps);
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* __SPSPPS_PATCH_H_ */
diff --git a/src/record/version.h b/src/record/version.h
index d275018f..c3caa9bc 100755
--- a/src/record/version.h
+++ b/src/record/version.h
@@ -1,5 +1,4 @@
-#ifndef __VERSION_H_
-#define __VERSION_H_
+#pragma once
 
 #if defined (__cplusplus)
 extern "C" {
@@ -13,6 +12,3 @@ extern "C" {
 #if defined (__cplusplus)
 }
 #endif
-
-#endif //__APPMSG_H_
-
diff --git a/src/record/vi2venc.h b/src/record/vi2venc.h
index abfa6e3c..daa22c16 100644
--- a/src/record/vi2venc.h
+++ b/src/record/vi2venc.h
@@ -1,5 +1,4 @@
-#ifndef __VI2VENC_H_
-#define __VI2VENC_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -231,6 +230,3 @@ char*     vi2venc_getProfileName(VencProfile_e profile, bool h265);
 #ifdef __cplusplus
 }
 #endif
-
-#endif  /* __VI2VENC_H_ */
-
diff --git a/src/record/vi2venc_live.h b/src/record/vi2venc_live.h
index c041070b..22ace207 100644
--- a/src/record/vi2venc_live.h
+++ b/src/record/vi2venc_live.h
@@ -1,5 +1,4 @@
-#ifndef __VI2VENC_LIVE_H_
-#define __VI2VENC_LIVE_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -14,6 +13,3 @@ bool       vi2live_started(Vi2Venc_t* vv);
 #ifdef __cplusplus
 }
 #endif
-
-#endif  /* __VI2VENC_LIVE_H_ */
-
diff --git a/src/rtspLive/server/DynamicRTSPServer.hh b/src/rtspLive/server/DynamicRTSPServer.hh
index 6f25225a..8a6c2b39 100644
--- a/src/rtspLive/server/DynamicRTSPServer.hh
+++ b/src/rtspLive/server/DynamicRTSPServer.hh
@@ -18,8 +18,7 @@ along with this library; if not, write to the Free Software Foundation, Inc.,
 // based on whether or not the specified stream name exists as a file
 // Header file
 
-#ifndef _DYNAMIC_RTSP_SERVER_HH
-#define _DYNAMIC_RTSP_SERVER_HH
+#pragma once
 
 #ifndef _RTSP_SERVER_HH
 #include "RTSPServer.hh"
@@ -50,5 +49,3 @@ public:
     Boolean  _h265;
     char*    _streamName;
 };
-
-#endif
diff --git a/src/rtspLive/server/H264FramedLiveSource.hh b/src/rtspLive/server/H264FramedLiveSource.hh
index 8acbbaa1..c49615df 100644
--- a/src/rtspLive/server/H264FramedLiveSource.hh
+++ b/src/rtspLive/server/H264FramedLiveSource.hh
@@ -1,5 +1,4 @@
-#ifndef _H264FRAMEDLIVESOURCE_HH
-#define _H264FRAMEDLIVESOURCE_HH
+#pragma once
 
 #include <FramedSource.hh>
 
@@ -21,5 +20,3 @@ protected:
 	FILE *_fileTest;
 #endif
 };
-
-#endif
diff --git a/src/rtspLive/server/H264LiveVideoServerMediaSubssion.hh b/src/rtspLive/server/H264LiveVideoServerMediaSubssion.hh
index 0ad79b49..4190b87f 100644
--- a/src/rtspLive/server/H264LiveVideoServerMediaSubssion.hh
+++ b/src/rtspLive/server/H264LiveVideoServerMediaSubssion.hh
@@ -1,5 +1,5 @@
-#ifndef _H264_LIVE_VIDEO_SERVER_MEDIA_SUBSESSION_HH
-#define _H264_LIVE_VIDEO_SERVER_MEDIA_SUBSESSION_HH
+#pragma once
+
 #include "H264VideoFileServerMediaSubsession.hh"
 
 class H264LiveVideoServerMediaSubssion : public H264VideoFileServerMediaSubsession {
@@ -14,5 +14,3 @@ protected:
 protected:
 	FramedSource* createNewStreamSource(unsigned clientSessionId, unsigned& estBitrate);
 };
-
-#endif
diff --git a/src/rtspLive/server/H265LiveVideoServerMediaSubssion.hh b/src/rtspLive/server/H265LiveVideoServerMediaSubssion.hh
index 8524257a..b0e2f012 100644
--- a/src/rtspLive/server/H265LiveVideoServerMediaSubssion.hh
+++ b/src/rtspLive/server/H265LiveVideoServerMediaSubssion.hh
@@ -1,5 +1,5 @@
-#ifndef _H265_LIVE_VIDEO_SERVER_MEDIA_SUBSESSION_HH
-#define _H265_LIVE_VIDEO_SERVER_MEDIA_SUBSESSION_HH
+#pragma once
+
 #include "H265VideoFileServerMediaSubsession.hh"
 
 class H265LiveVideoServerMediaSubssion : public H265VideoFileServerMediaSubsession {
@@ -14,5 +14,3 @@ protected:
 protected:
 	FramedSource* createNewStreamSource(unsigned clientSessionId, unsigned& estBitrate);
 };
-
-#endif
diff --git a/src/rtspLive/server/version.hh b/src/rtspLive/server/version.hh
index 941f5184..03361b8d 100644
--- a/src/rtspLive/server/version.hh
+++ b/src/rtspLive/server/version.hh
@@ -17,9 +17,6 @@ along with this library; if not, write to the Free Software Foundation, Inc.,
 // Version information for the LIVE555 Media Server application
 // Header file
 
-#ifndef _MEDIA_SERVER_VERSION_HH
-#define _MEDIA_SERVER_VERSION_HH
+#pragma once
 
 #define MEDIA_SERVER_VERSION_STRING "1.10"
-
-#endif
diff --git a/src/rtspLive/stream/appmsg.h b/src/rtspLive/stream/appmsg.h
index b17d454c..da82e95f 100644
--- a/src/rtspLive/stream/appmsg.h
+++ b/src/rtspLive/stream/appmsg.h
@@ -1,5 +1,4 @@
-#ifndef __APPMSG_H_
-#define __APPMSG_H_
+#pragma once
 
 #if defined (__cplusplus)
 extern "C" {
@@ -46,6 +45,3 @@ typedef enum {
 #if defined (__cplusplus)
 }
 #endif
-
-#endif //__APPMSG_H_
-
diff --git a/src/rtspLive/stream/avshare.h b/src/rtspLive/stream/avshare.h
index 272d681b..a7e3e968 100644
--- a/src/rtspLive/stream/avshare.h
+++ b/src/rtspLive/stream/avshare.h
@@ -14,8 +14,7 @@
     Modification: Created file
 
 ******************************************************************************/
-#ifndef _AVSHARE_H_
-#define _AVSHARE_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -65,5 +64,3 @@ void avshare_stop(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/rtspLive/stream/confparser.h b/src/rtspLive/stream/confparser.h
index b4aed62f..213b68ca 100644
--- a/src/rtspLive/stream/confparser.h
+++ b/src/rtspLive/stream/confparser.h
@@ -1,5 +1,4 @@
-#ifndef __CONFIG_PARSER_H__
-#define __CONFIG_PARSER_H__
+#pragma once
 
 #ifdef __cplusplus
 extern "C"{
@@ -12,6 +11,3 @@ void conf_loadLiveParams(LiveContext_t* liveCtx);
 #ifdef __cplusplus
 }
 #endif /* End of #ifdef __cplusplus */
-
-#endif //__CONFIG_PARSER_H__
-
diff --git a/src/rtspLive/stream/gogglemsg.h b/src/rtspLive/stream/gogglemsg.h
index 6ba90b85..8598cc33 100644
--- a/src/rtspLive/stream/gogglemsg.h
+++ b/src/rtspLive/stream/gogglemsg.h
@@ -1,5 +1,4 @@
-#ifndef __GOGGLEMSG_H_
-#define __GOGGLEMSG_H_
+#pragma once
 
 #if defined (__cplusplus)
 extern "C" {
@@ -48,6 +47,3 @@ int gogglemsg_flush( GoggleMsgType_e mtype );
 #if defined (__cplusplus)
 }
 #endif
-
-#endif //__GOGGLEMSG_H_
-
diff --git a/src/rtspLive/stream/live_context.h b/src/rtspLive/stream/live_context.h
index db5aee96..a7e81992 100644
--- a/src/rtspLive/stream/live_context.h
+++ b/src/rtspLive/stream/live_context.h
@@ -1,6 +1,4 @@
-
-#ifndef __LIVE_CONTEXT_H_
-#define __LIVE_CONTEXT_H_
+#pragma once
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -54,5 +52,3 @@ typedef struct
     bool  isSSM;
     char  ipMulticast[16];
 } LiveContext_t;
-
-#endif  /* __LIVE_CONTEXT_H_ */
diff --git a/src/rtspLive/stream/version.h b/src/rtspLive/stream/version.h
index dfed9297..f080a118 100644
--- a/src/rtspLive/stream/version.h
+++ b/src/rtspLive/stream/version.h
@@ -1,5 +1,4 @@
-#ifndef __VERSION_H_
-#define __VERSION_H_
+#pragma once
 
 #if defined(__cplusplus)
 extern "C" {
@@ -13,5 +12,3 @@ extern "C" {
 #if defined(__cplusplus)
 }
 #endif
-
-#endif //__VERSION_H_
diff --git a/src/ui/page_common.h b/src/ui/page_common.h
index 7c105194..44cb9769 100644
--- a/src/ui/page_common.h
+++ b/src/ui/page_common.h
@@ -1,5 +1,4 @@
-#ifndef _PAGE_COMMON_H
-#define _PAGE_COMMON_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -177,5 +176,3 @@ void btn_group_show(btn_group_t *btn_group, bool visible);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/ui/page_fans.h b/src/ui/page_fans.h
index f27934bd..53bff831 100644
--- a/src/ui/page_fans.h
+++ b/src/ui/page_fans.h
@@ -1,5 +1,4 @@
-#ifndef _PAGE_FANS_H
-#define _PAGE_FANS_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -30,5 +29,3 @@ void fans_auto_ctrl();
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/ui/page_headtracker.h b/src/ui/page_headtracker.h
index 0f4e2d99..7cd476cb 100644
--- a/src/ui/page_headtracker.h
+++ b/src/ui/page_headtracker.h
@@ -1,5 +1,4 @@
-#ifndef _PAGE_HEADTRACKER_H
-#define _PAGE_HEADTRACKER_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -14,5 +13,3 @@ extern page_pack_t pp_headtracker;
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/ui/page_imagesettings.h b/src/ui/page_imagesettings.h
index 2c1cfe38..f94e1324 100644
--- a/src/ui/page_imagesettings.h
+++ b/src/ui/page_imagesettings.h
@@ -1,5 +1,4 @@
-#ifndef _PAGE_IMAGESETTINGS_H
-#define _PAGE_IMAGESETTINGS_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -16,5 +15,3 @@ void set_slider_value();
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/ui/page_osd.h b/src/ui/page_osd.h
index b6c1f9ad..5d960aff 100644
--- a/src/ui/page_osd.h
+++ b/src/ui/page_osd.h
@@ -1,5 +1,4 @@
-#ifndef _PAGE_OSD_H
-#define _PAGE_OSD_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -13,5 +12,3 @@ void page_osd_update_ui_elements();
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/ui/page_playback.h b/src/ui/page_playback.h
index af2b3bed..56ce6c45 100644
--- a/src/ui/page_playback.h
+++ b/src/ui/page_playback.h
@@ -1,5 +1,4 @@
-#ifndef _PAGE_PLAYBACK_H
-#define _PAGE_PLAYBACK_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -58,5 +57,3 @@ void clear_videofile_cnt();
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/ui/page_power.h b/src/ui/page_power.h
index 9379c3f5..0812bc95 100644
--- a/src/ui/page_power.h
+++ b/src/ui/page_power.h
@@ -1,5 +1,4 @@
-#ifndef _PAGE_POWER_H
-#define _PAGE_POWER_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -12,5 +11,3 @@ extern page_pack_t pp_power;
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/ui/page_record.h b/src/ui/page_record.h
index 261800cc..f5522195 100644
--- a/src/ui/page_record.h
+++ b/src/ui/page_record.h
@@ -1,5 +1,4 @@
-#ifndef _PAGE_RECORD_H
-#define _PAGE_RECORD_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -14,5 +13,3 @@ extern page_pack_t pp_record;
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/ui/page_scannow.h b/src/ui/page_scannow.h
index e59dba5d..803fc74e 100644
--- a/src/ui/page_scannow.h
+++ b/src/ui/page_scannow.h
@@ -1,5 +1,4 @@
-#ifndef _PAGE_SCANNOW_H
-#define _PAGE_SCANNOW_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -25,5 +24,3 @@ extern page_pack_t pp_scannow;
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/ui/page_source.h b/src/ui/page_source.h
index 0ac50c8a..1b5aed0b 100644
--- a/src/ui/page_source.h
+++ b/src/ui/page_source.h
@@ -1,5 +1,4 @@
-#ifndef _PAGE_SOURCE_H
-#define _PAGE_SOURCE_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -16,5 +15,3 @@ void source_status_timer();
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/ui/page_version.h b/src/ui/page_version.h
index 366617c6..1d763901 100644
--- a/src/ui/page_version.h
+++ b/src/ui/page_version.h
@@ -1,5 +1,4 @@
-#ifndef _PAGE_VERSION_H
-#define _PAGE_VERSION_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -37,5 +36,3 @@ uint8_t command_monitor(char *cmd);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/ui/ui_attribute.h b/src/ui/ui_attribute.h
index 2a166fee..548eb2ab 100644
--- a/src/ui/ui_attribute.h
+++ b/src/ui/ui_attribute.h
@@ -1,5 +1,4 @@
-#ifndef _UI_ATTRIBUTE_H
-#define _UI_ATTRIBUTE_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -213,5 +212,3 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/ui/ui_image_setting.h b/src/ui/ui_image_setting.h
index f4590383..96381fb8 100644
--- a/src/ui/ui_image_setting.h
+++ b/src/ui/ui_image_setting.h
@@ -1,5 +1,4 @@
-#ifndef __IMAGESETTING_H__
-#define __IMAGESETTING_H__
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -49,5 +48,3 @@ void ims_save();
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/ui/ui_main_menu.h b/src/ui/ui_main_menu.h
index f1f058d4..7ef353e3 100644
--- a/src/ui/ui_main_menu.h
+++ b/src/ui/ui_main_menu.h
@@ -1,5 +1,4 @@
-#ifndef __MAIN_MENU_H__
-#define __MAIN_MENU_H__
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -56,5 +55,3 @@ void progress_bar_update();
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/ui/ui_osd_element_pos.h b/src/ui/ui_osd_element_pos.h
index b2ec1584..762c104b 100644
--- a/src/ui/ui_osd_element_pos.h
+++ b/src/ui/ui_osd_element_pos.h
@@ -1,5 +1,4 @@
-#ifndef __OSDELEMENTPOS_H__
-#define __OSDELEMENTPOS_H__
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -19,5 +18,3 @@ int ui_osd_element_pos_handle_input(int key);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/ui/ui_player.h b/src/ui/ui_player.h
index 6dff0f97..58c2301b 100644
--- a/src/ui/ui_player.h
+++ b/src/ui/ui_player.h
@@ -1,5 +1,4 @@
-#ifndef __MPLAYER_H__
-#define __MPLAYER_H__
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -46,5 +45,3 @@ void mplayer_file(char *fname);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/ui/ui_porting.h b/src/ui/ui_porting.h
index 85b1d745..7655c3cc 100644
--- a/src/ui/ui_porting.h
+++ b/src/ui/ui_porting.h
@@ -1,5 +1,4 @@
-#ifndef _PORTING_H
-#define _PORTING_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -25,5 +24,3 @@ void lvgl_screen_orbit(bool enable);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/ui/ui_statusbar.h b/src/ui/ui_statusbar.h
index 0909ebb5..f06b5a7a 100644
--- a/src/ui/ui_statusbar.h
+++ b/src/ui/ui_statusbar.h
@@ -1,5 +1,4 @@
-#ifndef __STATUSBAR_H__
-#define __STATUSBAR_H__
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -11,5 +10,3 @@ void statubar_update(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/ui/ui_style.h b/src/ui/ui_style.h
index d928f8ee..ecad1ee9 100644
--- a/src/ui/ui_style.h
+++ b/src/ui/ui_style.h
@@ -1,5 +1,4 @@
-#ifndef _STYLE_H
-#define _STYLE_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -37,5 +36,3 @@ int style_init(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/util/math.h b/src/util/math.h
index a98e00c1..1c131e5a 100644
--- a/src/util/math.h
+++ b/src/util/math.h
@@ -1,5 +1,4 @@
-#ifndef __UTIL_MATH_H__
-#define __UTIL_MATH_H__
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -18,5 +17,3 @@ void safe_update_value(int min, int max, int *val, int delta);
 #ifdef __cplusplus
 }
 #endif
-
-#endif // __UTIL_MATH_H__
\ No newline at end of file