diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.h b/drivers/gpu/nvgpu/vgpu/vgpu.h
index 6ce61e929..dcfbddf28 100644
--- a/drivers/gpu/nvgpu/vgpu/vgpu.h
+++ b/drivers/gpu/nvgpu/vgpu/vgpu.h
@@ -25,6 +25,13 @@
 #ifndef _VIRT_H_
 #define _VIRT_H_
 
+struct device;
+struct tegra_vgpu_gr_intr_info;
+struct tegra_vgpu_fifo_intr_info;
+struct tegra_vgpu_cmd_msg;
+struct gk20a_platform;
+
+#ifdef CONFIG_TEGRA_GR_VIRTUALIZATION
 #include <linux/tegra_gr_comm.h>
 #include <linux/tegra_vgpu.h>
 #include "gk20a/gk20a.h"
@@ -33,8 +40,6 @@
 
 #include <nvgpu/thread.h>
 
-#ifdef CONFIG_TEGRA_GR_VIRTUALIZATION
-
 struct vgpu_priv_data {
 	u64 virt_handle;
 	struct nvgpu_thread intr_handler;