Use "#pragma once" for headers

Some of the header guard names in ipmitool duplicated with the ones in
freeipmi.

* ipmitool/ipmi_fru.h and freeipmi/fru/ipmi-fru.h both uses IPMI_FRU_H
* ipmitool/ipmi_sdr.h and freeipmi/sdr/ipmi-sdr.h both uses IPMI_SDR_H
* ipmitool/ipmi_sel.h and freeipmi/sel/ipmi-sel.h both uses IPMI_SEL_H

This is problematic as including the 1st will prevent the 2nd from being
included, leading to the loss of any declarations, inline definitions,
or other "#includes" in the 2nd header.

For example, including ipmitool/ipmi_sel.h and freeipmi/freeipmi.h fails
to build.

$ cat test.c
 #include <ipmitool/ipmi_sel.h>
 #include <freeipmi/freeipmi.h>
$ gcc test.c -I${HOME}/src/oss/ipmitool/include
In file included from /usr/include/freeipmi/freeipmi.h:90,
                 from test.c:2:
/usr/include/freeipmi/sdr/oem/ipmi-sdr-oem-intel-node-manager.h:48:44: error: unknown type name 'ipmi_sdr_ctx_t'; did you mean 'ipmi_fru_ctx_t'?
   48 | int ipmi_sdr_oem_parse_intel_node_manager (ipmi_sdr_ctx_t ctx,
      |                                            ^~~~~~~~~~~~~~
      |                                            ipmi_fru_ctx_t

Remove header guards and use "#pragma once" instead. In this way, we
don't have to do manual management to avoid name clashes.
* src/plugins/lan/md5.h is left as is being an external header
  originally.
* src/plugins/imb/imbapi.h is a convoluted header consisting of multiple
  header guards. Let's just add "#pragma once" and leave header guards
  as is for now.

Signed-off-by: Bing-Hua Wang <binghuawang@ami.com>

62 files changed, 70 insertions, 253 deletions

diff --git a/include/ipmitool/bswap.h b/include/ipmitool/bswap.h
index 9948208..968de7e 100644
--- a/include/ipmitool/bswap.h
+++ b/include/ipmitool/bswap.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_BSWAP_H
-#define IPMI_BSWAP_H
+#pragma once
 
 #if HAVE_CONFIG_H
 # include <config.h>
@@ -49,5 +48,3 @@
 # define BSWAP_32(x) ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) |\
                      (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
 #endif
-
-#endif /* IPMI_BSWAP_H */
diff --git a/include/ipmitool/helper.h b/include/ipmitool/helper.h
index 2758b76..23dbc63 100644
--- a/include/ipmitool/helper.h
+++ b/include/ipmitool/helper.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_HELPER_H
-#define IPMI_HELPER_H
+#pragma once
 
 #include <sys/types.h>
 #include <inttypes.h>
@@ -227,5 +226,3 @@ uint8_t *array_letoh(uint8_t *buffer, size_t length);
 #ifndef __maxlen
 # define __maxlen(a, b) ({ int x=strlen(a); int y=strlen(b); (x > y) ? x : y;})
 #endif
-
-#endif /* IPMI_HELPER_H */
diff --git a/include/ipmitool/hpm2.h b/include/ipmitool/hpm2.h
index 09b6237..ebf9842 100644
--- a/include/ipmitool/hpm2.h
+++ b/include/ipmitool/hpm2.h
@@ -30,6 +30,8 @@
  * EVEN IF PPS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
+#pragma once
+
 #include <stdint.h>
 #include <ipmitool/ipmi_intf.h>
 
diff --git a/include/ipmitool/ipmi.h b/include/ipmitool/ipmi.h
index 615267c..7555596 100644
--- a/include/ipmitool/ipmi.h
+++ b/include/ipmitool/ipmi.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_H
-#define IPMI_H
+#pragma once
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -307,5 +306,3 @@ typedef enum IPMI_OEM {
 } IPMI_OEM;
 
 extern const struct valstr completion_code_vals[];
-
-#endif				/* IPMI_H */
diff --git a/include/ipmitool/ipmi_cc.h b/include/ipmitool/ipmi_cc.h
index 237b1ee..99ba231 100644
--- a/include/ipmitool/ipmi_cc.h
+++ b/include/ipmitool/ipmi_cc.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_CC_H
-#define IPMI_CC_H
+#pragma once
 
 /*
    Thu Jan 11 09:32:41 2007
@@ -71,6 +70,3 @@
 #define IPMI_CC_NOT_SUPPORTED_PRESENT_STATE        0xd5 
 #define IPMI_CC_ILLEGAL_COMMAND_DISABLED           0xd6 
 #define IPMI_CC_UNSPECIFIED_ERROR                  0xff 
-
-
-#endif /*IPMI_CC_H*/
diff --git a/include/ipmitool/ipmi_cfgp.h b/include/ipmitool/ipmi_cfgp.h
index ab8acb3..479e91e 100644
--- a/include/ipmitool/ipmi_cfgp.h
+++ b/include/ipmitool/ipmi_cfgp.h
@@ -29,8 +29,8 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef IPMI_CFGP_H
-#define IPMI_CFGP_H
+
+#pragma once
 
 #include <stdio.h>
 
@@ -193,5 +193,3 @@ extern int ipmi_cfgp_save(struct ipmi_cfgp_ctx *ctx,
 /* Print parameter data in user-friendly format. */
 extern int ipmi_cfgp_print(struct ipmi_cfgp_ctx *ctx,
 		const struct ipmi_cfgp_sel *sel, FILE *file);
-
-#endif /* IPMI_CFGP_H */
diff --git a/include/ipmitool/ipmi_channel.h b/include/ipmitool/ipmi_channel.h
index 85d158f..d9be57e 100644
--- a/include/ipmitool/ipmi_channel.h
+++ b/include/ipmitool/ipmi_channel.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_CHANNEL_H
-#define IPMI_CHANNEL_H
+#pragma once
 
 #if HAVE_CONFIG_H
 # include <config.h>
@@ -217,5 +216,3 @@ int ipmi_channel_main(struct ipmi_intf * intf, int argc, char ** argv);
 int ipmi_get_channel_auth_cap(struct ipmi_intf * intf,
                               uint8_t channel, uint8_t priv);
 int ipmi_get_channel_info(struct ipmi_intf * intf, uint8_t channel);
-
-#endif /*IPMI_CHANNEL_H*/
diff --git a/include/ipmitool/ipmi_chassis.h b/include/ipmitool/ipmi_chassis.h
index 3f56924..31d4141 100644
--- a/include/ipmitool/ipmi_chassis.h
+++ b/include/ipmitool/ipmi_chassis.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_CHASSIS_H
-#define IPMI_CHASSIS_H
+#pragma once
 
 #include <ipmitool/ipmi.h>
 
@@ -51,5 +50,3 @@ int ipmi_chassis_power_status(struct ipmi_intf * intf);
 int ipmi_chassis_power_control(struct ipmi_intf * intf, uint8_t ctl);
 int ipmi_chassis_main(struct ipmi_intf * intf, int argc, char ** argv);
 int ipmi_power_main(struct ipmi_intf * intf, int argc, char ** argv);
-
-#endif /*IPMI_CHASSIS_H*/
diff --git a/include/ipmitool/ipmi_constants.h b/include/ipmitool/ipmi_constants.h
index fc8642d..1a91940 100644
--- a/include/ipmitool/ipmi_constants.h
+++ b/include/ipmitool/ipmi_constants.h
@@ -30,9 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_CONSTANTS_H
-#define IPMI_CONSTANTS_H
-
+#pragma once
 
 /*
  * COMMANDS
@@ -133,5 +131,3 @@
 #define IPMI_CRYPT_AES_CBC_128      0x01
 #define IPMI_CRYPT_XRC4_128         0x02
 #define IPMI_CRYPT_XRC4_40          0x03
-
-#endif /*IPMI_CONSTANTS_H*/
diff --git a/include/ipmitool/ipmi_dcmi.h b/include/ipmitool/ipmi_dcmi.h
index 7a03bb6..c872f56 100644
--- a/include/ipmitool/ipmi_dcmi.h
+++ b/include/ipmitool/ipmi_dcmi.h
@@ -16,9 +16,7 @@
  *
  */
 
-
-#ifndef IPMI_DCMI_H
-#define IPMI_DCMI_H
+#pragma once
 
 #include <ipmitool/ipmi.h>
 
@@ -267,4 +265,3 @@ struct nm_suspend {
 } __attribute__ ((packed));
 
 int ipmi_nm_main(struct ipmi_intf * intf, int argc, char ** argv);
-#endif /*IPMI_DCMI_H*/
diff --git a/include/ipmitool/ipmi_delloem.h b/include/ipmitool/ipmi_delloem.h
index 7543e4f..915a36c 100644
--- a/include/ipmitool/ipmi_delloem.h
+++ b/include/ipmitool/ipmi_delloem.h
@@ -26,8 +26,8 @@ POSSIBILITY OF SUCH DAMAGE.
 
 
 *****************************************************************************/
-#ifndef IPMI_DELLOEM_H
-#define IPMI_DELLOEM_H
+
+#pragma once
 
 #if HAVE_CONFIG_H
 # include <config.h>
@@ -366,5 +366,3 @@ typedef struct _SensorReadingType
 }SensorReadingType;
 uint16_t compareinputwattage(IPMI_POWER_SUPPLY_INFO* powersupplyinfo, uint16_t inputwattage);
 int ipmi_delloem_main(struct ipmi_intf * intf, int argc, char ** argv);
-
-#endif /*IPMI_DELLOEM_H*/
diff --git a/include/ipmitool/ipmi_ekanalyzer.h b/include/ipmitool/ipmi_ekanalyzer.h
index 7c43220..08698e4 100644
--- a/include/ipmitool/ipmi_ekanalyzer.h
+++ b/include/ipmitool/ipmi_ekanalyzer.h
@@ -33,8 +33,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_EKANALYZER_H
-#define IPMI_EKANALYZER_H
+#pragma once
 
 #include <inttypes.h>
 #include <ipmitool/ipmi.h>
@@ -64,5 +63,3 @@
 #define FRU_RADIAL_IPMB0_LINK_MAPPING 0x15
 
 int ipmi_ekanalyzer_main(struct ipmi_intf *, int, char **);
-
-#endif /* IPMI_EKANALYZER_H */
diff --git a/include/ipmitool/ipmi_entity.h b/include/ipmitool/ipmi_entity.h
index 6e5198c..e439560 100644
--- a/include/ipmitool/ipmi_entity.h
+++ b/include/ipmitool/ipmi_entity.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_ENTITY_H
-#define IPMI_ENTITY_H
+#pragma once
 
 #ifdef HAVE_PRAGMA_PACK
 #pragma pack(1)
@@ -49,5 +48,3 @@ struct entity_id {
 #ifdef HAVE_PRAGMA_PACK
 #pragma pack(0)
 #endif
-
-#endif /* IPMI_ENTITY_H */
diff --git a/include/ipmitool/ipmi_event.h b/include/ipmitool/ipmi_event.h
index 3788533..375eb3d 100644
--- a/include/ipmitool/ipmi_event.h
+++ b/include/ipmitool/ipmi_event.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_EVENT_H
-#define IPMI_EVENT_H
+#pragma once
 
 #if HAVE_CONFIG_H
 # include <config.h>
@@ -89,5 +88,3 @@ typedef enum {
 #define EVENT_GENERATOR(base, index) (EVENT_SWID(base,index) << 1 | 1)
 
 int  ipmi_event_main(struct ipmi_intf *, int, char **);
-
-#endif /*IPMI_EVENT_H*/
diff --git a/include/ipmitool/ipmi_firewall.h b/include/ipmitool/ipmi_firewall.h
index f18770e..da48d79 100644
--- a/include/ipmitool/ipmi_firewall.h
+++ b/include/ipmitool/ipmi_firewall.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_FIREWALL_H
-#define IPMI_FIREWALL_H
+#pragma once
 
 #include <ipmitool/ipmi.h>
 
@@ -102,5 +101,3 @@ static inline int bit_test(const unsigned char * bf, int n) {
 static inline void bit_set(unsigned char * bf, int n, int v) {
 	bf[n>>3] = (bf[n>>3] & ~(1<<(n%8))) | ((v?1:0)<<(n%8));
 }
-
-#endif				/*IPMI_FIREWALL_H */
diff --git a/include/ipmitool/ipmi_fru.h b/include/ipmitool/ipmi_fru.h
index b17870c..4d4d6c6 100644
--- a/include/ipmitool/ipmi_fru.h
+++ b/include/ipmitool/ipmi_fru.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_FRU_H
-#define IPMI_FRU_H
+#pragma once
 
 #include <inttypes.h>
 #include <ipmitool/ipmi.h>
@@ -623,5 +622,3 @@ typedef struct ipmi_fru_bloc {
 int ipmi_fru_main(struct ipmi_intf *intf, int argc, char **argv);
 int ipmi_fru_print(struct ipmi_intf *intf, struct sdr_record_fru_locator *fru);
 char *get_fru_area_str(uint8_t *data, uint32_t *offset);
-
-#endif /* IPMI_FRU_H */
diff --git a/include/ipmitool/ipmi_fwum.h b/include/ipmitool/ipmi_fwum.h
index c19a582..e15b517 100644
--- a/include/ipmitool/ipmi_fwum.h
+++ b/include/ipmitool/ipmi_fwum.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_KFWUM_H
-# define IPMI_KFWUM_H
+#pragma once
 
 #include <inttypes.h>
 #include <ipmitool/ipmi.h>
@@ -239,5 +238,3 @@ struct KfwumFinishFirmwareDownloadReq {
 # ifdef HAVE_PRAGMA_PACK
 #  pragma pack(0)
 # endif
-
-#endif /* IPMI_KFWUM_H */
diff --git a/include/ipmitool/ipmi_gendev.h b/include/ipmitool/ipmi_gendev.h
index cb18699..9291b30 100644
--- a/include/ipmitool/ipmi_gendev.h
+++ b/include/ipmitool/ipmi_gendev.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_GENDEV_H
-#define IPMI_GENDEV_H
+#pragma once
 
 #if HAVE_CONFIG_H
 # include <config.h>
@@ -44,5 +43,3 @@
 #include <ipmitool/ipmi_entity.h>
 
 int ipmi_gendev_main(struct ipmi_intf *, int, char **);
-
-#endif				/* IPMI_GENDEV_H */
diff --git a/include/ipmitool/ipmi_hpmfwupg.h b/include/ipmitool/ipmi_hpmfwupg.h
index d9f78c6..5ac8299 100644
--- a/include/ipmitool/ipmi_hpmfwupg.h
+++ b/include/ipmitool/ipmi_hpmfwupg.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_HPMFWUPG_H
-#define IPMI_HPMFWUPG_H
+#pragma once
 
 #include <inttypes.h>
 #include <ipmitool/ipmi.h>
@@ -786,5 +785,3 @@ typedef struct _VERSIONINFO {
 #define TARGET_VER (0x01)
 #define ROLLBACK_VER (0x02)
 #define IMAGE_VER (0x04)
-
-#endif /* IPMI_KFWUM_H */
diff --git a/include/ipmitool/ipmi_ime.h b/include/ipmitool/ipmi_ime.h
index 734ddb3..b92aea2 100644
--- a/include/ipmitool/ipmi_ime.h
+++ b/include/ipmitool/ipmi_ime.h
@@ -33,13 +33,10 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_IME_H
-#define IPMI_IME_H
+#pragma once
 
 #include <inttypes.h>
 #include <ipmitool/ipmi.h>
 
 
 int ipmi_ime_main(struct ipmi_intf *, int, char **);
-
-#endif /* IPMI_IME_H */
diff --git a/include/ipmitool/ipmi_intf.h b/include/ipmitool/ipmi_intf.h
index 5ae252e..ed16612 100644
--- a/include/ipmitool/ipmi_intf.h
+++ b/include/ipmitool/ipmi_intf.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_INTF_H
-#define IPMI_INTF_H
+#pragma once
 
 #include <ipmitool/ipmi.h>
 #include <ipmitool/ipmi_oem.h>
@@ -268,4 +267,3 @@ void ipmi_cleanup(struct ipmi_intf * intf);
 #if defined(IPMI_INTF_LAN) || defined (IPMI_INTF_LANPLUS)
 int  ipmi_intf_socket_connect(struct ipmi_intf * intf);
 #endif
-#endif /* IPMI_INTF_H */
diff --git a/include/ipmitool/ipmi_isol.h b/include/ipmitool/ipmi_isol.h
index e52279e..5514c21 100644
--- a/include/ipmitool/ipmi_isol.h
+++ b/include/ipmitool/ipmi_isol.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_ISOL_H
-#define IPMI_ISOL_H
+#pragma once
 
 #include <ipmitool/ipmi.h>
 
@@ -53,5 +52,3 @@ struct isol_config_parameters {
 };
 
 int ipmi_isol_main(struct ipmi_intf *, int, char **);
-
-#endif /* IPMI_SOL_H */
diff --git a/include/ipmitool/ipmi_kontronoem.h b/include/ipmitool/ipmi_kontronoem.h
index d92d654..10222bd 100644
--- a/include/ipmitool/ipmi_kontronoem.h
+++ b/include/ipmitool/ipmi_kontronoem.h
@@ -33,8 +33,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_KONTRONOEM_H
-#define IPMI_KONTRONOEM_H
+#pragma once
 
 #include <inttypes.h>
 #include <ipmitool/ipmi.h>
@@ -42,5 +41,3 @@
 
 int ipmi_kontronoem_main(struct ipmi_intf *, int, char **);
 int ipmi_kontronoem_set_large_buffer(struct ipmi_intf *, unsigned char size);
-
-#endif /* IPMI_KONTRONOEM_H */
diff --git a/include/ipmitool/ipmi_lanp.h b/include/ipmitool/ipmi_lanp.h
index f14e07a..e312b25 100644
--- a/include/ipmitool/ipmi_lanp.h
+++ b/include/ipmitool/ipmi_lanp.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_LANP_H
-#define IPMI_LANP_H
+#pragma once
 
 #include <ipmitool/ipmi.h>
 
@@ -128,5 +127,3 @@ enum {
 int  ipmi_lanp_main(struct ipmi_intf *, int, char **);
 
 uint8_t find_lan_channel(struct ipmi_intf *intf, uint8_t start);
-
-#endif /*IPMI_LANP_H*/
diff --git a/include/ipmitool/ipmi_lanp6.h b/include/ipmitool/ipmi_lanp6.h
index 91799e5..fe987d3 100644
--- a/include/ipmitool/ipmi_lanp6.h
+++ b/include/ipmitool/ipmi_lanp6.h
@@ -29,8 +29,8 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef IPMI_LANP6_H
-#define IPMI_LANP6_H
+
+#pragma once
 
 #include <ipmitool/ipmi_intf.h>
 
@@ -50,5 +50,3 @@ struct ipmi_lanp_priv {
 	struct ipmi_intf *intf;
 	int channel;
 };
-
-#endif /* IPMI_LANP6_H */
diff --git a/include/ipmitool/ipmi_main.h b/include/ipmitool/ipmi_main.h
index e32360a..76fe602 100644
--- a/include/ipmitool/ipmi_main.h
+++ b/include/ipmitool/ipmi_main.h
@@ -30,13 +30,10 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_MAIN_H
-#define IPMI_MAIN_H
+#pragma once
 
 #include <ipmitool/ipmi_intf.h>
 
 int ipmi_main(int argc, char ** argv, struct ipmi_cmd * cmdlist, struct ipmi_intf_support * intflist);
 void ipmi_cmd_print(struct ipmi_cmd * cmdlist);
 int ipmi_cmd_run(struct ipmi_intf * intf, char * name, int argc, char ** argv);
-
-#endif /* IPMI_MAIN_H */
diff --git a/include/ipmitool/ipmi_mc.h b/include/ipmitool/ipmi_mc.h
index 0f813d3..78ceb3d 100644
--- a/include/ipmitool/ipmi_mc.h
+++ b/include/ipmitool/ipmi_mc.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_MC_H
-#define IPMI_MC_H
+#pragma once
 
 #include <stdbool.h>
 
@@ -325,5 +324,3 @@ struct ipm_get_watchdog_rsp {
 int ipmi_mc_getsysinfo(struct ipmi_intf * intf, int param, int block, int set, 
 		    int len, void *buffer);
 int ipmi_mc_setsysinfo(struct ipmi_intf * intf, int len, void *buffer);
-
-#endif				/*IPMI_MC_H */
diff --git a/include/ipmitool/ipmi_oem.h b/include/ipmitool/ipmi_oem.h
index ad22fde..4d4c518 100644
--- a/include/ipmitool/ipmi_oem.h
+++ b/include/ipmitool/ipmi_oem.h
@@ -28,8 +28,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_OEM_H
-#define IPMI_OEM_H
+#pragma once
 
 #include <ipmitool/ipmi.h>
 
@@ -43,5 +42,3 @@ struct ipmi_oem_handle {
 void ipmi_oem_print(void);
 int ipmi_oem_setup(struct ipmi_intf * intf, char * oemtype);
 int ipmi_oem_active(struct ipmi_intf * intf, const char * oemtype);
-
-#endif /*IPMI_OEM_H*/
diff --git a/include/ipmitool/ipmi_pef.h b/include/ipmitool/ipmi_pef.h
index ffd4263..a324997 100644
--- a/include/ipmitool/ipmi_pef.h
+++ b/include/ipmitool/ipmi_pef.h
@@ -30,8 +30,7 @@
  * EVEN IF DELL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_PEF_H
-#define IPMI_PEF_H
+#pragma once
 
 #include <ipmitool/ipmi.h>
 
@@ -667,5 +666,3 @@ void ipmi_pef_print_2xd(const char * text, uint8_t u1, uint8_t u2);
 void ipmi_pef_print_str(const char * text, const char * val);
 
 int ipmi_pef_main(struct ipmi_intf * intf, int argc, char ** argv);
-
-#endif /* IPMI_PEF_H */
diff --git a/include/ipmitool/ipmi_picmg.h b/include/ipmitool/ipmi_picmg.h
index 0d34215..f1b4963 100644
--- a/include/ipmitool/ipmi_picmg.h
+++ b/include/ipmitool/ipmi_picmg.h
@@ -3,8 +3,7 @@
 	(C) Kontron
  */
 
-#ifndef _IPMI_PICMG_H_
-#define _IPMI_PICMG_H_
+#pragma once
 
 #include <ipmitool/ipmi.h>
 
@@ -120,5 +119,3 @@ struct sAmcPortState {
 int ipmi_picmg_main (struct ipmi_intf * intf, int argc, char ** argv);
 uint8_t picmg_discover(struct ipmi_intf *intf);
 uint8_t ipmi_picmg_ipmb_address(struct ipmi_intf *intf);
-
-#endif
diff --git a/include/ipmitool/ipmi_quantaoem.h b/include/ipmitool/ipmi_quantaoem.h
index 544f510..a222320 100644
--- a/include/ipmitool/ipmi_quantaoem.h
+++ b/include/ipmitool/ipmi_quantaoem.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_QUANTAOEM_H
-#define IPMI_QUANTAOEM_H
+#pragma once
 
 #if HAVE_CONFIG_H
 # include <config.h>
@@ -51,5 +50,3 @@ typedef enum
 
 qct_platform_t oem_qct_get_platform_id(struct ipmi_intf *intf);
 char *oem_qct_get_evt_desc(struct ipmi_intf *intf, struct sel_event_record *rec);
-
-#endif /*IPMI_QUANTAOEM_H*/
diff --git a/include/ipmitool/ipmi_raw.h b/include/ipmitool/ipmi_raw.h
index f4364f3..45fdd6b 100644
--- a/include/ipmitool/ipmi_raw.h
+++ b/include/ipmitool/ipmi_raw.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_RAW_H
-#define IPMI_RAW_H
+#pragma once
 
 #include <ipmitool/ipmi.h>
 
@@ -40,5 +39,3 @@ struct ipmi_rs * ipmi_master_write_read(struct ipmi_intf * intf, uint8_t bus, ui
 					uint8_t * wdata, uint8_t wsize, uint8_t rsize);
 int ipmi_rawi2c_main(struct ipmi_intf * intf, int argc, char ** argv);
 int ipmi_rawspd_main(struct ipmi_intf * intf, int argc, char ** argv);
-
-#endif /* IPMI_RAW_H */
diff --git a/include/ipmitool/ipmi_sdr.h b/include/ipmitool/ipmi_sdr.h
index 9f783c4..85231c6 100644
--- a/include/ipmitool/ipmi_sdr.h
+++ b/include/ipmitool/ipmi_sdr.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_SDR_H
-#define IPMI_SDR_H
+#pragma once
 
 #if HAVE_CONFIG_H
 # include <config.h>
@@ -926,5 +925,3 @@ int ipmi_sdr_print_sensor_event_enable(struct ipmi_intf *intf,
 				       uint8_t sensor_num, uint8_t sensor_type,
 				       uint8_t event_type, int numeric_fmt,
 				       uint8_t target, uint8_t lun, uint8_t channel);
-
-#endif				/* IPMI_SDR_H */
diff --git a/include/ipmitool/ipmi_sdradd.h b/include/ipmitool/ipmi_sdradd.h
index b39e82b..032246f 100644
--- a/include/ipmitool/ipmi_sdradd.h
+++ b/include/ipmitool/ipmi_sdradd.h
@@ -27,9 +27,8 @@
  * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
- 
-#ifndef IPMI_SDRADD_H
-#define IPMI_SDRADD_H
+
+#pragma once
 
 /*
  * Methods to add SDRs to repository from built-in sensors or files
@@ -42,5 +41,3 @@ ipmi_sdr_add_from_file(struct ipmi_intf *intf, const char *ifile);
 
 int
 ipmi_sdr_add_from_list(struct ipmi_intf *intf, const char *rangeList);
-
-#endif /* IPMI_SDRADD_H */
diff --git a/include/ipmitool/ipmi_sel.h b/include/ipmitool/ipmi_sel.h
index 99bc107..06ca507 100644
--- a/include/ipmitool/ipmi_sel.h
+++ b/include/ipmitool/ipmi_sel.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_SEL_H
-#define IPMI_SEL_H
+#pragma once
 
 #include <inttypes.h>
 #include <ipmitool/ipmi.h>
@@ -687,5 +686,3 @@ const struct ipmi_event_sensor_types *
 ipmi_get_first_event_sensor_type(struct ipmi_intf *intf, uint8_t sensor_type, uint8_t event_type);
 const struct ipmi_event_sensor_types *
 ipmi_get_next_event_sensor_type(const struct ipmi_event_sensor_types *evt);
-
-#endif /* IPMI_SEL_H */
diff --git a/include/ipmitool/ipmi_sel_supermicro.h b/include/ipmitool/ipmi_sel_supermicro.h
index 98960e6..55f04d7 100644
--- a/include/ipmitool/ipmi_sel_supermicro.h
+++ b/include/ipmitool/ipmi_sel_supermicro.h
@@ -30,9 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-
-#ifndef IPMI_SEL_SUPERMICRO_H
-# define IPMI_SEL_SUPERMICRO_H
+#pragma once
 
 static uint16_t supermicro_x11[] = {
 		0x0958, 0x0955, 0x0953, 0x0952, 0x0941, 0x093A, 0x0939, 0x0938, 0x0937, 0x0930, 0x0927, 0x091D,
@@ -151,5 +149,3 @@ static uint16_t supermicro_older[] = {
 		0x0944, 0x0945, 0x0947, 0x0948, 0x0949, 0x094A, 0x094B, 0x094C, 0x094D, 0x094E, 0x0954, 0x0956,
 		0x0957, 0x0959, 0xFFFF
 };
-
-#endif /* IPMI_SEL_SUPERMICRO_H */
diff --git a/include/ipmitool/ipmi_sensor.h b/include/ipmitool/ipmi_sensor.h
index 63fc4aa..48f7337 100644
--- a/include/ipmitool/ipmi_sensor.h
+++ b/include/ipmitool/ipmi_sensor.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_SENSOR_H
-#define IPMI_SENSOR_H
+#pragma once
 
 #include <math.h>
 #include <ipmitool/bswap.h>
@@ -86,4 +85,3 @@ struct sensor_set_thresh_rq {
 int ipmi_sensor_main(struct ipmi_intf *, int, char **);
 int ipmi_sensor_print_fc(struct ipmi_intf *, struct sdr_record_common_sensor *, uint8_t);
 int ipmi_sensor_get_sensor_reading_factors( struct ipmi_intf * intf, struct sdr_record_full_sensor * sensor, uint8_t reading);
-#endif  /* IPMI_SENSOR_H */
diff --git a/include/ipmitool/ipmi_session.h b/include/ipmitool/ipmi_session.h
index 21ff12f..b01f9d9 100644
--- a/include/ipmitool/ipmi_session.h
+++ b/include/ipmitool/ipmi_session.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_SESSION_H
-#define IPMI_SESSION_H
+#pragma once
 
 #if HAVE_CONFIG_H
 # include <config.h>
@@ -127,5 +126,3 @@ struct get_session_info_rsp
 
 
 int ipmi_session_main(struct ipmi_intf *, int, char **);
-
-#endif /*IPMI_CHANNEL_H*/
diff --git a/include/ipmitool/ipmi_sol.h b/include/ipmitool/ipmi_sol.h
index 1d3f8e1..0cbbe0e 100644
--- a/include/ipmitool/ipmi_sol.h
+++ b/include/ipmitool/ipmi_sol.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_SOL_H
-#define IPMI_SOL_H
+#pragma once
 
 #include <ipmitool/ipmi.h>
 
@@ -102,6 +101,3 @@ int ipmi_sol_main(struct ipmi_intf *, int, char **);
 int ipmi_get_sol_info(struct ipmi_intf *intf,
 		      uint8_t channel,
 		      struct sol_config_parameters *params);
-
-
-#endif /* IPMI_SOL_H */
diff --git a/include/ipmitool/ipmi_strings.h b/include/ipmitool/ipmi_strings.h
index 799f1a8..210d3e8 100644
--- a/include/ipmitool/ipmi_strings.h
+++ b/include/ipmitool/ipmi_strings.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_STRINGS_H
-#define IPMI_STRINGS_H
+#pragma once
 
 #include <ipmitool/helper.h>
 
@@ -75,5 +74,3 @@ extern const struct oemvalstr picmg_busres_shmc_status_vals[];
 extern const struct oemvalstr ipmi_oem_product_info[];
 extern const char *ipmi_generic_sensor_type_vals[];
 extern const struct oemvalstr ipmi_oem_sensor_type_vals[];
-
-#endif /*IPMI_STRINGS_H*/
diff --git a/include/ipmitool/ipmi_sunoem.h b/include/ipmitool/ipmi_sunoem.h
index 78afbf2..664bc7d 100644
--- a/include/ipmitool/ipmi_sunoem.h
+++ b/include/ipmitool/ipmi_sunoem.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_SUNOEM_H
-#define IPMI_SUNOEM_H
+#pragma once
 
 #if HAVE_CONFIG_H
 # include <config.h>
@@ -68,6 +67,3 @@ typedef enum {
 } sunoem_ec_t;
 
 int ipmi_sunoem_main(struct ipmi_intf *, int, char **);
-
-#endif /*IPMI_SUNOEM_H*/
-
diff --git a/include/ipmitool/ipmi_time.h b/include/ipmitool/ipmi_time.h
index fffa7dd..fc7a23a 100644
--- a/include/ipmitool/ipmi_time.h
+++ b/include/ipmitool/ipmi_time.h
@@ -30,8 +30,8 @@
  * SOFTWARE, EVEN IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGES.
  */
-#ifndef IPMI_TIME_H
-#define IPMI_TIME_H
+
+#pragma once
 
 #include <time.h>
 #include <stdbool.h>
@@ -88,6 +88,3 @@ char *ipmi_timestamp_time(uint32_t stamp); /* HH:MM:SS ZZZ */
 
 /* Subtract the UTC offset from local time_t */
 time_t ipmi_localtime2utc(time_t local);
-
-#endif
-
diff --git a/include/ipmitool/ipmi_tsol.h b/include/ipmitool/ipmi_tsol.h
index 8157cd8..8baf21e 100644
--- a/include/ipmitool/ipmi_tsol.h
+++ b/include/ipmitool/ipmi_tsol.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_TSOL_H
-#define IPMI_TSOL_H
+#pragma once
 
 #include <ipmitool/ipmi.h>
 
@@ -42,5 +41,3 @@
 #define IPMI_TSOL_DEF_PORT	6230
 
 int ipmi_tsol_main(struct ipmi_intf *, int, char **);
-
-#endif /* IPMI_TSOL_H */
diff --git a/include/ipmitool/ipmi_user.h b/include/ipmitool/ipmi_user.h
index 0fbab0c..a3cebd9 100644
--- a/include/ipmitool/ipmi_user.h
+++ b/include/ipmitool/ipmi_user.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_USER_H
-#define IPMI_USER_H
+#pragma once
 
 #if HAVE_CONFIG_H
 # include <config.h>
@@ -82,5 +81,3 @@ int _ipmi_set_user_access(struct ipmi_intf *intf,
 int _ipmi_set_user_password(struct ipmi_intf *intf,
 		uint8_t user_id, uint8_t operation,
 		const char *password, uint8_t is_twenty_byte);
-
-#endif /* IPMI_USER_H */
diff --git a/include/ipmitool/ipmi_vita.h b/include/ipmitool/ipmi_vita.h
index 71d471a..b62fb12 100644
--- a/include/ipmitool/ipmi_vita.h
+++ b/include/ipmitool/ipmi_vita.h
@@ -2,8 +2,7 @@
  * Copyright (c) Pigeon Point Systems. All right reserved
  */
 
-#ifndef _IPMI_VITA_H_
-#define _IPMI_VITA_H_
+#pragma once
 
 /* VITA 46.11 commands */
 #define VITA_GET_VSO_CAPABILITIES_CMD		0x00
@@ -45,5 +44,3 @@ ipmi_vita_ipmb_address(struct ipmi_intf *intf);
 
 extern int
 ipmi_vita_main(struct ipmi_intf * intf, int argc, char ** argv);
-
-#endif /* _IPMI_VITA_H_ */
diff --git a/include/ipmitool/log.h b/include/ipmitool/log.h
index b4ea8b6..dcdd760 100644
--- a/include/ipmitool/log.h
+++ b/include/ipmitool/log.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMITOOL_LOG_H
-#define IPMITOOL_LOG_H
+#pragma once
 
 #include <syslog.h>
 
@@ -57,6 +56,3 @@ void log_halt(void);
 void log_level_set(int verbose);
 void lprintf(int level, const char * format, ...);
 void lperror(int level, const char * format, ...);
-
-#endif /*IPMITOOL_LOG_H*/
-
diff --git a/src/plugins/bmc/bmc.h b/src/plugins/bmc/bmc.h
index 0138710..5274897 100644
--- a/src/plugins/bmc/bmc.h
+++ b/src/plugins/bmc/bmc.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef _IPMI_BMC_H_
-#define	_IPMI_BMC_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -48,5 +47,3 @@ void ipmi_bmc_close(struct ipmi_intf *intf);
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* _IPMI_BMC_H_ */
diff --git a/src/plugins/bmc/bmc_intf.h b/src/plugins/bmc/bmc_intf.h
index c73e4c1..1d322ba 100644
--- a/src/plugins/bmc/bmc_intf.h
+++ b/src/plugins/bmc/bmc_intf.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef _BMC_INTF_H
-#define	_BMC_INTF_H
+#pragma once
 
 #pragma ident	"@(#)bmc_intf.h	1.2	05/03/07 SMI"
 
@@ -203,5 +202,3 @@ typedef struct bmc_msg {
 #ifdef	__cplusplus
 }
 #endif
-
-#endif /* _BMC_INTF_H */
diff --git a/src/plugins/dummy/dummy.h b/src/plugins/dummy/dummy.h
index cac4aff..e6a170a 100644
--- a/src/plugins/dummy/dummy.h
+++ b/src/plugins/dummy/dummy.h
@@ -1,5 +1,4 @@
-#ifndef IPMI_DUMMYIPMI_H
-# define IPMI_DUMMYIPMI_H
+#pragma once
 
 #define IPMI_DUMMY_DEFAULTSOCK "/tmp/.ipmi_dummy"
 
@@ -26,5 +25,3 @@ struct dummy_rs {
 	int data_len;
 	uint8_t *data;
 };
-
-#endif
diff --git a/src/plugins/imb/imbapi.h b/src/plugins/imb/imbapi.h
index 12e67fb..67fdc84 100644
--- a/src/plugins/imb/imbapi.h
+++ b/src/plugins/imb/imbapi.h
@@ -33,6 +33,9 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *----------------------------------------------------------------------*/
+
+#pragma once
+
 #ifndef	_WINDEFS_H
 #define	_WINDEFS_H
 
diff --git a/src/plugins/lan/asf.h b/src/plugins/lan/asf.h
index fdbd815..eb1004f 100644
--- a/src/plugins/lan/asf.h
+++ b/src/plugins/lan/asf.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_ASF_H
-#define IPMI_ASF_H
+#pragma once
 
 #include <ipmitool/helper.h>
 #include "lan.h"
@@ -57,5 +56,3 @@ struct asf_hdr {
 #endif
 
 int handle_asf(struct ipmi_intf * intf, uint8_t * data, int data_len);
-
-#endif /* IPMI_ASF_H */
diff --git a/src/plugins/lan/auth.h b/src/plugins/lan/auth.h
index b9866ba..b7acbba 100644
--- a/src/plugins/lan/auth.h
+++ b/src/plugins/lan/auth.h
@@ -30,11 +30,8 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_AUTH_H
-#define IPMI_AUTH_H
+#pragma once
 
 uint8_t * ipmi_auth_md2(struct ipmi_session * s, uint8_t * data, int data_len);
 uint8_t * ipmi_auth_md5(struct ipmi_session * s, uint8_t * data, int data_len);
 uint8_t * ipmi_auth_special(struct ipmi_session * s);
-
-#endif /*IPMI_AUTH_H*/
diff --git a/src/plugins/lan/lan.h b/src/plugins/lan/lan.h
index 3ba3055..4b26922 100644
--- a/src/plugins/lan/lan.h
+++ b/src/plugins/lan/lan.h
@@ -30,12 +30,9 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_LAN_H
-#define IPMI_LAN_H
+#pragma once
 
 #include <ipmitool/ipmi.h>
 #include <ipmitool/ipmi_intf.h>
 
 extern struct ipmi_intf ipmi_lan_intf;
-
-#endif /*IPMI_LAN_H*/
diff --git a/src/plugins/lan/rmcp.h b/src/plugins/lan/rmcp.h
index 93cd89b..f283bf3 100644
--- a/src/plugins/lan/rmcp.h
+++ b/src/plugins/lan/rmcp.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_RMCP_H
-#define IPMI_RMCP_H
+#pragma once
 
 #include <ipmitool/helper.h>
 #include "lan.h"
@@ -82,5 +81,3 @@ struct rmcp_pong {
 #endif
 
 int handle_rmcp(struct ipmi_intf * intf, uint8_t * data, int data_len);
-
-#endif /* IPMI_RMCP_H */
diff --git a/src/plugins/lanplus/asf.h b/src/plugins/lanplus/asf.h
index 184f0f4..6453363 100644
--- a/src/plugins/lanplus/asf.h
+++ b/src/plugins/lanplus/asf.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_ASF_H
-#define IPMI_ASF_H
+#pragma once
 
 #include <ipmitool/helper.h>
 #include "lanplus.h"
@@ -57,5 +56,3 @@ struct asf_hdr {
 #endif
 
 int handle_asf(struct ipmi_intf * intf, uint8_t * data, int data_len);
-
-#endif /* IPMI_ASF_H */
diff --git a/src/plugins/lanplus/lanplus.h b/src/plugins/lanplus/lanplus.h
index 3923dbf..3e287ae 100644
--- a/src/plugins/lanplus/lanplus.h
+++ b/src/plugins/lanplus/lanplus.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_LANPLUS_H
-#define IPMI_LANPLUS_H
+#pragma once
 
 #include <ipmitool/ipmi.h>
 
@@ -130,5 +129,3 @@ struct ipmi_rs * ipmi_lan_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req
 int  ipmi_lanplus_open(struct ipmi_intf * intf);
 void ipmi_lanplus_close(struct ipmi_intf * intf);
 int ipmiv2_lan_ping(struct ipmi_intf * intf);
-
-#endif /*IPMI_LAN_H*/
diff --git a/src/plugins/lanplus/lanplus_crypt.h b/src/plugins/lanplus/lanplus_crypt.h
index d69cc9b..1c306dd 100644
--- a/src/plugins/lanplus/lanplus_crypt.h
+++ b/src/plugins/lanplus/lanplus_crypt.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_LANPLUS_CRYPT_H
-#define IPMI_LANPLUS_CRYPT_H
+#pragma once
 
 #include <ipmitool/ipmi_intf.h>
 
@@ -68,8 +67,3 @@ int lanplus_decrypt_payload(uint8_t         crypt_alg,
 							uint16_t      * payload_size);
 int lanplus_has_valid_auth_code(struct ipmi_rs * rs,
 								struct ipmi_session * session);
-
-
-
-
-#endif /* IPMI_LANPLUS_CRYPT_H  */
diff --git a/src/plugins/lanplus/lanplus_crypt_impl.h b/src/plugins/lanplus/lanplus_crypt_impl.h
index ff534bc..a48c6b7 100644
--- a/src/plugins/lanplus/lanplus_crypt_impl.h
+++ b/src/plugins/lanplus/lanplus_crypt_impl.h
@@ -30,9 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_LANPLUS_CRYPT_IMPL_H
-#define IPMI_LANPLUS_CRYPT_IMPL_H
-
+#pragma once
 
 int
 lanplus_seed_prng(uint32_t bytes);
@@ -61,6 +59,3 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
 							uint32_t          input_length,
 							uint8_t       * output,
 							uint32_t        * bytes_written);
-
-
-#endif /* IPMI_LANPLUS_CRYPT_IMPL_H */
diff --git a/src/plugins/lanplus/lanplus_dump.h b/src/plugins/lanplus/lanplus_dump.h
index 4e29ebb..d4c8a8d 100644
--- a/src/plugins/lanplus/lanplus_dump.h
+++ b/src/plugins/lanplus/lanplus_dump.h
@@ -30,9 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-
-#ifndef IPMI_LANPLUS_DUMP_H
-#define IPMI_LANPLUS_DUMP_H
+#pragma once
 
 #include <ipmitool/ipmi_intf.h>
 
@@ -40,6 +38,3 @@
 void lanplus_dump_open_session_response(const struct ipmi_rs * rsp);
 void lanplus_dump_rakp2_message(const struct ipmi_rs * rsp, uint8_t auth_alg);
 void lanplus_dump_rakp4_message(const struct ipmi_rs * rsp, uint8_t auth_alg);
-
-
-#endif /* IPMI_LANPLUS_DUMP_H  */
diff --git a/src/plugins/lanplus/rmcp.h b/src/plugins/lanplus/rmcp.h
index 0d3e230..df07f2f 100644
--- a/src/plugins/lanplus/rmcp.h
+++ b/src/plugins/lanplus/rmcp.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_RMCP_H
-#define IPMI_RMCP_H
+#pragma once
 
 #include <ipmitool/helper.h>
 #include "lanplus.h"
@@ -65,5 +64,3 @@ struct rmcp_hdr {
 #endif
 
 int handle_rmcp(struct ipmi_intf * intf, uint8_t * data, int data_len);
-
-#endif /* IPMI_RMCP_H */
diff --git a/src/plugins/lipmi/lipmi.h b/src/plugins/lipmi/lipmi.h
index 7cf0e0a..37a01fb 100644
--- a/src/plugins/lipmi/lipmi.h
+++ b/src/plugins/lipmi/lipmi.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_LIPMI_H
-#define IPMI_LIPMI_H
+#pragma once
 
 #include <ipmitool/ipmi.h>
 #include <ipmitool/ipmi_intf.h>
@@ -42,5 +41,3 @@ struct ipmi_rs * ipmi_lipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * r
 int ipmi_lipmi_open(struct ipmi_intf * intf);
 void ipmi_lipmi_close(struct ipmi_intf * intf);
 int lipmi_intf_setup(struct ipmi_intf ** intf);
-
-#endif
diff --git a/src/plugins/open/open.h b/src/plugins/open/open.h
index 5d7aa5b..aab3085 100644
--- a/src/plugins/open/open.h
+++ b/src/plugins/open/open.h
@@ -30,8 +30,7 @@
  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#ifndef IPMI_OPENIPMI_H
-#define IPMI_OPENIPMI_H
+#pragma once
 
 #define IPMI_MAX_ADDR_SIZE		0x20
 #define IPMI_BMC_CHANNEL		0xf
@@ -102,5 +101,3 @@ struct ipmi_ipmb_addr {
 #define IPMICTL_GET_MY_ADDRESS_CMD	_IOR(IPMI_IOC_MAGIC, 18, unsigned int)
 #define IPMICTL_SET_MY_LUN_CMD		_IOR(IPMI_IOC_MAGIC, 19, unsigned int)
 #define IPMICTL_GET_MY_LUN_CMD		_IOR(IPMI_IOC_MAGIC, 20, unsigned int)
-
-#endif /*IPMI_OPENIPMI_H*/