diff --git a/include/linux/nvhost.h b/arch/arm/mach-tegra/include/mach/nvhost.h
similarity index 100%
rename from include/linux/nvhost.h
rename to arch/arm/mach-tegra/include/mach/nvhost.h
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c
index ef333f6474af..55ecf100de05 100644
--- a/drivers/video/tegra/dc/dc.c
+++ b/drivers/video/tegra/dc/dc.c
@@ -19,7 +19,6 @@
 #include <linux/kernel.h>
 #include <linux/err.h>
 #include <linux/errno.h>
-#include <linux/nvhost.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 #include <linux/io.h>
@@ -35,6 +34,7 @@
 #include <mach/clk.h>
 #include <mach/dc.h>
 #include <mach/fb.h>
+#include <mach/nvhost.h>
 
 #include "dc_reg.h"
 #include "dc_priv.h"
diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c
index cfd41e8950da..3487e54c74cf 100644
--- a/drivers/video/tegra/dc/hdmi.c
+++ b/drivers/video/tegra/dc/hdmi.c
@@ -22,13 +22,13 @@
 #include <linux/gpio.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/nvhost.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
 
 #include <mach/clk.h>
 #include <mach/dc.h>
 #include <mach/fb.h>
+#include <mach/nvhost.h>
 
 #include "dc_reg.h"
 #include "dc_priv.h"
diff --git a/drivers/video/tegra/fb.c b/drivers/video/tegra/fb.c
index 45d47e6c991a..ac07c551fb5d 100644
--- a/drivers/video/tegra/fb.c
+++ b/drivers/video/tegra/fb.c
@@ -24,12 +24,12 @@
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
-#include <linux/nvhost.h>
 
 #include <asm/atomic.h>
 
 #include <mach/dc.h>
 #include <mach/fb.h>
+#include <mach/nvhost.h>
 
 struct tegra_fb_info {
 	struct tegra_dc_win	*win;
diff --git a/drivers/video/tegra/host/bus.c b/drivers/video/tegra/host/bus.c
index b8caf337ede4..a633950aeaff 100644
--- a/drivers/video/tegra/host/bus.c
+++ b/drivers/video/tegra/host/bus.c
@@ -20,7 +20,8 @@
  */
 
 #include <linux/pm_runtime.h>
-#include <linux/nvhost.h>
+
+#include <mach/nvhost.h>
 
 #include "dev.h"
 
diff --git a/drivers/video/tegra/host/dev.c b/drivers/video/tegra/host/dev.c
index 2102f1b545fd..4d2d3c50fc3f 100644
--- a/drivers/video/tegra/host/dev.c
+++ b/drivers/video/tegra/host/dev.c
@@ -22,7 +22,6 @@
 
 #include "dev.h"
 
-#include <linux/nvhost.h>
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/spinlock.h>
@@ -31,10 +30,11 @@
 #include <linux/platform_device.h>
 #include <linux/uaccess.h>
 #include <linux/file.h>
-#include <linux/nvhost.h>
 
 #include <asm/io.h>
 
+#include <mach/nvhost.h>
+
 #define DRIVER_NAME "tegra_grhost"
 #define IFACE_NAME "nvhost"