diff --git a/drivers/gpu/nvgpu/common/fifo/channel.c b/drivers/gpu/nvgpu/common/fifo/channel.c
index 1a27da1ac..28487b9f8 100644
--- a/drivers/gpu/nvgpu/common/fifo/channel.c
+++ b/drivers/gpu/nvgpu/common/fifo/channel.c
@@ -55,7 +55,6 @@
 #include <nvgpu/preempt.h>
 
 #include "common/gr/gr_priv.h"
-#include "gk20a/gr_gk20a.h"
 
 static void free_channel(struct fifo_gk20a *f, struct channel_gk20a *ch);
 static void gk20a_channel_dump_ref_actions(struct channel_gk20a *ch);
diff --git a/drivers/gpu/nvgpu/common/fifo/tsg.c b/drivers/gpu/nvgpu/common/fifo/tsg.c
index c5cfc1050..07c9e1311 100644
--- a/drivers/gpu/nvgpu/common/fifo/tsg.c
+++ b/drivers/gpu/nvgpu/common/fifo/tsg.c
@@ -36,8 +36,6 @@
 
 #include "common/gr/gr_priv.h"
 
-#include "gk20a/gr_gk20a.h"
-
 void nvgpu_tsg_disable(struct tsg_gk20a *tsg)
 {
 	struct gk20a *g = tsg->g;
diff --git a/drivers/gpu/nvgpu/common/ltc/ltc.c b/drivers/gpu/nvgpu/common/ltc/ltc.c
index 545fbdf7a..c4ed4c14d 100644
--- a/drivers/gpu/nvgpu/common/ltc/ltc.c
+++ b/drivers/gpu/nvgpu/common/ltc/ltc.c
@@ -25,8 +25,6 @@
 #include <nvgpu/nvgpu_mem.h>
 #include <nvgpu/gk20a.h>
 
-#include "gk20a/gr_gk20a.h"
-
 void nvgpu_ltc_remove_support(struct gk20a *g)
 {
 	struct nvgpu_ltc *ltc = g->ltc;
diff --git a/drivers/gpu/nvgpu/common/vgpu/gr/gr_vgpu.c b/drivers/gpu/nvgpu/common/vgpu/gr/gr_vgpu.c
index d0ac1f2a5..4c3273300 100644
--- a/drivers/gpu/nvgpu/common/vgpu/gr/gr_vgpu.c
+++ b/drivers/gpu/nvgpu/common/vgpu/gr/gr_vgpu.c
@@ -46,8 +46,6 @@
 #include <nvgpu/cyclestats_snapshot.h>
 #include <nvgpu/power_features/pg.h>
 
-#include <nvgpu/hw/gk20a/hw_gr_gk20a.h>
-
 #include "gr_vgpu.h"
 #include "ctx_vgpu.h"
 #include "subctx_vgpu.h"
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index 3c9b081e2..08cf5ac5e 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -64,7 +64,6 @@
 
 #include <nvgpu/hw/gk20a/hw_fifo_gk20a.h>
 #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h>
-#include <nvgpu/hw/gk20a/hw_gr_gk20a.h>
 
 #define FECS_METHOD_WFI_RESTORE 0x80000U
 
diff --git a/drivers/gpu/nvgpu/os/linux/cde.c b/drivers/gpu/nvgpu/os/linux/cde.c
index 37774b4b7..b97391b6b 100644
--- a/drivers/gpu/nvgpu/os/linux/cde.c
+++ b/drivers/gpu/nvgpu/os/linux/cde.c
@@ -44,7 +44,6 @@
 #include <nvgpu/linux/vm.h>
 
 #include "gk20a/mm_gk20a.h"
-#include "gk20a/gr_gk20a.h"
 
 #include "cde.h"
 #include "os_linux.h"
diff --git a/drivers/gpu/nvgpu/os/linux/fecs_trace_linux.c b/drivers/gpu/nvgpu/os/linux/fecs_trace_linux.c
index e4552d081..80da007a4 100644
--- a/drivers/gpu/nvgpu/os/linux/fecs_trace_linux.c
+++ b/drivers/gpu/nvgpu/os/linux/fecs_trace_linux.c
@@ -29,15 +29,12 @@
 #include <nvgpu/gr/fecs_trace.h>
 #include <nvgpu/string.h>
 
-#include "gk20a/gr_gk20a.h"
 #include "common/gr/gr_priv.h"
 
 #include "platform_gk20a.h"
 #include "os_linux.h"
 #include "fecs_trace_linux.h"
 
-#include <nvgpu/hw/gk20a/hw_gr_gk20a.h>
-
 #define GK20A_CTXSW_TRACE_MAX_VM_RING_SIZE	(128*PAGE_SIZE)
 
 /* Userland-facing FIFO (one global + eventually one per VM) */
diff --git a/drivers/gpu/nvgpu/os/linux/sched.c b/drivers/gpu/nvgpu/os/linux/sched.c
index 184811812..44c373df2 100644
--- a/drivers/gpu/nvgpu/os/linux/sched.c
+++ b/drivers/gpu/nvgpu/os/linux/sched.c
@@ -27,13 +27,10 @@
 #include <nvgpu/string.h>
 #include <nvgpu/gr/ctx.h>
 
-#include "gk20a/gr_gk20a.h"
 #include "sched.h"
 #include "os_linux.h"
 #include "ioctl_tsg.h"
 
-#include <nvgpu/hw/gk20a/hw_gr_gk20a.h>
-
 ssize_t gk20a_sched_dev_read(struct file *filp, char __user *buf,
 	size_t size, loff_t *off)
 {
diff --git a/drivers/gpu/nvgpu/os/linux/sysfs.c b/drivers/gpu/nvgpu/os/linux/sysfs.c
index 667e33698..5a7eb87e3 100644
--- a/drivers/gpu/nvgpu/os/linux/sysfs.c
+++ b/drivers/gpu/nvgpu/os/linux/sysfs.c
@@ -36,7 +36,6 @@
 #include "os_linux.h"
 #include "sysfs.h"
 #include "platform_gk20a.h"
-#include "gk20a/gr_gk20a.h"
 #include "gv11b/gr_gv11b.h"
 
 #define PTIMER_FP_FACTOR			1000000