diff --git a/drivers/platform/tegra/dce/include/dce-hsp-t234.h b/drivers/platform/tegra/dce/include/dce-hsp-t234.h
index 20e492b5..1be43911 100644
--- a/drivers/platform/tegra/dce/include/dce-hsp-t234.h
+++ b/drivers/platform/tegra/dce/include/dce-hsp-t234.h
@@ -1,12 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2019-2024, NVIDIA CORPORATION.  All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2019-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
 
 #ifndef DCE_HSP_T234_H
 #define DCE_HSP_T234_H
 
-#include <linux/types.h> // TODO: use dce-types
+#include <types.h>
 
 struct tegra_dce;
 
diff --git a/drivers/platform/tegra/dce/include/dce-hsp-t264.h b/drivers/platform/tegra/dce/include/dce-hsp-t264.h
index f8a0a42f..491f04f4 100644
--- a/drivers/platform/tegra/dce/include/dce-hsp-t264.h
+++ b/drivers/platform/tegra/dce/include/dce-hsp-t264.h
@@ -1,12 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2024, NVIDIA CORPORATION.  All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
 
 #ifndef DCE_HSP_T264_H
 #define DCE_HSP_T264_H
 
-#include <linux/types.h> // TODO: use dce-types
+#include <types.h>
 
 struct tegra_dce;
 
diff --git a/drivers/platform/tegra/dce/include/dce-hsp.h b/drivers/platform/tegra/dce/include/dce-hsp.h
index abbbbb2f..3ddf947e 100644
--- a/drivers/platform/tegra/dce/include/dce-hsp.h
+++ b/drivers/platform/tegra/dce/include/dce-hsp.h
@@ -1,12 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2019-2024, NVIDIA CORPORATION.  All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2019-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
 
 #ifndef DCE_HSP_H
 #define DCE_HSP_H
 
-#include <linux/types.h> // TODO: use dce-types
+#include <types.h>
 
 struct tegra_dce;
 
diff --git a/drivers/platform/tegra/dce/include/dce-util-common.h b/drivers/platform/tegra/dce/include/dce-util-common.h
index 47c42958..dad2627e 100644
--- a/drivers/platform/tegra/dce/include/dce-util-common.h
+++ b/drivers/platform/tegra/dce/include/dce-util-common.h
@@ -1,12 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2019-2023, NVIDIA CORPORATION.  All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2019-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
 
 #ifndef DCE_UTIL_COMMON_H
 #define DCE_UTIL_COMMON_H
 
-#include <linux/types.h>
+#include <types.h>
 #include <linux/bitops.h>
 #include <linux/bitmap.h>
 #include <linux/workqueue.h>
diff --git a/drivers/platform/tegra/dce/include/dce.h b/drivers/platform/tegra/dce/include/dce.h
index 288892e5..c74496c6 100644
--- a/drivers/platform/tegra/dce/include/dce.h
+++ b/drivers/platform/tegra/dce/include/dce.h
@@ -1,13 +1,13 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2019-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2019-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
 
 #ifndef TEGRA_DCE_H
 #define TEGRA_DCE_H
 
 #include <linux/cdev.h>
-#include <linux/types.h>
+#include <types.h>
 #include <dce-log.h>
 #include <dce-ipc.h>
 #include <dce-hsp.h>