diff --git a/drivers/video/tegra/host/nvdla/nvdla.c b/drivers/video/tegra/host/nvdla/nvdla.c
index c19973b7..29f645f1 100644
--- a/drivers/video/tegra/host/nvdla/nvdla.c
+++ b/drivers/video/tegra/host/nvdla/nvdla.c
@@ -1,7 +1,7 @@
 /*
  * NVDLA driver for T194
  *
- * Copyright (c) 2016-2021, 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,
@@ -30,12 +30,9 @@
 #include <soc/tegra/fuse.h>
 
 #include "dev.h"
-#include "bus_client.h"
-#include "nvhost_acm.h"
 
 #include "flcn/flcn.h"
 #include "flcn/hw_flcn.h"
-#include "nvhost_syncpt_unit_interface.h"
 #include "nvhost_gos.h"
 
 #include "t194/t194.h"
diff --git a/drivers/video/tegra/host/nvdla/nvdla_debug.c b/drivers/video/tegra/host/nvdla/nvdla_debug.c
index 237fb92f..a9feab36 100644
--- a/drivers/video/tegra/host/nvdla/nvdla_debug.c
+++ b/drivers/video/tegra/host/nvdla/nvdla_debug.c
@@ -1,7 +1,7 @@
 /*
  * NVDLA debug utils
  *
- * Copyright (c) 2016 - 2021, 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,
@@ -23,13 +23,9 @@
 #include <linux/delay.h>
 #include <linux/version.h>
 
-#include "host1x/host1x.h"
-#include "flcn/flcn.h"
-#include "flcn/hw_flcn.h"
 #include "dla_os_interface.h"
 #include "nvdla/nvdla.h"
 #include "nvdla_debug.h"
-#include "nvhost_acm.h"
 
 /*
  * Header in ring buffer consist (start, end) two uint32_t values.
diff --git a/drivers/video/tegra/host/nvdla/nvdla_ioctl.c b/drivers/video/tegra/host/nvdla/nvdla_ioctl.c
index 35813525..fabfb74f 100644
--- a/drivers/video/tegra/host/nvdla/nvdla_ioctl.c
+++ b/drivers/video/tegra/host/nvdla/nvdla_ioctl.c
@@ -1,7 +1,7 @@
 /*
  * NVDLA IOCTL for T194
  *
- * Copyright (c) 2016-2021, 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,
@@ -22,15 +22,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/uaccess.h>
 
-#include "dev.h"
-#include "bus_client.h"
-#include "nvhost_acm.h"
-
-#include "flcn/flcn.h"
-#include "flcn/hw_flcn.h"
-
-#include "t194/t194.h"
-
+#include "host1x/host1x.h"
 
 #include "nvdla/nvdla.h"
 #include "nvdla/dla_queue.h"
@@ -38,6 +30,7 @@
 #include "nvdla/nvdla_debug.h"
 
 #include <uapi/linux/nvdev_fence.h>
+#include <uapi/linux/nvhost_ioctl.h>
 #include <uapi/linux/nvhost_nvdla_ioctl.h>
 #include "dla_os_interface.h"
 
diff --git a/drivers/video/tegra/host/nvdla/nvdla_queue.c b/drivers/video/tegra/host/nvdla/nvdla_queue.c
index 1fc2c301..8accf9ab 100644
--- a/drivers/video/tegra/host/nvdla/nvdla_queue.c
+++ b/drivers/video/tegra/host/nvdla/nvdla_queue.c
@@ -23,14 +23,9 @@
 #include <linux/dma-mapping.h>
 #include <linux/uaccess.h>
 #include <linux/delay.h>
-#include <trace/events/nvhost.h>
 
-#include "dev.h"
-#include "bus_client.h"
-#include "chip_support.h"
-#include "nvhost_acm.h"
+#include "host1x/host1x.h"
 
-#include "nvhost_syncpt_unit_interface.h"
 #include "nvhost_gos.h"
 
 #include "nvdla/nvdla.h"