diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_bus_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_bus_tu104.h
index 3fbb51d28..4a3de0e13 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_bus_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_bus_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_bus_tu104_h_
-#define _hw_bus_tu104_h_
+#ifndef NVGPU_HW_BUS_TU104_H
+#define NVGPU_HW_BUS_TU104_H
 
 static inline u32 bus_sw_scratch_r(u32 i)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ccsr_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ccsr_tu104.h
index 1249cc25f..3fa90fb14 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ccsr_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ccsr_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_ccsr_tu104_h_
-#define _hw_ccsr_tu104_h_
+#ifndef NVGPU_HW_CCSR_TU104_H
+#define NVGPU_HW_CCSR_TU104_H
 
 static inline u32 ccsr_channel_inst_r(u32 i)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ce_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ce_tu104.h
index 4226584cf..8b4b8bd24 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ce_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ce_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_ce_tu104_h_
-#define _hw_ce_tu104_h_
+#ifndef NVGPU_HW_CE_TU104_H
+#define NVGPU_HW_CE_TU104_H
 
 static inline u32 ce_intr_status_r(u32 i)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ctrl_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ctrl_tu104.h
index 10209dfc2..2fb03d270 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ctrl_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ctrl_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_ctrl_tu104_h_
-#define _hw_ctrl_tu104_h_
+#ifndef NVGPU_HW_CTRL_TU104_H
+#define NVGPU_HW_CTRL_TU104_H
 
 static inline u32 ctrl_doorbell_r(u32 i)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ctxsw_prog_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ctxsw_prog_tu104.h
index e29fe7447..8822ba7b4 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ctxsw_prog_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ctxsw_prog_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_ctxsw_prog_tu104_h_
-#define _hw_ctxsw_prog_tu104_h_
+#ifndef NVGPU_HW_CTXSW_PROG_TU104_H
+#define NVGPU_HW_CTXSW_PROG_TU104_H
 
 static inline u32 ctxsw_prog_fecs_header_v(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_falcon_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_falcon_tu104.h
index 1fbcbae06..4f6b3deb9 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_falcon_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_falcon_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_falcon_tu104_h_
-#define _hw_falcon_tu104_h_
+#ifndef NVGPU_HW_FALCON_TU104_H
+#define NVGPU_HW_FALCON_TU104_H
 
 static inline u32 falcon_falcon_irqsset_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_fb_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_fb_tu104.h
index a113dd004..3c6255417 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_fb_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_fb_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_fb_tu104_h_
-#define _hw_fb_tu104_h_
+#ifndef NVGPU_HW_FB_TU104_H
+#define NVGPU_HW_FB_TU104_H
 
 static inline u32 fb_fbhub_num_active_ltcs_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_fbpa_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_fbpa_tu104.h
index 7ffb16fb1..588cdeb4d 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_fbpa_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_fbpa_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_fbpa_tu104_h_
-#define _hw_fbpa_tu104_h_
+#ifndef NVGPU_HW_FBPA_TU104_H
+#define NVGPU_HW_FBPA_TU104_H
 
 static inline u32 fbpa_0_intr_status_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_fifo_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_fifo_tu104.h
index bb9ec08fb..2891213ef 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_fifo_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_fifo_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_fifo_tu104_h_
-#define _hw_fifo_tu104_h_
+#ifndef NVGPU_HW_FIFO_TU104_H
+#define NVGPU_HW_FIFO_TU104_H
 
 static inline u32 fifo_userd_writeback_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_flush_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_flush_tu104.h
index 2fb948e18..501c40c9e 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_flush_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_flush_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_flush_tu104_h_
-#define _hw_flush_tu104_h_
+#ifndef NVGPU_HW_FLUSH_TU104_H
+#define NVGPU_HW_FLUSH_TU104_H
 
 static inline u32 flush_l2_system_invalidate_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_func_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_func_tu104.h
index 15eaf0de0..7f0cfb5b0 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_func_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_func_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_func_tu104_h_
-#define _hw_func_tu104_h_
+#ifndef NVGPU_HW_FUNC_TU104_H
+#define NVGPU_HW_FUNC_TU104_H
 
 static inline u32 func_full_phys_offset_v(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_fuse_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_fuse_tu104.h
index 04f9faa26..6e83cf4eb 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_fuse_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_fuse_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_fuse_tu104_h_
-#define _hw_fuse_tu104_h_
+#ifndef NVGPU_HW_FUSE_TU104_H
+#define NVGPU_HW_FUSE_TU104_H
 
 static inline u32 fuse_status_opt_gpc_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_gc6_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_gc6_tu104.h
index e13cb1621..cefaddc30 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_gc6_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_gc6_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_gc6_tu104_h_
-#define _hw_gc6_tu104_h_
+#ifndef NVGPU_HW_GC6_TU104_H
+#define NVGPU_HW_GC6_TU104_H
 
 static inline u32 gc6_aon_secure_scratch_group_05_r(u32 i)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_gmmu_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_gmmu_tu104.h
index c80dceef3..483781be5 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_gmmu_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_gmmu_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_gmmu_tu104_h_
-#define _hw_gmmu_tu104_h_
+#ifndef NVGPU_HW_GMMU_TU104_H
+#define NVGPU_HW_GMMU_TU104_H
 
 static inline u32 gmmu_new_pde_is_pte_w(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_gr_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_gr_tu104.h
index c4e874aed..7a621749a 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_gr_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_gr_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_gr_tu104_h_
-#define _hw_gr_tu104_h_
+#ifndef NVGPU_HW_GR_TU104_H
+#define NVGPU_HW_GR_TU104_H
 
 static inline u32 gr_intr_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ioctrl_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ioctrl_tu104.h
index 5597f6024..bc2f8894c 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ioctrl_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ioctrl_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_ioctrl_tu104_h_
-#define _hw_ioctrl_tu104_h_
+#ifndef NVGPU_HW_IOCTRL_TU104_H
+#define NVGPU_HW_IOCTRL_TU104_H
 
 static inline u32 ioctrl_reset_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ioctrlmif_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ioctrlmif_tu104.h
index 188566192..934f1eecc 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ioctrlmif_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ioctrlmif_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_ioctrlmif_tu104_h_
-#define _hw_ioctrlmif_tu104_h_
+#ifndef NVGPU_HW_IOCTRLMIF_TU104_H
+#define NVGPU_HW_IOCTRLMIF_TU104_H
 
 static inline u32 ioctrlmif_rx_err_contain_en_0_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ltc_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ltc_tu104.h
index 30da7995e..1c5f9d3e7 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ltc_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ltc_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_ltc_tu104_h_
-#define _hw_ltc_tu104_h_
+#ifndef NVGPU_HW_LTC_TU104_H
+#define NVGPU_HW_LTC_TU104_H
 
 static inline u32 ltc_pltcg_base_v(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_mc_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_mc_tu104.h
index e6f7f48b2..6e4a7e0bf 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_mc_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_mc_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_mc_tu104_h_
-#define _hw_mc_tu104_h_
+#ifndef NVGPU_HW_MC_TU104_H
+#define NVGPU_HW_MC_TU104_H
 
 static inline u32 mc_boot_0_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_minion_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_minion_tu104.h
index 8bb1874a4..f284f1cb4 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_minion_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_minion_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_minion_tu104_h_
-#define _hw_minion_tu104_h_
+#ifndef NVGPU_HW_MINION_TU104_H
+#define NVGPU_HW_MINION_TU104_H
 
 static inline u32 minion_minion_status_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_nvl_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_nvl_tu104.h
index 90382af45..3ce15554e 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_nvl_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_nvl_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_nvl_tu104_h_
-#define _hw_nvl_tu104_h_
+#ifndef NVGPU_HW_NVL_TU104_H
+#define NVGPU_HW_NVL_TU104_H
 
 static inline u32 nvl_link_state_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_nvlinkip_discovery_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_nvlinkip_discovery_tu104.h
index 21e24bedb..27758669d 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_nvlinkip_discovery_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_nvlinkip_discovery_tu104.h
@@ -53,7 +53,7 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_nvlinkip_discovery_tu104_h_
-#define _hw_nvlinkip_discovery_tu104_h_
+#ifndef NVGPU_HW_NVLINKIP_DISCOVERY_TU104_H
+#define NVGPU_HW_NVLINKIP_DISCOVERY_TU104_H
 
 #endif
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_nvlipt_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_nvlipt_tu104.h
index 83c27d5f1..24452e50a 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_nvlipt_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_nvlipt_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_nvlipt_tu104_h_
-#define _hw_nvlipt_tu104_h_
+#ifndef NVGPU_HW_NVLIPT_TU104_H
+#define NVGPU_HW_NVLIPT_TU104_H
 
 static inline u32 nvlipt_intr_control_link0_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_nvtlc_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_nvtlc_tu104.h
index 63d514894..cbb2459c8 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_nvtlc_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_nvtlc_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_nvtlc_tu104_h_
-#define _hw_nvtlc_tu104_h_
+#ifndef NVGPU_HW_NVTLC_TU104_H
+#define NVGPU_HW_NVTLC_TU104_H
 
 static inline u32 nvtlc_tx_err_report_en_0_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pbdma_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pbdma_tu104.h
index 5e558bafa..fe2b5048e 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pbdma_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pbdma_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_pbdma_tu104_h_
-#define _hw_pbdma_tu104_h_
+#ifndef NVGPU_HW_PBDMA_TU104_H
+#define NVGPU_HW_PBDMA_TU104_H
 
 static inline u32 pbdma_gp_entry1_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_perf_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_perf_tu104.h
index 1c04a1b6f..0be6401ae 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_perf_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_perf_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_perf_tu104_h_
-#define _hw_perf_tu104_h_
+#ifndef NVGPU_HW_PERF_TU104_H
+#define NVGPU_HW_PERF_TU104_H
 
 static inline u32 perf_pmmgpc_perdomain_offset_v(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pnvdec_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pnvdec_tu104.h
index 6f517bf46..f551ee0f5 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pnvdec_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pnvdec_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_pnvdec_tu104_h_
-#define _hw_pnvdec_tu104_h_
+#ifndef NVGPU_HW_PNVDEC_TU104_H
+#define NVGPU_HW_PNVDEC_TU104_H
 
 static inline u32 pnvdec_falcon_irqsset_r(u32 i)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pram_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pram_tu104.h
index acf35482c..0d25674c3 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pram_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pram_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_pram_tu104_h_
-#define _hw_pram_tu104_h_
+#ifndef NVGPU_HW_PRAM_TU104_H
+#define NVGPU_HW_PRAM_TU104_H
 
 static inline u32 pram_data032_r(u32 i)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pri_ringmaster_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pri_ringmaster_tu104.h
index 161d85de9..930c1ea74 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pri_ringmaster_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pri_ringmaster_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_pri_ringmaster_tu104_h_
-#define _hw_pri_ringmaster_tu104_h_
+#ifndef NVGPU_HW_PRI_RINGMASTER_TU104_H
+#define NVGPU_HW_PRI_RINGMASTER_TU104_H
 
 static inline u32 pri_ringmaster_command_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pri_ringstation_gpc_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pri_ringstation_gpc_tu104.h
index b3eaf040d..f7399da85 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pri_ringstation_gpc_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pri_ringstation_gpc_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_pri_ringstation_gpc_tu104_h_
-#define _hw_pri_ringstation_gpc_tu104_h_
+#ifndef NVGPU_HW_PRI_RINGSTATION_GPC_TU104_H
+#define NVGPU_HW_PRI_RINGSTATION_GPC_TU104_H
 
 static inline u32 pri_ringstation_gpc_gpc0_priv_error_adr_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pri_ringstation_sys_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pri_ringstation_sys_tu104.h
index c3bdc5464..04ed6ca4d 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pri_ringstation_sys_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pri_ringstation_sys_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_pri_ringstation_sys_tu104_h_
-#define _hw_pri_ringstation_sys_tu104_h_
+#ifndef NVGPU_HW_PRI_RINGSTATION_SYS_TU104_H
+#define NVGPU_HW_PRI_RINGSTATION_SYS_TU104_H
 
 static inline u32 pri_ringstation_sys_decode_config_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_proj_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_proj_tu104.h
index 21bf1da65..cb833dd47 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_proj_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_proj_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_proj_tu104_h_
-#define _hw_proj_tu104_h_
+#ifndef NVGPU_HW_PROJ_TU104_H
+#define NVGPU_HW_PROJ_TU104_H
 
 static inline u32 proj_gpc_base_v(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_psec_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_psec_tu104.h
index 8e8474f0d..b1393fabe 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_psec_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_psec_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_psec_tu104_h_
-#define _hw_psec_tu104_h_
+#ifndef NVGPU_HW_PSEC_TU104_H
+#define NVGPU_HW_PSEC_TU104_H
 
 static inline u32 psec_falcon_irqsset_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pwr_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pwr_tu104.h
index 1134eb70c..5b2945be9 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pwr_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pwr_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_pwr_tu104_h_
-#define _hw_pwr_tu104_h_
+#ifndef NVGPU_HW_PWR_TU104_H
+#define NVGPU_HW_PWR_TU104_H
 
 static inline u32 pwr_falcon_irqsset_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ram_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ram_tu104.h
index 1649c90eb..186404682 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ram_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ram_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_ram_tu104_h_
-#define _hw_ram_tu104_h_
+#ifndef NVGPU_HW_RAM_TU104_H
+#define NVGPU_HW_RAM_TU104_H
 
 static inline u32 ram_in_ramfc_s(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_therm_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_therm_tu104.h
index 6121992d4..155cf9315 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_therm_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_therm_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_therm_tu104_h_
-#define _hw_therm_tu104_h_
+#ifndef NVGPU_HW_THERM_TU104_H
+#define NVGPU_HW_THERM_TU104_H
 
 static inline u32 therm_weight_1_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_timer_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_timer_tu104.h
index d129c9c72..6af53b1e9 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_timer_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_timer_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_timer_tu104_h_
-#define _hw_timer_tu104_h_
+#ifndef NVGPU_HW_TIMER_TU104_H
+#define NVGPU_HW_TIMER_TU104_H
 
 static inline u32 timer_pri_timeout_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_top_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_top_tu104.h
index 3c3ef33b9..2689ee5c4 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_top_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_top_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_top_tu104_h_
-#define _hw_top_tu104_h_
+#ifndef NVGPU_HW_TOP_TU104_H
+#define NVGPU_HW_TOP_TU104_H
 
 static inline u32 top_num_gpcs_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_trim_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_trim_tu104.h
index 2bc4d8af5..4bd1a9b1e 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_trim_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_trim_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_trim_tu104_h_
-#define _hw_trim_tu104_h_
+#ifndef NVGPU_HW_TRIM_TU104_H
+#define NVGPU_HW_TRIM_TU104_H
 
 static inline u32 trim_sys_nvlink_uphy_cfg_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_usermode_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_usermode_tu104.h
index 596fffabf..4298aba93 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_usermode_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_usermode_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_usermode_tu104_h_
-#define _hw_usermode_tu104_h_
+#ifndef NVGPU_HW_USERMODE_TU104_H
+#define NVGPU_HW_USERMODE_TU104_H
 
 static inline u32 usermode_cfg0_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_xp_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_xp_tu104.h
index 193810cfa..f321bc6be 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_xp_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_xp_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_xp_tu104_h_
-#define _hw_xp_tu104_h_
+#ifndef NVGPU_HW_XP_TU104_H
+#define NVGPU_HW_XP_TU104_H
 
 static inline u32 xp_dl_mgr_r(u32 i)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_xve_tu104.h b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_xve_tu104.h
index cc190ff42..b2c967e7e 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_xve_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_xve_tu104.h
@@ -53,8 +53,8 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_xve_tu104_h_
-#define _hw_xve_tu104_h_
+#ifndef NVGPU_HW_XVE_TU104_H
+#define NVGPU_HW_XVE_TU104_H
 
 static inline u32 xve_rom_ctrl_r(void)
 {