diff --git a/openmp/libomptarget/include/Shared/SourceInfo.h b/openmp/libomptarget/include/Shared/SourceInfo.h
index 711f06a04d017..63488ff0e8cac 100644
--- a/openmp/libomptarget/include/Shared/SourceInfo.h
+++ b/openmp/libomptarget/include/Shared/SourceInfo.h
@@ -13,7 +13,7 @@
 #ifndef OMPTARGET_SHARED_SOURCE_INFO_H
 #define OMPTARGET_SHARED_SOURCE_INFO_H
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 
 #ifdef _WIN32
diff --git a/openmp/libomptarget/include/omptarget.h b/openmp/libomptarget/include/omptarget.h
index 9a2bd1340e3b4..8e0ccf191839d 100644
--- a/openmp/libomptarget/include/omptarget.h
+++ b/openmp/libomptarget/include/omptarget.h
@@ -20,11 +20,10 @@
 
 #include "OpenMP/InternalTypes.h"
 
+#include <cstddef>
 #include <cstdint>
 #include <deque>
 #include <functional>
-#include <stddef.h>
-#include <stdint.h>
 #include <type_traits>
 
 #include "llvm/ADT/SmallVector.h"
diff --git a/openmp/libomptarget/plugins-nextgen/common/include/RPC.h b/openmp/libomptarget/plugins-nextgen/common/include/RPC.h
index e1ebcb20e2644..2e39b3f299c88 100644
--- a/openmp/libomptarget/plugins-nextgen/common/include/RPC.h
+++ b/openmp/libomptarget/plugins-nextgen/common/include/RPC.h
@@ -18,7 +18,7 @@
 
 #include "llvm/Support/Error.h"
 
-#include <stdint.h>
+#include <cstdint>
 
 namespace llvm::omp::target {
 namespace plugin {