diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ef94d320e..d7b8c85ef7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,6 +52,7 @@ elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")
   set(DISABLE_WDDM_LINUX TRUE)
 endif()
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/shared/source/gmm_helper/igfxfmid_wrapper/${BRANCH_DIR_SUFFIX}")
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/shared/source/device_binary_format/aot_platforms/${BRANCH_DIR_SUFFIX}")
 
 message(STATUS "Host processor: ${CMAKE_HOST_SYSTEM_PROCESSOR}")
 message(STATUS "Target processor: ${CMAKE_SYSTEM_PROCESSOR}")
diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/pvc/test_device_pvc.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/pvc/test_device_pvc.cpp
index 1e0b43dc2a..5953488908 100644
--- a/level_zero/core/test/unit_tests/xe_hpc_core/pvc/test_device_pvc.cpp
+++ b/level_zero/core/test/unit_tests/xe_hpc_core/pvc/test_device_pvc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -18,7 +18,7 @@
 #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h"
 #include "level_zero/core/test/unit_tests/xe_hpc_core/xe_hpc_core_test_l0_fixtures.h"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 namespace L0 {
 namespace ult {
diff --git a/opencl/test/unit_test/offline_compiler/ocloc_api_tests.cpp b/opencl/test/unit_test/offline_compiler/ocloc_api_tests.cpp
index 52a2b15775..35339ad8e4 100644
--- a/opencl/test/unit_test/offline_compiler/ocloc_api_tests.cpp
+++ b/opencl/test/unit_test/offline_compiler/ocloc_api_tests.cpp
@@ -29,7 +29,7 @@
 #include "environment.h"
 #include "gtest/gtest.h"
 #include "hw_cmds_default.h"
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 #include <algorithm>
 #include <array>
diff --git a/opencl/test/unit_test/offline_compiler/ocloc_concat_tests.cpp b/opencl/test/unit_test/offline_compiler/ocloc_concat_tests.cpp
index 4ef2fbd2c6..5b1d70d634 100644
--- a/opencl/test/unit_test/offline_compiler/ocloc_concat_tests.cpp
+++ b/opencl/test/unit_test/offline_compiler/ocloc_concat_tests.cpp
@@ -13,7 +13,7 @@
 #include "gtest/gtest.h"
 #include "mock/mock_argument_helper.h"
 #include "mock/mock_ocloc_concat.h"
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 #include <array>
 
diff --git a/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.cpp b/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.cpp
index 48c3a2ec5c..4bc74eb425 100644
--- a/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.cpp
+++ b/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.cpp
@@ -27,7 +27,7 @@
 #include "environment.h"
 #include "mock/mock_argument_helper.h"
 #include "mock/mock_offline_compiler.h"
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 #include <algorithm>
 #include <filesystem>
@@ -195,10 +195,10 @@ TEST(OclocFatBinaryRequestedFatBinary, givenReleaseOrFamilyAcronymWhenGetAcronym
 
         if (!acronym.empty()) {
             getProductsAcronymsForTarget<AOT::RELEASE>(outRelease, device.release, argHelper.get());
-            EXPECT_TRUE(std::find(outRelease.begin(), outRelease.end(), acronym) != outRelease.end());
+            EXPECT_TRUE(std::find(outRelease.begin(), outRelease.end(), acronym) != outRelease.end()) << acronym.str();
 
             getProductsAcronymsForTarget<AOT::FAMILY>(outFamily, device.family, argHelper.get());
-            EXPECT_TRUE(std::find(outFamily.begin(), outFamily.end(), acronym) != outFamily.end());
+            EXPECT_TRUE(std::find(outFamily.begin(), outFamily.end(), acronym) != outFamily.end()) << acronym.str();
 
             device.deviceAcronyms.clear();
             device.rtlIdAcronyms.clear();
@@ -206,10 +206,10 @@ TEST(OclocFatBinaryRequestedFatBinary, givenReleaseOrFamilyAcronymWhenGetAcronym
             outFamily.clear();
 
             getProductsAcronymsForTarget<AOT::RELEASE>(outRelease, device.release, argHelper.get());
-            EXPECT_FALSE(std::find(outRelease.begin(), outRelease.end(), acronym) != outRelease.end());
+            EXPECT_FALSE(std::find(outRelease.begin(), outRelease.end(), acronym) != outRelease.end()) << acronym.str();
 
             getProductsAcronymsForTarget<AOT::FAMILY>(outFamily, device.family, argHelper.get());
-            EXPECT_FALSE(std::find(outFamily.begin(), outFamily.end(), acronym) != outFamily.end());
+            EXPECT_FALSE(std::find(outFamily.begin(), outFamily.end(), acronym) != outFamily.end()) << acronym.str();
         }
     }
 }
@@ -996,7 +996,7 @@ TEST_F(OclocFatBinaryProductAcronymsTests, givenOpenRangeFromProductWhenFatBinar
         resString << "Build succeeded for : " << product.str() + ".\n";
     }
 
-    EXPECT_STREQ(output.c_str(), resString.str().c_str());
+    EXPECT_STREQ(output.c_str(), resString.str().c_str()) << ConstStringRef(" ").join(argv);
 }
 
 TEST_F(OclocFatBinaryProductAcronymsTests, givenOpenRangeFromProductWithoutDashesWhenFatBinaryBuildIsInvokedThenSuccessIsReturned) {
@@ -1127,7 +1127,7 @@ TEST_F(OclocFatBinaryProductAcronymsTests, givenFullRangeWhenGetProductsForRange
         GTEST_SKIP();
     }
     auto product = aotInfos[0].aotConfig.value;
-    uint32_t productTo = AOT::CONFIG_MAX_PLATFORM;
+    uint32_t productTo = AOT::getConfixMaxPlatform();
     --productTo;
     auto got = NEO::getProductsForRange(product, static_cast<AOT::PRODUCT_CONFIG>(productTo), oclocArgHelperWithoutInput.get());
 
@@ -1165,7 +1165,7 @@ TEST_F(OclocFatBinaryProductAcronymsTests, givenOnlyRtlIdAcronymsForConfigWhenGe
     std::string tmpStr("tmp");
     aotInfo.rtlIdAcronyms.push_back(ConstStringRef(tmpStr));
 
-    uint32_t productTo = AOT::CONFIG_MAX_PLATFORM;
+    uint32_t productTo = AOT::getConfixMaxPlatform();
     --productTo;
     auto acronyms = NEO::getProductsForRange(product, static_cast<AOT::PRODUCT_CONFIG>(productTo), oclocArgHelperWithoutInput.get());
 
diff --git a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp
index 73cc00ec7a..9d66ca2263 100644
--- a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp
+++ b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp
@@ -41,7 +41,7 @@
 #include "mock/mock_argument_helper.h"
 #include "mock/mock_multi_command.h"
 #include "mock/mock_offline_compiler.h"
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 #include <algorithm>
 #include <array>
@@ -591,7 +591,7 @@ TEST_F(MockOfflineCompilerTests, givenDeviceIdsFromDevicesFileWhenInitHwInfoThen
         mockOfflineCompiler.deviceConfig = AOT::UNKNOWN_ISA;
         std::stringstream deviceIDStr;
         deviceIDStr << "0x" << std::hex << deviceId;
-        EXPECT_EQ(OCLOC_SUCCESS, mockOfflineCompiler.initHardwareInfo(deviceIDStr.str()));
+        EXPECT_EQ(OCLOC_SUCCESS, mockOfflineCompiler.initHardwareInfo(deviceIDStr.str())) << deviceIDStr.str();
         EXPECT_NE(mockOfflineCompiler.deviceConfig, AOT::UNKNOWN_ISA);
     }
 }
@@ -1332,7 +1332,7 @@ TEST_F(OfflineCompilerTests, givenDeviceHexIdAndDeviceOptionsInGeneralWhenCmdLin
         };
 
         if (addFirstMatchingAcronym(AOT::deviceAcronyms) ||
-            addFirstMatchingAcronym(AOT::rtlIdAcronyms) ||
+            addFirstMatchingAcronym(AOT::getRtlIdAcronyms()) ||
             addFirstMatchingAcronym(AOT::genericIdAcronyms)) {
             break;
         }
diff --git a/opencl/test/unit_test/offline_compiler/xe3_core/ptl/offline_compiler_tests_ptl.cpp b/opencl/test/unit_test/offline_compiler/xe3_core/ptl/offline_compiler_tests_ptl.cpp
index 14520eedbf..2dd6572acc 100644
--- a/opencl/test/unit_test/offline_compiler/xe3_core/ptl/offline_compiler_tests_ptl.cpp
+++ b/opencl/test/unit_test/offline_compiler/xe3_core/ptl/offline_compiler_tests_ptl.cpp
@@ -15,7 +15,7 @@
 #include "opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h"
 
 #include "device_ids_configs_ptl.h"
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 using namespace NEO;
 
diff --git a/opencl/test/unit_test/offline_compiler/xe_hpg_core/dg2/offline_compiler_tests_dg2.cpp b/opencl/test/unit_test/offline_compiler/xe_hpg_core/dg2/offline_compiler_tests_dg2.cpp
index 9408a702fb..4f56e63456 100644
--- a/opencl/test/unit_test/offline_compiler/xe_hpg_core/dg2/offline_compiler_tests_dg2.cpp
+++ b/opencl/test/unit_test/offline_compiler/xe_hpg_core/dg2/offline_compiler_tests_dg2.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -12,7 +12,7 @@
 #include "opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.h"
 #include "opencl/test/unit_test/offline_compiler/ocloc_product_config_tests.h"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 namespace NEO {
 
 inline constexpr AOT::PRODUCT_CONFIG productConfigs[] = {
diff --git a/shared/offline_compiler/source/ocloc_arg_helper.cpp b/shared/offline_compiler/source/ocloc_arg_helper.cpp
index d5cc1c1c37..d7a3382b35 100644
--- a/shared/offline_compiler/source/ocloc_arg_helper.cpp
+++ b/shared/offline_compiler/source/ocloc_arg_helper.cpp
@@ -14,7 +14,7 @@
 #include "shared/source/release_helper/release_helper.h"
 
 #include "hw_cmds.h"
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 #include <algorithm>
 #include <cstring>
diff --git a/shared/offline_compiler/source/ocloc_fatbinary.cpp b/shared/offline_compiler/source/ocloc_fatbinary.cpp
index 557258ce8b..0868a52502 100644
--- a/shared/offline_compiler/source/ocloc_fatbinary.cpp
+++ b/shared/offline_compiler/source/ocloc_fatbinary.cpp
@@ -22,8 +22,8 @@
 #include "shared/source/helpers/product_config_helper.h"
 #include "shared/source/utilities/directory.h"
 
+#include "neo_aot_platforms.h"
 #include "neo_igfxfmid.h"
-#include "platforms.h"
 
 #include <algorithm>
 #include <cstddef>
@@ -204,7 +204,7 @@ std::vector<ConstStringRef> getProductForOpenRange(ConstStringRef openRange, Ocl
             ++productFrom;
             return getProductsForRange(productFrom, static_cast<unsigned int>(product), argHelper);
         } else {
-            unsigned int productTo = AOT::CONFIG_MAX_PLATFORM;
+            unsigned int productTo = AOT::getConfixMaxPlatform();
             --productTo;
             return getProductsForRange(product, static_cast<AOT::PRODUCT_CONFIG>(productTo), argHelper);
         }
diff --git a/shared/offline_compiler/source/offline_compiler.cpp b/shared/offline_compiler/source/offline_compiler.cpp
index 32be951ab4..71a589df88 100644
--- a/shared/offline_compiler/source/offline_compiler.cpp
+++ b/shared/offline_compiler/source/offline_compiler.cpp
@@ -33,8 +33,8 @@
 #include "shared/source/release_helper/release_helper.h"
 #include "shared/source/utilities/io_functions.h"
 
+#include "neo_aot_platforms.h"
 #include "offline_compiler_ext.h"
-#include "platforms.h"
 
 #include <iomanip>
 #include <iterator>
diff --git a/shared/source/device_binary_format/aot_platforms/neo_aot_platforms.h b/shared/source/device_binary_format/aot_platforms/neo_aot_platforms.h
new file mode 100644
index 0000000000..e60a1ef8fd
--- /dev/null
+++ b/shared/source/device_binary_format/aot_platforms/neo_aot_platforms.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2025 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+
+#include "platforms.h"
+
+namespace AOT {
+consteval PRODUCT_CONFIG getConfixMaxPlatform() {
+    return CONFIG_MAX_PLATFORM;
+}
+
+inline const auto &getCompatibilityMapping() {
+    return compatibilityMapping;
+}
+
+inline const auto &getRtlIdAcronyms() {
+    return rtlIdAcronyms;
+}
+
+} // namespace AOT
diff --git a/shared/source/device_binary_format/zebin/zebin_decoder.cpp b/shared/source/device_binary_format/zebin/zebin_decoder.cpp
index 18950acbc8..a4de6a540e 100644
--- a/shared/source/device_binary_format/zebin/zebin_decoder.cpp
+++ b/shared/source/device_binary_format/zebin/zebin_decoder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -19,7 +19,7 @@
 #include "shared/source/program/program_info.h"
 #include "shared/source/utilities/logger.h"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 namespace NEO {
 template <>
@@ -45,8 +45,8 @@ bool isZebin(ArrayRef<const uint8_t> binary) {
 
 bool isTargetProductConfigCompatibleWithProductConfig(const AOT::PRODUCT_CONFIG &targetDeviceProductConfig,
                                                       const AOT::PRODUCT_CONFIG &productConfig) {
-    auto compatProdConfPairItr = AOT::compatibilityMapping.find(productConfig);
-    if (compatProdConfPairItr != AOT::compatibilityMapping.end()) {
+    auto compatProdConfPairItr = AOT::getCompatibilityMapping().find(productConfig);
+    if (compatProdConfPairItr != AOT::getCompatibilityMapping().end()) {
         for (auto &compatibleConfig : compatProdConfPairItr->second)
             if (targetDeviceProductConfig == compatibleConfig)
                 return true;
diff --git a/shared/source/gen12lp/enable_compiler_product_helper_adln.cpp b/shared/source/gen12lp/enable_compiler_product_helper_adln.cpp
index 59800c68f8..79a78d8d9f 100644
--- a/shared/source/gen12lp/enable_compiler_product_helper_adln.cpp
+++ b/shared/source/gen12lp/enable_compiler_product_helper_adln.cpp
@@ -15,7 +15,7 @@
 #include "shared/source/helpers/compiler_product_helper_tgllp_and_later.inl"
 
 #include "compiler_product_helper_adln.inl"
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 namespace NEO {
 template <>
diff --git a/shared/source/gen12lp/enable_compiler_product_helper_adlp.cpp b/shared/source/gen12lp/enable_compiler_product_helper_adlp.cpp
index 5fa013b76d..97cf964004 100644
--- a/shared/source/gen12lp/enable_compiler_product_helper_adlp.cpp
+++ b/shared/source/gen12lp/enable_compiler_product_helper_adlp.cpp
@@ -15,7 +15,7 @@
 #include "shared/source/helpers/compiler_product_helper_tgllp_and_later.inl"
 
 #include "compiler_product_helper_adlp.inl"
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 namespace NEO {
 template <>
diff --git a/shared/source/gen12lp/enable_compiler_product_helper_adls.cpp b/shared/source/gen12lp/enable_compiler_product_helper_adls.cpp
index 6e82c740a8..c8c251a745 100644
--- a/shared/source/gen12lp/enable_compiler_product_helper_adls.cpp
+++ b/shared/source/gen12lp/enable_compiler_product_helper_adls.cpp
@@ -14,7 +14,7 @@
 #include "shared/source/helpers/compiler_product_helper_product_config_default.inl"
 #include "shared/source/helpers/compiler_product_helper_tgllp_and_later.inl"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 namespace NEO {
 template <>
diff --git a/shared/source/gen12lp/enable_compiler_product_helper_dg1.cpp b/shared/source/gen12lp/enable_compiler_product_helper_dg1.cpp
index 5140fe0f78..4b3348db6a 100644
--- a/shared/source/gen12lp/enable_compiler_product_helper_dg1.cpp
+++ b/shared/source/gen12lp/enable_compiler_product_helper_dg1.cpp
@@ -14,7 +14,7 @@
 #include "shared/source/helpers/compiler_product_helper_product_config_default.inl"
 #include "shared/source/helpers/compiler_product_helper_tgllp_and_later.inl"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 namespace NEO {
 template <>
diff --git a/shared/source/gen12lp/enable_compiler_product_helper_rkl.cpp b/shared/source/gen12lp/enable_compiler_product_helper_rkl.cpp
index b6da6dea81..18fb1f68b2 100644
--- a/shared/source/gen12lp/enable_compiler_product_helper_rkl.cpp
+++ b/shared/source/gen12lp/enable_compiler_product_helper_rkl.cpp
@@ -14,7 +14,7 @@
 #include "shared/source/helpers/compiler_product_helper_product_config_default.inl"
 #include "shared/source/helpers/compiler_product_helper_tgllp_and_later.inl"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 namespace NEO {
 
diff --git a/shared/source/gen12lp/enable_compiler_product_helper_tgllp.cpp b/shared/source/gen12lp/enable_compiler_product_helper_tgllp.cpp
index b5626b32b6..a70ec458cf 100644
--- a/shared/source/gen12lp/enable_compiler_product_helper_tgllp.cpp
+++ b/shared/source/gen12lp/enable_compiler_product_helper_tgllp.cpp
@@ -14,7 +14,7 @@
 #include "shared/source/helpers/compiler_product_helper_product_config_default.inl"
 #include "shared/source/helpers/compiler_product_helper_tgllp_and_later.inl"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 namespace NEO {
 template <>
diff --git a/shared/source/helpers/product_config_helper.cpp b/shared/source/helpers/product_config_helper.cpp
index acb27d4a1b..a7fd93323b 100644
--- a/shared/source/helpers/product_config_helper.cpp
+++ b/shared/source/helpers/product_config_helper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,7 +11,7 @@
 
 #include "device_ids_configs.h"
 #include "hw_cmds.h"
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 ProductConfigHelper::ProductConfigHelper() : deviceAotInfo({
 #define DEVICE_CONFIG(productConfig, hwConfig, deviceIds, family, release) {{AOT::productConfig}, &NEO::hwConfig::hwInfo, &NEO::deviceIds, AOT::family, AOT::release, {}, {}},
@@ -304,7 +304,7 @@ void ProductConfigHelper::initialize() {
             }
         }
 
-        for (const auto &[acronym, value] : AOT::rtlIdAcronyms) {
+        for (const auto &[acronym, value] : AOT::getRtlIdAcronyms()) {
             if (value == device.aotConfig.value) {
                 device.rtlIdAcronyms.push_back(NEO::ConstStringRef(acronym));
             }
@@ -324,8 +324,8 @@ AOT::PRODUCT_CONFIG ProductConfigHelper::getProductConfigFromAcronym(const std::
         return deviceAcronymIt->second;
     }
 
-    auto rtlIdAcronymIt = std::find_if(AOT::rtlIdAcronyms.begin(), AOT::rtlIdAcronyms.end(), findMapAcronymWithoutDash(device));
-    if (rtlIdAcronymIt != AOT::rtlIdAcronyms.end()) {
+    auto rtlIdAcronymIt = std::find_if(AOT::getRtlIdAcronyms().begin(), AOT::getRtlIdAcronyms().end(), findMapAcronymWithoutDash(device));
+    if (rtlIdAcronymIt != AOT::getRtlIdAcronyms().end()) {
         return rtlIdAcronymIt->second;
     }
 
diff --git a/shared/source/release_helper/release_helper_1255.cpp b/shared/source/release_helper/release_helper_1255.cpp
index eda60a0738..9916269d4e 100644
--- a/shared/source/release_helper/release_helper_1255.cpp
+++ b/shared/source/release_helper/release_helper_1255.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,7 +8,7 @@
 #include "shared/source/release_helper/release_helper.h"
 #include "shared/source/release_helper/release_helper_base.inl"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 #include "release_definitions.h"
 
 namespace NEO {
diff --git a/shared/source/release_helper/release_helper_1270.cpp b/shared/source/release_helper/release_helper_1270.cpp
index 1b72282a12..0eb0568b19 100644
--- a/shared/source/release_helper/release_helper_1270.cpp
+++ b/shared/source/release_helper/release_helper_1270.cpp
@@ -9,7 +9,7 @@
 #include "shared/source/release_helper/release_helper_base.inl"
 #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 #include "release_definitions.h"
 
 #include <algorithm>
diff --git a/shared/source/release_helper/release_helper_1271.cpp b/shared/source/release_helper/release_helper_1271.cpp
index 660627b3f9..48668f29cb 100644
--- a/shared/source/release_helper/release_helper_1271.cpp
+++ b/shared/source/release_helper/release_helper_1271.cpp
@@ -9,7 +9,7 @@
 #include "shared/source/release_helper/release_helper_base.inl"
 #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 #include "release_definitions.h"
 
 #include <algorithm>
diff --git a/shared/source/release_helper/release_helper_3000.cpp b/shared/source/release_helper/release_helper_3000.cpp
index b6433d77a6..f53c738017 100644
--- a/shared/source/release_helper/release_helper_3000.cpp
+++ b/shared/source/release_helper/release_helper_3000.cpp
@@ -9,7 +9,7 @@
 #include "shared/source/release_helper/release_helper.h"
 #include "shared/source/release_helper/release_helper_base.inl"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 #include "release_definitions.h"
 
 namespace NEO {
diff --git a/shared/source/release_helper/release_helper_3001.cpp b/shared/source/release_helper/release_helper_3001.cpp
index 36ae741399..c48a2d35e2 100644
--- a/shared/source/release_helper/release_helper_3001.cpp
+++ b/shared/source/release_helper/release_helper_3001.cpp
@@ -9,7 +9,7 @@
 #include "shared/source/release_helper/release_helper.h"
 #include "shared/source/release_helper/release_helper_base.inl"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 #include "release_definitions.h"
 
 namespace NEO {
diff --git a/shared/source/xe2_hpg_core/enable_compiler_product_helper_bmg.cpp b/shared/source/xe2_hpg_core/enable_compiler_product_helper_bmg.cpp
index e7e14cc310..2e52f5d436 100644
--- a/shared/source/xe2_hpg_core/enable_compiler_product_helper_bmg.cpp
+++ b/shared/source/xe2_hpg_core/enable_compiler_product_helper_bmg.cpp
@@ -13,7 +13,7 @@
 #include "shared/source/helpers/compiler_product_helper_xe_hp_and_later.inl"
 #include "shared/source/helpers/compiler_product_helper_xe_hpc_and_later.inl"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 namespace NEO {
 template <>
diff --git a/shared/source/xe2_hpg_core/enable_compiler_product_helper_lnl.cpp b/shared/source/xe2_hpg_core/enable_compiler_product_helper_lnl.cpp
index 1a806824c8..de3f9cd817 100644
--- a/shared/source/xe2_hpg_core/enable_compiler_product_helper_lnl.cpp
+++ b/shared/source/xe2_hpg_core/enable_compiler_product_helper_lnl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Intel Corporation
+ * Copyright (C) 2024-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,7 +13,7 @@
 #include "shared/source/helpers/compiler_product_helper_xe_hp_and_later.inl"
 #include "shared/source/helpers/compiler_product_helper_xe_hpc_and_later.inl"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 namespace NEO {
 template <>
diff --git a/shared/source/xe3_core/enable_compiler_product_helper_ptl.cpp b/shared/source/xe3_core/enable_compiler_product_helper_ptl.cpp
index 6c3dda3189..01adc42eab 100644
--- a/shared/source/xe3_core/enable_compiler_product_helper_ptl.cpp
+++ b/shared/source/xe3_core/enable_compiler_product_helper_ptl.cpp
@@ -13,7 +13,7 @@
 #include "shared/source/helpers/compiler_product_helper_xe_hp_and_later.inl"
 #include "shared/source/helpers/compiler_product_helper_xe_hpc_and_later.inl"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 constexpr auto gfxProduct = IGFX_PTL;
 
diff --git a/shared/source/xe_hpc_core/enable_compiler_product_helper_pvc.cpp b/shared/source/xe_hpc_core/enable_compiler_product_helper_pvc.cpp
index 3c5fce5523..4ae2123fbe 100644
--- a/shared/source/xe_hpc_core/enable_compiler_product_helper_pvc.cpp
+++ b/shared/source/xe_hpc_core/enable_compiler_product_helper_pvc.cpp
@@ -15,7 +15,7 @@
 #include "shared/source/xe_hpc_core/hw_cmds.h"
 #include "shared/source/xe_hpc_core/pvc/device_ids_configs_pvc.h"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 namespace NEO {
 template <>
 uint32_t CompilerProductHelperHw<IGFX_PVC>::getDefaultHwIpVersion() const {
diff --git a/shared/source/xe_hpg_core/enable_compiler_product_helper_dg2.cpp b/shared/source/xe_hpg_core/enable_compiler_product_helper_dg2.cpp
index 488a2f37fa..52cd19828a 100644
--- a/shared/source/xe_hpg_core/enable_compiler_product_helper_dg2.cpp
+++ b/shared/source/xe_hpg_core/enable_compiler_product_helper_dg2.cpp
@@ -14,7 +14,7 @@
 #include "shared/source/helpers/compiler_product_helper_xe_hp_and_later.inl"
 #include "shared/source/xe_hpg_core/hw_cmds_dg2.h"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 namespace NEO {
 template <>
diff --git a/shared/source/xe_hpg_core/xe_lpg/compiler_product_helper_xe_lpg.inl b/shared/source/xe_hpg_core/xe_lpg/compiler_product_helper_xe_lpg.inl
index d2aaa45192..a501048131 100644
--- a/shared/source/xe_hpg_core/xe_lpg/compiler_product_helper_xe_lpg.inl
+++ b/shared/source/xe_hpg_core/xe_lpg/compiler_product_helper_xe_lpg.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,4 +13,4 @@
 #include "shared/source/helpers/compiler_product_helper_tgllp_and_later.inl"
 #include "shared/source/helpers/compiler_product_helper_xe_hp_and_later.inl"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
diff --git a/shared/source/xe_hpg_core/xe_lpg/os_agnostic_product_helper_xe_lpg.inl b/shared/source/xe_hpg_core/xe_lpg/os_agnostic_product_helper_xe_lpg.inl
index 43243b97d6..b276659eb7 100644
--- a/shared/source/xe_hpg_core/xe_lpg/os_agnostic_product_helper_xe_lpg.inl
+++ b/shared/source/xe_hpg_core/xe_lpg/os_agnostic_product_helper_xe_lpg.inl
@@ -13,7 +13,7 @@
 #include "shared/source/os_interface/product_helper.h"
 
 #include "aubstream/product_family.h"
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 namespace NEO {
 
diff --git a/shared/test/common/xe2_hpg_core/bmg/product_configs_bmg.h b/shared/test/common/xe2_hpg_core/bmg/product_configs_bmg.h
index ecaa86ba1f..a16fb1aead 100644
--- a/shared/test/common/xe2_hpg_core/bmg/product_configs_bmg.h
+++ b/shared/test/common/xe2_hpg_core/bmg/product_configs_bmg.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2024 Intel Corporation
+ * Copyright (C) 2024-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 namespace AOT_BMG {
 constexpr AOT::PRODUCT_CONFIG productConfigs[] = {AOT::BMG_G21_A0};
diff --git a/shared/test/common/xe3_core/ptl/product_configs_ptl.h b/shared/test/common/xe3_core/ptl/product_configs_ptl.h
index cc954a33b8..4c09897356 100644
--- a/shared/test/common/xe3_core/ptl/product_configs_ptl.h
+++ b/shared/test/common/xe3_core/ptl/product_configs_ptl.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 namespace AOT_PTL {
 inline constexpr AOT::PRODUCT_CONFIG productConfigs[] = {
diff --git a/shared/test/common/xe_hpc_core/pvc/product_configs_pvc.h b/shared/test/common/xe_hpc_core/pvc/product_configs_pvc.h
index 1250eb8042..798c8647ee 100644
--- a/shared/test/common/xe_hpc_core/pvc/product_configs_pvc.h
+++ b/shared/test/common/xe_hpc_core/pvc/product_configs_pvc.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2022-2023 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 namespace AOT_PVC {
 inline constexpr AOT::PRODUCT_CONFIG productConfigs[] = {
diff --git a/shared/test/common/xe_hpg_core/arl/product_configs_arl.h b/shared/test/common/xe_hpg_core/arl/product_configs_arl.h
index 2e56f6102d..b368974990 100644
--- a/shared/test/common/xe_hpg_core/arl/product_configs_arl.h
+++ b/shared/test/common/xe_hpg_core/arl/product_configs_arl.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 namespace AOT_ARL {
 inline constexpr AOT::PRODUCT_CONFIG productConfigs[] = {
diff --git a/shared/test/common/xe_hpg_core/mtl/product_configs_mtl.h b/shared/test/common/xe_hpg_core/mtl/product_configs_mtl.h
index b2caa9fd29..89b3560cb2 100644
--- a/shared/test/common/xe_hpg_core/mtl/product_configs_mtl.h
+++ b/shared/test/common/xe_hpg_core/mtl/product_configs_mtl.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2022-2024 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 namespace AOT_MTL {
 inline constexpr AOT::PRODUCT_CONFIG productConfigs[] = {
diff --git a/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp b/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp
index 722c541e03..652462cbcf 100644
--- a/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp
+++ b/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp
@@ -25,7 +25,7 @@
 #include "shared/test/common/mocks/mock_modules_zebin.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 #include <numeric>
 #include <vector>
@@ -6700,11 +6700,11 @@ TEST(ValidateTargetDeviceTests, givenDeviceInCompatModeWhenValidatingTargetDevic
                                             productConfigToCompare,
                                             targetMetadata);
 
-            auto prodConfCompatPairItr = AOT::compatibilityMapping.find(productConfigToCompare);
+            auto prodConfCompatPairItr = AOT::getCompatibilityMapping().find(productConfigToCompare);
 
             if (targetDevice.aotConfig.value == productConfigToCompare) {
                 EXPECT_TRUE(res);
-            } else if (prodConfCompatPairItr != AOT::compatibilityMapping.end()) {
+            } else if (prodConfCompatPairItr != AOT::getCompatibilityMapping().end()) {
                 auto prodConfVec = prodConfCompatPairItr->second;
                 auto found = std::find(prodConfVec.begin(), prodConfVec.end(), currentDevice.second);
                 if (found != prodConfVec.end()) {
diff --git a/shared/test/unit_test/fixtures/product_config_fixture.h b/shared/test/unit_test/fixtures/product_config_fixture.h
index dd10f7f580..f809ec8473 100644
--- a/shared/test/unit_test/fixtures/product_config_fixture.h
+++ b/shared/test/unit_test/fixtures/product_config_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,7 +15,7 @@
 #include "shared/test/common/test_macros/test_base.h"
 
 #include "gtest/gtest.h"
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/gen12lp/adln/test_product_helper_adln.cpp b/shared/test/unit_test/gen12lp/adln/test_product_helper_adln.cpp
index 5ad87c1b83..fee45e649d 100644
--- a/shared/test/unit_test/gen12lp/adln/test_product_helper_adln.cpp
+++ b/shared/test/unit_test/gen12lp/adln/test_product_helper_adln.cpp
@@ -16,7 +16,7 @@
 #include "shared/test/unit_test/os_interface/product_helper_tests.h"
 
 #include "aubstream/product_family.h"
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/gen12lp/adlp/test_product_helper_adlp.cpp b/shared/test/unit_test/gen12lp/adlp/test_product_helper_adlp.cpp
index f4778c4584..ee82c43a89 100644
--- a/shared/test/unit_test/gen12lp/adlp/test_product_helper_adlp.cpp
+++ b/shared/test/unit_test/gen12lp/adlp/test_product_helper_adlp.cpp
@@ -16,7 +16,7 @@
 #include "shared/test/unit_test/os_interface/product_helper_tests.h"
 
 #include "aubstream/product_family.h"
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/gen12lp/adls/test_product_helper_adls.cpp b/shared/test/unit_test/gen12lp/adls/test_product_helper_adls.cpp
index c178589941..38aea6aac6 100644
--- a/shared/test/unit_test/gen12lp/adls/test_product_helper_adls.cpp
+++ b/shared/test/unit_test/gen12lp/adls/test_product_helper_adls.cpp
@@ -16,7 +16,7 @@
 #include "shared/test/unit_test/os_interface/product_helper_tests.h"
 
 #include "aubstream/product_family.h"
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/gen12lp/dg1/test_product_helper_dg1.cpp b/shared/test/unit_test/gen12lp/dg1/test_product_helper_dg1.cpp
index e64715dbf0..a0257935db 100644
--- a/shared/test/unit_test/gen12lp/dg1/test_product_helper_dg1.cpp
+++ b/shared/test/unit_test/gen12lp/dg1/test_product_helper_dg1.cpp
@@ -16,7 +16,7 @@
 
 #include "aubstream/product_family.h"
 #include "hw_cmds.h"
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/gen12lp/rkl/test_product_helper_rkl.cpp b/shared/test/unit_test/gen12lp/rkl/test_product_helper_rkl.cpp
index ded92b7c8b..9dd9dd8b4c 100644
--- a/shared/test/unit_test/gen12lp/rkl/test_product_helper_rkl.cpp
+++ b/shared/test/unit_test/gen12lp/rkl/test_product_helper_rkl.cpp
@@ -16,7 +16,7 @@
 #include "shared/test/common/test_macros/test.h"
 #include "shared/test/unit_test/os_interface/product_helper_tests.h"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/gen12lp/tgllp/product_helper_tests_tgllp.cpp b/shared/test/unit_test/gen12lp/tgllp/product_helper_tests_tgllp.cpp
index df0d246059..14a2df83e6 100644
--- a/shared/test/unit_test/gen12lp/tgllp/product_helper_tests_tgllp.cpp
+++ b/shared/test/unit_test/gen12lp/tgllp/product_helper_tests_tgllp.cpp
@@ -20,7 +20,7 @@
 #include "shared/test/unit_test/os_interface/product_helper_tests.h"
 
 #include "aubstream/product_family.h"
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/helpers/product_config_helper_tests.cpp b/shared/test/unit_test/helpers/product_config_helper_tests.cpp
index 151a6129e2..c2f0e53e8b 100644
--- a/shared/test/unit_test/helpers/product_config_helper_tests.cpp
+++ b/shared/test/unit_test/helpers/product_config_helper_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -12,7 +12,7 @@
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 #include <algorithm>
 
@@ -207,7 +207,7 @@ TEST_F(ProductConfigHelperTests, GivenDifferentAotConfigsInDeviceAotInfosWhenCom
     DeviceAotInfo rhs{};
     ASSERT_TRUE(lhs == rhs);
 
-    lhs.aotConfig = {AOT::CONFIG_MAX_PLATFORM};
+    lhs.aotConfig = {AOT::getConfixMaxPlatform()};
     rhs.aotConfig = {AOT::UNKNOWN_ISA};
 
     EXPECT_FALSE(lhs == rhs);
@@ -255,7 +255,7 @@ TEST_F(AotDeviceInfoTests, givenProductAcronymWhenHelperSearchForAMatchThenCorre
         numSupportedAcronyms++;
         EXPECT_EQ(productConfigHelper->getProductConfigFromDeviceName(acronym), value);
     }
-    for (const auto &[acronym, value] : AOT::rtlIdAcronyms) {
+    for (const auto &[acronym, value] : AOT::getRtlIdAcronyms()) {
         if (!productConfigHelper->isSupportedProductConfig(value)) {
             continue;
         }
@@ -267,7 +267,7 @@ TEST_F(AotDeviceInfoTests, givenProductAcronymWhenHelperSearchForAMatchThenCorre
 
 TEST_F(AotDeviceInfoTests, givenGenericAcronymWhenHelperSearchForAMatchThenCorrespondingValueIsReturned) {
     for (const auto &[acronym, value] : AOT::genericIdAcronyms) {
-        EXPECT_EQ(productConfigHelper->getProductConfigFromDeviceName(acronym), value);
+        EXPECT_EQ(productConfigHelper->getProductConfigFromDeviceName(acronym), value) << acronym;
     }
 }
 
@@ -280,7 +280,7 @@ TEST_F(AotDeviceInfoTests, givenProductIpVersionStringWhenHelperSearchForProduct
         ipVersion << deviceConfig.second;
         EXPECT_EQ(productConfigHelper->getProductConfigFromDeviceName(ipVersion.str()), deviceConfig.second);
     }
-    for (const auto &deviceConfig : AOT::rtlIdAcronyms) {
+    for (const auto &deviceConfig : AOT::getRtlIdAcronyms()) {
         if (!productConfigHelper->isSupportedProductConfig(deviceConfig.second)) {
             continue;
         }
@@ -341,7 +341,7 @@ TEST_F(AotDeviceInfoTests, givenProductAcronymWhenRemoveDashesFromTheNameThenSti
 
         EXPECT_EQ(productConfigHelper->getProductConfigFromDeviceName(acronymCopy), value);
     }
-    for (const auto &[acronym, value] : AOT::rtlIdAcronyms) {
+    for (const auto &[acronym, value] : AOT::getRtlIdAcronyms()) {
         if (!productConfigHelper->isSupportedProductConfig(value)) {
             continue;
         }
diff --git a/shared/test/unit_test/xe2_hpg_core/bmg/product_helper_tests_bmg.cpp b/shared/test/unit_test/xe2_hpg_core/bmg/product_helper_tests_bmg.cpp
index aa43b3fd07..51b3823556 100644
--- a/shared/test/unit_test/xe2_hpg_core/bmg/product_helper_tests_bmg.cpp
+++ b/shared/test/unit_test/xe2_hpg_core/bmg/product_helper_tests_bmg.cpp
@@ -18,7 +18,7 @@
 #include "shared/test/unit_test/os_interface/product_helper_tests.h"
 
 #include "aubstream/product_family.h"
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/xe2_hpg_core/lnl/product_helper_tests_lnl.cpp b/shared/test/unit_test/xe2_hpg_core/lnl/product_helper_tests_lnl.cpp
index 75b2f93ce6..a99c051db3 100644
--- a/shared/test/unit_test/xe2_hpg_core/lnl/product_helper_tests_lnl.cpp
+++ b/shared/test/unit_test/xe2_hpg_core/lnl/product_helper_tests_lnl.cpp
@@ -22,7 +22,7 @@
 #include "shared/test/unit_test/os_interface/product_helper_tests.h"
 
 #include "aubstream/product_family.h"
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 namespace NEO {
 extern ApiSpecificConfig::ApiType apiTypeForUlts;
diff --git a/shared/test/unit_test/xe3_core/product_helper_tests_xe3_core.cpp b/shared/test/unit_test/xe3_core/product_helper_tests_xe3_core.cpp
index 494f06af9a..c614fcde33 100644
--- a/shared/test/unit_test/xe3_core/product_helper_tests_xe3_core.cpp
+++ b/shared/test/unit_test/xe3_core/product_helper_tests_xe3_core.cpp
@@ -16,7 +16,7 @@
 
 #include "aubstream/product_family.h"
 #include "hw_cmds_xe3_core.h"
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/xe3_core/ptl/product_helper_tests_ptl.cpp b/shared/test/unit_test/xe3_core/ptl/product_helper_tests_ptl.cpp
index 72745220fa..f76af4f089 100644
--- a/shared/test/unit_test/xe3_core/ptl/product_helper_tests_ptl.cpp
+++ b/shared/test/unit_test/xe3_core/ptl/product_helper_tests_ptl.cpp
@@ -18,7 +18,7 @@
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/unit_test/os_interface/product_helper_tests.h"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 namespace NEO {
 extern ApiSpecificConfig::ApiType apiTypeForUlts;
diff --git a/shared/test/unit_test/xe_hpc_core/pvc/device_binary_format_ar_tests_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/device_binary_format_ar_tests_pvc.cpp
index bd7c99e6de..0ff7b450d8 100644
--- a/shared/test/unit_test/xe_hpc_core/pvc/device_binary_format_ar_tests_pvc.cpp
+++ b/shared/test/unit_test/xe_hpc_core/pvc/device_binary_format_ar_tests_pvc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -20,7 +20,7 @@
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 using PvcUnpackSingleDeviceBinaryAr = ::testing::Test;
 
diff --git a/shared/test/unit_test/xe_hpc_core/pvc/product_config_helper_tests_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/product_config_helper_tests_pvc.cpp
index 0a834e1164..1fea1d46eb 100644
--- a/shared/test/unit_test/xe_hpc_core/pvc/product_config_helper_tests_pvc.cpp
+++ b/shared/test/unit_test/xe_hpc_core/pvc/product_config_helper_tests_pvc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,7 +10,7 @@
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 using namespace NEO;
 using ProductConfigHelperPvcTests = ::testing::Test;
diff --git a/shared/test/unit_test/xe_hpg_core/arl/product_helper_tests_arl.cpp b/shared/test/unit_test/xe_hpg_core/arl/product_helper_tests_arl.cpp
index 35a6a4dad0..882a334dd2 100644
--- a/shared/test/unit_test/xe_hpg_core/arl/product_helper_tests_arl.cpp
+++ b/shared/test/unit_test/xe_hpg_core/arl/product_helper_tests_arl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -12,7 +12,7 @@
 #include "shared/test/common/test_macros/test.h"
 #include "shared/test/unit_test/os_interface/product_helper_tests.h"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/xe_hpg_core/command_encoder_tests_xe_hpg_core.cpp b/shared/test/unit_test/xe_hpg_core/command_encoder_tests_xe_hpg_core.cpp
index db2562b211..01064a9de5 100644
--- a/shared/test/unit_test/xe_hpg_core/command_encoder_tests_xe_hpg_core.cpp
+++ b/shared/test/unit_test/xe_hpg_core/command_encoder_tests_xe_hpg_core.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,7 +13,7 @@
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/xe_hpg_core/dg2/compiler_product_helper_dg2_tests.cpp b/shared/test/unit_test/xe_hpg_core/dg2/compiler_product_helper_dg2_tests.cpp
index e16e06b9cb..79792cb030 100644
--- a/shared/test/unit_test/xe_hpg_core/dg2/compiler_product_helper_dg2_tests.cpp
+++ b/shared/test/unit_test/xe_hpg_core/dg2/compiler_product_helper_dg2_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,7 +11,7 @@
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/xe_hpg_core/dg2/device_binary_format_ar_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/device_binary_format_ar_tests_dg2.cpp
index d3c2fb7186..c7fc230843 100644
--- a/shared/test/unit_test/xe_hpg_core/dg2/device_binary_format_ar_tests_dg2.cpp
+++ b/shared/test/unit_test/xe_hpg_core/dg2/device_binary_format_ar_tests_dg2.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -20,7 +20,7 @@
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 using Dg2UnpackSingleDeviceBinaryAr = ::testing::Test;
 
diff --git a/shared/test/unit_test/xe_hpg_core/dg2/device_factory_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/device_factory_tests_dg2.cpp
index c79f26c4a2..a0d89df0ed 100644
--- a/shared/test/unit_test/xe_hpg_core/dg2/device_factory_tests_dg2.cpp
+++ b/shared/test/unit_test/xe_hpg_core/dg2/device_factory_tests_dg2.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,7 +13,7 @@
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/xe_hpg_core/dg2/product_config_helper_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/product_config_helper_tests_dg2.cpp
index a2e7b2bc80..748f4e40a9 100644
--- a/shared/test/unit_test/xe_hpg_core/dg2/product_config_helper_tests_dg2.cpp
+++ b/shared/test/unit_test/xe_hpg_core/dg2/product_config_helper_tests_dg2.cpp
@@ -23,7 +23,7 @@
 
 #include "aubstream/product_family.h"
 #include "gtest/gtest.h"
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 #include <array>
 
diff --git a/shared/test/unit_test/xe_hpg_core/dg2/test_encode_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/test_encode_dg2.cpp
index e48d7ef577..8d18c740b1 100644
--- a/shared/test/unit_test/xe_hpg_core/dg2/test_encode_dg2.cpp
+++ b/shared/test/unit_test/xe_hpg_core/dg2/test_encode_dg2.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2024 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -19,7 +19,7 @@
 #include "shared/test/common/test_macros/test.h"
 #include "shared/test/unit_test/helpers/state_base_address_tests.h"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/xe_hpg_core/mtl/product_config_helper_tests_mtl.cpp b/shared/test/unit_test/xe_hpg_core/mtl/product_config_helper_tests_mtl.cpp
index 7b9011e676..87b65ce4d0 100644
--- a/shared/test/unit_test/xe_hpg_core/mtl/product_config_helper_tests_mtl.cpp
+++ b/shared/test/unit_test/xe_hpg_core/mtl/product_config_helper_tests_mtl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -12,7 +12,7 @@
 #include "shared/test/common/test_macros/test.h"
 #include "shared/test/unit_test/os_interface/product_helper_tests.h"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 using namespace NEO;
 using ProductConfigHelperMtlTests = ::testing::Test;
diff --git a/shared/test/unit_test/xe_hpg_core/mtl/product_helper_tests_mtl.cpp b/shared/test/unit_test/xe_hpg_core/mtl/product_helper_tests_mtl.cpp
index f2a23f384c..4b72c3d42c 100644
--- a/shared/test/unit_test/xe_hpg_core/mtl/product_helper_tests_mtl.cpp
+++ b/shared/test/unit_test/xe_hpg_core/mtl/product_helper_tests_mtl.cpp
@@ -17,7 +17,7 @@
 #include "shared/test/common/test_macros/test.h"
 #include "shared/test/unit_test/os_interface/product_helper_tests.h"
 
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 namespace NEO {
 extern ApiSpecificConfig::ApiType apiTypeForUlts;
diff --git a/shared/test/unit_test/xe_hpg_core/os_agnostic_product_helper_xe_lpg_tests.cpp b/shared/test/unit_test/xe_hpg_core/os_agnostic_product_helper_xe_lpg_tests.cpp
index 3531d27290..57c333aea9 100644
--- a/shared/test/unit_test/xe_hpg_core/os_agnostic_product_helper_xe_lpg_tests.cpp
+++ b/shared/test/unit_test/xe_hpg_core/os_agnostic_product_helper_xe_lpg_tests.cpp
@@ -20,7 +20,7 @@
 #include "shared/test/common/test_macros/hw_test.h"
 
 #include "aubstream/product_family.h"
-#include "platforms.h"
+#include "neo_aot_platforms.h"
 
 using namespace NEO;