diff --git a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h
index c31360230..8b1f85a1b 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h
@@ -18,8 +18,6 @@
 #ifndef _GK20A_CHANNEL_SYNC_H_
 #define _GK20A_CHANNEL_SYNC_H_
 
-#include <linux/types.h>
-
 struct gk20a_channel_sync;
 struct priv_cmd_entry;
 struct channel_gk20a;
diff --git a/drivers/gpu/nvgpu/gk20a/fb_gk20a.c b/drivers/gpu/nvgpu/gk20a/fb_gk20a.c
index 28dfee018..44f0ac4cf 100644
--- a/drivers/gpu/nvgpu/gk20a/fb_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fb_gk20a.c
@@ -13,7 +13,6 @@
  * more details.
  */
 
-#include <linux/types.h>
 #include <trace/events/gk20a.h>
 #include <linux/delay.h>
 
diff --git a/drivers/gpu/nvgpu/gk20a/fence_gk20a.h b/drivers/gpu/nvgpu/gk20a/fence_gk20a.h
index 9d9fde858..fccf0c27f 100644
--- a/drivers/gpu/nvgpu/gk20a/fence_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/fence_gk20a.h
@@ -17,7 +17,6 @@
 #ifndef _GK20A_FENCE_H_
 #define _GK20A_FENCE_H_
 
-#include <linux/types.h>
 #include <linux/kref.h>
 #include <linux/wait.h>
 
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a_gating_reglist.c b/drivers/gpu/nvgpu/gk20a/gk20a_gating_reglist.c
index dc1c0afb5..e218ce94f 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a_gating_reglist.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a_gating_reglist.c
@@ -20,7 +20,6 @@
 #ifndef __gk20a_gating_reglist_h__
 #define __gk20a_gating_reglist_h__
 
-#include <linux/types.h>
 #include "gk20a_gating_reglist.h"
 
 struct gating_desc {
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a_scale.c b/drivers/gpu/nvgpu/gk20a/gk20a_scale.c
index aabe673a8..5c1350d37 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a_scale.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a_scale.c
@@ -18,7 +18,6 @@
 
 #include <linux/devfreq.h>
 #include <linux/debugfs.h>
-#include <linux/types.h>
 #include <linux/export.h>
 #include <linux/slab.h>
 #include <soc/tegra/chip-id.h>
diff --git a/drivers/gpu/nvgpu/gk20a/mc_gk20a.c b/drivers/gpu/nvgpu/gk20a/mc_gk20a.c
index de90355d8..18fd3648f 100644
--- a/drivers/gpu/nvgpu/gk20a/mc_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mc_gk20a.c
@@ -13,7 +13,6 @@
  * more details.
  */
 
-#include <linux/types.h>
 #include <linux/delay.h>
 #include <trace/events/gk20a.h>
 
diff --git a/drivers/gpu/nvgpu/gk20a/sync_gk20a.h b/drivers/gpu/nvgpu/gk20a/sync_gk20a.h
index 5dcdfe156..33112bb3e 100644
--- a/drivers/gpu/nvgpu/gk20a/sync_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/sync_gk20a.h
@@ -18,7 +18,6 @@
 #ifndef _GK20A_SYNC_H_
 #define _GK20A_SYNC_H_
 
-#include <linux/types.h>
 #include <linux/version.h>
 
 struct sync_timeline;
diff --git a/drivers/gpu/nvgpu/gm20b/fb_gm20b.c b/drivers/gpu/nvgpu/gm20b/fb_gm20b.c
index b50cb2d17..9c5b730b7 100644
--- a/drivers/gpu/nvgpu/gm20b/fb_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/fb_gm20b.c
@@ -13,8 +13,6 @@
  * more details.
  */
 
-#include <linux/types.h>
-
 #include "gk20a/gk20a.h"
 #include "gk20a/kind_gk20a.h"
 #include "gk20a/fb_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gm20b/gm20b_gating_reglist.c b/drivers/gpu/nvgpu/gm20b/gm20b_gating_reglist.c
index 3cd4e9687..00e7cce09 100644
--- a/drivers/gpu/nvgpu/gm20b/gm20b_gating_reglist.c
+++ b/drivers/gpu/nvgpu/gm20b/gm20b_gating_reglist.c
@@ -20,7 +20,6 @@
 #ifndef __gm20b_gating_reglist_h__
 #define __gm20b_gating_reglist_h__
 
-#include <linux/types.h>
 #include "gm20b_gating_reglist.h"
 
 struct gating_desc {
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index a43fcdab1..7d9e47d69 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -13,7 +13,6 @@
  * more details.
  */
 
-#include <linux/types.h>
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/vmalloc.h>
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index 5e19a5ae6..bfae27c0b 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -13,8 +13,6 @@
  * more details.
  */
 
-#include <linux/types.h>
-
 #include "gk20a/gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
 #include "gk20a/css_gr_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
index a2c466006..491112fc9 100644
--- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
@@ -13,7 +13,6 @@
  * more details.
  */
 
-#include <linux/types.h>
 #include <trace/events/gk20a.h>
 
 #include "gk20a/gk20a.h"
diff --git a/drivers/gpu/nvgpu/gm20b/mc_gm20b.c b/drivers/gpu/nvgpu/gm20b/mc_gm20b.c
index 7d0d052d0..05504e823 100644
--- a/drivers/gpu/nvgpu/gm20b/mc_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/mc_gm20b.c
@@ -13,8 +13,6 @@
  * more details.
  */
 
-#include <linux/types.h>
-
 #include "gk20a/gk20a.h"
 #include "gk20a/mc_gk20a.h"
 #include "mc_gm20b.h"
diff --git a/drivers/gpu/nvgpu/gp106/fb_gp106.c b/drivers/gpu/nvgpu/gp106/fb_gp106.c
index 81c52677d..b2e264cdf 100644
--- a/drivers/gpu/nvgpu/gp106/fb_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/fb_gp106.c
@@ -11,7 +11,6 @@
  * more details.
  */
 
-#include <linux/types.h>
 #include <linux/delay.h>
 
 #include "gk20a/gk20a.h"
diff --git a/drivers/gpu/nvgpu/gp106/gp106_gating_reglist.c b/drivers/gpu/nvgpu/gp106/gp106_gating_reglist.c
index 0b6b8beb2..5f85f0bf4 100644
--- a/drivers/gpu/nvgpu/gp106/gp106_gating_reglist.c
+++ b/drivers/gpu/nvgpu/gp106/gp106_gating_reglist.c
@@ -16,7 +16,6 @@
 #ifndef __gp106_gating_reglist_h__
 #define __gp106_gating_reglist_h__
 
-#include <linux/types.h>
 #include "gp106_gating_reglist.h"
 
 struct gating_desc {
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index 80ec85254..e8ea2e8d3 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -13,11 +13,8 @@
  * more details.
  */
 
-#include <linux/types.h>
 #include <linux/printk.h>
 
-#include <linux/types.h>
-
 #include "gk20a/gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
 #include "gk20a/css_gr_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gp106/ltc_gp106.c b/drivers/gpu/nvgpu/gp106/ltc_gp106.c
index b162ddb36..755e4b05e 100644
--- a/drivers/gpu/nvgpu/gp106/ltc_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/ltc_gp106.c
@@ -11,8 +11,6 @@
  * more details.
  */
 
-#include <linux/types.h>
-
 #include "gk20a/gk20a.h"
 #include "gm20b/ltc_gm20b.h"
 #include "gp10b/ltc_gp10b.h"
diff --git a/drivers/gpu/nvgpu/gp10b/fb_gp10b.c b/drivers/gpu/nvgpu/gp10b/fb_gp10b.c
index db4716f33..aa6b543a5 100644
--- a/drivers/gpu/nvgpu/gp10b/fb_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/fb_gp10b.c
@@ -13,8 +13,6 @@
  * more details.
  */
 
-#include <linux/types.h>
-
 #include "gk20a/gk20a.h"
 #include "gm20b/fb_gm20b.h"
 #include "gk20a/kind_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
index 6f576e3f9..6f1a0298b 100644
--- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
@@ -14,7 +14,6 @@
  */
 
 #include <linux/delay.h>
-#include <linux/types.h>
 
 #include "fifo_gp10b.h"
 
diff --git a/drivers/gpu/nvgpu/gp10b/gp10b_gating_reglist.c b/drivers/gpu/nvgpu/gp10b/gp10b_gating_reglist.c
index 563819de4..afb933e9d 100644
--- a/drivers/gpu/nvgpu/gp10b/gp10b_gating_reglist.c
+++ b/drivers/gpu/nvgpu/gp10b/gp10b_gating_reglist.c
@@ -20,7 +20,6 @@
 #ifndef __gp10b_gating_reglist_h__
 #define __gp10b_gating_reglist_h__
 
-#include <linux/types.h>
 #include "gp10b_gating_reglist.h"
 
 struct gating_desc {
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
index fc1168f58..95fdcceab 100644
--- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
@@ -13,10 +13,8 @@
  * more details.
  */
 
-#include <linux/types.h>
 #include <linux/printk.h>
 #include <linux/version.h>
-#include <linux/types.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c
index 9a11d90be..e1aa34a94 100644
--- a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c
@@ -13,8 +13,6 @@
  * more details.
  */
 
-#include <linux/types.h>
-
 #include <dt-bindings/memory/tegra-swgroup.h>
 
 #include "gk20a/gk20a.h"
diff --git a/drivers/gpu/nvgpu/gp10b/mc_gp10b.c b/drivers/gpu/nvgpu/gp10b/mc_gp10b.c
index 4a8dc4c1d..5842cb625 100644
--- a/drivers/gpu/nvgpu/gp10b/mc_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/mc_gp10b.c
@@ -13,8 +13,6 @@
  * more details.
  */
 
-#include <linux/types.h>
-
 #include "gk20a/gk20a.h"
 #include "gk20a/mc_gk20a.h"
 
diff --git a/drivers/gpu/nvgpu/include/nvgpu/bios.h b/drivers/gpu/nvgpu/include/nvgpu/bios.h
index 6fbf068c8..edd4e08c6 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/bios.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/bios.h
@@ -14,7 +14,7 @@
 #ifndef NVGPU_BIOS_H
 #define NVGPU_BIOS_H
 
-#include <linux/types.h>
+#include <nvgpu/types.h>
 
 struct gk20a;
 
diff --git a/drivers/gpu/nvgpu/include/nvgpu/types.h b/drivers/gpu/nvgpu/include/nvgpu/types.h
new file mode 100644
index 000000000..4bfdddb7f
--- /dev/null
+++ b/drivers/gpu/nvgpu/include/nvgpu/types.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+#ifndef __NVGPU_TYPES_H__
+#define __NVGPU_TYPES_H__
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+#endif
+
+#endif
diff --git a/drivers/gpu/nvgpu/platform_tegra.h b/drivers/gpu/nvgpu/platform_tegra.h
index 815ac657c..63aed5a70 100644
--- a/drivers/gpu/nvgpu/platform_tegra.h
+++ b/drivers/gpu/nvgpu/platform_tegra.h
@@ -16,7 +16,7 @@
 #ifndef _NVGPU_PLATFORM_TEGRA_H_
 #define _NVGPU_PLATFORM_TEGRA_H_
 
-#include <linux/types.h>
+#include <nvgpu/types.h>
 
 struct platform_device;
 struct gr_ctx_buffer_desc;