1diff --git a/common/CudaWorker/DcgmDgemm.cpp b/common/CudaWorker/DcgmDgemm.cpp
2index 8d33a3256e..6b3284258d 100644
3--- a/common/CudaWorker/DcgmDgemm.cpp
4+++ b/common/CudaWorker/DcgmDgemm.cpp
5@@ -17,6 +17,7 @@
6
7 #include <exception>
8 #include <stdexcept>
9+#include <cinttypes>
10
11 #define CU_CHK(op) \
12 if (auto const status = op; status != CUBLAS_STATUS_SUCCESS) \
13@@ -122,4 +123,4 @@
14 return CUBLAS_STATUS_SUCCESS;
15 }
16
17-} // namespace DcgmNs
18\ No newline at end of file
19+} // namespace DcgmNs
20diff --git a/common/DcgmError.h b/common/DcgmError.h
21index 8638cdceb1..e8d817c0d4 100644
22--- a/common/DcgmError.h
23+++ b/common/DcgmError.h
24@@ -17,6 +17,7 @@
25
26 #include <sstream>
27 #include <string>
28+#include <cinttypes>
29
30 #include <dcgm_agent.h>
31 #include <dcgm_errors.h>
32diff --git a/common/DcgmStringHelpers.cpp b/common/DcgmStringHelpers.cpp
33index b41917e3b7..1fe63980c7 100644
34--- a/common/DcgmStringHelpers.cpp
35+++ b/common/DcgmStringHelpers.cpp
36@@ -17,6 +17,7 @@
37
38 #include <cstring>
39 #include <string>
40+#include <algorithm>
41
42 /*****************************************************************************/
43 void dcgmTokenizeString(const std::string &src, const std::string &delimiter, std::vector<std::string> &tokens)
44diff --git a/dcgmi/CommandOutputController.cpp b/dcgmi/CommandOutputController.cpp
45index 5057205564..8520171efa 100644
46--- a/dcgmi/CommandOutputController.cpp
47+++ b/dcgmi/CommandOutputController.cpp
48@@ -24,6 +24,7 @@
49 #include "dcgm_agent.h"
50 #include <DcgmStringHelpers.h>
51 #include <algorithm>
52+#include <functional>
53 #include <cstdarg>
54 #include <iostream>
55 #include <string>
56diff --git a/dcgmi/Diag.h b/dcgmi/Diag.h
57index a326f7b949..563fb3c9c0 100755
58--- a/dcgmi/Diag.h
59+++ b/dcgmi/Diag.h
60@@ -24,6 +24,7 @@
61 #define DIAG_H_
62
63 #include <optional>
64+#include <functional>
65
66 #include "Command.h"
67 #include "CommandOutputController.h"
68diff --git a/hostengine/src/HostEngineOutput.cpp b/hostengine/src/HostEngineOutput.cpp
69index 23c6ca9f54..798b83b3e4 100644
70--- a/hostengine/src/HostEngineOutput.cpp
71+++ b/hostengine/src/HostEngineOutput.cpp
72@@ -20,6 +20,7 @@
73 #include <iostream>
74 #include <limits>
75 #include <string_view>
76+#include <unordered_map>
77
78 namespace
79 {
80@@ -365,4 +366,4 @@
81 }
82 }
83 os << std::endl;
84-}
85\ No newline at end of file
86+}
87diff --git a/nvvs/src/NvvsCommon.cpp b/nvvs/src/NvvsCommon.cpp
88index 8f7888649b..1604d9dabe 100644
89--- a/nvvs/src/NvvsCommon.cpp
90+++ b/nvvs/src/NvvsCommon.cpp
91@@ -15,6 +15,7 @@
92 */
93 #include <sstream>
94 #include <stdexcept>
95+#include <algorithm>
96 #include <sys/stat.h>
97 #include <sys/types.h>
98
99diff --git a/sdk/nvidia/nvml/nvml_loader/nvml_loader.cpp b/sdk/nvidia/nvml/nvml_loader/nvml_loader.cpp
100index 9eebeaf1c4..6e21201229 100644
101--- a/sdk/nvidia/nvml/nvml_loader/nvml_loader.cpp
102+++ b/sdk/nvidia/nvml/nvml_loader/nvml_loader.cpp
103@@ -20,6 +20,7 @@
104
105 #include <atomic>
106 #include <mutex>
107+#include <cstdlib>
108
109 static void *g_nvmlLib = 0;
110 static std::atomic_uint32_t g_nvmlStaticLibResetHooksCount = 1;