diff --git a/src/northbridge/intel/haswell/haswell.h b/src/northbridge/intel/haswell/haswell.h
index b010cdf..6faf787 100644
--- a/src/northbridge/intel/haswell/haswell.h
+++ b/src/northbridge/intel/haswell/haswell.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef __NORTHBRIDGE_INTEL_HASWELL_HASWELL_H__
-#define __NORTHBRIDGE_INTEL_HASWELL_HASWELL_H__
+#ifndef NORTHBRIDGE_INTEL_HASWELL_HASWELL_H
+#define NORTHBRIDGE_INTEL_HASWELL_HASWELL_H
 
 #include <device/device.h>
 #include <northbridge/intel/common/fixed_bars.h>
@@ -68,4 +68,4 @@
 unsigned long northbridge_write_acpi_tables(const struct device *device, unsigned long start,
 					    struct acpi_rsdp *rsdp);
 
-#endif /* __NORTHBRIDGE_INTEL_HASWELL_HASWELL_H__ */
+#endif /* NORTHBRIDGE_INTEL_HASWELL_HASWELL_H */
diff --git a/src/northbridge/intel/haswell/memmap.h b/src/northbridge/intel/haswell/memmap.h
index 02bdecc..1aa2d67 100644
--- a/src/northbridge/intel/haswell/memmap.h
+++ b/src/northbridge/intel/haswell/memmap.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef __NORTHBRIDGE_INTEL_HASWELL_MEMMAP_H__
-#define __NORTHBRIDGE_INTEL_HASWELL_MEMMAP_H__
+#ifndef NORTHBRIDGE_INTEL_HASWELL_MEMMAP_H
+#define NORTHBRIDGE_INTEL_HASWELL_MEMMAP_H
 
 #define GFXVT_BASE_ADDRESS	0xfed90000ULL
 #define GFXVT_BASE_SIZE		0x1000
@@ -9,4 +9,4 @@
 #define VTVC0_BASE_ADDRESS	0xfed91000ULL
 #define VTVC0_BASE_SIZE		0x1000
 
-#endif /* __NORTHBRIDGE_INTEL_HASWELL_MEMMAP_H__ */
+#endif /* NORTHBRIDGE_INTEL_HASWELL_MEMMAP_H */
diff --git a/src/northbridge/intel/haswell/raminit.h b/src/northbridge/intel/haswell/raminit.h
index 5483229..e151b46 100644
--- a/src/northbridge/intel/haswell/raminit.h
+++ b/src/northbridge/intel/haswell/raminit.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef RAMINIT_H
-#define RAMINIT_H
+#ifndef NORTHBRIDGE_INTEL_HASWELL_RAMINIT_H
+#define NORTHBRIDGE_INTEL_HASWELL_RAMINIT_H
 
 #include <types.h>
 
@@ -17,4 +17,4 @@
 
 void perform_raminit(const int s3resume);
 
-#endif				/* RAMINIT_H */
+#endif	/* NORTHBRIDGE_INTEL_HASWELL_RAMINIT_H */
diff --git a/src/northbridge/intel/haswell/registers/dmibar.h b/src/northbridge/intel/haswell/registers/dmibar.h
index 9d52382..09a9078 100644
--- a/src/northbridge/intel/haswell/registers/dmibar.h
+++ b/src/northbridge/intel/haswell/registers/dmibar.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef __HASWELL_REGISTERS_DMIBAR_H__
-#define __HASWELL_REGISTERS_DMIBAR_H__
+#ifndef HASWELL_REGISTERS_DMIBAR_H
+#define HASWELL_REGISTERS_DMIBAR_H
 
 #define DMIVCECH	0x000	/* 32bit */
 #define DMIPVCCAP1	0x004	/* 32bit */
@@ -53,4 +53,4 @@
 
 #define DMI_AFE_PM_TMR	0xc28	/* 32bit */
 
-#endif /* __HASWELL_REGISTERS_DMIBAR_H__ */
+#endif /* HASWELL_REGISTERS_DMIBAR_H */
diff --git a/src/northbridge/intel/haswell/registers/epbar.h b/src/northbridge/intel/haswell/registers/epbar.h
index 699a2ba..cccfcca 100644
--- a/src/northbridge/intel/haswell/registers/epbar.h
+++ b/src/northbridge/intel/haswell/registers/epbar.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef __HASWELL_REGISTERS_EPBAR_H__
-#define __HASWELL_REGISTERS_EPBAR_H__
+#ifndef HASWELL_REGISTERS_EPBAR_H
+#define HASWELL_REGISTERS_EPBAR_H
 
 #define EPPVCCAP1	0x004	/* 32bit */
 #define EPPVCCAP2	0x008	/* 32bit */
@@ -25,4 +25,4 @@
 #define EPLE4D		0x080	/* 32bit */
 #define EPLE4A		0x088	/* 64bit */
 
-#endif /* __HASWELL_REGISTERS_EPBAR_H__ */
+#endif /* HASWELL_REGISTERS_EPBAR_H */
diff --git a/src/northbridge/intel/haswell/registers/host_bridge.h b/src/northbridge/intel/haswell/registers/host_bridge.h
index 7746801..1ee0ab2 100644
--- a/src/northbridge/intel/haswell/registers/host_bridge.h
+++ b/src/northbridge/intel/haswell/registers/host_bridge.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef __HASWELL_REGISTERS_HOST_BRIDGE_H__
-#define __HASWELL_REGISTERS_HOST_BRIDGE_H__
+#ifndef HASWELL_REGISTERS_HOST_BRIDGE_H
+#define HASWELL_REGISTERS_HOST_BRIDGE_H
 
 #define EPBAR		0x40
 #define MCHBAR		0x48
@@ -71,4 +71,4 @@
 
 #define CAPID0_B	0xe8
 
-#endif /* __HASWELL_REGISTERS_HOST_BRIDGE_H__ */
+#endif /* HASWELL_REGISTERS_HOST_BRIDGE_H */
diff --git a/src/northbridge/intel/haswell/registers/mchbar.h b/src/northbridge/intel/haswell/registers/mchbar.h
index 2dfad62..5610e70 100644
--- a/src/northbridge/intel/haswell/registers/mchbar.h
+++ b/src/northbridge/intel/haswell/registers/mchbar.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef __HASWELL_REGISTERS_MCHBAR_H__
-#define __HASWELL_REGISTERS_MCHBAR_H__
+#ifndef HASWELL_REGISTERS_MCHBAR_H
+#define HASWELL_REGISTERS_MCHBAR_H
 
 /* Memory controller characteristics */
 #define NUM_CHANNELS	2
@@ -74,4 +74,4 @@
 #define CRDTLCK			0x77fc
 #define MCARBLCK		0x7ffc
 
-#endif /* __HASWELL_REGISTERS_MCHBAR_H__ */
+#endif /* HASWELL_REGISTERS_MCHBAR_H */