diff --git a/unit_tests/global_environment.cpp b/unit_tests/global_environment.cpp
index de3fe8710d..3fc12e5ea7 100644
--- a/unit_tests/global_environment.cpp
+++ b/unit_tests/global_environment.cpp
@@ -77,7 +77,7 @@ void TestEnvironment::setDefaultDebugVars(
     fclDefaultDebugVars = fclDefaults;
     igcDefaultDebugVars = igcDefaults;
 
-    libraryOS = setAdapterInfo(reinterpret_cast<const void *>(hwInfo.pPlatform), reinterpret_cast<const void *>(hwInfo.pSysInfo));
+    libraryOS = setAdapterInfo(hwInfo.pPlatform, hwInfo.pSysInfo);
 }
 
 void TestEnvironment::setMockFileNames(
diff --git a/unit_tests/global_environment.h b/unit_tests/global_environment.h
index afe34f8dd9..a54a424677 100644
--- a/unit_tests/global_environment.h
+++ b/unit_tests/global_environment.h
@@ -28,7 +28,7 @@
 
 using namespace OCLRT;
 
-OsLibrary *setAdapterInfo(const void *platform, const void *gtSystemInfo);
+OsLibrary *setAdapterInfo(const PLATFORM *platform, const GT_SYSTEM_INFO *gtSystemInfo);
 
 class TestEnvironment : public ::testing::Environment {
   public:
diff --git a/unit_tests/os_interface/device_factory_tests.cpp b/unit_tests/os_interface/device_factory_tests.cpp
index a5212b0ebb..bc89ebea39 100644
--- a/unit_tests/os_interface/device_factory_tests.cpp
+++ b/unit_tests/os_interface/device_factory_tests.cpp
@@ -31,14 +31,14 @@
 
 using namespace OCLRT;
 
-OsLibrary *setAdapterInfo(const void *platform, const void *gtSystemInfo);
+OsLibrary *setAdapterInfo(const PLATFORM *platform, const GT_SYSTEM_INFO *gtSystemInfo);
 
 struct DeviceFactoryTest : public MemoryManagementFixture,
                            public ::testing::Test {
   public:
     void SetUp() override {
         const HardwareInfo hwInfo = *platformDevices[0];
-        mockGdiDll = setAdapterInfo(reinterpret_cast<const void *>(hwInfo.pPlatform), reinterpret_cast<const void *>(hwInfo.pSysInfo));
+        mockGdiDll = setAdapterInfo(hwInfo.pPlatform, hwInfo.pSysInfo);
         MemoryManagementFixture::SetUp();
     }
 
diff --git a/unit_tests/os_interface/linux/options.cpp b/unit_tests/os_interface/linux/options.cpp
index ab4be9c2a9..4cfc6f7d33 100644
--- a/unit_tests/os_interface/linux/options.cpp
+++ b/unit_tests/os_interface/linux/options.cpp
@@ -21,6 +21,8 @@
  */
 
 #include "runtime/os_interface/os_library.h"
+#include "common/gtsysinfo.h"
+#include "igfxfmid.h"
 
 namespace Os {
 ///////////////////////////////////////////////////////////////////////////////
@@ -36,6 +38,6 @@ const char *testDllName = "libtest_dynamic_lib.so";
 const char *sysFsPciPath = "./test_files";
 }
 
-OCLRT::OsLibrary *setAdapterInfo(const void *platform, const void *gtSystemInfo) {
+OCLRT::OsLibrary *setAdapterInfo(const PLATFORM *platform, const GT_SYSTEM_INFO *gtSystemInfo) {
     return nullptr;
 }
diff --git a/unit_tests/os_interface/windows/options.cpp b/unit_tests/os_interface/windows/options.cpp
index d364076c07..1768e3c47e 100644
--- a/unit_tests/os_interface/windows/options.cpp
+++ b/unit_tests/os_interface/windows/options.cpp
@@ -21,6 +21,8 @@
  */
 
 #include "runtime/os_interface/os_library.h"
+#include "common/gtsysinfo.h"
+#include "igfxfmid.h"
 
 namespace Os {
 ///////////////////////////////////////////////////////////////////////////////
@@ -33,7 +35,7 @@ const char *gdiDllName = "gdi32_mock.dll";
 const char *testDllName = "test_dynamic_lib.dll";
 }
 
-OCLRT::OsLibrary *setAdapterInfo(const void *platform, const void *gtSystemInfo) {
+OCLRT::OsLibrary *setAdapterInfo(const PLATFORM *platform, const GT_SYSTEM_INFO *gtSystemInfo) {
     OCLRT::OsLibrary *mockGdiDll;
     mockGdiDll = OCLRT::OsLibrary::load("gdi32_mock.dll");
 
diff --git a/unit_tests/os_interface/windows/wddm_fixture.h b/unit_tests/os_interface/windows/wddm_fixture.h
index 187719d799..aeafb784cb 100644
--- a/unit_tests/os_interface/windows/wddm_fixture.h
+++ b/unit_tests/os_interface/windows/wddm_fixture.h
@@ -43,7 +43,7 @@
 
 using namespace OCLRT;
 
-OsLibrary *setAdapterInfo(const void *platform, const void *gtSystemInfo);
+OsLibrary *setAdapterInfo(const PLATFORM *platform, const GT_SYSTEM_INFO *gtSystemInfo);
 
 class WddmMock : public Wddm {
     struct CallResult {
@@ -390,7 +390,7 @@ class WddmFixture {
   public:
     virtual void SetUp() {
         const HardwareInfo hwInfo = *platformDevices[0];
-        mockGdiDll = setAdapterInfo(reinterpret_cast<const void *>(hwInfo.pPlatform), reinterpret_cast<const void *>(hwInfo.pSysInfo));
+        mockGdiDll = setAdapterInfo(hwInfo.pPlatform, hwInfo.pSysInfo);
 
         setSizesFunction = reinterpret_cast<decltype(&MockSetSizes)>(mockGdiDll->getProcAddress("MockSetSizes"));
         getSizesFunction = reinterpret_cast<decltype(&GetMockSizes)>(mockGdiDll->getProcAddress("GetMockSizes"));
@@ -443,7 +443,7 @@ class WddmFixtureMock {
   public:
     virtual void SetUp() {
         const HardwareInfo hwInfo = *platformDevices[0];
-        mockGdiDll = setAdapterInfo(reinterpret_cast<const void *>(hwInfo.pPlatform), reinterpret_cast<const void *>(hwInfo.pSysInfo));
+        mockGdiDll = setAdapterInfo(hwInfo.pPlatform, hwInfo.pSysInfo);
         wddm = new WddmMock();
     }
 
diff --git a/unit_tests/os_interface/windows/wddm_tests.cpp b/unit_tests/os_interface/windows/wddm_tests.cpp
index 38838b5152..c3e18c1b6b 100644
--- a/unit_tests/os_interface/windows/wddm_tests.cpp
+++ b/unit_tests/os_interface/windows/wddm_tests.cpp
@@ -92,7 +92,7 @@ TEST(WddmTestEnumAdapters, expectTrue) {
     HardwareInfo outHwInfo;
 
     const HardwareInfo hwInfo = *platformDevices[0];
-    OsLibrary *mockGdiDll = setAdapterInfo(reinterpret_cast<const void *>(hwInfo.pPlatform), reinterpret_cast<const void *>(hwInfo.pSysInfo));
+    OsLibrary *mockGdiDll = setAdapterInfo(hwInfo.pPlatform, hwInfo.pSysInfo);
 
     bool success = Wddm::enumAdapters(0, outHwInfo);
     EXPECT_TRUE(success);
diff --git a/unit_tests/os_interface/windows/wddm_tests.h b/unit_tests/os_interface/windows/wddm_tests.h
index da19b3a8f2..491b28bd98 100644
--- a/unit_tests/os_interface/windows/wddm_tests.h
+++ b/unit_tests/os_interface/windows/wddm_tests.h
@@ -29,7 +29,7 @@
 
 using namespace OCLRT;
 
-OsLibrary *setAdapterInfo(const void *platform, const void *gtSystemInfo);
+OsLibrary *setAdapterInfo(const PLATFORM *platform, const GT_SYSTEM_INFO *gtSystemInfo);
 
 typedef Test<WddmGmmFixture> WddmTest;