diff --git a/arch/sw_64/include/asm/asm-offsets.h b/arch/sw_64/include/asm/asm-offsets.h
index 72cd408a9c6fa6594b8a17b19cf7d6b73b582f6c..5ddfd96ccb793c8d1011bc1542968d29e9a68416 100644
--- a/arch/sw_64/include/asm/asm-offsets.h
+++ b/arch/sw_64/include/asm/asm-offsets.h
@@ -4,4 +4,4 @@
 
 #include <generated/asm-offsets.h>
 
-#endif
+#endif /* _ASM_SW64_ASM_OFFSETS_H */
diff --git a/arch/sw_64/include/asm/asm-prototypes.h b/arch/sw_64/include/asm/asm-prototypes.h
index 15bad8ef6883027ff7502a8e362e7b936dbc8d4b..67746d6bffb725b41d5997f983cded406e63573a 100644
--- a/arch/sw_64/include/asm/asm-prototypes.h
+++ b/arch/sw_64/include/asm/asm-prototypes.h
@@ -19,4 +19,4 @@ extern void __remlu(void);
 extern void __divwu(void);
 extern void __remwu(void);
 
-#endif
+#endif /* _ASM_SW64_ASM_PROTOTYPES_H */
diff --git a/arch/sw_64/include/asm/bugs.h b/arch/sw_64/include/asm/bugs.h
index c4a336fe04a2f66628e863aef87e9c5441c896c1..1cd94ed171fbc2c69523d87d37d19fecd37cc428 100644
--- a/arch/sw_64/include/asm/bugs.h
+++ b/arch/sw_64/include/asm/bugs.h
@@ -6,4 +6,4 @@ static void check_bugs(void)
 {
 }
 
-#endif
+#endif /* _ASM_SW64_BUGS_H */
diff --git a/arch/sw_64/include/asm/cache.h b/arch/sw_64/include/asm/cache.h
index 1dca2e2e04a4360c28b2a68fdccd6eac011001b9..fade2e095b8b60a4e7c087018eff19fa769f84ae 100644
--- a/arch/sw_64/include/asm/cache.h
+++ b/arch/sw_64/include/asm/cache.h
@@ -8,4 +8,4 @@
 #define L1_CACHE_SHIFT		7
 #define L1_CACHE_BYTES		(1 << L1_CACHE_SHIFT)
 
-#endif
+#endif /* _ASM_SW64_CACHE_H */
diff --git a/arch/sw_64/include/asm/checksum.h b/arch/sw_64/include/asm/checksum.h
index 284c1678f51ea084f71ee6a3747ce49854c512eb..7f3768290402bea31e0e5c445716012e81d6ad4e 100644
--- a/arch/sw_64/include/asm/checksum.h
+++ b/arch/sw_64/include/asm/checksum.h
@@ -123,4 +123,4 @@ static inline unsigned short from64to16(unsigned long x)
 	return out_v.us[0] + out_v.us[1];
 }
 
-#endif
+#endif /* _ASM_SW64_CHECKSUM_H */
diff --git a/arch/sw_64/include/asm/chip3_io.h b/arch/sw_64/include/asm/chip3_io.h
index 14d02c080607403805e357207ec8fa1de9eb6376..3bfbc2bdafe7f967f4e79d2f504861a4800e24f3 100644
--- a/arch/sw_64/include/asm/chip3_io.h
+++ b/arch/sw_64/include/asm/chip3_io.h
@@ -314,4 +314,4 @@ enum {
 	GPIO_SWPORTA_DDR =	GPIO_BASE | 0x200UL,
 };
 /*--------------------------------------------------------------------------*/
-#endif
+#endif /* _ASM_SW64_CHIP3_IO_H */
diff --git a/arch/sw_64/include/asm/cmpxchg.h b/arch/sw_64/include/asm/cmpxchg.h
index e07abc47c7dd2218862cb9df4a6c2f65b6d7d278..7f2d103db9c21c950825bc111bb0ee08b8d0e286 100644
--- a/arch/sw_64/include/asm/cmpxchg.h
+++ b/arch/sw_64/include/asm/cmpxchg.h
@@ -39,6 +39,7 @@
 #endif
 #undef ____xchg
 #undef ____cmpxchg
+#undef _ASM_SW64_XCHG_H
 #define ____xchg(type, args...)		__xchg ##type(args)
 #define ____cmpxchg(type, args...)	__cmpxchg ##type(args)
 #include <asm/xchg.h>
diff --git a/arch/sw_64/include/asm/core.h b/arch/sw_64/include/asm/core.h
index 72d752c8741261fa2a37caab52c1fb177d7925d5..e5e4cc138102791c5976634799afd60d646cc032 100644
--- a/arch/sw_64/include/asm/core.h
+++ b/arch/sw_64/include/asm/core.h
@@ -45,4 +45,4 @@ extern void entSys(void);
 extern void entUna(void);
 /* head.S */
 extern void __smp_callin(unsigned long);
-#endif
+#endif /* _ASM_SW64_CORE_H */
diff --git a/arch/sw_64/include/asm/delay.h b/arch/sw_64/include/asm/delay.h
index 45112c7c3c013b02b3d7a5368c9d29371e3af7b1..f4080753e9545c1f19cc3775b4ad362cc378b32f 100644
--- a/arch/sw_64/include/asm/delay.h
+++ b/arch/sw_64/include/asm/delay.h
@@ -8,4 +8,4 @@ extern void udelay(unsigned long usecs);
 extern void ndelay(unsigned long nsecs);
 #define ndelay ndelay
 
-#endif /* defined(_ASM_SW64_DELAY_H) */
+#endif /* _ASM_SW64_DELAY_H */
diff --git a/arch/sw_64/include/asm/device.h b/arch/sw_64/include/asm/device.h
index dadd756d693421ae5dc0e52d530cd293d88d4a75..bc1408c47dd3875bcb7b371411e876cb62ad93f2 100644
--- a/arch/sw_64/include/asm/device.h
+++ b/arch/sw_64/include/asm/device.h
@@ -10,4 +10,4 @@ struct dev_archdata {
 
 struct pdev_archdata {
 };
-#endif
+#endif /* _ASM_SW64_DEVICE_H */
diff --git a/arch/sw_64/include/asm/dmi.h b/arch/sw_64/include/asm/dmi.h
index 5142aa66ea45dfdd2710a0f40005fceca77ad6e7..05e80c9a3a76dc143e505440a41b7d150b873e3d 100644
--- a/arch/sw_64/include/asm/dmi.h
+++ b/arch/sw_64/include/asm/dmi.h
@@ -27,4 +27,4 @@
 #define dmi_unmap(x)			early_iounmap(x, 0)
 #define dmi_alloc(l)			kzalloc(l, GFP_KERNEL)
 
-#endif
+#endif /* _ASM_SW64_DMI_H */
diff --git a/arch/sw_64/include/asm/early_ioremap.h b/arch/sw_64/include/asm/early_ioremap.h
index 930c6bf36ad3c69a0be9dbe175649fc17d780d84..5459cba8a67772a1a4c904752272af13853eb02e 100644
--- a/arch/sw_64/include/asm/early_ioremap.h
+++ b/arch/sw_64/include/asm/early_ioremap.h
@@ -27,4 +27,4 @@ static inline void early_iounmap(volatile void __iomem *addr, unsigned long size
 }
 #define early_memunmap(addr, size)		early_iounmap(addr, size)
 
-#endif
+#endif /* _ASM_SW64_EARLY_IOREMAP_H */
diff --git a/arch/sw_64/include/asm/extable.h b/arch/sw_64/include/asm/extable.h
index ae753772a45a9b12e8c4476b9e78be7921371822..3680b4a918a6676e8ce6b31fba2ef487dccfe9f4 100644
--- a/arch/sw_64/include/asm/extable.h
+++ b/arch/sw_64/include/asm/extable.h
@@ -56,4 +56,4 @@ struct exception_table_entry {
 extern short regoffsets[];
 #define map_regs(r) (*(unsigned long *)((char *)regs + regoffsets[r]))
 
-#endif
+#endif /* _ASM_SW64_EXTABLE_H */
diff --git a/arch/sw_64/include/asm/hmcall.h b/arch/sw_64/include/asm/hmcall.h
index e85397ab06a1de2cee870f51b3506af577211f00..04fcafac9e80c788fe67fe6da02f9391026327be 100644
--- a/arch/sw_64/include/asm/hmcall.h
+++ b/arch/sw_64/include/asm/hmcall.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _ASM_SW64_HMC_H
-#define _ASM_SW64_HMC_H
+#ifndef _ASM_SW64_HMCALL_H
+#define _ASM_SW64_HMCALL_H
 
 /*
  * Common HMC-code
@@ -216,4 +216,4 @@ __CALL_HMC_W1(wrtp, unsigned long);
 #endif /* !__ASSEMBLY__ */
 #endif /* __KERNEL__ */
 
-#endif /* _ASM_SW64_HMC_H */
+#endif /* _ASM_SW64_HMCALL_H */
diff --git a/arch/sw_64/include/asm/hw_init.h b/arch/sw_64/include/asm/hw_init.h
index 8a28aac2e54f05d83de77f69e030b7976d871a86..81dd2581e0da017e5427a6dbb0dc60924e2a5bf1 100644
--- a/arch/sw_64/include/asm/hw_init.h
+++ b/arch/sw_64/include/asm/hw_init.h
@@ -162,4 +162,4 @@ DECLARE_STATIC_KEY_FALSE(run_mode_emul_key);
 	(((val) & CACHE_INDEX_BITS_MASK) >> CACHE_INDEX_BITS_SHIFT)
 #define current_cpu_data cpu_data[smp_processor_id()]
 
-#endif /* HW_INIT_H */
+#endif /* _ASM_SW64_HW_INIT_H */
diff --git a/arch/sw_64/include/asm/hw_irq.h b/arch/sw_64/include/asm/hw_irq.h
index f6fd1d802abdf9356ae94d59240036cc673b3fd0..ad5aed26efb7f9ca58bd3b5881e0858d401780c0 100644
--- a/arch/sw_64/include/asm/hw_irq.h
+++ b/arch/sw_64/include/asm/hw_irq.h
@@ -13,4 +13,4 @@ DECLARE_PER_CPU(unsigned long, irq_pmi_count);
 typedef unsigned int vector_irq_t[PERCPU_MSI_IRQS];
 DECLARE_PER_CPU(vector_irq_t, vector_irq);
 #endif
-#endif
+#endif /* _ASM_SW64_HW_IRQ_H */
diff --git a/arch/sw_64/include/asm/irq_impl.h b/arch/sw_64/include/asm/irq_impl.h
index 48dbc486a126d6b37cf10897ef2d9518e6302a75..797af433a1267c8b49cfda9901baed051ff16b98 100644
--- a/arch/sw_64/include/asm/irq_impl.h
+++ b/arch/sw_64/include/asm/irq_impl.h
@@ -45,4 +45,4 @@ extern void handle_ipi(struct pt_regs *regs);
 extern void __init sw64_init_irq(void);
 extern irqreturn_t timer_interrupt(int irq, void *dev);
 
-#endif
+#endif /* _ASM_SW64_IRQ_IMPL_H */
diff --git a/arch/sw_64/include/asm/jump_label.h b/arch/sw_64/include/asm/jump_label.h
index 78d3fb6246f013862df71773d497281f7f82a226..32fbf7573b206bb2c935cc173de392b100d02010 100644
--- a/arch/sw_64/include/asm/jump_label.h
+++ b/arch/sw_64/include/asm/jump_label.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 
-#ifndef __ASM_SW64_JUMP_LABEL_H
-#define __ASM_SW64_JUMP_LABEL_H
+#ifndef _ASM_SW64_JUMP_LABEL_H
+#define _ASM_SW64_JUMP_LABEL_H
 
 #ifndef __ASSEMBLY__
 
@@ -47,4 +47,4 @@ struct jump_entry {
 };
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ASM_SW64_JUMP_LABEL_H */
+#endif /* _ASM_SW64_JUMP_LABEL_H */
diff --git a/arch/sw_64/include/asm/kvm_cma.h b/arch/sw_64/include/asm/kvm_cma.h
index 192bca43638089cef0c0e0d0ee6e1126231fb596..d50ba599ceb716ac0309122cf77c1e2ea38c70d7 100644
--- a/arch/sw_64/include/asm/kvm_cma.h
+++ b/arch/sw_64/include/asm/kvm_cma.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _ASM_SW64_KVM_CMA_H__
-#define _ASM_SW64_KVM_CMA_H__
+#ifndef _ASM_SW64_KVM_CMA_H
+#define _ASM_SW64_KVM_CMA_H
 
 #include <linux/cma.h>
 
@@ -8,4 +8,4 @@ extern int __init kvm_cma_declare_contiguous(phys_addr_t base,
 			phys_addr_t size, phys_addr_t limit,
 			phys_addr_t alignment, unsigned int order_per_bit,
 			const char *name, struct cma **res_cma);
-#endif
+#endif /* _ASM_SW64_KVM_CMA_H */
diff --git a/arch/sw_64/include/asm/kvm_emulate.h b/arch/sw_64/include/asm/kvm_emulate.h
index d842008f189a326e497cd38d940a59f3d5e9c8f3..915aa6c0bce212b8b06bb3aa19aa6aee8c04e532 100644
--- a/arch/sw_64/include/asm/kvm_emulate.h
+++ b/arch/sw_64/include/asm/kvm_emulate.h
@@ -43,4 +43,4 @@ unsigned int interrupt_pending(struct kvm_vcpu *vcpu, bool *more);
 void clear_vcpu_irq(struct kvm_vcpu *vcpu);
 void inject_vcpu_irq(struct kvm_vcpu *vcpu, unsigned int irq);
 void try_deliver_interrupt(struct kvm_vcpu *vcpu, unsigned int irq, bool more);
-#endif
+#endif /* _ASM_SW64_KVM_EMULATE_H */
diff --git a/arch/sw_64/include/asm/kvm_para.h b/arch/sw_64/include/asm/kvm_para.h
index ba78c53715701b8a3f59ebc11631e1e6d648fa1d..442f1c7d9f832159bcb04068b8939c1fa3b107cc 100644
--- a/arch/sw_64/include/asm/kvm_para.h
+++ b/arch/sw_64/include/asm/kvm_para.h
@@ -23,4 +23,4 @@ static inline unsigned long kvm_hypercall3(unsigned long num,
 		: "$1", "$22", "$23", "$24", "$25");
 	return __r0;
 }
-#endif
+#endif /* _ASM_SW64_KVM_PARA_H */
diff --git a/arch/sw_64/include/asm/kvm_timer.h b/arch/sw_64/include/asm/kvm_timer.h
index be50bba9c4c684d11c13faccd9c03c176d930825..8080873c684f82b0e0c06b7e55c72ba475f497cd 100644
--- a/arch/sw_64/include/asm/kvm_timer.h
+++ b/arch/sw_64/include/asm/kvm_timer.h
@@ -6,4 +6,4 @@ void set_timer(struct kvm_vcpu *vcpu, unsigned long delta);
 void set_interrupt(struct kvm_vcpu *vcpu, unsigned int irq);
 enum hrtimer_restart clockdev_fn(struct hrtimer *timer);
 
-#endif
+#endif /* _ASM_SW64_KVM_TIMER_H */
diff --git a/arch/sw_64/include/asm/linkage.h b/arch/sw_64/include/asm/linkage.h
index 96c83663d9e84b81a03a1673a4e02284136e3826..6576fb46a000c3c6e7a6cfb644db9db8b981a959 100644
--- a/arch/sw_64/include/asm/linkage.h
+++ b/arch/sw_64/include/asm/linkage.h
@@ -6,4 +6,4 @@
 #define SYSCALL_ALIAS(alias, name)                                      \
 	asm(#alias " = " #name "\n\t.globl " #alias)
 
-#endif
+#endif /* _ASM_SW64_LINKAGE_H */
diff --git a/arch/sw_64/include/asm/mmu.h b/arch/sw_64/include/asm/mmu.h
index 548c73b318cb2acbeeaa501bbabc9d95c4151b9c..f24219fac654bb3381ea0e85e5faeeb3486d23d3 100644
--- a/arch/sw_64/include/asm/mmu.h
+++ b/arch/sw_64/include/asm/mmu.h
@@ -7,4 +7,4 @@ typedef struct {
 	unsigned long asid[NR_CPUS];
 	void *vdso;
 } mm_context_t;
-#endif
+#endif /* _ASM_SW64_MMU_H */
diff --git a/arch/sw_64/include/asm/ptrace.h b/arch/sw_64/include/asm/ptrace.h
index b5afebf82939c0dc94d0b984d53dcb616c2b6a92..5f6cd305f95e6c3fa1c2801e52903eb4a438d470 100644
--- a/arch/sw_64/include/asm/ptrace.h
+++ b/arch/sw_64/include/asm/ptrace.h
@@ -92,4 +92,4 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
 {
 	return regs->r0;
 }
-#endif
+#endif /* _ASM_SW64_PTRACE_H */
diff --git a/arch/sw_64/include/asm/setup.h b/arch/sw_64/include/asm/setup.h
index c0fb4e8bd80c40ce9f43d6f951bfc349bc62b7a0..384eeba021446347359d097528f205606e1a4334 100644
--- a/arch/sw_64/include/asm/setup.h
+++ b/arch/sw_64/include/asm/setup.h
@@ -43,4 +43,4 @@
 extern struct boot_params *sunway_boot_params;
 #endif
 
-#endif
+#endif /* _ASM_SW64_SETUP_H */
diff --git a/arch/sw_64/include/asm/sfp-machine.h b/arch/sw_64/include/asm/sfp-machine.h
index 9b3e8688feee7725e76e51d75d34106be638d86d..c1b914898543d01498834bd1d8dff4215fee768c 100644
--- a/arch/sw_64/include/asm/sfp-machine.h
+++ b/arch/sw_64/include/asm/sfp-machine.h
@@ -66,4 +66,4 @@ do {								\
 /* We write the results always */
 #define FP_INHIBIT_RESULTS 0
 
-#endif
+#endif /* _ASM_SW64_SFP_MACHINE_H */
diff --git a/arch/sw_64/include/asm/signal.h b/arch/sw_64/include/asm/signal.h
index 0d846c1aa571e5ea946d7ef9422ba63d77d3bd30..9e0936e6db2b4265320d46a606a7bd04c91f0f8b 100644
--- a/arch/sw_64/include/asm/signal.h
+++ b/arch/sw_64/include/asm/signal.h
@@ -21,4 +21,4 @@ struct odd_sigaction {
 };
 
 #include <asm/sigcontext.h>
-#endif
+#endif /* _ASM_SW64_SIGNAL_H */
diff --git a/arch/sw_64/include/asm/smp.h b/arch/sw_64/include/asm/smp.h
index e7aa742f73f0dd95b77e4c0a26e56c93f7311665..0573361dc840d021f3acf88989e4eeae2ce5be97 100644
--- a/arch/sw_64/include/asm/smp.h
+++ b/arch/sw_64/include/asm/smp.h
@@ -178,4 +178,4 @@ static inline void send_ipi(int cpu, unsigned long type)
 
 #define reset_cpu(cpu)  send_ipi((cpu), II_RESET)
 
-#endif
+#endif /* _ASM_SW64_SMP_H */
diff --git a/arch/sw_64/include/asm/spinlock_types.h b/arch/sw_64/include/asm/spinlock_types.h
index 28f2183ced749485f0bbbdff5767bf081c943430..62e554e4f48c35b2d4578072231b58c75b202a4b 100644
--- a/arch/sw_64/include/asm/spinlock_types.h
+++ b/arch/sw_64/include/asm/spinlock_types.h
@@ -5,4 +5,4 @@
 #include <asm-generic/qspinlock_types.h>
 #include <asm-generic/qrwlock_types.h>
 
-#endif
+#endif /* _ASM_SW64_SPINLOCK_TYPES_H */
diff --git a/arch/sw_64/include/asm/suspend.h b/arch/sw_64/include/asm/suspend.h
index de6d97a0aff6d88956a90dc6bb57cb27c3dbaf26..521ab099f94b80ca6f31abc0f5da5447a6debeb0 100644
--- a/arch/sw_64/include/asm/suspend.h
+++ b/arch/sw_64/include/asm/suspend.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _ASM_SW64_SLEEP_H
-#define _ASM_SW64_SLEEP_H
+#ifndef _ASM_SW64_SUSPEND_H
+#define _ASM_SW64_SUSPEND_H
 
 #include <asm/hmcall.h>
 #include <asm/ptrace.h>
@@ -45,4 +45,4 @@ struct processor_state {
 };
 
 extern void sw64_suspend_deep_sleep(struct processor_state *state);
-#endif /* _ASM_SW64_SLEEP_H */
+#endif /* _ASM_SW64_SUSPEND_H */
diff --git a/arch/sw_64/include/asm/sw64_init.h b/arch/sw_64/include/asm/sw64_init.h
index 9f16bdf2a61a803ef0d3fbcc57a09975dedf5e7c..aae82f4163e00c1236205c02636968b7d92ee987 100644
--- a/arch/sw_64/include/asm/sw64_init.h
+++ b/arch/sw_64/include/asm/sw64_init.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _ASM_SW64_INIT_H
-#define _ASM_SW64_INIT_H
+#ifndef _ASM_SW64_SW64_INIT_H
+#define _ASM_SW64_SW64_INIT_H
 
 #include <linux/cpu.h>
 #include <linux/pci.h>
@@ -43,4 +43,4 @@ extern struct sw64_chip_init_ops *sw64_chip_init;
 
 DECLARE_PER_CPU(unsigned long, hard_node_id);
 
-#endif /* _ASM_SW64_INIT_H */
+#endif /* _ASM_SW64_SW64_INIT_H */
diff --git a/arch/sw_64/include/asm/sw64io.h b/arch/sw_64/include/asm/sw64io.h
index 7d79a5b75090d82b2df8cde97918405cc4dcbb3c..0892356b8e6b7ad6cca0d81906afbcd48a24df33 100644
--- a/arch/sw_64/include/asm/sw64io.h
+++ b/arch/sw_64/include/asm/sw64io.h
@@ -95,4 +95,4 @@ sw64_io_write(unsigned long node, unsigned long reg, unsigned long data)
 	addr = __va(SW64_IO_BASE(node) | reg);
 	writeq(data, addr);
 }
-#endif
+#endif /* _ASM_SW64_SW64IO_H */
diff --git a/arch/sw_64/include/asm/tc.h b/arch/sw_64/include/asm/tc.h
index f995a2a75f8550afde45213b51e785d16963a073..aa39c3528e3fa923022365c1db31c1ef2c61e220 100644
--- a/arch/sw_64/include/asm/tc.h
+++ b/arch/sw_64/include/asm/tc.h
@@ -13,4 +13,4 @@ static inline unsigned long rdtc(void)
 extern void tc_sync_clear(void);
 extern void tc_sync_ready(void *ignored);
 extern void tc_sync_set(void);
-#endif
+#endif /* _ASM_SW64_TC_H */
diff --git a/arch/sw_64/include/asm/timex.h b/arch/sw_64/include/asm/timex.h
index 9065e39a0466cff54233f124bc34a053d9b8df3f..235197b0d1fd825713acafa7b5e3dc1a1ba25062 100644
--- a/arch/sw_64/include/asm/timex.h
+++ b/arch/sw_64/include/asm/timex.h
@@ -21,4 +21,4 @@ static inline cycles_t get_cycles(void)
 	return rdtc();
 }
 
-#endif
+#endif /* _ASM_SW64_TIMEX_H */
diff --git a/arch/sw_64/include/asm/tlb.h b/arch/sw_64/include/asm/tlb.h
index 4902624dba888d81d0c3ba6d036eb977218d544b..67ce55fc4c43cbade95cf356b317061bb0cb34db 100644
--- a/arch/sw_64/include/asm/tlb.h
+++ b/arch/sw_64/include/asm/tlb.h
@@ -15,4 +15,4 @@
 
 #define __pud_free_tlb(tlb, pud, address)	pud_free((tlb)->mm, pud)
 
-#endif
+#endif /* _ASM_SW64_TLB_H */
diff --git a/arch/sw_64/include/asm/wrperfmon.h b/arch/sw_64/include/asm/wrperfmon.h
index 15f7f6beb07c0606924c0c1e74a88762f8b88ed5..c06a05121a68be93e265928f0651bfda2ad43ac8 100644
--- a/arch/sw_64/include/asm/wrperfmon.h
+++ b/arch/sw_64/include/asm/wrperfmon.h
@@ -61,4 +61,4 @@
 #define MAX_HWEVENTS			2
 #define PMC_COUNT_MASK			((1UL << 58) - 1)
 
-#endif
+#endif /* _ASM_SW64_WRPERFMON_H */
diff --git a/arch/sw_64/include/asm/xchg.h b/arch/sw_64/include/asm/xchg.h
index bac67623da91442716be7df6b561c2bb91ae087d..ba4e6d1a27ad064aeef83ec4e4a2b2c89181093a 100644
--- a/arch/sw_64/include/asm/xchg.h
+++ b/arch/sw_64/include/asm/xchg.h
@@ -1,7 +1,10 @@
 /* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _ASM_SW64_XCHG_H
+#define _ASM_SW64_XCHG_H
+
 #ifndef _ASM_SW64_CMPXCHG_H
-#error Do not include xchg.h directly!
-#else
+#error Do not include xchg.h directly. Use cmpxchg.h
+#endif
 /*
  * xchg/xchg_local and cmpxchg/cmpxchg_local share the same code
  * except that local version do not have the expensive memory barrier.
@@ -325,4 +328,4 @@ static __always_inline unsigned long ____cmpxchg(, volatile void *ptr,
 	return old;
 }
 
-#endif
+#endif /* _ASM_SW64_XCHG_H */
diff --git a/arch/sw_64/include/asm/xor.h b/arch/sw_64/include/asm/xor.h
index af95259ed8ef90fe26a9d4a8f40fcab2c5250105..e9731f2a8f12302bf3cbf768ba915203862bdc11 100644
--- a/arch/sw_64/include/asm/xor.h
+++ b/arch/sw_64/include/asm/xor.h
@@ -844,4 +844,4 @@ static struct xor_block_template xor_block_sw64_prefetch = {
  */
 #define XOR_SELECT_TEMPLATE(FASTEST)   (&xor_block_sw64_prefetch)
 
-#endif
+#endif /* _ASM_SW64_XOR_H */
diff --git a/arch/sw_64/include/uapi/asm/errno.h b/arch/sw_64/include/uapi/asm/errno.h
index 94e1eab5d00312ef347f14c237eb22ba6f771b9e..969ee99ee86c7a72c125a903e438a2373cf36c4a 100644
--- a/arch/sw_64/include/uapi/asm/errno.h
+++ b/arch/sw_64/include/uapi/asm/errno.h
@@ -125,4 +125,4 @@
 
 #define EHWPOISON	139	/* Memory page has hardware error */
 
-#endif
+#endif /* _UAPI_ASM_SW64_ERRNO_H */
diff --git a/arch/sw_64/include/uapi/asm/fcntl.h b/arch/sw_64/include/uapi/asm/fcntl.h
index 99e1a31c5e8606000808bd62c6a6db25c0982501..be2daae2cc4dc1a1f7d9a8b653ade486e7329db9 100644
--- a/arch/sw_64/include/uapi/asm/fcntl.h
+++ b/arch/sw_64/include/uapi/asm/fcntl.h
@@ -55,4 +55,4 @@
 
 #include <asm-generic/fcntl.h>
 
-#endif
+#endif /* _UAPI_ASM_SW64_FCNTL_H */
diff --git a/arch/sw_64/include/uapi/asm/hmcall.h b/arch/sw_64/include/uapi/asm/hmcall.h
index dcff778e16163e0cdac3ae23b056dd8ccd263899..6867fb7b4d244ee325b1d6294d1cae7453246af2 100644
--- a/arch/sw_64/include/uapi/asm/hmcall.h
+++ b/arch/sw_64/include/uapi/asm/hmcall.h
@@ -14,4 +14,4 @@
 #define HMC_gentrap		0xAA
 #define HMC_wrperfmon		0xB0
 
-#endif
+#endif /* _UAPI_ASM_SW64_HMCALL_H */
diff --git a/arch/sw_64/include/uapi/asm/perf_regs.h b/arch/sw_64/include/uapi/asm/perf_regs.h
index 1378a7397951d6ba3085cf64bdda6ef0453a3932..febde5fd72fb7f95b442060352e6c4a38a7e8fbc 100644
--- a/arch/sw_64/include/uapi/asm/perf_regs.h
+++ b/arch/sw_64/include/uapi/asm/perf_regs.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 
-#ifndef _ASM_SW64_PERF_REGS_H
-#define _ASM_SW64_PERF_REGS_H
+#ifndef _UAPI_ASM_SW64_PERF_REGS_H
+#define _UAPI_ASM_SW64_PERF_REGS_H
 
 enum perf_event_sw64_regs {
 	PERF_REG_SW64_R0,
@@ -42,4 +42,4 @@ enum perf_event_sw64_regs {
 	PERF_REG_SW64_R18,
 	PERF_REG_SW64_MAX,
 };
-#endif /* _ASM_SW64_PERF_REGS_H */
+#endif /* _UAPI_ASM_SW64_PERF_REGS_H */
diff --git a/arch/sw_64/include/uapi/asm/setup.h b/arch/sw_64/include/uapi/asm/setup.h
index 10ce5dba9c3066a3334f8ecfe59f569403024178..e6cca45250491ca64bfc6a6c473da19f01984bb9 100644
--- a/arch/sw_64/include/uapi/asm/setup.h
+++ b/arch/sw_64/include/uapi/asm/setup.h
@@ -4,4 +4,4 @@
 
 #define COMMAND_LINE_SIZE   2048
 
-#endif
+#endif /* _UAPI_ASM_SW64_SETUP_H */
diff --git a/arch/sw_64/include/uapi/asm/sigcontext.h b/arch/sw_64/include/uapi/asm/sigcontext.h
index 11d7eece86efa8e50c6ce5b7fb71e36341aad88a..08a0814703830370efae670d59f4262b7da50dbd 100644
--- a/arch/sw_64/include/uapi/asm/sigcontext.h
+++ b/arch/sw_64/include/uapi/asm/sigcontext.h
@@ -31,4 +31,4 @@ struct sigcontext {
 };
 
 
-#endif
+#endif /* _UAPI_ASM_SW64_SIGCONTEXT_H */
diff --git a/arch/sw_64/include/uapi/asm/siginfo.h b/arch/sw_64/include/uapi/asm/siginfo.h
index 4a58eea9b67c9ab254f7142aeb37bf70758b5d8a..28c656c283132e1771179391d0c5a95144b470e4 100644
--- a/arch/sw_64/include/uapi/asm/siginfo.h
+++ b/arch/sw_64/include/uapi/asm/siginfo.h
@@ -8,4 +8,4 @@
 #include <asm-generic/siginfo.h>
 
 
-#endif
+#endif /* _UAPI_ASM_SW64_SIGINFO_H */
diff --git a/arch/sw_64/include/uapi/asm/stat.h b/arch/sw_64/include/uapi/asm/stat.h
index d2b21128c56947bfeef183113ba6a51e149a91a1..25aad21f4d31c7beda0f023f8a0dd7e21db52fac 100644
--- a/arch/sw_64/include/uapi/asm/stat.h
+++ b/arch/sw_64/include/uapi/asm/stat.h
@@ -48,4 +48,4 @@ struct stat64 {
 	long		__unused[3];
 };
 
-#endif
+#endif /* _UAPI_ASM_SW64_STAT_H */
diff --git a/arch/sw_64/kernel/pci_impl.h b/arch/sw_64/kernel/pci_impl.h
index 41d83a41db56189022ac03293e406b4850d3ef7c..4262ba94f44b92935e44b46c6de94f0050c2a390 100644
--- a/arch/sw_64/kernel/pci_impl.h
+++ b/arch/sw_64/kernel/pci_impl.h
@@ -25,4 +25,4 @@ extern const struct dma_map_ops sw64_dma_direct_ops;
 
 extern struct cma *sw64_kvm_cma;
 extern struct gen_pool *sw64_kvm_pool;
-#endif
+#endif /* _SW64_KERNEL_PCI_IMPL_H */
diff --git a/arch/sw_64/kernel/proto.h b/arch/sw_64/kernel/proto.h
index 8c31eca3cc3226a60de293ab2bdc16022d414e10..f908263f925a76c6acee373cf213ccb541bf029b 100644
--- a/arch/sw_64/kernel/proto.h
+++ b/arch/sw_64/kernel/proto.h
@@ -19,4 +19,4 @@ extern void __init setup_sched_clock(void);
 extern void __init sw64_sched_clock_init(void);
 #endif
 
-#endif /* _SW64_PROTO_H */
+#endif /* _SW64_KERNEL_PROTO_H */
diff --git a/arch/sw_64/kvm/irq.h b/arch/sw_64/kvm/irq.h
index ee56d9b97632f3be9962aa832fafb32d4cc35e41..9268ab6af4920818566e2d39e056be795429d20d 100644
--- a/arch/sw_64/kvm/irq.h
+++ b/arch/sw_64/kvm/irq.h
@@ -3,10 +3,10 @@
  * irq.h: in kernel interrupt controller related definitions
  */
 
-#ifndef __IRQ_H
-#define __IRQ_H
+#ifndef _SW64_KVM_IRQ_H
+#define _SW64_KVM_IRQ_H
 static inline int irqchip_in_kernel(struct kvm *kvm)
 {
 	return 1;
 }
-#endif
+#endif /* _SW64_KVM_IRQ_H */
diff --git a/arch/sw_64/math-emu/sfp-util.h b/arch/sw_64/math-emu/sfp-util.h
index 63f9685999f3df9cd34edc1e0a300d74b4fec494..0769c0223e0d7e43e0b73fbd45882333e95f765f 100644
--- a/arch/sw_64/math-emu/sfp-util.h
+++ b/arch/sw_64/math-emu/sfp-util.h
@@ -1,4 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _SW64_MATH_EMU_SFP_UTIL_H
+#define _SW64_MATH_EMU_SFP_UTIL_H
+
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/types.h>
@@ -34,3 +37,5 @@ extern unsigned long __udiv_qrnnd(unsigned long *, unsigned long,
 #define __LITTLE_ENDIAN -1
 #endif
 #define __BYTE_ORDER __LITTLE_ENDIAN
+
+#endif /* _SW64_MATH_EMU_SFP_UTIL_H */
diff --git a/arch/sw_64/net/bpf_jit.h b/arch/sw_64/net/bpf_jit.h
index 2cf5ba5253a84dd34f87e420a59a8d999584d783..929036d8ea6b10daec13166c1e87f63165d99f1a 100644
--- a/arch/sw_64/net/bpf_jit.h
+++ b/arch/sw_64/net/bpf_jit.h
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _SW64_BPF_JIT_H
-#define _SW64_BPF_JIT_H
+#ifndef _SW64_NET_BPF_JIT_H
+#define _SW64_NET_BPF_JIT_H
 
 /* SW64 instruction field shift */
 #define SW64_BPF_OPCODE_OFFSET		26
@@ -365,4 +365,4 @@ enum sw64_bpf_registers {
 	sw64_bpf_gen_format_simple_alu_imm(SW64_BPF_OPCODE_ALU_IMM, \
 			ra, imm8, dst, SW64_BPF_FUNC_ALU_CMPULE)
 
-#endif /* _SW64_BPF_JIT_H */
+#endif /* _SW64_NET_BPF_JIT_H */
diff --git a/arch/sw_64/oprofile/op_impl.h b/arch/sw_64/oprofile/op_impl.h
index 10bdd455c3dde7c259e424606420c991b08ad86f..e8714cb7c2ea773b8c270bd4f9cfee7c3c8286db 100644
--- a/arch/sw_64/oprofile/op_impl.h
+++ b/arch/sw_64/oprofile/op_impl.h
@@ -53,4 +53,4 @@ struct op_axp_model {
 	unsigned char can_set_proc_mode;
 };
 
-#endif
+#endif /* _SW64_OPROFILE_OP_IMPL_H */
diff --git a/arch/sw_64/tools/relocs.h b/arch/sw_64/tools/relocs.h
index 7273ccaed11fee146d4d5ba695fb39791d266740..37ac09ec2a77b439ead8d6a56d5016fd201d3799 100644
--- a/arch/sw_64/tools/relocs.h
+++ b/arch/sw_64/tools/relocs.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
-#ifndef RELOCS_H
-#define RELOCS_H
+#ifndef _SW64_TOOLS_RELOCS_H
+#define _SW64_TOOLS_RELOCS_H
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -68,4 +68,4 @@ enum symtype {
 
 void process(FILE *fp, int as_text, int as_bin,
 		int show_reloc_info, int keep_relocs);
-#endif /* RELOCS_H */
+#endif /* _SW64_TOOLS_RELOCS_H */