Remove unnecessary includes

Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org> [ROCm/amdsmi commit: 924a06d1e1]
2025-08-15 14:35:47 -05:00
@@ -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() {

@@ -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>
@@ -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>
@@ -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>

@@ -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"
@@ -21,6 +21,7 @@
 */

 #pragma once
+#include <vector>

 #include "amd_smi/amdsmi.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 {
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -23,6 +23,8 @@
 #ifndef __FDINFO__
 #define __FDINFO__

+#include <vector>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -36,7 +36,7 @@

 #include <stdarg.h>
 #include <sys/types.h>
-#include <stdint.h>
+#include <cstdint>
 #ifndef __LIBDRM__
 #define __LIBDRM__
 #include <libdrm/drm.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"
@@ -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"
@@ -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>
@@ -29,7 +29,6 @@
 #include <set>
 #include <string>
 #include <cstdint>
-#include <unordered_map>
 #include <map>
 #include <mutex>  // NOLINT
 #include <utility>
@@ -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>
@@ -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;

@@ -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) {
@@ -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"
@@ -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"
@@ -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;
@@ -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"
@@ -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"
@@ -43,7 +43,6 @@

 // C++ Header File(s)
 #include <cstdlib>
-#include <chrono>
 #include <ctime>
 #include <iomanip>
 #include <iostream>
@@ -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"
@@ -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"
@@ -22,9 +22,7 @@

 #include <cassert>
 #include <cstdint>
-#include <fstream>
 #include <iostream>
-#include <map>
 #include <sstream>
 #include <string>

@@ -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"
@@ -20,7 +20,6 @@
 * THE SOFTWARE.
 */

-#include <functional>
 #include "amd_smi/amdsmi.h"
 #include "amd_smi/impl/amd_smi_common.h"

@@ -27,7 +27,6 @@
 #include <memory>
 #include <cstring>
 #include <sstream>
-#include <vector>

 extern "C" {
 #include "aca-decode/aca_decode.h"
@@ -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 {
@@ -20,7 +20,6 @@
 * THE SOFTWARE.
 */

-#include <functional>
 #include "amd_smi/impl/amd_smi_socket.h"


@@ -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 {

@@ -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>
@@ -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"
@@ -27,7 +27,6 @@
 #include "rocm_smi/rocm_smi_device.h"
 #include "rocm_smi/rocm_smi_logger.h"

-#include <algorithm>
 #include <cassert>
 #include <sstream>

@@ -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");
@@ -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"
@@ -20,8 +20,7 @@
 * THE SOFTWARE.
 */

-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>

 #include <iostream>

@@ -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() {
@@ -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");
@@ -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");
@@ -20,11 +20,9 @@
 * THE SOFTWARE.
 */

-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>

 #include <iostream>
-#include <map>
 #include <bitset>
 #include <string>
 #include <algorithm>
@@ -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>

@@ -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;
@@ -20,8 +20,8 @@
 * THE SOFTWARE.
 */

-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
+#include <cstddef>
 #include <gtest/gtest.h>

 #include <iostream>
@@ -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);
@@ -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");
@@ -20,8 +20,7 @@
 * THE SOFTWARE.
 */

-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>

 #include <cstdint>
 #include <iostream>
@@ -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() {
@@ -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

@@ -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");
@@ -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");
@@ -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() {
@@ -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),
@@ -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"
@@ -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");
@@ -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");
@@ -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() {
@@ -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");
@@ -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");
@@ -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 = {
@@ -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");
@@ -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");
@@ -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"
@@ -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");
@@ -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"
@@ -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[] = "####";
@@ -28,7 +28,6 @@
 #include <map>
 #include <string>

-#include "test_base.h"
 #include "test_common.h"
 #include "amd_smi/amdsmi.h"

@@ -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>