Index: NVIDIA-Linux-x86_64-470.63.01/kernel/common/inc/nv.h
===================================================================
--- NVIDIA-Linux-x86_64-470.63.01.orig/kernel/common/inc/nv.h
+++ NVIDIA-Linux-x86_64-470.63.01/kernel/common/inc/nv.h
@@ -19,11 +19,11 @@
 #if defined(NV_KERNEL_INTERFACE_LAYER) && defined(__FreeBSD__)
   #include <sys/stddef.h> // NULL
 #else
-  #include <stddef.h>     // NULL
+  #include <linux/stddef.h>     // NULL
 #endif
 
 #include <nvstatus.h>
-#include <stdarg.h>
+#include <linux/stdarg.h>
 #include <nv-caps.h>
 #include <nv-ioctl.h>
 #include <nvmisc.h>
Index: NVIDIA-Linux-x86_64-470.63.01/kernel/common/inc/os-interface.h
===================================================================
--- NVIDIA-Linux-x86_64-470.63.01.orig/kernel/common/inc/os-interface.h
+++ NVIDIA-Linux-x86_64-470.63.01/kernel/common/inc/os-interface.h
@@ -24,7 +24,7 @@
 
 #include <nvtypes.h>
 #include <nvstatus.h>
-#include <stdarg.h>
+#include <linux/stdarg.h>
 #include <nv-kernel-interface-api.h>
 #include <os/nv_memory_type.h>
 
Index: NVIDIA-Linux-x86_64-470.63.01/kernel/common/inc/rm-gpu-ops.h
===================================================================
--- NVIDIA-Linux-x86_64-470.63.01.orig/kernel/common/inc/rm-gpu-ops.h
+++ NVIDIA-Linux-x86_64-470.63.01/kernel/common/inc/rm-gpu-ops.h
@@ -16,7 +16,7 @@
 
 #include <nvtypes.h>
 #include <nvCpuUuid.h>
-#include <stdarg.h>
+#include <linux/stdarg.h>
 #include <nv-caps.h>
 #include <nv-ioctl.h>
 #include <nvmisc.h>
Index: NVIDIA-Linux-x86_64-470.63.01/kernel/nvidia-modeset/nvidia-modeset-os-interface.h
===================================================================
--- NVIDIA-Linux-x86_64-470.63.01.orig/kernel/nvidia-modeset/nvidia-modeset-os-interface.h
+++ NVIDIA-Linux-x86_64-470.63.01/kernel/nvidia-modeset/nvidia-modeset-os-interface.h
@@ -16,8 +16,8 @@
 #if !defined(_NVIDIA_MODESET_OS_INTERFACE_H_)
 #define _NVIDIA_MODESET_OS_INTERFACE_H_
 
-#include <stddef.h>  /* size_t */
-#include <stdarg.h>  /* va_list */
+#include <linux/stddef.h>  /* size_t */
+#include <linux/stdarg.h>  /* va_list */
 
 #include "nvtypes.h" /* NvU8 */
 
Index: NVIDIA-Linux-x86_64-470.63.01/kernel/nvidia-modeset/nvkms.h
===================================================================
--- NVIDIA-Linux-x86_64-470.63.01.orig/kernel/nvidia-modeset/nvkms.h
+++ NVIDIA-Linux-x86_64-470.63.01/kernel/nvidia-modeset/nvkms.h
@@ -9,7 +9,7 @@
 #define __NV_KMS_H__
 
 #include "nvtypes.h"
-#include <stddef.h> /* size_t */
+#include <linux/stddef.h> /* size_t */
 
 #include "nvkms-kapi.h"
 
Index: NVIDIA-Linux-x86_64-470.63.01/kernel/nvidia-uvm/uvm_mmu.c
===================================================================
--- NVIDIA-Linux-x86_64-470.63.01.orig/kernel/nvidia-uvm/uvm_mmu.c
+++ NVIDIA-Linux-x86_64-470.63.01/kernel/nvidia-uvm/uvm_mmu.c
@@ -32,7 +32,7 @@
 #include "uvm_push.h"
 #include "uvm_mem.h"
 #include "uvm_va_space.h"
-#include <stdarg.h>
+#include <linux/stdarg.h>
 
 
 
Index: NVIDIA-Linux-x86_64-470.63.01/kernel/nvidia/export_nvswitch.h
===================================================================
--- NVIDIA-Linux-x86_64-470.63.01.orig/kernel/nvidia/export_nvswitch.h
+++ NVIDIA-Linux-x86_64-470.63.01/kernel/nvidia/export_nvswitch.h
@@ -28,7 +28,7 @@
 extern "C" {
 #endif
 
-#include <stdarg.h>
+#include <linux/stdarg.h>
 #include "nvlink_common.h"
 #include "ioctl_common_nvswitch.h"