3 files changed, 7 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
index e9a2d582..339f2237 100644
--- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
@@ -18,8 +18,9 @@
 
 #include "vgpu/vgpu.h"
 #include "gk20a/ctxsw_trace_gk20a.h"
-#include "gk20a/hw_fifo_gk20a.h"
-#include "gk20a/hw_ram_gk20a.h"
+
+#include <nvgpu/hw/gk20a/hw_fifo_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_ram_gk20a.h>
 
 static void vgpu_channel_bind(struct channel_gk20a *ch)
 {
diff --git a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
index 02a5e87e..6cafc49f 100644
--- a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
@@ -14,9 +14,10 @@
  */
 
 #include "vgpu/vgpu.h"
-#include "gk20a/hw_gr_gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
 
+#include <nvgpu/hw/gk20a/hw_gr_gk20a.h>
+
 static void vgpu_gr_detect_sm_arch(struct gk20a *g)
 {
         struct vgpu_priv_data *priv = vgpu_get_priv_data(g);
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c
index c3dba7d1..0ac79345 100644
--- a/drivers/gpu/nvgpu/vgpu/vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/vgpu.c
@@ -23,13 +23,14 @@
 #include "vgpu/fecs_trace_vgpu.h"
 #include "gk20a/debug_gk20a.h"
 #include "gk20a/hal_gk20a.h"
-#include "gk20a/hw_mc_gk20a.h"
 #include "gk20a/ctxsw_trace_gk20a.h"
 #include "gk20a/tsg_gk20a.h"
 #include "gk20a/gk20a_scale.h"
 #include "gk20a/channel_gk20a.h"
 #include "gm20b/hal_gm20b.h"
 
+#include <nvgpu/hw/gk20a/hw_mc_gk20a.h>
+
 #ifdef CONFIG_ARCH_TEGRA_18x_SOC
 #include "nvgpu_gpuid_t18x.h"
 #endif