diff --git a/drivers/gpu/nvgpu/common/linux/cde.h b/drivers/gpu/nvgpu/common/linux/cde.h
index 22732a2af..5dd15c371 100644
--- a/drivers/gpu/nvgpu/common/linux/cde.h
+++ b/drivers/gpu/nvgpu/common/linux/cde.h
@@ -19,6 +19,13 @@
 #ifndef _CDE_GK20A_H_
 #define _CDE_GK20A_H_
 
+#include <nvgpu/nvgpu_mem.h>
+#include <nvgpu/list.h>
+#include <nvgpu/lock.h>
+
+#include <linux/kobject.h>
+#include <linux/workqueue.h>
+
 #define MAX_CDE_BUFS		10
 #define MAX_CDE_PARAMS		64
 #define MAX_CDE_USER_PARAMS	40
@@ -33,7 +40,14 @@
 #define NUM_CDE_CONTEXTS	4
 
 struct dma_buf;
+struct device;
+struct nvgpu_os_linux;
 struct gk20a;
+struct gk20a_fence;
+struct nvgpu_fence;
+struct channel_gk20a;
+struct vm_gk20a;
+struct nvgpu_gpfifo;
 
 /*
  * this element defines a buffer that is allocated and mapped into gpu address
diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.c b/drivers/gpu/nvgpu/common/linux/driver_common.c
index 1c6002de7..9e567c275 100644
--- a/drivers/gpu/nvgpu/common/linux/driver_common.c
+++ b/drivers/gpu/nvgpu/common/linux/driver_common.c
@@ -15,6 +15,7 @@
  */
 
 #include <linux/dma-mapping.h>
+#include <uapi/linux/nvgpu.h>
 
 #include <nvgpu/kmem.h>
 #include <nvgpu/nvgpu_common.h>
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_channel.h b/drivers/gpu/nvgpu/common/linux/ioctl_channel.h
index 8cfce7e1c..c3cd11c7a 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_channel.h
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_channel.h
@@ -13,6 +13,13 @@
 #ifndef __NVGPU_IOCTL_CHANNEL_H__
 #define __NVGPU_IOCTL_CHANNEL_H__
 
+#include <linux/fs.h>
+
+struct inode;
+struct file;
+struct gk20a;
+struct nvgpu_channel_open_args;
+
 int gk20a_channel_open(struct inode *inode, struct file *filp);
 int gk20a_channel_release(struct inode *inode, struct file *filp);
 long gk20a_channel_ioctl(struct file *filp,
diff --git a/drivers/gpu/nvgpu/common/linux/module.c b/drivers/gpu/nvgpu/common/linux/module.c
index 4841b032e..2e90fbe42 100644
--- a/drivers/gpu/nvgpu/common/linux/module.c
+++ b/drivers/gpu/nvgpu/common/linux/module.c
@@ -24,6 +24,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/reset.h>
 #include <linux/platform/tegra/common.h>
+#include <uapi/linux/nvgpu.h>
 
 #include <nvgpu/dma.h>
 #include <nvgpu/kmem.h>
diff --git a/drivers/gpu/nvgpu/common/linux/vm.c b/drivers/gpu/nvgpu/common/linux/vm.c
index 123807d90..0cfd010b1 100644
--- a/drivers/gpu/nvgpu/common/linux/vm.c
+++ b/drivers/gpu/nvgpu/common/linux/vm.c
@@ -16,6 +16,7 @@
 
 #include <linux/dma-buf.h>
 #include <linux/scatterlist.h>
+#include <uapi/linux/nvgpu.h>
 
 #include <nvgpu/log.h>
 #include <nvgpu/lock.h>