diff --git a/drivers/video/tegra/host/nvdla/Makefile b/drivers/video/tegra/host/nvdla/Makefile
index 1e10abfd..d69820df 100644
--- a/drivers/video/tegra/host/nvdla/Makefile
+++ b/drivers/video/tegra/host/nvdla/Makefile
@@ -2,6 +2,7 @@ GCOV_PROFILE := y
 ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host
 ccflags-y += -I$(srctree.nvidia)/include
 ccflags-y += -I$(srctree.nvidia)/include/uapi/linux
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host/nvdla
 ccflags-y += -Werror
 
 nvhost-nvdla-objs  = \
@@ -13,10 +14,3 @@ nvhost-nvdla-objs  = \
 		nvdla_debug.o
 
 obj-$(CONFIG_TEGRA_GRHOST_NVDLA) += nvhost-nvdla.o
-
-ifdef CONFIG_TEGRA_T23X_GRHOST
-
-ccflags-y += -I$(srctree.nvidia-t23x)/drivers/video/tegra/host
-ccflags-y += -I$(srctree.nvidia-t23x)/drivers/video/tegra/host/nvdla
-
-endif
diff --git a/drivers/video/tegra/host/nvdla/nvdla.c b/drivers/video/tegra/host/nvdla/nvdla.c
index f29af1d2..81356ec1 100644
--- a/drivers/video/tegra/host/nvdla/nvdla.c
+++ b/drivers/video/tegra/host/nvdla/nvdla.c
@@ -40,9 +40,7 @@
 #include "nvhost_gos.h"
 
 #include "t194/t194.h"
-#ifdef CONFIG_TEGRA_T23X_GRHOST
 #include "t23x/t23x.h"
-#endif
 
 #include "nvdla/nvdla.h"
 #include "nvdla/dla_queue.h"
@@ -772,7 +770,6 @@ static struct of_device_id tegra_nvdla_of_match[] = {
 		.name = "nvdla1",
 		.compatible = "nvidia,tegra194-nvdla",
 		.data = (struct nvhost_device_data *)&t19_nvdla1_info },
-#ifdef CONFIG_TEGRA_T23X_GRHOST
 	{
 		.name = "nvdla0",
 		.compatible = "nvidia,tegra234-nvdla",
@@ -781,7 +778,6 @@ static struct of_device_id tegra_nvdla_of_match[] = {
 		.name = "nvdla1",
 		.compatible = "nvidia,tegra234-nvdla",
 		.data = (struct nvhost_device_data *)&t23x_nvdla1_info },
-#endif
 	{ },
 };