diff --git a/projects/amdsmi/docs/rocm-smi-lib/tutorials/c++_tutorials.rst b/projects/amdsmi/docs/rocm-smi-lib/tutorials/c++_tutorials.rst
index 8c8d82aacd..884b133657 100644
--- a/projects/amdsmi/docs/rocm-smi-lib/tutorials/c++_tutorials.rst
+++ b/projects/amdsmi/docs/rocm-smi-lib/tutorials/c++_tutorials.rst
@@ -6,7 +6,7 @@ This chapter contains the ROCm SMI C++ API tutorials.
 
 .. code-block:: c++
 
-    #include <stdint.h>
+    #include <cstdint>
     #include "rocm_smi/rocm_smi.h"
     int main() {
 
diff --git a/projects/amdsmi/example/amd_smi_drm_example.cc b/projects/amdsmi/example/amd_smi_drm_example.cc
index 8e8919a5c4..962e9f486c 100644
--- a/projects/amdsmi/example/amd_smi_drm_example.cc
+++ b/projects/amdsmi/example/amd_smi_drm_example.cc
@@ -23,9 +23,8 @@
 #include <pwd.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <inttypes.h>
+#include <cinttypes>
 
-#include <bitset>
 #include <cassert>
 #include <cstdint>
 #include <cstring>
diff --git a/projects/amdsmi/example/amd_smi_nodrm_example.cc b/projects/amdsmi/example/amd_smi_nodrm_example.cc
index 741d1957aa..118fa2f475 100644
--- a/projects/amdsmi/example/amd_smi_nodrm_example.cc
+++ b/projects/amdsmi/example/amd_smi_nodrm_example.cc
@@ -21,11 +21,10 @@
  */
 
 #include <pwd.h>
-#include <inttypes.h>
+#include <cinttypes>
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <bitset>
 #include <cassert>
 #include <cstdint>
 #include <cstring>
diff --git a/projects/amdsmi/example/amdsmi_esmi_intg_example.cc b/projects/amdsmi/example/amdsmi_esmi_intg_example.cc
index ea156484ac..c6f439cf63 100644
--- a/projects/amdsmi/example/amdsmi_esmi_intg_example.cc
+++ b/projects/amdsmi/example/amdsmi_esmi_intg_example.cc
@@ -20,15 +20,13 @@
  * THE SOFTWARE.
  */
 
-#include <assert.h>
-#include <stdint.h>
+#include <cassert>
+#include <cstdint>
 #include <unistd.h>
 #include <vector>
 #include <iostream>
-#include <bitset>
 #include <iomanip>
 #include "amd_smi/amdsmi.h"
-#include "asm/amd_hsmp.h"
 #include <cstring>
 #include <cmath>
 
diff --git a/projects/amdsmi/goamdsmi.go b/projects/amdsmi/goamdsmi.go
index 019d949f36..c97f0965ba 100644
--- a/projects/amdsmi/goamdsmi.go
+++ b/projects/amdsmi/goamdsmi.go
@@ -26,7 +26,7 @@ package goamdsmi
 /*
 #cgo CFLAGS: -Wall -I/opt/rocm/include
 #cgo LDFLAGS: -L/opt/rocm/lib -L/opt/rocm/lib64 -lgoamdsmi_shim64 -Wl,--unresolved-symbols=ignore-in-object-files
-#include <stdint.h>
+#include <cstdint>
 #include <amdsmi_go_shim.h>
 */
 import "C"
diff --git a/projects/amdsmi/include/amd_smi/impl/amd_smi_cper.h b/projects/amdsmi/include/amd_smi/impl/amd_smi_cper.h
index 03960f6142..6a9476c075 100644
--- a/projects/amdsmi/include/amd_smi/impl/amd_smi_cper.h
+++ b/projects/amdsmi/include/amd_smi/impl/amd_smi_cper.h
@@ -21,6 +21,7 @@
  */
 
 #pragma once
+#include <vector>
 
 #include "amd_smi/amdsmi.h"
 
diff --git a/projects/amdsmi/include/amd_smi/impl/amd_smi_gpu_device.h b/projects/amdsmi/include/amd_smi/impl/amd_smi_gpu_device.h
index ed1258b97a..3dfb7e87c4 100644
--- a/projects/amdsmi/include/amd_smi/impl/amd_smi_gpu_device.h
+++ b/projects/amdsmi/include/amd_smi/impl/amd_smi_gpu_device.h
@@ -23,10 +23,11 @@
 #ifndef AMD_SMI_INCLUDE_IMPL_AMD_SMI_GPU_DEVICE_H_
 #define AMD_SMI_INCLUDE_IMPL_AMD_SMI_GPU_DEVICE_H_
 
+#include <map>
+
 #include "amd_smi/amdsmi.h"
 #include "amd_smi/impl/amd_smi_processor.h"
 #include "amd_smi/impl/amd_smi_drm.h"
-#include "shared_mutex.h"  // NOLINT
 
 namespace amd {
 namespace smi {
diff --git a/projects/amdsmi/include/amd_smi/impl/amd_smi_lib_loader.h b/projects/amdsmi/include/amd_smi/impl/amd_smi_lib_loader.h
index a297d0290d..ae92027a39 100644
--- a/projects/amdsmi/include/amd_smi/impl/amd_smi_lib_loader.h
+++ b/projects/amdsmi/include/amd_smi/impl/amd_smi_lib_loader.h
@@ -23,8 +23,7 @@
 #ifndef AMD_SMI_INCLUDE_IMPL_AMD_SMI_LIB_LOADER_H_
 #define AMD_SMI_INCLUDE_IMPL_AMD_SMI_LIB_LOADER_H_
 #include <dlfcn.h>
-#include <string.h>
-#include <map>
+#include <cstring>
 #include <iostream>
 #include <mutex>   //  NOLINT(build/c++11)
 #include "amd_smi/amdsmi.h"
diff --git a/projects/amdsmi/include/amd_smi/impl/amd_smi_socket.h b/projects/amdsmi/include/amd_smi/impl/amd_smi_socket.h
index 66f3c3adf8..adb7401d19 100644
--- a/projects/amdsmi/include/amd_smi/impl/amd_smi_socket.h
+++ b/projects/amdsmi/include/amd_smi/impl/amd_smi_socket.h
@@ -24,7 +24,6 @@
 #define AMD_SMI_INCLUDE_AMD_SMI_SOCKET_H_
 
 #include <string>
-#include <algorithm>
 #include <vector>
 #include "amd_smi/amdsmi.h"
 #include "amd_smi/impl/amd_smi_processor.h"
diff --git a/projects/amdsmi/include/amd_smi/impl/amd_smi_system.h b/projects/amdsmi/include/amd_smi/impl/amd_smi_system.h
index 2d658376ab..0b03c0959c 100644
--- a/projects/amdsmi/include/amd_smi/impl/amd_smi_system.h
+++ b/projects/amdsmi/include/amd_smi/impl/amd_smi_system.h
@@ -25,7 +25,6 @@
 
 #include <vector>
 #include <set>
-#include <map>
 #include "amd_smi/amdsmi.h"
 #include "amd_smi/impl/amd_smi_socket.h"
 #include "amd_smi/impl/amd_smi_processor.h"
diff --git a/projects/amdsmi/include/amd_smi/impl/amd_smi_utils.h b/projects/amdsmi/include/amd_smi/impl/amd_smi_utils.h
index 64e6cbe108..8e7246e8af 100644
--- a/projects/amdsmi/include/amd_smi/impl/amd_smi_utils.h
+++ b/projects/amdsmi/include/amd_smi/impl/amd_smi_utils.h
@@ -27,9 +27,6 @@
 #include <limits>
 #include <type_traits>
 #include <string>
-#include <utility>
-#include <functional>
-#include <memory>
 
 #include "amd_smi/amdsmi.h"
 #include "amd_smi/impl/amd_smi_gpu_device.h"
diff --git a/projects/amdsmi/include/amd_smi/impl/fdinfo.h b/projects/amdsmi/include/amd_smi/impl/fdinfo.h
index bcafa58c20..3fe313944f 100644
--- a/projects/amdsmi/include/amd_smi/impl/fdinfo.h
+++ b/projects/amdsmi/include/amd_smi/impl/fdinfo.h
@@ -23,6 +23,8 @@
 #ifndef __FDINFO__
 #define __FDINFO__
 
+#include <vector>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/projects/amdsmi/include/amd_smi/impl/xf86drm.h b/projects/amdsmi/include/amd_smi/impl/xf86drm.h
index 24dd896ad3..864eb52f4f 100644
--- a/projects/amdsmi/include/amd_smi/impl/xf86drm.h
+++ b/projects/amdsmi/include/amd_smi/impl/xf86drm.h
@@ -36,7 +36,7 @@
 
 #include <stdarg.h>
 #include <sys/types.h>
-#include <stdint.h>
+#include <cstdint>
 #ifndef __LIBDRM__
 #define __LIBDRM__
 #include <libdrm/drm.h>
diff --git a/projects/amdsmi/rocm_smi/include/rocm_smi/rocm_smi.h b/projects/amdsmi/rocm_smi/include/rocm_smi/rocm_smi.h
index 8916436232..cceb59e9ad 100644
--- a/projects/amdsmi/rocm_smi/include/rocm_smi/rocm_smi.h
+++ b/projects/amdsmi/rocm_smi/include/rocm_smi/rocm_smi.h
@@ -25,12 +25,13 @@
 
 #ifdef __cplusplus
 extern "C" {
-#include <cstdint>
-#else
 #include <stdint.h>
+#include <stddef.h>
+#else
+#include <cstdint>
+#include <cstddef>
 #endif  // __cplusplus
 
-#include <stddef.h>
 #include <stdbool.h>
 
 #include "rocm_smi/kfd_ioctl.h"
diff --git a/projects/amdsmi/rocm_smi/include/rocm_smi/rocm_smi_device.h b/projects/amdsmi/rocm_smi/include/rocm_smi/rocm_smi_device.h
index 7be11d7eca..5c33b630a6 100644
--- a/projects/amdsmi/rocm_smi/include/rocm_smi/rocm_smi_device.h
+++ b/projects/amdsmi/rocm_smi/include/rocm_smi/rocm_smi_device.h
@@ -32,8 +32,6 @@
 #include <vector>
 #include <unordered_set>
 #include <map>
-#include <type_traits>
-#include <optional>
 
 #include "rocm_smi/rocm_smi_monitor.h"
 #include "rocm_smi/rocm_smi_power_mon.h"
diff --git a/projects/amdsmi/rocm_smi/include/rocm_smi/rocm_smi_io_link.h b/projects/amdsmi/rocm_smi/include/rocm_smi/rocm_smi_io_link.h
index a1bce406aa..9804a65beb 100644
--- a/projects/amdsmi/rocm_smi/include/rocm_smi/rocm_smi_io_link.h
+++ b/projects/amdsmi/rocm_smi/include/rocm_smi/rocm_smi_io_link.h
@@ -24,8 +24,6 @@
 #define INCLUDE_ROCM_SMI_ROCM_SMI_IO_LINK_H_
 
 #include <string>
-#include <vector>
-#include <unordered_set>
 #include <memory>
 #include <map>
 #include <utility>
diff --git a/projects/amdsmi/rocm_smi/include/rocm_smi/rocm_smi_main.h b/projects/amdsmi/rocm_smi/include/rocm_smi/rocm_smi_main.h
index 68e55a27cd..87c19eb7b3 100644
--- a/projects/amdsmi/rocm_smi/include/rocm_smi/rocm_smi_main.h
+++ b/projects/amdsmi/rocm_smi/include/rocm_smi/rocm_smi_main.h
@@ -29,7 +29,6 @@
 #include <set>
 #include <string>
 #include <cstdint>
-#include <unordered_map>
 #include <map>
 #include <mutex>  // NOLINT
 #include <utility>
diff --git a/projects/amdsmi/rocm_smi/include/rocm_smi/rocm_smi_properties.h b/projects/amdsmi/rocm_smi/include/rocm_smi/rocm_smi_properties.h
index 9ba66ce197..293314fbc2 100644
--- a/projects/amdsmi/rocm_smi/include/rocm_smi/rocm_smi_properties.h
+++ b/projects/amdsmi/rocm_smi/include/rocm_smi/rocm_smi_properties.h
@@ -23,7 +23,6 @@
 #ifndef INCLUDE_ROCM_SMI_ROCM_SMI_PROPERTIES_H_
 #define INCLUDE_ROCM_SMI_ROCM_SMI_PROPERTIES_H_
 
-#include "rocm_smi/rocm_smi_common.h"
 #include "rocm_smi/rocm_smi.h"
 
 #include <cstdint>
diff --git a/projects/amdsmi/rocm_smi/src/rocm_smi.cc b/projects/amdsmi/rocm_smi/src/rocm_smi.cc
index 51c1a76f87..628417a7c8 100644
--- a/projects/amdsmi/rocm_smi/src/rocm_smi.cc
+++ b/projects/amdsmi/rocm_smi/src/rocm_smi.cc
@@ -28,7 +28,7 @@
 #include <sys/ioctl.h>
 #include <sys/utsname.h>
 #include <unistd.h>
-#include <inttypes.h>
+#include <cinttypes>
 
 #include <algorithm>
 #include <bitset>
@@ -39,13 +39,8 @@
 #include <cstring>
 #include <fstream>
 #include <iostream>
-#include <iterator>
-#include <map>
 #include <sstream>
-#include <type_traits>
 #include <vector>
-#include <unordered_map>
-#include <unordered_set>
 
 #include "rocm_smi/rocm_smi_common.h"  // Should go before rocm_smi.h
 #include "rocm_smi/rocm_smi.h"
@@ -63,7 +58,6 @@
 
 using amd::smi::monitorTypesToString;
 using amd::smi::getRSMIStatusString;
-using amd::smi::AMDGpuMetricsUnitType_t;
 using amd::smi::AMDGpuMetricTypeId_t;
 auto &devInfoTypesStrings = amd::smi::Device::devInfoTypesStrings;
 
diff --git a/projects/amdsmi/rocm_smi/src/rocm_smi_binary_parser.cc b/projects/amdsmi/rocm_smi/src/rocm_smi_binary_parser.cc
index 2b6a660cd7..2aa318f81f 100644
--- a/projects/amdsmi/rocm_smi/src/rocm_smi_binary_parser.cc
+++ b/projects/amdsmi/rocm_smi/src/rocm_smi_binary_parser.cc
@@ -30,21 +30,12 @@
 #include "rocm_smi/rocm_smi_logger.h"
 
 #include <dirent.h>
-#include <inttypes.h>
+#include <cinttypes>
 #include <pthread.h>
 
-#include <algorithm>
 #include <cassert>
 #include <cstdint>
 #include <cstring>
-#include <fstream>
-#include <iostream>
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-#include <variant>
-#include <vector>
 
 namespace amd::smi {
 static uint64_t get_value(uint8_t **ptr, struct metric_field *field) {
diff --git a/projects/amdsmi/rocm_smi/src/rocm_smi_counters.cc b/projects/amdsmi/rocm_smi/src/rocm_smi_counters.cc
index 1bca566d15..699327565c 100644
--- a/projects/amdsmi/rocm_smi/src/rocm_smi_counters.cc
+++ b/projects/amdsmi/rocm_smi/src/rocm_smi_counters.cc
@@ -26,7 +26,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <algorithm>
 #include <cassert>
 #include <cstdio>
 #include <cstring>
@@ -34,7 +33,6 @@
 #include <iostream>
 #include <map>
 #include <sstream>
-#include <unordered_set>
 
 #include "rocm_smi/rocm_smi.h"
 #include "rocm_smi/rocm_smi_counters.h"
diff --git a/projects/amdsmi/rocm_smi/src/rocm_smi_device.cc b/projects/amdsmi/rocm_smi/src/rocm_smi_device.cc
index 338a994f87..f41944323b 100755
--- a/projects/amdsmi/rocm_smi/src/rocm_smi_device.cc
+++ b/projects/amdsmi/rocm_smi/src/rocm_smi_device.cc
@@ -32,13 +32,11 @@
 #include <cstring>
 #include <fstream>
 #include <iostream>
-#include <iterator>
 #include <map>
 #include <memory>
 #include <mutex>
 #include <sstream>
 #include <string>
-#include <type_traits>
 #include <vector>
 
 #include "rocm_smi/rocm_smi_main.h"
diff --git a/projects/amdsmi/rocm_smi/src/rocm_smi_gpu_metrics.cc b/projects/amdsmi/rocm_smi/src/rocm_smi_gpu_metrics.cc
index 3bac9726b5..97dee9e585 100644
--- a/projects/amdsmi/rocm_smi/src/rocm_smi_gpu_metrics.cc
+++ b/projects/amdsmi/rocm_smi/src/rocm_smi_gpu_metrics.cc
@@ -40,17 +40,11 @@
 #include <cstdint>
 #include <cstring>
 #include <ctime>
-#include <fstream>
-#include <iostream>
 #include <map>
-#include <memory>
-#include <optional>
 #include <regex>  // NOLINT
 #include <string>
 #include <tuple>
 #include <type_traits>
-#include <utility>
-#include <variant>
 #include <vector>
 
 using namespace amd::smi;
diff --git a/projects/amdsmi/rocm_smi/src/rocm_smi_io_link.cc b/projects/amdsmi/rocm_smi/src/rocm_smi_io_link.cc
index f910cb4ce5..2bcb3564d9 100644
--- a/projects/amdsmi/rocm_smi/src/rocm_smi_io_link.cc
+++ b/projects/amdsmi/rocm_smi/src/rocm_smi_io_link.cc
@@ -27,11 +27,7 @@
 #include <cassert>
 #include <cstdint>
 #include <fstream>
-#include <iostream>
-#include <memory>
-#include <sstream>
 #include <string>
-#include <unordered_set>
 
 #include "rocm_smi/rocm_smi_utils.h"
 #include "rocm_smi/rocm_smi_io_link.h"
diff --git a/projects/amdsmi/rocm_smi/src/rocm_smi_kfd.cc b/projects/amdsmi/rocm_smi/src/rocm_smi_kfd.cc
index 15604ae31c..93fdada1e7 100644
--- a/projects/amdsmi/rocm_smi/src/rocm_smi_kfd.cc
+++ b/projects/amdsmi/rocm_smi/src/rocm_smi_kfd.cc
@@ -31,11 +31,9 @@
 #include <cstdint>
 #include <fstream>
 #include <iostream>
-#include <memory>
 #include <sstream>
 #include <string>
 #include <unordered_set>
-#include <regex>
 
 #include "rocm_smi/rocm_smi_io_link.h"
 #include "rocm_smi/rocm_smi_kfd.h"
diff --git a/projects/amdsmi/rocm_smi/src/rocm_smi_logger.cc b/projects/amdsmi/rocm_smi/src/rocm_smi_logger.cc
index 1e00a0cb8b..57708ef821 100644
--- a/projects/amdsmi/rocm_smi/src/rocm_smi_logger.cc
+++ b/projects/amdsmi/rocm_smi/src/rocm_smi_logger.cc
@@ -43,7 +43,6 @@
 
 // C++ Header File(s)
 #include <cstdlib>
-#include <chrono>
 #include <ctime>
 #include <iomanip>
 #include <iostream>
diff --git a/projects/amdsmi/rocm_smi/src/rocm_smi_main.cc b/projects/amdsmi/rocm_smi/src/rocm_smi_main.cc
index b9f0435ebc..312bfbbc88 100644
--- a/projects/amdsmi/rocm_smi/src/rocm_smi_main.cc
+++ b/projects/amdsmi/rocm_smi/src/rocm_smi_main.cc
@@ -30,15 +30,10 @@
 #include <cstdlib>
 #include <cstring>
 #include <fstream>
-#include <functional>
 #include <iostream>
-#include <memory>
 #include <algorithm>
-#include <set>
 #include <sstream>
 #include <string>
-#include <utility>
-#include <vector>
 
 #include "rocm_smi/rocm_smi.h"
 #include "rocm_smi/rocm_smi_device.h"
diff --git a/projects/amdsmi/rocm_smi/src/rocm_smi_monitor.cc b/projects/amdsmi/rocm_smi/src/rocm_smi_monitor.cc
index cb6b36dd01..c8f0d09eed 100644
--- a/projects/amdsmi/rocm_smi/src/rocm_smi_monitor.cc
+++ b/projects/amdsmi/rocm_smi/src/rocm_smi_monitor.cc
@@ -25,12 +25,9 @@
 #include <algorithm>
 #include <cassert>
 #include <cstdint>
-#include <fstream>
 #include <iostream>
-#include <map>
 #include <regex>  // NOLINT
 #include <string>
-#include <vector>
 
 #include "rocm_smi/rocm_smi_monitor.h"
 #include "rocm_smi/rocm_smi_utils.h"
diff --git a/projects/amdsmi/rocm_smi/src/rocm_smi_power_mon.cc b/projects/amdsmi/rocm_smi/src/rocm_smi_power_mon.cc
index f0d0aeccf4..716b021491 100644
--- a/projects/amdsmi/rocm_smi/src/rocm_smi_power_mon.cc
+++ b/projects/amdsmi/rocm_smi/src/rocm_smi_power_mon.cc
@@ -22,9 +22,7 @@
 
 #include <cassert>
 #include <cstdint>
-#include <fstream>
 #include <iostream>
-#include <map>
 #include <sstream>
 #include <string>
 
diff --git a/projects/amdsmi/rocm_smi/src/rocm_smi_utils.cc b/projects/amdsmi/rocm_smi/src/rocm_smi_utils.cc
index 8332cb2574..f69e715597 100644
--- a/projects/amdsmi/rocm_smi/src/rocm_smi_utils.cc
+++ b/projects/amdsmi/rocm_smi/src/rocm_smi_utils.cc
@@ -22,8 +22,8 @@
 
 #define _GNU_SOURCE 1 // REQUIRED: to utilize some GNU features/functions, see
                       // _GNU_SOURCE functions which check
-#include <assert.h>
-#include <errno.h>
+#include <cassert>
+#include <cerrno>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <dirent.h>
@@ -46,7 +46,6 @@
 #include <cmath>
 
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi/rocm_smi_kfd.h"
 #include "rocm_smi/rocm_smi_utils.h"
 #include "rocm_smi/rocm_smi_exception.h"
 #include "rocm_smi/rocm_smi_main.h"
diff --git a/projects/amdsmi/src/amd_smi/amd_smi_common.cc b/projects/amdsmi/src/amd_smi/amd_smi_common.cc
index c1d0c30151..54ac67b2c5 100644
--- a/projects/amdsmi/src/amd_smi/amd_smi_common.cc
+++ b/projects/amdsmi/src/amd_smi/amd_smi_common.cc
@@ -20,7 +20,6 @@
  * THE SOFTWARE.
  */
 
-#include <functional>
 #include "amd_smi/amdsmi.h"
 #include "amd_smi/impl/amd_smi_common.h"
 
diff --git a/projects/amdsmi/src/amd_smi/amd_smi_cper.cc b/projects/amdsmi/src/amd_smi/amd_smi_cper.cc
index d00d83e204..b901427368 100644
--- a/projects/amdsmi/src/amd_smi/amd_smi_cper.cc
+++ b/projects/amdsmi/src/amd_smi/amd_smi_cper.cc
@@ -27,7 +27,6 @@
 #include <memory>
 #include <cstring>
 #include <sstream>
-#include <vector>
 
 extern "C" {
 #include "aca-decode/aca_decode.h"
diff --git a/projects/amdsmi/src/amd_smi/amd_smi_drm.cc b/projects/amdsmi/src/amd_smi/amd_smi_drm.cc
index 9b9156cf26..bb46ce0757 100644
--- a/projects/amdsmi/src/amd_smi/amd_smi_drm.cc
+++ b/projects/amdsmi/src/amd_smi/amd_smi_drm.cc
@@ -24,16 +24,13 @@
 #include <dirent.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <string.h>
+#include <cstring>
 #include <memory>
 #include <regex>
 #include "amd_smi/impl/amd_smi_drm.h"
-#include "amd_smi/impl/amd_smi_common.h"
 #include "impl/scoped_fd.h"
 #include "rocm_smi/rocm_smi.h"
 #include "rocm_smi/rocm_smi_main.h"
-#include "rocm_smi/rocm_smi_utils.h"
-#include "rocm_smi/rocm_smi_logger.h"
 
 namespace amd {
 namespace smi {
diff --git a/projects/amdsmi/src/amd_smi/amd_smi_socket.cc b/projects/amdsmi/src/amd_smi/amd_smi_socket.cc
index b2565bf3e7..7e5566ea29 100644
--- a/projects/amdsmi/src/amd_smi/amd_smi_socket.cc
+++ b/projects/amdsmi/src/amd_smi/amd_smi_socket.cc
@@ -20,7 +20,6 @@
  * THE SOFTWARE.
  */
 
-#include <functional>
 #include "amd_smi/impl/amd_smi_socket.h"
 
 
diff --git a/projects/amdsmi/src/amd_smi/amd_smi_system.cc b/projects/amdsmi/src/amd_smi/amd_smi_system.cc
index bd6ea8140d..48e1b5baee 100644
--- a/projects/amdsmi/src/amd_smi/amd_smi_system.cc
+++ b/projects/amdsmi/src/amd_smi/amd_smi_system.cc
@@ -20,6 +20,7 @@
  * THE SOFTWARE.
  */
 
+#include <dirent.h>
 #include <sstream>
 #include <iomanip>
 #include <fstream>
@@ -28,10 +29,9 @@
 #include "amd_smi/impl/amd_smi_system.h"
 #include "amd_smi/impl/amd_smi_gpu_device.h"
 #include "amd_smi/impl/amd_smi_common.h"
-#include "amd_smi/impl/amd_smi_utils.h"
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi/rocm_smi_main.h"
 #include <map>
+#include <algorithm>
 
 namespace amd::smi {
 
diff --git a/projects/amdsmi/src/amd_smi/amd_smi_utils.cc b/projects/amdsmi/src/amd_smi/amd_smi_utils.cc
index 4ac19f946a..326fc56870 100644
--- a/projects/amdsmi/src/amd_smi/amd_smi_utils.cc
+++ b/projects/amdsmi/src/amd_smi/amd_smi_utils.cc
@@ -24,9 +24,8 @@
 #include <sys/ioctl.h>
 #include <libdrm/amdgpu.h>
 #include <libdrm/drm.h>
-#include <errno.h>
 #include <fcntl.h>
-#include <stdint.h>
+#include <cstdint>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/projects/amdsmi/src/amd_smi/fdinfo.cc b/projects/amdsmi/src/amd_smi/fdinfo.cc
index d9b8631ef9..17478e2514 100644
--- a/projects/amdsmi/src/amd_smi/fdinfo.cc
+++ b/projects/amdsmi/src/amd_smi/fdinfo.cc
@@ -21,7 +21,7 @@
  */
 
 #include <dirent.h>
-#include <inttypes.h>
+#include <cinttypes>
 #include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -29,7 +29,6 @@
 #include <algorithm>
 #include <cstdlib>
 #include <fstream>
-#include <memory>
 #include <vector>
 
 #include "amd_smi/amdsmi.h"
diff --git a/projects/amdsmi/src/rocm_smi_properties.cc b/projects/amdsmi/src/rocm_smi_properties.cc
index 2a5a787de4..731df393e6 100644
--- a/projects/amdsmi/src/rocm_smi_properties.cc
+++ b/projects/amdsmi/src/rocm_smi_properties.cc
@@ -27,7 +27,6 @@
 #include "rocm_smi/rocm_smi_device.h"
 #include "rocm_smi/rocm_smi_logger.h"
 
-#include <algorithm>
 #include <cassert>
 #include <sstream>
 
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/api_support_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/api_support_read.cc
index 052b0221f3..f07a2fa952 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/api_support_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/api_support_read.cc
@@ -20,17 +20,12 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stddef.h>
 
 #include <iostream>
 #include <string>
 
 #include <gtest/gtest.h>
-#include "amd_smi/amdsmi.h"
 #include "api_support_read.h"
-#include "../test_common.h"
-#include "../test_utils.h"
 
 TestAPISupportRead::TestAPISupportRead() : TestBase() {
   set_title("AMDSMI API Support Read Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/computepartition_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/computepartition_read_write.cc
index 4edeeee709..797373b94d 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/computepartition_read_write.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/computepartition_read_write.cc
@@ -20,8 +20,7 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
 #include <unistd.h>
 
 #include <iostream>
@@ -33,7 +32,6 @@
 
 #include "gtest/gtest.h"
 #include "../test_base.h"
-#include "../test_common.h"
 #include "amd_smi/amdsmi.h"
 #include "rocm_smi/rocm_smi_utils.h"
 #include "amd_smi/impl/amd_smi_utils.h"
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/err_cnt_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/err_cnt_read.cc
index f346b41d2b..359a5c4629 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/err_cnt_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/err_cnt_read.cc
@@ -20,8 +20,7 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
 
 #include <iostream>
 
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/evt_notif_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/evt_notif_read_write.cc
index a1cd7eb970..68b55cc3bf 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/evt_notif_read_write.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/evt_notif_read_write.cc
@@ -20,15 +20,13 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
 
 #include <iostream>
 
 #include <gtest/gtest.h>
 #include "amd_smi/amdsmi.h"
 #include "evt_notif_read_write.h"
-#include "../test_common.h"
 #include "../test_utils.h"
 
 TestEvtNotifReadWrite::TestEvtNotifReadWrite() : TestBase() {
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/fan_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/fan_read.cc
index 0a351cb826..01f098cd57 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/fan_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/fan_read.cc
@@ -20,15 +20,13 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
 
 #include <iostream>
 
 #include <gtest/gtest.h>
 #include "amd_smi/amdsmi.h"
 #include "fan_read.h"
-#include "../test_common.h"
 
 TestFanRead::TestFanRead() : TestBase() {
   set_title("AMDSMI Fan Read Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/fan_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/fan_read_write.cc
index ee3a1c5a21..dd388693ff 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/fan_read_write.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/fan_read_write.cc
@@ -20,15 +20,13 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
 
 #include <iostream>
 
 #include <gtest/gtest.h>
 #include "amd_smi/amdsmi.h"
 #include "fan_read_write.h"
-#include "../test_common.h"
 
 TestFanReadWrite::TestFanReadWrite() : TestBase() {
   set_title("AMDSMI Fan Read/Write Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read_write.cc
index 1bd702c497..3b776a2372 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read_write.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read_write.cc
@@ -20,11 +20,9 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
 
 #include <iostream>
-#include <map>
 #include <bitset>
 #include <string>
 #include <algorithm>
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/gpu_metrics_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/gpu_metrics_read.cc
index 31c85f6d15..ec5a3b917e 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/gpu_metrics_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/gpu_metrics_read.cc
@@ -20,13 +20,11 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
 
 #include <algorithm>
 #include <iostream>
 #include <iterator>
-#include <sstream>
 #include <string>
 #include <map>
 
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/hw_topology_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/hw_topology_read.cc
index 56888798a5..ed99cffab7 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/hw_topology_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/hw_topology_read.cc
@@ -20,9 +20,8 @@
  * THE SOFTWARE.
  */
 
-#include <inttypes.h>
-#include <stdint.h>
-#include <stddef.h>
+#include <cinttypes>
+#include <cstdint>
 
 #include <iostream>
 #include <string>
@@ -31,7 +30,6 @@
 #include <gtest/gtest.h>
 #include "amd_smi/amdsmi.h"
 #include "hw_topology_read.h"
-#include "../test_common.h"
 
 typedef struct {
   std::string type;
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/id_info_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/id_info_read.cc
index 46e9088614..455297e682 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/id_info_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/id_info_read.cc
@@ -20,8 +20,8 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
+#include <cstddef>
 #include <gtest/gtest.h>
 
 #include <iostream>
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/init_shutdown_refcount.cc b/projects/amdsmi/tests/amd_smi_test/functional/init_shutdown_refcount.cc
index 55f7733278..af6eed8c90 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/init_shutdown_refcount.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/init_shutdown_refcount.cc
@@ -22,7 +22,6 @@
 
 #include <pthread.h>
 
-#include <algorithm>
 #include <iostream>
 #include <thread>  // NOLINT
 #include <random>
@@ -31,7 +30,6 @@
 #include "init_shutdown_refcount.h"
 #include <gtest/gtest.h>
 #include "amd_smi/amdsmi.h"
-#include "../test_common.h"
 
 extern int32_t
 rsmi_test_refcount(uint64_t refcnt_type);
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/mem_page_info_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/mem_page_info_read.cc
index 439666c7c9..b17e985ee7 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/mem_page_info_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/mem_page_info_read.cc
@@ -20,8 +20,7 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
 
 #include <iostream>
 #include <string>
@@ -29,7 +28,6 @@
 #include <gtest/gtest.h>
 #include "amd_smi/amdsmi.h"
 #include "mem_page_info_read.h"
-#include "../test_common.h"
 
 TestMemPageInfoRead::TestMemPageInfoRead() : TestBase() {
   set_title("AMDSMI Memory Page Info Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/memorypartition_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/memorypartition_read_write.cc
index 2bb46b0bf6..353304ebe6 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/memorypartition_read_write.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/memorypartition_read_write.cc
@@ -20,8 +20,7 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
 
 #include <cstdint>
 #include <iostream>
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/metrics_counter_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/metrics_counter_read.cc
index b2e9c91b9e..c829f74ea1 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/metrics_counter_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/metrics_counter_read.cc
@@ -20,18 +20,14 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
 
 #include <iostream>
 #include <string>
-#include <map>
-#include <type_traits>
 
 #include <gtest/gtest.h>
 #include "amd_smi/amdsmi.h"
 #include "metrics_counter_read.h"
-#include "../test_common.h"
 
 
 TestMetricsCounterRead::TestMetricsCounterRead() : TestBase() {
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc b/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc
index 51ce7648ab..5036177969 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc
@@ -20,17 +20,14 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
 
 #include <iostream>
 #include <string>
-#include <map>
 
 #include <gtest/gtest.h>
 #include "amd_smi/amdsmi.h"
 #include "mutual_exclusion.h"
-#include "../test_common.h"
 
 #define  AMD_SMI_INIT_FLAG_RESRV_TEST1 0x800000000000000  //!< Reserved for test
 
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read.cc
index 620417fe75..e687f32343 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read.cc
@@ -20,8 +20,7 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
 
 #include <iostream>
 #include <string>
@@ -29,7 +28,6 @@
 #include <gtest/gtest.h>
 #include "amd_smi/amdsmi.h"
 #include "overdrive_read.h"
-#include "../test_common.h"
 
 TestOverdriveRead::TestOverdriveRead() : TestBase() {
   set_title("AMDSMI Overdrive Read Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read_write.cc
index 6dadb5b259..15614082b7 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read_write.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read_write.cc
@@ -20,15 +20,13 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
 
 #include <iostream>
 
 #include <gtest/gtest.h>
 #include "amd_smi/amdsmi.h"
 #include "overdrive_read_write.h"
-#include "../test_common.h"
 
 TestOverdriveReadWrite::TestOverdriveReadWrite() : TestBase() {
   set_title("AMDSMI Overdrive Read/Write Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/pci_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/pci_read_write.cc
index 576e8427a9..6610bfd9f8 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/pci_read_write.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/pci_read_write.cc
@@ -20,8 +20,7 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
 
 #include <iostream>
 #include <bitset>
@@ -31,7 +30,6 @@
 #include <gtest/gtest.h>
 #include "amd_smi/amdsmi.h"
 #include "pci_read_write.h"
-#include "../test_common.h"
 
 
 TestPciReadWrite::TestPciReadWrite() : TestBase() {
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/perf_cntr_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/perf_cntr_read_write.cc
index 5d96c45252..ef70ba466c 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/perf_cntr_read_write.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/perf_cntr_read_write.cc
@@ -20,20 +20,16 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
 
 #include <iostream>
-#include <bitset>
 #include <string>
-#include <algorithm>
 #include <vector>
 #include <memory>
 
 #include <gtest/gtest.h>
 #include "amd_smi/amdsmi.h"
 #include "perf_cntr_read_write.h"
-#include "../test_common.h"
 
 PerfCntrEvtGrp::PerfCntrEvtGrp(amdsmi_event_group_t grp, uint32_t first,
         uint32_t last, std::string name) : grp_(grp), first_evt_(first),
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/perf_determinism.cc b/projects/amdsmi/tests/amd_smi_test/functional/perf_determinism.cc
index f73cd3b045..ba48eba1ad 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/perf_determinism.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/perf_determinism.cc
@@ -20,14 +20,10 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
 
 #include <iostream>
 #include <string>
-#include <map>
-#include <bitset>
-#include <algorithm>
 
 #include <gtest/gtest.h>
 #include "amd_smi/amdsmi.h"
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read.cc
index 06145429a9..111c48eb1c 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read.cc
@@ -29,7 +29,6 @@
 
 #include "amd_smi/amdsmi.h"
 #include "perf_level_read.h"
-#include "../test_common.h"
 
 TestPerfLevelRead::TestPerfLevelRead() : TestBase() {
   set_title("AMDSMI Performance Level Read Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/power_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/power_read.cc
index 0b8704e99e..57fe03f285 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/power_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/power_read.cc
@@ -29,7 +29,6 @@
 
 #include "amd_smi/amdsmi.h"
 #include "power_read.h"
-#include "../test_common.h"
 
 TestPowerRead::TestPowerRead() : TestBase() {
   set_title("AMDSMI Power Read Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/power_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/power_read_write.cc
index a80f0f3cf8..aa746b9278 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/power_read_write.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/power_read_write.cc
@@ -20,18 +20,14 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
 
 #include <iostream>
-#include <bitset>
 #include <string>
-#include <algorithm>
 
 #include <gtest/gtest.h>
 #include "amd_smi/amdsmi.h"
 #include "power_read_write.h"
-#include "../test_common.h"
 
 
 TestPowerReadWrite::TestPowerReadWrite() : TestBase() {
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/process_info_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/process_info_read.cc
index 450dac0cf1..6feeb902e9 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/process_info_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/process_info_read.cc
@@ -20,8 +20,7 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
 
 #include <iostream>
 #include <string>
@@ -29,7 +28,6 @@
 #include <gtest/gtest.h>
 #include "amd_smi/amdsmi.h"
 #include "process_info_read.h"
-#include "../test_common.h"
 
 TestProcInfoRead::TestProcInfoRead() : TestBase() {
   set_title("AMDSMI Process Info Read Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/sys_info_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/sys_info_read.cc
index 6631ba6fe7..9344855ebd 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/sys_info_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/sys_info_read.cc
@@ -30,8 +30,6 @@
 
 #include "amd_smi/amdsmi.h"
 #include "sys_info_read.h"
-#include "../test_common.h"
-#include "../test_utils.h"
 
 TestSysInfoRead::TestSysInfoRead() : TestBase() {
   set_title("AMDSMI System Info Read Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/temp_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/temp_read.cc
index c8816ff2a1..01bc840c0f 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/temp_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/temp_read.cc
@@ -20,8 +20,7 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
 
 #include <iostream>
 #include <string>
@@ -30,7 +29,6 @@
 #include <gtest/gtest.h>
 #include "amd_smi/amdsmi.h"
 #include "temp_read.h"
-#include "../test_common.h"
 
 
 static const std::map<uint32_t, std::string> kTempSensorNameMap = {
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/version_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/version_read.cc
index 12a325fa21..5a0b826651 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/version_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/version_read.cc
@@ -20,16 +20,13 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
 
 #include <iostream>
-#include <map>
 
 #include <gtest/gtest.h>
 #include "amd_smi/amdsmi.h"
 #include "version_read.h"
-#include "../test_common.h"
 
 TestVersionRead::TestVersionRead() : TestBase() {
   set_title("AMDSMI Version Read Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/volt_freq_curv_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/volt_freq_curv_read.cc
index 5bf9b63aec..86edeabaf6 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/volt_freq_curv_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/volt_freq_curv_read.cc
@@ -20,8 +20,7 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
 
 #include <iostream>
 #include <string>
@@ -29,7 +28,6 @@
 #include <gtest/gtest.h>
 #include "amd_smi/amdsmi.h"
 #include "volt_freq_curv_read.h"
-#include "../test_common.h"
 
 TestVoltCurvRead::TestVoltCurvRead() : TestBase() {
   set_title("AMDSMI Voltage-Frequency Curve Read Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/volt_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/volt_read.cc
index 685f61431c..bea47ca487 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/volt_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/volt_read.cc
@@ -20,12 +20,10 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
 
 #include <iostream>
 #include <string>
-#include <map>
 
 #include <gtest/gtest.h>
 #include "amd_smi/amdsmi.h"
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/xgmi_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/xgmi_read_write.cc
index 7efdf57489..ab8e991a48 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/xgmi_read_write.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/xgmi_read_write.cc
@@ -20,15 +20,13 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
 
 #include <iostream>
 
 #include <gtest/gtest.h>
 #include "amd_smi/amdsmi.h"
 #include "xgmi_read_write.h"
-#include "../test_common.h"
 
 TestXGMIReadWrite::TestXGMIReadWrite() : TestBase() {
   set_title("AMDSMI XGMI Read/Write Test");
diff --git a/projects/amdsmi/tests/amd_smi_test/main.cc b/projects/amdsmi/tests/amd_smi_test/main.cc
index 56685f832b..8e9c549797 100644
--- a/projects/amdsmi/tests/amd_smi_test/main.cc
+++ b/projects/amdsmi/tests/amd_smi_test/main.cc
@@ -21,12 +21,7 @@
  */
 #include <gtest/gtest.h>
 
-#include <string>
-#include <vector>
-#include <memory>
-#include <iostream>
 
-#include "amd_smi/amdsmi.h"
 #include "rocm_smi/rocm_smi_utils.h"
 #include "amd_smi/impl/amd_smi_utils.h"
 #include "test_common.h"
@@ -63,8 +58,6 @@
 #include "functional/id_info_read.h"
 #include "functional/metrics_counter_read.h"
 #include "functional/version_read.h"
-#include "functional/mutual_exclusion.h"
-#include "functional/init_shutdown_refcount.h"
 #include "functional/memorypartition_read_write.h"
 #include "functional/computepartition_read_write.h"
 #include "functional/gpu_cache_read.h"
diff --git a/projects/amdsmi/tests/amd_smi_test/test_base.cc b/projects/amdsmi/tests/amd_smi_test/test_base.cc
index 424b300d1d..5320c297fd 100644
--- a/projects/amdsmi/tests/amd_smi_test/test_base.cc
+++ b/projects/amdsmi/tests/amd_smi_test/test_base.cc
@@ -28,7 +28,6 @@
 #include "amd_smi/impl/amd_smi_utils.h"
 #include "rocm_smi/rocm_smi_utils.h"
 #include "test_base.h"
-#include "test_common.h"
 
 static const int kOutputLineLength = 80;
 static const char kLabelDelimiter[] = "####";
diff --git a/projects/amdsmi/tests/amd_smi_test/test_common.cc b/projects/amdsmi/tests/amd_smi_test/test_common.cc
index 58a313cb9f..1fa752e897 100644
--- a/projects/amdsmi/tests/amd_smi_test/test_common.cc
+++ b/projects/amdsmi/tests/amd_smi_test/test_common.cc
@@ -28,7 +28,6 @@
 #include <map>
 #include <string>
 
-#include "test_base.h"
 #include "test_common.h"
 #include "amd_smi/amdsmi.h"
 
diff --git a/projects/amdsmi/third_party/shared_mutex/shared_mutex.cc b/projects/amdsmi/third_party/shared_mutex/shared_mutex.cc
index 808a7e4eda..fa8e07dde8 100644
--- a/projects/amdsmi/third_party/shared_mutex/shared_mutex.cc
+++ b/projects/amdsmi/third_party/shared_mutex/shared_mutex.cc
@@ -23,17 +23,17 @@ THE SOFTWARE.
 */
 
 #include "shared_mutex.h"  // NOLINT(build/include)
-#include <errno.h>  // errno, ENOENT
+#include <cerrno>
 #include <fcntl.h>  // O_RDWR, O_CREATE
 #include <linux/limits.h>  // NAME_MAX
 #include <sys/mman.h>  // shm_open, shm_unlink, mmap, munmap,
                       // PROT_READ, PROT_WRITE, MAP_SHARED, MAP_FAILED
 #include <unistd.h>  // ftruncate, close
-#include <stdio.h>  // perror
-#include <stdlib.h>  // malloc, free
-#include <string.h>  // strcpy
-#include <time.h>   // clock_gettime
-#include <assert.h>
+#include <cstdio>  // perror
+#include <cstdlib>  // malloc, free
+#include <cstring>  // strcpy
+#include <ctime>   // clock_gettime
+#include <cassert>
 
 #include <sys/types.h>
 #include <dirent.h>