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 797373b94d..18c2540ccd 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
@@ -24,13 +24,14 @@
 #include <unistd.h>
 
 #include <iostream>
+#include <iomanip>
 #include <chrono>   // NOLINT [build]
 #include <map>
 #include <string>
 #include <vector>
 #include <limits>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "../test_base.h"
 #include "amd_smi/amdsmi.h"
 #include "rocm_smi/rocm_smi_utils.h"
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read.cc
index 4e89331551..eba205fdb9 100644
--- a/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read.cc
@@ -22,6 +22,7 @@
 
 #include <cstdint>
 #include <iostream>
+#include <iomanip>
 #include <string>
 
 #include <gtest/gtest.h>
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 ed99cffab7..398099349a 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
@@ -22,7 +22,9 @@
 
 #include <cinttypes>
 #include <cstdint>
+#include <cstdio>
 
+#include <iomanip>
 #include <iostream>
 #include <string>
 #include <vector>
@@ -431,7 +433,7 @@ void TestHWTopologyRead::Run(void) {
   }
   std::cout << std::endl;
 
-  char *topology_link_type_str[] = {
+  std::string topology_link_type_str[] = {
       "AMDSMI_LINK_TYPE_INTERNAL",
       "AMDSMI_LINK_TYPE_XGMI",
       "AMDSMI_LINK_TYPE_PCIE",
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 86185f7621..b3861f61b3 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
@@ -28,7 +28,7 @@
 #include <map>
 #include <limits>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "../test_base.h"
 #include "../test_common.h"
 #include "amd_smi/amdsmi.h"
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 6ebcd35a79..e2e14ac7d6 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
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
 #include <gtest/gtest.h>
 
+#include <iomanip>
 #include <iostream>
 #include <string>
 #include <limits>
diff --git a/projects/amdsmi/tests/amd_smi_test/test_base.cc b/projects/amdsmi/tests/amd_smi_test/test_base.cc
index c2d65262a6..c010ab0e6e 100644
--- a/projects/amdsmi/tests/amd_smi_test/test_base.cc
+++ b/projects/amdsmi/tests/amd_smi_test/test_base.cc
@@ -20,10 +20,11 @@
  * THE SOFTWARE.
  */
 
-#include <gtest/gtest.h>
-
 #include <cassert>
 
+#include <iomanip>
+
+#include <gtest/gtest.h>
 #include "amd_smi/amdsmi.h"
 #include "amd_smi/impl/amd_smi_utils.h"
 #include "rocm_smi/rocm_smi_utils.h"