diff --git a/drivers/nvpps/nvpps_common.h b/drivers/nvpps/nvpps_common.h
index 877d58c0..56a0189b 100644
--- a/drivers/nvpps/nvpps_common.h
+++ b/drivers/nvpps/nvpps_common.h
@@ -4,7 +4,6 @@
 #ifndef __NVPPS_COMMON_H__
 #define __NVPPS_COMMON_H__
 
-#include <linux/version.h>
 #include <linux/device.h>
 #include <asm/arch_timer.h>
 #include <linux/platform/tegra/ptp-notifier.h>
diff --git a/drivers/nvpps/nvpps_main.c b/drivers/nvpps/nvpps_main.c
index e2c2d6e2..9ab548db 100644
--- a/drivers/nvpps/nvpps_main.c
+++ b/drivers/nvpps/nvpps_main.c
@@ -13,10 +13,8 @@
 #include <linux/poll.h>
 #include <linux/gpio.h>
 #include <linux/list.h>
-#include <linux/of_device.h>
 #include <linux/of_gpio.h>
 #include <linux/time.h>
-#include <linux/version.h>
 #include <uapi/linux/nvpps_ioctl.h>
 #include <linux/hte.h>
 #include <linux/nvpps.h>
@@ -24,9 +22,7 @@
 #include <linux/of_address.h>
 
 #include "nvpps_common.h"
-#include "nvpps_t23x.h"
-#include "nvpps_t26x.h"
-
+#include "nvpps_platforms.h"
 
 #define MAX_NVPPS_SOURCES	1
 #define NVPPS_DEF_MODE		NVPPS_MODE_GPIO
@@ -1121,13 +1117,6 @@ static int nvpps_resume(struct platform_device *pdev)
 #endif /* CONFIG_PM */
 
 
-static const struct of_device_id nvpps_of_table[] = {
-	{ .compatible = "nvidia,tegra234-nvpps", .data = &tegra234_chip_ops },
-	{ .compatible = "nvidia,tegra264-nvpps", .data = &tegra264_chip_ops },
-	{ /* sentinel */ }
-};
-MODULE_DEVICE_TABLE(of, nvpps_of_table);
-
 
 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
 static void nvpps_remove_wrapper(struct platform_device *pdev)
diff --git a/drivers/nvpps/nvpps_platforms.h b/drivers/nvpps/nvpps_platforms.h
new file mode 100644
index 00000000..7886f684
--- /dev/null
+++ b/drivers/nvpps/nvpps_platforms.h
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+
+#ifndef __NVPPS_PLATFORMS_H__
+#define __NVPPS_PLATFORMS_H__
+
+#include <linux/of_device.h>
+
+#include "nvpps_t23x.h"
+#include "nvpps_t26x.h"
+
+static const struct of_device_id nvpps_of_table[] = {
+	{ .compatible = "nvidia,tegra234-nvpps", .data = &tegra234_chip_ops },
+	{ .compatible = "nvidia,tegra264-nvpps", .data = &tegra264_chip_ops },
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, nvpps_of_table);
+
+#endif