diff --git a/drivers/gpu/nvgpu/clk/clk_mclk.c b/drivers/gpu/nvgpu/clk/clk_mclk.c
index cf95f4c5a..0f191b6f3 100644
--- a/drivers/gpu/nvgpu/clk/clk_mclk.c
+++ b/drivers/gpu/nvgpu/clk/clk_mclk.c
@@ -11,17 +11,20 @@
  * more details.
  */
 
-#include "gk20a/gk20a.h"
 #include <linux/delay.h>
-#include "pmuif/gpmuifseq.h"
-#include "gm206/bios_gm206.h"
+
+#include "gk20a/gk20a.h"
 #include "gk20a/pmu_gk20a.h"
 
-#include <nvgpu/hw/gk20a/hw_pwr_gk20a.h>
-#include "gp106/hw_fb_gp106.h"
+#include "pmuif/gpmuifseq.h"
+
+#include "gm206/bios_gm206.h"
 
 #include "include/bios.h"
 
+#include <nvgpu/hw/gk20a/hw_pwr_gk20a.h>
+#include <nvgpu/hw/gp106/hw_fb_gp106.h>
+
 #define VREG_COUNT 24
 
 struct memory_link_training_pattern {
diff --git a/drivers/gpu/nvgpu/clk/clk_vin.c b/drivers/gpu/nvgpu/clk/clk_vin.c
index 649eb2348..e2a209ee4 100644
--- a/drivers/gpu/nvgpu/clk/clk_vin.c
+++ b/drivers/gpu/nvgpu/clk/clk_vin.c
@@ -12,17 +12,25 @@
  */
 
 #include "gk20a/gk20a.h"
-#include "clk.h"
-#include "clk_vin.h"
+
 #include "include/bios.h"
+
 #include "boardobj/boardobjgrp.h"
 #include "boardobj/boardobjgrp_e32.h"
+
 #include "pmuif/gpmuifboardobj.h"
 #include "pmuif/gpmuifclk.h"
-#include "gm206/bios_gm206.h"
+
 #include "ctrl/ctrlvolt.h"
+
+#include "gm206/bios_gm206.h"
 #include "gk20a/pmu_gk20a.h"
-#include "gp106/hw_fuse_gp106.h"
+
+#include "clk.h"
+#include "clk_vin.h"
+
+
+#include <nvgpu/hw/gp106/hw_fuse_gp106.h>
 
 static u32 devinit_get_vin_device_table(struct gk20a *g,
 		struct avfsvinobjs *pvinobjs);
diff --git a/drivers/gpu/nvgpu/gp106/acr_gp106.c b/drivers/gpu/nvgpu/gp106/acr_gp106.c
index 5ed6300ce..58c4e68a1 100644
--- a/drivers/gpu/nvgpu/gp106/acr_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/acr_gp106.c
@@ -22,15 +22,18 @@
 #include "gk20a/gk20a.h"
 #include "gk20a/pmu_gk20a.h"
 #include "gk20a/semaphore_gk20a.h"
-#include "gp106/hw_psec_gp106.h"
-#include "gp106/hw_pwr_gp106.h"
+
 #include "gm206/acr_gm206.h"
 #include "gm20b/acr_gm20b.h"
 #include "gm206/pmu_gm206.h"
+
 #include "sec2_gp106.h"
 #include "nvgpu_gpuid_t18x.h"
 #include "nvgpu_common.h"
 
+#include <nvgpu/hw/gp106/hw_psec_gp106.h>
+#include <nvgpu/hw/gp106/hw_pwr_gp106.h>
+
 /*Defines*/
 #define gp106_dbg_pmu(fmt, arg...) \
 	gk20a_dbg(gpu_dbg_pmu, fmt, ##arg)
diff --git a/drivers/gpu/nvgpu/gp106/bios_gp106.c b/drivers/gpu/nvgpu/gp106/bios_gp106.c
index 8be4314d0..d3e565ca4 100644
--- a/drivers/gpu/nvgpu/gp106/bios_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/bios_gp106.c
@@ -13,8 +13,10 @@
 
 #include "gk20a/gk20a.h"
 #include "gm206/bios_gm206.h"
+
 #include "bios_gp106.h"
-#include "hw_gc6_gp106.h"
+
+#include <nvgpu/hw/gp106/hw_gc6_gp106.h>
 
 static void gp106_init_xmemsel_zm_nv_reg_array(struct gk20a *g, bool *condition,
 	u32 reg, u32 stride, u32 count, u32 data_table_offset)
diff --git a/drivers/gpu/nvgpu/gp106/clk_gp106.c b/drivers/gpu/nvgpu/gp106/clk_gp106.c
index 4c9bc7829..709527e31 100644
--- a/drivers/gpu/nvgpu/gp106/clk_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/clk_gp106.c
@@ -25,10 +25,12 @@
 #include <linux/tegra-fuse.h>
 
 #include "gk20a/gk20a.h"
-#include "hw_trim_gp106.h"
+
 #include "clk_gp106.h"
 #include "clk/clk_arb.h"
 
+#include <nvgpu/hw/gp106/hw_trim_gp106.h>
+
 #define gk20a_dbg_clk(fmt, arg...) \
 	gk20a_dbg(gpu_dbg_clk, fmt, ##arg)
 
@@ -270,4 +272,3 @@ void gp106_init_clk_ops(struct gpu_ops *gops) {
 	gops->clk.get_crystal_clk_hz = gp106_crystal_clk_hz;
 	gops->clk.get_rate = gp106_clk_get_rate;
 }
-
diff --git a/drivers/gpu/nvgpu/gp106/fb_gp106.c b/drivers/gpu/nvgpu/gp106/fb_gp106.c
index ef9f10947..81c52677d 100644
--- a/drivers/gpu/nvgpu/gp106/fb_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/fb_gp106.c
@@ -16,7 +16,8 @@
 
 #include "gk20a/gk20a.h"
 #include "gp10b/fb_gp10b.h"
-#include "hw_fb_gp106.h"
+
+#include <nvgpu/hw/gp106/hw_fb_gp106.h>
 
 #define HW_SCRUB_TIMEOUT_DEFAULT	100 /* usec */
 #define HW_SCRUB_TIMEOUT_MAX		2000000 /* usec */
diff --git a/drivers/gpu/nvgpu/gp106/fifo_gp106.c b/drivers/gpu/nvgpu/gp106/fifo_gp106.c
index 3c70d5177..5fa03d6ff 100644
--- a/drivers/gpu/nvgpu/gp106/fifo_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/fifo_gp106.c
@@ -13,9 +13,11 @@
 
 #include "gk20a/gk20a.h"
 #include "gp10b/fifo_gp10b.h"
+
 #include "fifo_gp106.h"
-#include "hw_ccsr_gp106.h"
-#include "hw_fifo_gp106.h"
+
+#include <nvgpu/hw/gp106/hw_ccsr_gp106.h>
+#include <nvgpu/hw/gp106/hw_fifo_gp106.h>
 
 static u32 gp106_fifo_get_num_fifos(struct gk20a *g)
 {
diff --git a/drivers/gpu/nvgpu/gp106/gr_gp106.c b/drivers/gpu/nvgpu/gp106/gr_gp106.c
index cbcb5981e..5b4de94a0 100644
--- a/drivers/gpu/nvgpu/gp106/gr_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/gr_gp106.c
@@ -13,14 +13,14 @@
  * more details.
  */
 
-#include "gk20a/gk20a.h" /* FERMI and MAXWELL classes defined here */
-
+#include "gk20a/gk20a.h"
 #include "gk20a/gr_gk20a.h"
-
-#include "gm20b/gr_gm20b.h" /* for MAXWELL classes */
+#include "gm20b/gr_gm20b.h"
 #include "gp10b/gr_gp10b.h"
+
 #include "gr_gp106.h"
-#include "hw_gr_gp106.h"
+
+#include <nvgpu/hw/gp106/hw_gr_gp106.h>
 
 static bool gr_gp106_is_valid_class(struct gk20a *g, u32 class_num)
 {
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index dd87de7d9..e3874c06c 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -19,37 +19,42 @@
 #include <linux/types.h>
 
 #include "gk20a/gk20a.h"
+#include "gk20a/dbg_gpu_gk20a.h"
+#include "gk20a/css_gr_gk20a.h"
 
 #include "gp10b/gr_gp10b.h"
 #include "gp10b/fecs_trace_gp10b.h"
 #include "gp10b/mc_gp10b.h"
-#include "gp106/ltc_gp106.h"
 #include "gp10b/mm_gp10b.h"
 #include "gp10b/ce_gp10b.h"
+#include "gp10b/regops_gp10b.h"
+#include "gp10b/cde_gp10b.h"
+
 #include "gp106/fifo_gp106.h"
 #include "gp106/regops_gp106.h"
-#include "gp10b/cde_gp10b.h"
-#include "gp106/therm_gp106.h"
-#include "gp106/xve_gp106.h"
-
-#include "gp106/bios_gp106.h"
 
 #include "gm20b/gr_gm20b.h"
 #include "gm20b/fifo_gm20b.h"
 #include "gm20b/pmu_gm20b.h"
+
 #include "gp106/clk_gp106.h"
 #include "gp106/clk_arb_gp106.h"
-
+#include "gp106/bios_gp106.h"
+#include "gp106/therm_gp106.h"
+#include "gp106/xve_gp106.h"
+#include "gp106/fifo_gp106.h"
+#include "gp106/ltc_gp106.h"
+#include "gp106/clk_gp106.h"
 #include "gp106/mm_gp106.h"
 #include "gp106/pmu_gp106.h"
 #include "gp106/gr_ctx_gp106.h"
 #include "gp106/gr_gp106.h"
 #include "gp106/fb_gp106.h"
 #include "gp106/gp106_gating_reglist.h"
+
 #include "nvgpu_gpuid_t18x.h"
-#include "hw_proj_gp106.h"
-#include "gk20a/dbg_gpu_gk20a.h"
-#include "gk20a/css_gr_gk20a.h"
+
+#include <nvgpu/hw/gp106/hw_proj_gp106.h>
 
 static struct gpu_ops gp106_ops = {
 	.clock_gating = {
diff --git a/drivers/gpu/nvgpu/gp106/mm_gp106.c b/drivers/gpu/nvgpu/gp106/mm_gp106.c
index 3309a0d7f..b7d7e8b80 100644
--- a/drivers/gpu/nvgpu/gp106/mm_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/mm_gp106.c
@@ -17,7 +17,7 @@
 #include "gp10b/mm_gp10b.h"
 #include "gp106/mm_gp106.h"
 
-#include "hw_fb_gp106.h"
+#include <nvgpu/hw/gp106/hw_fb_gp106.h>
 
 static size_t gp106_mm_get_vidmem_size(struct gk20a *g)
 {
diff --git a/drivers/gpu/nvgpu/gp106/pmu_gp106.c b/drivers/gpu/nvgpu/gp106/pmu_gp106.c
index c28073b63..f294b1e0a 100644
--- a/drivers/gpu/nvgpu/gp106/pmu_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/pmu_gp106.c
@@ -12,21 +12,25 @@
  */
 
 #include <linux/delay.h>	/* for udelay */
+
 #include "gk20a/gk20a.h"
 #include "gk20a/pmu_gk20a.h"
 
-#include "gm206/pmu_gm206.h"
 #include "gm20b/pmu_gm20b.h"
+#include "gm206/pmu_gm206.h"
 #include "gp10b/pmu_gp10b.h"
 #include "gp106/pmu_gp106.h"
 #include "gp106/acr_gp106.h"
-#include "gp106/hw_psec_gp106.h"
+
 #include "clk/clk_mclk.h"
-#include "hw_mc_gp106.h"
-#include "hw_pwr_gp106.h"
+
 #include "lpwr/lpwr.h"
 #include "lpwr/rppg.h"
 
+#include <nvgpu/hw/gp106/hw_psec_gp106.h>
+#include <nvgpu/hw/gp106/hw_mc_gp106.h>
+#include <nvgpu/hw/gp106/hw_pwr_gp106.h>
+
 #define PMU_MEM_SCRUBBING_TIMEOUT_MAX 1000
 #define PMU_MEM_SCRUBBING_TIMEOUT_DEFAULT 10
 
diff --git a/drivers/gpu/nvgpu/gp106/sec2_gp106.c b/drivers/gpu/nvgpu/gp106/sec2_gp106.c
index 8f34edd17..738519cf9 100644
--- a/drivers/gpu/nvgpu/gp106/sec2_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/sec2_gp106.c
@@ -13,20 +13,26 @@
 
 #include <linux/delay.h>	/* for udelay */
 #include <linux/clk.h>
+
 #include "gk20a/gk20a.h"
 #include "gk20a/pmu_gk20a.h"
 
 #include "gm206/pmu_gm206.h"
+
 #include "gm20b/pmu_gm20b.h"
+
 #include "gp10b/pmu_gp10b.h"
+
 #include "gp106/pmu_gp106.h"
 #include "gp106/acr_gp106.h"
-#include "gp106/hw_mc_gp106.h"
-#include "gp106/hw_pwr_gp106.h"
-#include "gp106/hw_psec_gp106.h"
+
 #include "sec2_gp106.h"
 #include "acr.h"
 
+#include <nvgpu/hw/gp106/hw_mc_gp106.h>
+#include <nvgpu/hw/gp106/hw_pwr_gp106.h>
+#include <nvgpu/hw/gp106/hw_psec_gp106.h>
+
 /*Defines*/
 #define gm20b_dbg_pmu(fmt, arg...) \
 	gk20a_dbg(gpu_dbg_pmu, fmt, ##arg)
diff --git a/drivers/gpu/nvgpu/gp106/therm_gp106.c b/drivers/gpu/nvgpu/gp106/therm_gp106.c
index bbcc5c80a..c6ce64672 100644
--- a/drivers/gpu/nvgpu/gp106/therm_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/therm_gp106.c
@@ -13,9 +13,10 @@
 
 #include "therm_gp106.h"
 #include <linux/debugfs.h>
-#include "hw_therm_gp106.h"
 #include "therm/thrmpmu.h"
 
+#include <nvgpu/hw/gp106/hw_therm_gp106.h>
+
 static void gp106_get_internal_sensor_limits(s32 *max_24_8, s32 *min_24_8)
 {
 	*max_24_8 = (0x87 << 8);
diff --git a/drivers/gpu/nvgpu/gp106/xve_gp106.c b/drivers/gpu/nvgpu/gp106/xve_gp106.c
index 71580e40e..a0ee8108a 100644
--- a/drivers/gpu/nvgpu/gp106/xve_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/xve_gp106.c
@@ -22,8 +22,8 @@
 #include "gm206/bios_gm206.h"
 #include "gp106/xve_gp106.h"
 
-#include "gp106/hw_xp_gp106.h"
-#include "gp106/hw_xve_gp106.h"
+#include <nvgpu/hw/gp106/hw_xp_gp106.h>
+#include <nvgpu/hw/gp106/hw_xve_gp106.h>
 
 /**
  * Init a timer and place the timeout data in @timeout.
diff --git a/drivers/gpu/nvgpu/gp106/hw_bus_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_bus_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_bus_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_bus_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_ccsr_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_ccsr_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_ccsr_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_ccsr_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_ce_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_ce_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_ce_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_ce_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_ctxsw_prog_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_ctxsw_prog_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_ctxsw_prog_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_ctxsw_prog_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_fb_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fb_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_fb_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fb_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_fbpa_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fbpa_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_fbpa_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fbpa_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_fifo_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fifo_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_fifo_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fifo_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_flush_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_flush_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_flush_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_flush_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_fuse_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fuse_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_fuse_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fuse_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_gc6_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_gc6_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_gc6_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_gc6_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_gmmu_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_gmmu_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_gmmu_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_gmmu_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_gr_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_gr_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_gr_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_gr_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_ltc_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_ltc_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_ltc_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_ltc_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_mc_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_mc_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_mc_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_mc_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_pbdma_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_pbdma_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_pbdma_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_pbdma_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_perf_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_perf_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_perf_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_perf_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_pri_ringmaster_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_pri_ringmaster_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_pri_ringmaster_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_pri_ringmaster_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_pri_ringstation_sys_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_pri_ringstation_sys_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_pri_ringstation_sys_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_pri_ringstation_sys_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_proj_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_proj_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_proj_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_proj_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_psec_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_psec_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_psec_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_psec_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_pwr_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_pwr_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_pwr_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_pwr_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_ram_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_ram_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_ram_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_ram_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_therm_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_therm_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_therm_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_therm_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_timer_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_timer_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_timer_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_timer_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_top_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_top_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_top_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_top_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_trim_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_trim_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_trim_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_trim_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_xp_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_xp_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_xp_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_xp_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hw_xve_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_xve_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/hw_xve_gp106.h
rename to drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_xve_gp106.h