diff --git a/drivers/video/tegra/host/nvdla/nvdla.c b/drivers/video/tegra/host/nvdla/nvdla.c
index f3bcdabb..2f7b4348 100644
--- a/drivers/video/tegra/host/nvdla/nvdla.c
+++ b/drivers/video/tegra/host/nvdla/nvdla.c
@@ -29,15 +29,15 @@
 #include <linux/version.h>
 #include <linux/nvmem-consumer.h>
 #include <soc/tegra/fuse-helper.h>
-
-#include "nvdla/nvdla.h"
-#include "nvdla/nvdla_hw_flcn.h"
-#include "nvdla/nvdla_t194.h"
-#include "nvdla/nvdla_t234.h"
-#include "nvdla/dla_queue.h"
-#include "nvdla/nvdla_buffer.h"
-#include "nvdla/nvdla_debug.h"
 #include <uapi/linux/nvhost_nvdla_ioctl.h>
+
+#include "nvdla.h"
+#include "nvdla_hw_flcn.h"
+#include "nvdla_t194.h"
+#include "nvdla_t234.h"
+#include "dla_queue.h"
+#include "nvdla_buffer.h"
+#include "nvdla_debug.h"
 #include "dla_os_interface.h"
 
 /*
diff --git a/drivers/video/tegra/host/nvdla/nvdla_debug.c b/drivers/video/tegra/host/nvdla/nvdla_debug.c
index 91905848..5b65e93a 100644
--- a/drivers/video/tegra/host/nvdla/nvdla_debug.c
+++ b/drivers/video/tegra/host/nvdla/nvdla_debug.c
@@ -24,7 +24,7 @@
 #include <linux/version.h>
 
 #include "dla_os_interface.h"
-#include "nvdla/nvdla.h"
+#include "nvdla.h"
 #include "nvdla_debug.h"
 
 /*
diff --git a/drivers/video/tegra/host/nvdla/nvdla_debug.h b/drivers/video/tegra/host/nvdla/nvdla_debug.h
index c67ba613..8b4c3b1e 100644
--- a/drivers/video/tegra/host/nvdla/nvdla_debug.h
+++ b/drivers/video/tegra/host/nvdla/nvdla_debug.h
@@ -1,7 +1,7 @@
 /*
  * NVDLA debug utils header
  *
- * Copyright (c) 2016 - 2018, NVIDIA Corporation.  All rights reserved.
+ * Copyright (c) 2016-2022, 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,
@@ -24,7 +24,7 @@
 #include <linux/debugfs.h>
 #include <linux/nvhost.h>
 
-#include "nvdla/nvdla.h"
+#include "nvdla.h"
 
 enum nvdla_dbg_categories {
 	debug_err	= BIT(0),  /* error logs */
diff --git a/drivers/video/tegra/host/nvdla/nvdla_ioctl.c b/drivers/video/tegra/host/nvdla/nvdla_ioctl.c
index 446f18d0..021a2f08 100644
--- a/drivers/video/tegra/host/nvdla/nvdla_ioctl.c
+++ b/drivers/video/tegra/host/nvdla/nvdla_ioctl.c
@@ -23,10 +23,10 @@
 #include <linux/dma-mapping.h>
 #include <linux/uaccess.h>
 
-#include "nvdla/nvdla.h"
-#include "nvdla/dla_queue.h"
-#include "nvdla/nvdla_buffer.h"
-#include "nvdla/nvdla_debug.h"
+#include "nvdla.h"
+#include "dla_queue.h"
+#include "nvdla_buffer.h"
+#include "nvdla_debug.h"
 
 #include <uapi/linux/nvdev_fence.h>
 #include <uapi/linux/nvhost_ioctl.h>
diff --git a/drivers/video/tegra/host/nvdla/nvdla_queue.c b/drivers/video/tegra/host/nvdla/nvdla_queue.c
index d19bc0e9..d5b7d4a4 100644
--- a/drivers/video/tegra/host/nvdla/nvdla_queue.c
+++ b/drivers/video/tegra/host/nvdla/nvdla_queue.c
@@ -31,9 +31,9 @@
 #include "t194/hardware_t194.h"
 #endif
 
-#include "nvdla/nvdla.h"
-#include "nvdla/dla_queue.h"
-#include "nvdla/nvdla_debug.h"
+#include "nvdla.h"
+#include "dla_queue.h"
+#include "nvdla_debug.h"
 #include "dla_os_interface.h"
 
 #define NVDLA_QUEUE_ABORT_TIMEOUT	10000	/* 10 sec */
diff --git a/drivers/video/tegra/host/nvdla/nvdla_t194.h b/drivers/video/tegra/host/nvdla/nvdla_t194.h
index 050f4149..92fca6d2 100644
--- a/drivers/video/tegra/host/nvdla/nvdla_t194.h
+++ b/drivers/video/tegra/host/nvdla/nvdla_t194.h
@@ -9,9 +9,9 @@
 #include <linux/nvhost.h>
 #include <linux/platform/tegra/emc_bwmgr.h>
 
-#include "nvdla/nvdla.h"
-#include "nvdla/nvdla_cg_regs.h"
-#include "nvdla/dla_t19x_fw_version.h"
+#include "nvdla.h"
+#include "nvdla_cg_regs.h"
+#include "dla_t19x_fw_version.h"
 
 struct nvhost_device_data t19_nvdla0_info = {
 	.devfs_name_family	= "nvdla",
diff --git a/drivers/video/tegra/host/nvdla/nvdla_t234.h b/drivers/video/tegra/host/nvdla/nvdla_t234.h
index f5e578b4..5328986e 100644
--- a/drivers/video/tegra/host/nvdla/nvdla_t234.h
+++ b/drivers/video/tegra/host/nvdla/nvdla_t234.h
@@ -9,9 +9,9 @@
 #include <linux/nvhost.h>
 #include <dt-bindings/interconnect/tegra_icc_id.h>
 
-#include "nvdla/nvdla.h"
-#include "nvdla/nvdla_cg_regs.h"
-#include "nvdla/dla_t23x_fw_version.h"
+#include "nvdla.h"
+#include "nvdla_cg_regs.h"
+#include "dla_t23x_fw_version.h"
 
 struct nvhost_device_data t23x_nvdla0_info = {
 	.devfs_name_family	= "nvdla",