diff --git a/drivers/misc/nvsciipc/Makefile b/drivers/misc/nvsciipc/Makefile
index 9ce5cf81..094b8ba1 100644
--- a/drivers/misc/nvsciipc/Makefile
+++ b/drivers/misc/nvsciipc/Makefile
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
-# Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 
 #
 # Makefile for NvSciIpc driver
@@ -7,4 +7,15 @@
 
 ccflags-y += -I$(PWD)
 
+ifneq ($(NV_CUSTOMER_BUILD), 1)
+ifdef TEGRA_TOP
+  ccflags-y += -I$(TEGRA_TOP)/gpu/drv/drivers/nvsci/inc/internal
+endif
+ifdef PWD
+  ccflags-y += -I$(PWD)/gpu/drv/drivers/nvsci/inc/internal
+endif
+else
+ccflags-y += -I$(TEGRA_TOP)/prebuilt/generic-aaos-pdk/gpu/drv/drivers/nvsci/inc/internal
+endif
+
 obj-m += nvsciipc.o
diff --git a/drivers/misc/nvsciipc/nvsciipc.h b/drivers/misc/nvsciipc/nvsciipc.h
index 122b8099..ebd26cc4 100644
--- a/drivers/misc/nvsciipc/nvsciipc.h
+++ b/drivers/misc/nvsciipc/nvsciipc.h
@@ -1,6 +1,7 @@
 /* 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 __NVSCIIPC_KERNEL_H__
@@ -8,7 +9,7 @@
 
 #include <linux/nvscierror.h>
 #include <linux/nvsciipc_interface.h>
-#include <uapi/linux/nvsciipc_ioctl.h>
+#include "nvsciipc_ioctl.h"
 
 #define ERR(...) pr_err("nvsciipc: " __VA_ARGS__)
 #define INFO(...) pr_info("nvsciipc: " __VA_ARGS__)