diff --git a/common/inc/nv-misc.h b/common/inc/nv-misc.h
index cd5ffb9..9e0bf38 100644
--- a/common/inc/nv-misc.h
+++ b/common/inc/nv-misc.h
@@ -17,7 +17,7 @@
 #if defined(NV_KERNEL_INTERFACE_LAYER) && defined(__FreeBSD__)
   #include <sys/stddef.h> // NULL
 #else
-  #include <stddef.h>     // NULL
+  #include <linux/stddef.h>     // NULL
 #endif
 
 #endif /* _NV_MISC_H_ */
diff --git a/common/inc/nv.h b/common/inc/nv.h
index d56e97d..fcd2d2d 100644
--- a/common/inc/nv.h
+++ b/common/inc/nv.h
@@ -22,7 +22,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>
diff --git a/common/inc/os-interface.h b/common/inc/os-interface.h
index 4d7383b..398fdc8 100644
--- a/common/inc/os-interface.h
+++ b/common/inc/os-interface.h
@@ -24,7 +24,7 @@
 *                                                                           *
 \***************************************************************************/
 
-#include <stdarg.h>
+#include <linux/stdarg.h>
 #include <nv-kernel-interface-api.h>
 #include <os/nv_memory_type.h>
 
diff --git a/nvidia-modeset/nvidia-modeset-os-interface.h b/nvidia-modeset/nvidia-modeset-os-interface.h
index 6e6bfcb..21b5635 100644
--- a/nvidia-modeset/nvidia-modeset-os-interface.h
+++ b/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 */
 
diff --git a/nvidia-modeset/nvkms.h b/nvidia-modeset/nvkms.h
index ff49fdf..aa368a0 100644
--- a/nvidia-modeset/nvkms.h
+++ b/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"
 
diff --git a/nvidia-uvm/uvm_mmu.c b/nvidia-uvm/uvm_mmu.c
index d7351f0..fcd54bf 100644
--- a/nvidia-uvm/uvm_mmu.c
+++ b/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>
 
 // The page tree has 5 levels on pascal, and the root is never freed by a normal 'put' operation
 // which leaves a maximum of 4 levels
diff --git a/nvidia/export_nvswitch.h b/nvidia/export_nvswitch.h
index 8902fa0..253e272 100644
--- a/nvidia/export_nvswitch.h
+++ b/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"