diff --git a/opencl/test/unit_test/offline_compiler/CMakeLists.txt b/opencl/test/unit_test/offline_compiler/CMakeLists.txt
index 83c7121c2d..e2334fb2ef 100644
--- a/opencl/test/unit_test/offline_compiler/CMakeLists.txt
+++ b/opencl/test/unit_test/offline_compiler/CMakeLists.txt
@@ -21,14 +21,6 @@ set(IGDRCL_SRCS_offline_compiler_mock
     ${CMAKE_CURRENT_SOURCE_DIR}/decoder/mock/mock_zebin_decoder.h
     ${CMAKE_CURRENT_SOURCE_DIR}/decoder/mock/mock_zebin_encoder.h
     ${CMAKE_CURRENT_SOURCE_DIR}/decoder/mock/mock_iga_wrapper.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock/mock_argument_helper.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock/mock_multi_command.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock/mock_ocloc_concat.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock/mock_ocloc_fcl_facade.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock/mock_ocloc_igc_facade.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock/mock_offline_compiler.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock/mock_offline_linker.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock/mock_sip_ocloc_tests.cpp
 )
 
 set(CLOC_LIB_SRCS_UTILITIES
@@ -64,8 +56,6 @@ set(IGDRCL_SRCS_offline_compiler_tests
     ${CMAKE_CURRENT_SOURCE_DIR}/default_cache_config_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/environment.h
     ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock/mock_iga_dll.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock/mock_iga_dll.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ocloc_api_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ocloc_concat_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ocloc_fatbinary_tests.cpp
diff --git a/opencl/test/unit_test/offline_compiler/decoder/decoder_tests.cpp b/opencl/test/unit_test/offline_compiler/decoder/decoder_tests.cpp
index 0777b6885b..182ad112cc 100644
--- a/opencl/test/unit_test/offline_compiler/decoder/decoder_tests.cpp
+++ b/opencl/test/unit_test/offline_compiler/decoder/decoder_tests.cpp
@@ -8,6 +8,7 @@
 #include "shared/offline_compiler/source/decoder/translate_platform_base.h"
 #include "shared/source/helpers/array_count.h"
 #include "shared/source/helpers/hw_info.h"
+#include "shared/source/helpers/product_config_helper.h"
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/helpers/test_files.h"
 #include "shared/test/common/helpers/variable_backup.h"
diff --git a/opencl/test/unit_test/offline_compiler/decoder/zebin_manipulator_tests.cpp b/opencl/test/unit_test/offline_compiler/decoder/zebin_manipulator_tests.cpp
index 272f30d2ff..b58a0e8f80 100644
--- a/opencl/test/unit_test/offline_compiler/decoder/zebin_manipulator_tests.cpp
+++ b/opencl/test/unit_test/offline_compiler/decoder/zebin_manipulator_tests.cpp
@@ -10,6 +10,7 @@
 #include "shared/offline_compiler/source/ocloc_error_code.h"
 #include "shared/source/device_binary_format/elf/elf.h"
 #include "shared/source/device_binary_format/elf/elf_encoder.h"
+#include "shared/source/helpers/product_config_helper.h"
 #include "shared/test/common/mocks/mock_elf.h"
 #include "shared/test/common/mocks/mock_modules_zebin.h"
 #include "shared/test/common/test_macros/test.h"
diff --git a/opencl/test/unit_test/offline_compiler/mock/CMakeLists.txt b/opencl/test/unit_test/offline_compiler/mock/CMakeLists.txt
new file mode 100644
index 0000000000..e7f9f403dc
--- /dev/null
+++ b/opencl/test/unit_test/offline_compiler/mock/CMakeLists.txt
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2023 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+target_sources(ocloc_tests PRIVATE
+               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+               ${CMAKE_CURRENT_SOURCE_DIR}/mock_argument_helper.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/mock_multi_command.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/mock_ocloc_concat.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/mock_ocloc_fcl_facade.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/mock_ocloc_fcl_facade.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/mock_ocloc_igc_facade.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/mock_ocloc_igc_facade.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/mock_offline_compiler.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/mock_offline_compiler.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/mock_offline_linker.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/mock_sip_ocloc_tests.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/mock_iga_dll.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/mock_iga_dll.h
+)
+
diff --git a/opencl/test/unit_test/offline_compiler/mock/mock_ocloc_fcl_facade.cpp b/opencl/test/unit_test/offline_compiler/mock/mock_ocloc_fcl_facade.cpp
new file mode 100644
index 0000000000..d14fd3c9ae
--- /dev/null
+++ b/opencl/test/unit_test/offline_compiler/mock/mock_ocloc_fcl_facade.cpp
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2023 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "opencl/test/unit_test/offline_compiler/mock/mock_ocloc_fcl_facade.h"
+
+#include "shared/source/os_interface/os_library.h"
+
+#include <optional>
+#include <string>
+
+namespace NEO {
+
+MockOclocFclFacade::MockOclocFclFacade(OclocArgHelper *argHelper) : OclocFclFacade(argHelper){};
+MockOclocFclFacade::~MockOclocFclFacade() = default;
+
+std::unique_ptr<OsLibrary> MockOclocFclFacade::loadFclLibrary() const {
+    if (shouldFailLoadingOfFclLib) {
+        return nullptr;
+    } else {
+        return OclocFclFacade::loadFclLibrary();
+    }
+}
+
+CIF::CreateCIFMainFunc_t MockOclocFclFacade::loadCreateFclMainFunction() const {
+    if (shouldFailLoadingOfFclCreateMainFunction) {
+        return nullptr;
+    } else {
+        return OclocFclFacade::loadCreateFclMainFunction();
+    }
+}
+
+CIF::RAII::UPtr_t<CIF::CIFMain> MockOclocFclFacade::createFclMain(CIF::CreateCIFMainFunc_t createMainFunction) const {
+    if (shouldFailCreationOfFclMain) {
+        return nullptr;
+    } else {
+        return OclocFclFacade::createFclMain(createMainFunction);
+    }
+}
+
+bool MockOclocFclFacade::isFclInterfaceCompatible() const {
+    if (isFclInterfaceCompatibleReturnValue.has_value()) {
+        return *isFclInterfaceCompatibleReturnValue;
+    } else {
+        return OclocFclFacade::isFclInterfaceCompatible();
+    }
+}
+
+std::string MockOclocFclFacade::getIncompatibleInterface() const {
+    if (getIncompatibleInterfaceReturnValue.has_value()) {
+        return *getIncompatibleInterfaceReturnValue;
+    } else {
+        return OclocFclFacade::getIncompatibleInterface();
+    }
+}
+
+CIF::RAII::UPtr_t<IGC::FclOclDeviceCtxTagOCL> MockOclocFclFacade::createFclDeviceContext() const {
+    if (shouldFailCreationOfFclDeviceContext) {
+        return nullptr;
+    } else {
+        return OclocFclFacade::createFclDeviceContext();
+    }
+}
+
+bool MockOclocFclFacade::shouldPopulateFclInterface() const {
+    if (shouldPopulateFclInterfaceReturnValue.has_value()) {
+        return *shouldPopulateFclInterfaceReturnValue;
+    } else {
+        return OclocFclFacade::shouldPopulateFclInterface();
+    }
+}
+
+CIF::RAII::UPtr_t<IGC::PlatformTagOCL> MockOclocFclFacade::getPlatformHandle() const {
+    if (shouldReturnInvalidFclPlatformHandle) {
+        return nullptr;
+    } else {
+        return OclocFclFacade::getPlatformHandle();
+    }
+}
+
+void MockOclocFclFacade::populateFclInterface(IGC::PlatformTagOCL &handle, const HardwareInfo &hwInfo) {
+    ++populateFclInterfaceCalledCount;
+    OclocFclFacade::populateFclInterface(handle, hwInfo);
+}
+
+} // namespace NEO
diff --git a/opencl/test/unit_test/offline_compiler/mock/mock_ocloc_fcl_facade.h b/opencl/test/unit_test/offline_compiler/mock/mock_ocloc_fcl_facade.h
index a219b1232c..b1b71169c4 100644
--- a/opencl/test/unit_test/offline_compiler/mock/mock_ocloc_fcl_facade.h
+++ b/opencl/test/unit_test/offline_compiler/mock/mock_ocloc_fcl_facade.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -28,77 +28,25 @@ class MockOclocFclFacade : public OclocFclFacade {
     std::optional<bool> shouldPopulateFclInterfaceReturnValue{};
     int populateFclInterfaceCalledCount{0};
 
-    MockOclocFclFacade(OclocArgHelper *argHelper) : OclocFclFacade{argHelper} {}
-    ~MockOclocFclFacade() override = default;
+    MockOclocFclFacade(OclocArgHelper *argHelper);
+    ~MockOclocFclFacade() override;
 
-    std::unique_ptr<OsLibrary> loadFclLibrary() const override {
-        if (shouldFailLoadingOfFclLib) {
-            return nullptr;
-        } else {
-            return OclocFclFacade::loadFclLibrary();
-        }
-    }
+    std::unique_ptr<OsLibrary> loadFclLibrary() const override;
+    CIF::CreateCIFMainFunc_t loadCreateFclMainFunction() const override;
 
-    CIF::CreateCIFMainFunc_t loadCreateFclMainFunction() const override {
-        if (shouldFailLoadingOfFclCreateMainFunction) {
-            return nullptr;
-        } else {
-            return OclocFclFacade::loadCreateFclMainFunction();
-        }
-    }
+    CIF::RAII::UPtr_t<CIF::CIFMain> createFclMain(CIF::CreateCIFMainFunc_t createMainFunction) const override;
 
-    CIF::RAII::UPtr_t<CIF::CIFMain> createFclMain(CIF::CreateCIFMainFunc_t createMainFunction) const override {
-        if (shouldFailCreationOfFclMain) {
-            return nullptr;
-        } else {
-            return OclocFclFacade::createFclMain(createMainFunction);
-        }
-    }
+    bool isFclInterfaceCompatible() const override;
 
-    bool isFclInterfaceCompatible() const override {
-        if (isFclInterfaceCompatibleReturnValue.has_value()) {
-            return *isFclInterfaceCompatibleReturnValue;
-        } else {
-            return OclocFclFacade::isFclInterfaceCompatible();
-        }
-    }
+    std::string getIncompatibleInterface() const override;
 
-    std::string getIncompatibleInterface() const override {
-        if (getIncompatibleInterfaceReturnValue.has_value()) {
-            return *getIncompatibleInterfaceReturnValue;
-        } else {
-            return OclocFclFacade::getIncompatibleInterface();
-        }
-    }
+    CIF::RAII::UPtr_t<IGC::FclOclDeviceCtxTagOCL> createFclDeviceContext() const override;
 
-    CIF::RAII::UPtr_t<IGC::FclOclDeviceCtxTagOCL> createFclDeviceContext() const override {
-        if (shouldFailCreationOfFclDeviceContext) {
-            return nullptr;
-        } else {
-            return OclocFclFacade::createFclDeviceContext();
-        }
-    }
+    bool shouldPopulateFclInterface() const override;
 
-    bool shouldPopulateFclInterface() const override {
-        if (shouldPopulateFclInterfaceReturnValue.has_value()) {
-            return *shouldPopulateFclInterfaceReturnValue;
-        } else {
-            return OclocFclFacade::shouldPopulateFclInterface();
-        }
-    }
+    CIF::RAII::UPtr_t<IGC::PlatformTagOCL> getPlatformHandle() const override;
 
-    CIF::RAII::UPtr_t<IGC::PlatformTagOCL> getPlatformHandle() const override {
-        if (shouldReturnInvalidFclPlatformHandle) {
-            return nullptr;
-        } else {
-            return OclocFclFacade::getPlatformHandle();
-        }
-    }
-
-    void populateFclInterface(IGC::PlatformTagOCL &handle, const HardwareInfo &hwInfo) override {
-        ++populateFclInterfaceCalledCount;
-        OclocFclFacade::populateFclInterface(handle, hwInfo);
-    }
+    void populateFclInterface(IGC::PlatformTagOCL &handle, const HardwareInfo &hwInfo) override;
 };
 
 } // namespace NEO
diff --git a/opencl/test/unit_test/offline_compiler/mock/mock_ocloc_igc_facade.cpp b/opencl/test/unit_test/offline_compiler/mock/mock_ocloc_igc_facade.cpp
new file mode 100644
index 0000000000..84f6d3ce38
--- /dev/null
+++ b/opencl/test/unit_test/offline_compiler/mock/mock_ocloc_igc_facade.cpp
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2023 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "opencl/test/unit_test/offline_compiler/mock/mock_ocloc_igc_facade.h"
+
+#include "shared/source/os_interface/os_library.h"
+
+namespace NEO {
+
+MockOclocIgcFacade::MockOclocIgcFacade(OclocArgHelper *argHelper) : OclocIgcFacade(argHelper){};
+MockOclocIgcFacade::~MockOclocIgcFacade() = default;
+
+std::unique_ptr<OsLibrary> MockOclocIgcFacade::loadIgcLibrary() const {
+    if (shouldFailLoadingOfIgcLib) {
+        return nullptr;
+    } else {
+        return OclocIgcFacade::loadIgcLibrary();
+    }
+}
+
+CIF::CreateCIFMainFunc_t MockOclocIgcFacade::loadCreateIgcMainFunction() const {
+    if (shouldFailLoadingOfIgcCreateMainFunction) {
+        return nullptr;
+    } else {
+        return OclocIgcFacade::loadCreateIgcMainFunction();
+    }
+}
+
+CIF::RAII::UPtr_t<CIF::CIFMain> MockOclocIgcFacade::createIgcMain(CIF::CreateCIFMainFunc_t createMainFunction) const {
+    if (shouldFailCreationOfIgcMain) {
+        return nullptr;
+    } else {
+        return OclocIgcFacade::createIgcMain(createMainFunction);
+    }
+}
+
+bool MockOclocIgcFacade::isIgcInterfaceCompatible(const std::vector<CIF::InterfaceId_t> &interfacesToIgnore) const {
+    if (isIgcInterfaceCompatibleReturnValue.has_value()) {
+        return *isIgcInterfaceCompatibleReturnValue;
+    } else {
+        return OclocIgcFacade::isIgcInterfaceCompatible(interfacesToIgnore);
+    }
+}
+
+std::string MockOclocIgcFacade::getIncompatibleInterface(const std::vector<CIF::InterfaceId_t> &interfacesToIgnore) const {
+    if (getIncompatibleInterfaceReturnValue.has_value()) {
+        return *getIncompatibleInterfaceReturnValue;
+    } else {
+        return OclocIgcFacade::getIncompatibleInterface(interfacesToIgnore);
+    }
+}
+
+bool MockOclocIgcFacade::isPatchtokenInterfaceSupported() const {
+    if (isPatchtokenInterfaceSupportedReturnValue.has_value()) {
+        return *isPatchtokenInterfaceSupportedReturnValue;
+    } else {
+        return OclocIgcFacade::isPatchtokenInterfaceSupported();
+    }
+}
+
+CIF::RAII::UPtr_t<IGC::IgcOclDeviceCtxTagOCL> MockOclocIgcFacade::createIgcDeviceContext() const {
+    if (shouldFailCreationOfIgcDeviceContext) {
+        return nullptr;
+    } else {
+        return OclocIgcFacade::createIgcDeviceContext();
+    }
+}
+
+CIF::RAII::UPtr_t<IGC::PlatformTagOCL> MockOclocIgcFacade::getIgcPlatformHandle() const {
+    if (shouldReturnInvalidIgcPlatformHandle) {
+        return nullptr;
+    } else {
+        return OclocIgcFacade::getIgcPlatformHandle();
+    }
+}
+
+CIF::RAII::UPtr_t<IGC::GTSystemInfoTagOCL> MockOclocIgcFacade::getGTSystemInfoHandle() const {
+    if (shouldReturnInvalidGTSystemInfoHandle) {
+        return nullptr;
+    } else {
+        return OclocIgcFacade::getGTSystemInfoHandle();
+    }
+}
+
+CIF::RAII::UPtr_t<IGC::IgcFeaturesAndWorkaroundsTagOCL> MockOclocIgcFacade::getIgcFeaturesAndWorkaroundsHandle() const {
+    if (shouldReturnInvalidIgcFeaturesAndWorkaroundsHandle) {
+        return nullptr;
+    } else {
+        return OclocIgcFacade::getIgcFeaturesAndWorkaroundsHandle();
+    }
+}
+
+} // namespace NEO
\ No newline at end of file
diff --git a/opencl/test/unit_test/offline_compiler/mock/mock_ocloc_igc_facade.h b/opencl/test/unit_test/offline_compiler/mock/mock_ocloc_igc_facade.h
index 4d59bb5339..ef9409d546 100644
--- a/opencl/test/unit_test/offline_compiler/mock/mock_ocloc_igc_facade.h
+++ b/opencl/test/unit_test/offline_compiler/mock/mock_ocloc_igc_facade.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -29,88 +29,28 @@ class MockOclocIgcFacade : public OclocIgcFacade {
     std::optional<std::string> getIncompatibleInterfaceReturnValue{};
     std::optional<bool> isPatchtokenInterfaceSupportedReturnValue{};
 
-    MockOclocIgcFacade(OclocArgHelper *argHelper) : OclocIgcFacade{argHelper} {}
-    ~MockOclocIgcFacade() override = default;
+    MockOclocIgcFacade(OclocArgHelper *argHelper);
+    ~MockOclocIgcFacade() override;
 
-    std::unique_ptr<OsLibrary> loadIgcLibrary() const override {
-        if (shouldFailLoadingOfIgcLib) {
-            return nullptr;
-        } else {
-            return OclocIgcFacade::loadIgcLibrary();
-        }
-    }
+    std::unique_ptr<OsLibrary> loadIgcLibrary() const override;
 
-    CIF::CreateCIFMainFunc_t loadCreateIgcMainFunction() const override {
-        if (shouldFailLoadingOfIgcCreateMainFunction) {
-            return nullptr;
-        } else {
-            return OclocIgcFacade::loadCreateIgcMainFunction();
-        }
-    }
+    CIF::CreateCIFMainFunc_t loadCreateIgcMainFunction() const override;
 
-    CIF::RAII::UPtr_t<CIF::CIFMain> createIgcMain(CIF::CreateCIFMainFunc_t createMainFunction) const override {
-        if (shouldFailCreationOfIgcMain) {
-            return nullptr;
-        } else {
-            return OclocIgcFacade::createIgcMain(createMainFunction);
-        }
-    }
+    CIF::RAII::UPtr_t<CIF::CIFMain> createIgcMain(CIF::CreateCIFMainFunc_t createMainFunction) const override;
 
-    bool isIgcInterfaceCompatible(const std::vector<CIF::InterfaceId_t> &interfacesToIgnore) const override {
-        if (isIgcInterfaceCompatibleReturnValue.has_value()) {
-            return *isIgcInterfaceCompatibleReturnValue;
-        } else {
-            return OclocIgcFacade::isIgcInterfaceCompatible(interfacesToIgnore);
-        }
-    }
+    bool isIgcInterfaceCompatible(const std::vector<CIF::InterfaceId_t> &interfacesToIgnore) const override;
 
-    std::string getIncompatibleInterface(const std::vector<CIF::InterfaceId_t> &interfacesToIgnore) const override {
-        if (getIncompatibleInterfaceReturnValue.has_value()) {
-            return *getIncompatibleInterfaceReturnValue;
-        } else {
-            return OclocIgcFacade::getIncompatibleInterface(interfacesToIgnore);
-        }
-    }
+    std::string getIncompatibleInterface(const std::vector<CIF::InterfaceId_t> &interfacesToIgnore) const override;
 
-    bool isPatchtokenInterfaceSupported() const override {
-        if (isPatchtokenInterfaceSupportedReturnValue.has_value()) {
-            return *isPatchtokenInterfaceSupportedReturnValue;
-        } else {
-            return OclocIgcFacade::isPatchtokenInterfaceSupported();
-        }
-    }
+    bool isPatchtokenInterfaceSupported() const override;
 
-    CIF::RAII::UPtr_t<IGC::IgcOclDeviceCtxTagOCL> createIgcDeviceContext() const override {
-        if (shouldFailCreationOfIgcDeviceContext) {
-            return nullptr;
-        } else {
-            return OclocIgcFacade::createIgcDeviceContext();
-        }
-    }
+    CIF::RAII::UPtr_t<IGC::IgcOclDeviceCtxTagOCL> createIgcDeviceContext() const override;
 
-    CIF::RAII::UPtr_t<IGC::PlatformTagOCL> getIgcPlatformHandle() const override {
-        if (shouldReturnInvalidIgcPlatformHandle) {
-            return nullptr;
-        } else {
-            return OclocIgcFacade::getIgcPlatformHandle();
-        }
-    }
+    CIF::RAII::UPtr_t<IGC::PlatformTagOCL> getIgcPlatformHandle() const override;
 
-    CIF::RAII::UPtr_t<IGC::GTSystemInfoTagOCL> getGTSystemInfoHandle() const override {
-        if (shouldReturnInvalidGTSystemInfoHandle) {
-            return nullptr;
-        } else {
-            return OclocIgcFacade::getGTSystemInfoHandle();
-        }
-    }
+    CIF::RAII::UPtr_t<IGC::GTSystemInfoTagOCL> getGTSystemInfoHandle() const override;
 
-    CIF::RAII::UPtr_t<IGC::IgcFeaturesAndWorkaroundsTagOCL> getIgcFeaturesAndWorkaroundsHandle() const override {
-        if (shouldReturnInvalidIgcFeaturesAndWorkaroundsHandle) {
-            return nullptr;
-        } else {
-            return OclocIgcFacade::getIgcFeaturesAndWorkaroundsHandle();
-        }
-    }
+    CIF::RAII::UPtr_t<IGC::IgcFeaturesAndWorkaroundsTagOCL> getIgcFeaturesAndWorkaroundsHandle() const override;
 };
 
 } // namespace NEO
\ No newline at end of file
diff --git a/opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.cpp b/opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.cpp
new file mode 100644
index 0000000000..a67e9908b0
--- /dev/null
+++ b/opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.cpp
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2023 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h"
+
+#include "opencl/test/unit_test/offline_compiler/mock/mock_argument_helper.h"
+#include "opencl/test/unit_test/offline_compiler/mock/mock_ocloc_fcl_facade.h"
+#include "opencl/test/unit_test/offline_compiler/mock/mock_ocloc_igc_facade.h"
+
+namespace NEO {
+
+MockOfflineCompiler::MockOfflineCompiler() : OfflineCompiler() {
+    uniqueHelper = std::make_unique<MockOclocArgHelper>(filesMap);
+    uniqueHelper->setAllCallBase(true);
+    argHelper = uniqueHelper.get();
+
+    auto uniqueFclFacadeMock = std::make_unique<MockOclocFclFacade>(argHelper);
+    mockFclFacade = uniqueFclFacadeMock.get();
+    fclFacade = std::move(uniqueFclFacadeMock);
+
+    auto uniqueIgcFacadeMock = std::make_unique<MockOclocIgcFacade>(argHelper);
+    mockIgcFacade = uniqueIgcFacadeMock.get();
+    igcFacade = std::move(uniqueIgcFacadeMock);
+}
+
+MockOfflineCompiler::~MockOfflineCompiler() = default;
+
+int MockOfflineCompiler::initialize(size_t numArgs, const std::vector<std::string> &argv) {
+    return OfflineCompiler::initialize(numArgs, argv, true);
+}
+
+void MockOfflineCompiler::storeGenBinary(const void *pSrc, const size_t srcSize) {
+    OfflineCompiler::storeBinary(genBinary, genBinarySize, pSrc, srcSize);
+}
+
+int MockOfflineCompiler::build() {
+    ++buildCalledCount;
+
+    if (buildReturnValue.has_value()) {
+        return *buildReturnValue;
+    }
+
+    return OfflineCompiler::build();
+}
+
+int MockOfflineCompiler::buildIrBinary() {
+    if (overrideBuildIrBinaryStatus) {
+        return buildIrBinaryStatus;
+    }
+    return OfflineCompiler::buildIrBinary();
+}
+
+int MockOfflineCompiler::buildSourceCode() {
+    if (overrideBuildSourceCodeStatus) {
+        return buildSourceCodeStatus;
+    }
+    return OfflineCompiler::buildSourceCode();
+}
+
+bool MockOfflineCompiler::generateElfBinary() {
+    generateElfBinaryCalled++;
+    return OfflineCompiler::generateElfBinary();
+}
+
+void MockOfflineCompiler::writeOutAllFiles() {
+    writeOutAllFilesCalled++;
+    OfflineCompiler::writeOutAllFiles();
+}
+
+void MockOfflineCompiler::clearLog() {
+    uniqueHelper = std::make_unique<MockOclocArgHelper>(filesMap);
+    uniqueHelper->setAllCallBase(true);
+    argHelper = uniqueHelper.get();
+}
+
+void MockOfflineCompiler::createDir(const std::string &path) {
+    if (interceptCreatedDirs) {
+        createdDirs.push_back(path);
+    } else {
+        OfflineCompiler::createDir(path);
+    }
+}
+
+} // namespace NEO
diff --git a/opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h b/opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h
index f37ff92908..be93175267 100644
--- a/opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h
+++ b/opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h
@@ -8,16 +8,15 @@
 #pragma once
 
 #include "shared/offline_compiler/source/offline_compiler.h"
-#include "shared/source/compiler_interface/default_cache_config.h"
-
-#include "opencl/test/unit_test/offline_compiler/mock/mock_argument_helper.h"
-#include "opencl/test/unit_test/offline_compiler/mock/mock_ocloc_fcl_facade.h"
-#include "opencl/test/unit_test/offline_compiler/mock/mock_ocloc_igc_facade.h"
 
+#include <map>
 #include <optional>
 #include <string>
 
+class MockOclocArgHelper;
 namespace NEO {
+class MockOclocFclFacade;
+class MockOclocIgcFacade;
 
 class MockOfflineCompiler : public OfflineCompiler {
   public:
@@ -76,77 +75,27 @@ class MockOfflineCompiler : public OfflineCompiler {
     using OfflineCompiler::useLlvmText;
     using OfflineCompiler::useOptionsSuffix;
 
-    MockOfflineCompiler() : OfflineCompiler() {
-        uniqueHelper = std::make_unique<MockOclocArgHelper>(filesMap);
-        uniqueHelper->setAllCallBase(true);
-        argHelper = uniqueHelper.get();
+    MockOfflineCompiler();
 
-        auto uniqueFclFacadeMock = std::make_unique<MockOclocFclFacade>(argHelper);
-        mockFclFacade = uniqueFclFacadeMock.get();
-        fclFacade = std::move(uniqueFclFacadeMock);
+    ~MockOfflineCompiler() override;
 
-        auto uniqueIgcFacadeMock = std::make_unique<MockOclocIgcFacade>(argHelper);
-        mockIgcFacade = uniqueIgcFacadeMock.get();
-        igcFacade = std::move(uniqueIgcFacadeMock);
-    }
+    int initialize(size_t numArgs, const std::vector<std::string> &argv);
 
-    ~MockOfflineCompiler() override = default;
+    void storeGenBinary(const void *pSrc, const size_t srcSize);
 
-    int initialize(size_t numArgs, const std::vector<std::string> &argv) {
-        return OfflineCompiler::initialize(numArgs, argv, true);
-    }
+    int build() override;
 
-    void storeGenBinary(const void *pSrc, const size_t srcSize) {
-        OfflineCompiler::storeBinary(genBinary, genBinarySize, pSrc, srcSize);
-    }
+    int buildIrBinary() override;
 
-    int build() override {
-        ++buildCalledCount;
+    int buildSourceCode() override;
 
-        if (buildReturnValue.has_value()) {
-            return *buildReturnValue;
-        }
+    bool generateElfBinary() override;
 
-        return OfflineCompiler::build();
-    }
+    void writeOutAllFiles() override;
 
-    int buildIrBinary() override {
-        if (overrideBuildIrBinaryStatus) {
-            return buildIrBinaryStatus;
-        }
-        return OfflineCompiler::buildIrBinary();
-    }
+    void clearLog();
 
-    int buildSourceCode() override {
-        if (overrideBuildSourceCodeStatus) {
-            return buildSourceCodeStatus;
-        }
-        return OfflineCompiler::buildSourceCode();
-    }
-
-    bool generateElfBinary() override {
-        generateElfBinaryCalled++;
-        return OfflineCompiler::generateElfBinary();
-    }
-
-    void writeOutAllFiles() override {
-        writeOutAllFilesCalled++;
-        OfflineCompiler::writeOutAllFiles();
-    }
-
-    void clearLog() {
-        uniqueHelper = std::make_unique<MockOclocArgHelper>(filesMap);
-        uniqueHelper->setAllCallBase(true);
-        argHelper = uniqueHelper.get();
-    }
-
-    void createDir(const std::string &path) override {
-        if (interceptCreatedDirs) {
-            createdDirs.push_back(path);
-        } else {
-            OfflineCompiler::createDir(path);
-        }
-    }
+    void createDir(const std::string &path) override;
 
     std::map<std::string, std::string> filesMap{};
     int buildIrBinaryStatus = 0;
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 68fa49787e..797d502e2e 100644
--- a/opencl/test/unit_test/offline_compiler/ocloc_api_tests.cpp
+++ b/opencl/test/unit_test/offline_compiler/ocloc_api_tests.cpp
@@ -17,6 +17,7 @@
 #include "shared/source/device_binary_format/elf/elf_decoder.h"
 #include "shared/source/device_binary_format/elf/ocl_elf.h"
 #include "shared/source/helpers/file_io.h"
+#include "shared/source/helpers/product_config_helper.h"
 #include "shared/test/common/helpers/variable_backup.h"
 
 #include "environment.h"
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 ec73ea9d78..e332d83f5d 100644
--- a/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.cpp
+++ b/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.cpp
@@ -12,11 +12,13 @@
 #include "shared/source/compiler_interface/compiler_options.h"
 #include "shared/source/device_binary_format/ar/ar.h"
 #include "shared/source/device_binary_format/ar/ar_decoder.h"
+#include "shared/source/device_binary_format/ar/ar_encoder.h"
 #include "shared/source/device_binary_format/elf/elf_decoder.h"
 #include "shared/source/device_binary_format/elf/ocl_elf.h"
 #include "shared/source/helpers/compiler_product_helper.h"
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/helpers/product_config_helper.h"
+#include "shared/source/release_helper/release_helper.h"
 #include "shared/test/common/helpers/gtest_helpers.h"
 
 #include "environment.h"
diff --git a/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.h b/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.h
index dfde336ecf..a19829c8ef 100644
--- a/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.h
+++ b/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.h
@@ -9,6 +9,7 @@
 
 #include "shared/offline_compiler/source/ocloc_arg_helper.h"
 #include "shared/offline_compiler/source/ocloc_fatbinary.h"
+#include "shared/source/helpers/product_config_helper.h"
 
 #include "gtest/gtest.h"
 #include "mock/mock_argument_helper.h"
diff --git a/opencl/test/unit_test/offline_compiler/ocloc_product_config_tests.cpp b/opencl/test/unit_test/offline_compiler/ocloc_product_config_tests.cpp
index 8a03da3351..78790dcd18 100644
--- a/opencl/test/unit_test/offline_compiler/ocloc_product_config_tests.cpp
+++ b/opencl/test/unit_test/offline_compiler/ocloc_product_config_tests.cpp
@@ -7,6 +7,7 @@
 
 #include "opencl/test/unit_test/offline_compiler/ocloc_product_config_tests.h"
 
+#include "shared/offline_compiler/source/ocloc_arg_helper.h"
 #include "shared/offline_compiler/source/ocloc_error_code.h"
 #include "shared/source/helpers/product_config_helper.h"
 #include "shared/source/os_interface/os_library.h"
diff --git a/opencl/test/unit_test/offline_compiler/ocloc_product_config_tests.h b/opencl/test/unit_test/offline_compiler/ocloc_product_config_tests.h
index 970401653c..4ffeef61d3 100644
--- a/opencl/test/unit_test/offline_compiler/ocloc_product_config_tests.h
+++ b/opencl/test/unit_test/offline_compiler/ocloc_product_config_tests.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include "shared/source/helpers/product_config_helper.h"
+
 #include "opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h"
 
 #include "gtest/gtest.h"
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 7a4861dacd..04dd451738 100644
--- a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp
+++ b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp
@@ -26,6 +26,9 @@
 #include "shared/test/common/mocks/mock_modules_zebin.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
+#include "opencl/test/unit_test/offline_compiler/mock/mock_ocloc_fcl_facade.h"
+#include "opencl/test/unit_test/offline_compiler/mock/mock_ocloc_igc_facade.h"
+
 #include "environment.h"
 #include "gtest/gtest.h"
 #include "mock/mock_argument_helper.h"
diff --git a/opencl/test/unit_test/offline_compiler/xe_hpc_core/pvc/offline_compiler_tests_pvc.cpp b/opencl/test/unit_test/offline_compiler/xe_hpc_core/pvc/offline_compiler_tests_pvc.cpp
index 04a6b8c1f9..3402b5adc8 100644
--- a/opencl/test/unit_test/offline_compiler/xe_hpc_core/pvc/offline_compiler_tests_pvc.cpp
+++ b/opencl/test/unit_test/offline_compiler/xe_hpc_core/pvc/offline_compiler_tests_pvc.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "shared/source/helpers/constants.h"
-#include "shared/source/os_interface/os_library.h"
 #include "shared/source/xe_hpc_core/hw_cmds_pvc.h"
 #include "shared/source/xe_hpc_core/pvc/device_ids_configs_pvc.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
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 81093289cb..48f8710207 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
@@ -6,7 +6,6 @@
  */
 
 #include "shared/source/helpers/constants.h"
-#include "shared/source/os_interface/os_library.h"
 #include "shared/source/xe_hpg_core/hw_cmds_dg2.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/xe_hpg_core/dg2/product_configs_dg2.h"
diff --git a/opencl/test/unit_test/offline_compiler/xe_hpg_core/mtl/offline_compiler_tests_mtl.cpp b/opencl/test/unit_test/offline_compiler/xe_hpg_core/mtl/offline_compiler_tests_mtl.cpp
index 1f0572ed1e..d7650d4648 100644
--- a/opencl/test/unit_test/offline_compiler/xe_hpg_core/mtl/offline_compiler_tests_mtl.cpp
+++ b/opencl/test/unit_test/offline_compiler/xe_hpg_core/mtl/offline_compiler_tests_mtl.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include "shared/source/os_interface/os_library.h"
-
 #include "opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.h"
 
 namespace NEO {
diff --git a/shared/offline_compiler/source/decoder/binary_decoder.cpp b/shared/offline_compiler/source/decoder/binary_decoder.cpp
index 5120f7990a..fcbd697ce7 100644
--- a/shared/offline_compiler/source/decoder/binary_decoder.cpp
+++ b/shared/offline_compiler/source/decoder/binary_decoder.cpp
@@ -13,8 +13,8 @@
 #include "shared/source/device_binary_format/elf/elf_decoder.h"
 #include "shared/source/device_binary_format/elf/ocl_elf.h"
 #include "shared/source/helpers/file_io.h"
+#include "shared/source/helpers/product_config_helper.h"
 #include "shared/source/helpers/ptr_math.h"
-#include "shared/source/os_interface/os_library.h"
 #include "shared/source/utilities/directory.h"
 
 #include <cstring>
diff --git a/shared/offline_compiler/source/decoder/binary_encoder.cpp b/shared/offline_compiler/source/decoder/binary_encoder.cpp
index c113065b1f..fee4b25afb 100644
--- a/shared/offline_compiler/source/decoder/binary_encoder.cpp
+++ b/shared/offline_compiler/source/decoder/binary_encoder.cpp
@@ -13,7 +13,7 @@
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/file_io.h"
 #include "shared/source/helpers/hash.h"
-#include "shared/source/os_interface/os_library.h"
+#include "shared/source/helpers/product_config_helper.h"
 
 #include "CL/cl.h"
 #include "helper.h"
diff --git a/shared/offline_compiler/source/decoder/helper.cpp b/shared/offline_compiler/source/decoder/helper.cpp
index 3028825e2e..838d727ea7 100644
--- a/shared/offline_compiler/source/decoder/helper.cpp
+++ b/shared/offline_compiler/source/decoder/helper.cpp
@@ -10,8 +10,8 @@
 #include "shared/offline_compiler/source/decoder/iga_wrapper.h"
 #include "shared/offline_compiler/source/ocloc_arg_helper.h"
 #include "shared/source/helpers/hw_info.h"
+#include "shared/source/helpers/product_config_helper.h"
 #include "shared/source/os_interface/os_inc_base.h"
-#include "shared/source/os_interface/os_library.h"
 
 #include "igfxfmid.h"
 
diff --git a/shared/offline_compiler/source/decoder/iga_wrapper.cpp b/shared/offline_compiler/source/decoder/iga_wrapper.cpp
index 449686ed17..8d822819d6 100644
--- a/shared/offline_compiler/source/decoder/iga_wrapper.cpp
+++ b/shared/offline_compiler/source/decoder/iga_wrapper.cpp
@@ -9,7 +9,6 @@
 
 #include "shared/offline_compiler/source/ocloc_dll_options.h"
 #include "shared/source/helpers/hw_info.h"
-#include "shared/source/os_interface/os_library.h"
 
 #include "helper.h"
 #include "igfxfmid.h"
diff --git a/shared/offline_compiler/source/decoder/zebin_manipulator.cpp b/shared/offline_compiler/source/decoder/zebin_manipulator.cpp
index c811c4ac49..0fc1945f90 100644
--- a/shared/offline_compiler/source/decoder/zebin_manipulator.cpp
+++ b/shared/offline_compiler/source/decoder/zebin_manipulator.cpp
@@ -15,6 +15,7 @@
 #include "shared/source/device_binary_format/elf/elf_encoder.h"
 #include "shared/source/device_binary_format/zebin/zebin_decoder.h"
 #include "shared/source/helpers/hw_info.h"
+#include "shared/source/helpers/product_config_helper.h"
 #include "shared/source/utilities/directory.h"
 
 #include <algorithm>
diff --git a/shared/offline_compiler/source/multi_command.cpp b/shared/offline_compiler/source/multi_command.cpp
index fde18b39de..26a30201b8 100644
--- a/shared/offline_compiler/source/multi_command.cpp
+++ b/shared/offline_compiler/source/multi_command.cpp
@@ -7,8 +7,12 @@
 
 #include "shared/offline_compiler/source/multi_command.h"
 
+#include "shared/offline_compiler/source/ocloc_arg_helper.h"
 #include "shared/offline_compiler/source/ocloc_error_code.h"
 #include "shared/offline_compiler/source/ocloc_fatbinary.h"
+#include "shared/offline_compiler/source/offline_compiler.h"
+#include "shared/offline_compiler/source/utilities/get_current_dir.h"
+#include "shared/offline_compiler/source/utilities/safety_caller.h"
 #include "shared/source/utilities/const_stringref.h"
 
 #include <memory>
diff --git a/shared/offline_compiler/source/multi_command.h b/shared/offline_compiler/source/multi_command.h
index dc5ee462c6..c7cdf6de03 100644
--- a/shared/offline_compiler/source/multi_command.h
+++ b/shared/offline_compiler/source/multi_command.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,17 +7,11 @@
 
 #pragma once
 
-#include "shared/offline_compiler/source/decoder/binary_decoder.h"
-#include "shared/offline_compiler/source/decoder/binary_encoder.h"
-#include "shared/offline_compiler/source/offline_compiler.h"
-#include "shared/offline_compiler/source/utilities/get_current_dir.h"
-#include "shared/offline_compiler/source/utilities/safety_caller.h"
-#include "shared/source/os_interface/os_library.h"
-
-#include <CL/cl.h>
-
-#include <iostream>
 #include <sstream>
+#include <string>
+#include <vector>
+
+class OclocArgHelper;
 
 namespace NEO {
 
diff --git a/shared/offline_compiler/source/ocloc_arg_helper.h b/shared/offline_compiler/source/ocloc_arg_helper.h
index 4116635317..711e70ea84 100644
--- a/shared/offline_compiler/source/ocloc_arg_helper.h
+++ b/shared/offline_compiler/source/ocloc_arg_helper.h
@@ -8,7 +8,6 @@
 #pragma once
 
 #include "shared/offline_compiler/source/decoder/helper.h"
-#include "shared/source/helpers/product_config_helper.h"
 #include "shared/source/utilities/const_stringref.h"
 
 #include <algorithm>
@@ -20,9 +19,11 @@
 
 constexpr auto *oclocStdoutLogName = "stdout.log";
 
+struct ProductConfigHelper;
 namespace NEO {
 class CompilerProductHelper;
 class ReleaseHelper;
+struct HardwareInfo;
 } // namespace NEO
 
 struct Source {
diff --git a/shared/offline_compiler/source/ocloc_concat.cpp b/shared/offline_compiler/source/ocloc_concat.cpp
index f935169d12..7d0ef8fe35 100644
--- a/shared/offline_compiler/source/ocloc_concat.cpp
+++ b/shared/offline_compiler/source/ocloc_concat.cpp
@@ -13,6 +13,7 @@
 #include "shared/source/device_binary_format/ar/ar_encoder.h"
 #include "shared/source/device_binary_format/elf/elf_decoder.h"
 #include "shared/source/device_binary_format/zebin/zebin_decoder.h"
+#include "shared/source/helpers/product_config_helper.h"
 
 namespace NEO {
 OclocConcat::ErrorCode OclocConcat::initialize(const std::vector<std::string> &args) {
diff --git a/shared/offline_compiler/source/ocloc_fatbinary.cpp b/shared/offline_compiler/source/ocloc_fatbinary.cpp
index 98a1c0e60d..596e26e769 100644
--- a/shared/offline_compiler/source/ocloc_fatbinary.cpp
+++ b/shared/offline_compiler/source/ocloc_fatbinary.cpp
@@ -7,17 +7,19 @@
 
 #include "shared/offline_compiler/source/ocloc_fatbinary.h"
 
+#include "shared/offline_compiler/source/ocloc_arg_helper.h"
 #include "shared/offline_compiler/source/ocloc_error_code.h"
+#include "shared/offline_compiler/source/offline_compiler.h"
 #include "shared/offline_compiler/source/utilities/safety_caller.h"
 #include "shared/source/compiler_interface/compiler_options.h"
 #include "shared/source/compiler_interface/intermediate_representations.h"
 #include "shared/source/compiler_interface/tokenized_string.h"
+#include "shared/source/device_binary_format/ar/ar_encoder.h"
 #include "shared/source/device_binary_format/elf/elf_encoder.h"
 #include "shared/source/device_binary_format/elf/ocl_elf.h"
 #include "shared/source/helpers/file_io.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/product_config_helper.h"
-#include "shared/source/os_interface/os_library.h"
 
 #include "igfxfmid.h"
 #include "platforms.h"
diff --git a/shared/offline_compiler/source/ocloc_fatbinary.h b/shared/offline_compiler/source/ocloc_fatbinary.h
index 05a153e941..eb18d5df44 100644
--- a/shared/offline_compiler/source/ocloc_fatbinary.h
+++ b/shared/offline_compiler/source/ocloc_fatbinary.h
@@ -7,15 +7,20 @@
 
 #pragma once
 
-#include "shared/offline_compiler/source/offline_compiler.h"
-#include "shared/source/device_binary_format/ar/ar_encoder.h"
+#include "shared/source/utilities/arrayref.h"
 #include "shared/source/utilities/const_stringref.h"
 
 #include <cstdint>
 #include <string>
 #include <vector>
 
+class OclocArgHelper;
+
 namespace NEO {
+namespace Ar {
+struct ArEncoder;
+}
+class OfflineCompiler;
 
 bool requestedFatBinary(const std::vector<std::string> &args, OclocArgHelper *helper);
 inline bool requestedFatBinary(int argc, const char *argv[], OclocArgHelper *helper) {
diff --git a/shared/offline_compiler/source/ocloc_fcl_facade.h b/shared/offline_compiler/source/ocloc_fcl_facade.h
index 7c0b471065..9bf727195f 100644
--- a/shared/offline_compiler/source/ocloc_fcl_facade.h
+++ b/shared/offline_compiler/source/ocloc_fcl_facade.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -53,9 +53,9 @@ class OclocFclFacade {
     MOCKABLE_VIRTUAL void populateFclInterface(IGC::PlatformTagOCL &handle, const HardwareInfo &hwInfo);
 
     OclocArgHelper *argHelper{};
-    std::unique_ptr<OsLibrary> fclLib{};
-    CIF::RAII::UPtr_t<CIF::CIFMain> fclMain{};
-    CIF::RAII::UPtr_t<IGC::FclOclDeviceCtxTagOCL> fclDeviceCtx{};
+    std::unique_ptr<OsLibrary> fclLib;
+    CIF::RAII::UPtr_t<CIF::CIFMain> fclMain;
+    CIF::RAII::UPtr_t<IGC::FclOclDeviceCtxTagOCL> fclDeviceCtx;
     bool initialized{false};
 };
 
diff --git a/shared/offline_compiler/source/ocloc_igc_facade.h b/shared/offline_compiler/source/ocloc_igc_facade.h
index d2279e03b4..e037557092 100644
--- a/shared/offline_compiler/source/ocloc_igc_facade.h
+++ b/shared/offline_compiler/source/ocloc_igc_facade.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -53,9 +53,9 @@ class OclocIgcFacade {
     void populateWithFeatures(IGC::IgcFeaturesAndWorkaroundsTagOCL *handle, const HardwareInfo &hwInfo, const CompilerProductHelper *compilerProductHelper) const;
 
     OclocArgHelper *argHelper{};
-    std::unique_ptr<OsLibrary> igcLib{};
-    CIF::RAII::UPtr_t<CIF::CIFMain> igcMain{};
-    CIF::RAII::UPtr_t<IGC::IgcOclDeviceCtxTagOCL> igcDeviceCtx{};
+    std::unique_ptr<OsLibrary> igcLib;
+    CIF::RAII::UPtr_t<CIF::CIFMain> igcMain;
+    CIF::RAII::UPtr_t<IGC::IgcOclDeviceCtxTagOCL> igcDeviceCtx;
     bool initialized{false};
 };
 
diff --git a/shared/offline_compiler/source/offline_compiler.cpp b/shared/offline_compiler/source/offline_compiler.cpp
index ae896385e7..22601b7258 100644
--- a/shared/offline_compiler/source/offline_compiler.cpp
+++ b/shared/offline_compiler/source/offline_compiler.cpp
@@ -7,7 +7,10 @@
 
 #include "offline_compiler.h"
 
+#include "shared/offline_compiler/source/ocloc_arg_helper.h"
 #include "shared/offline_compiler/source/ocloc_error_code.h"
+#include "shared/offline_compiler/source/ocloc_fcl_facade.h"
+#include "shared/offline_compiler/source/ocloc_igc_facade.h"
 #include "shared/offline_compiler/source/queries.h"
 #include "shared/offline_compiler/source/utilities/get_git_version_info.h"
 #include "shared/source/compiler_interface/compiler_options.h"
@@ -23,7 +26,6 @@
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/helpers/validators.h"
-#include "shared/source/os_interface/os_library.h"
 #include "shared/source/release_helper/release_helper.h"
 
 #include "platforms.h"
diff --git a/shared/offline_compiler/source/offline_compiler.h b/shared/offline_compiler/source/offline_compiler.h
index 57f6baf4f2..7cd96f7760 100644
--- a/shared/offline_compiler/source/offline_compiler.h
+++ b/shared/offline_compiler/source/offline_compiler.h
@@ -7,11 +7,7 @@
 
 #pragma once
 
-#include "shared/offline_compiler/source/ocloc_arg_helper.h"
-#include "shared/offline_compiler/source/ocloc_fcl_facade.h"
-#include "shared/offline_compiler/source/ocloc_igc_facade.h"
 #include "shared/source/helpers/hw_info.h"
-#include "shared/source/release_helper/release_helper.h"
 #include "shared/source/utilities/arrayref.h"
 #include "shared/source/utilities/const_stringref.h"
 
@@ -22,11 +18,14 @@
 #include <string>
 #include <unordered_map>
 
+class OclocArgHelper;
+
 namespace NEO {
 
-struct HardwareInfo;
-class OsLibrary;
 class CompilerCache;
+class ReleaseHelper;
+class OclocFclFacade;
+class OclocIgcFacade;
 
 std::string convertToPascalCase(const std::string &inString);
 
@@ -135,7 +134,7 @@ All supported acronyms: %s.
     MOCKABLE_VIRTUAL void createDir(const std::string &path);
     void unifyExcludeIrFlags();
     void enforceFormat(std::string &format);
-    HardwareInfo hwInfo;
+    HardwareInfo hwInfo{};
 
     uint32_t deviceConfig = {};
     std::string deviceName;
@@ -185,8 +184,8 @@ All supported acronyms: %s.
     int revisionId = -1;
     uint64_t hwInfoConfig = 0u;
 
-    std::unique_ptr<OclocIgcFacade> igcFacade{nullptr};
-    std::unique_ptr<OclocFclFacade> fclFacade{nullptr};
+    std::unique_ptr<OclocIgcFacade> igcFacade;
+    std::unique_ptr<OclocFclFacade> fclFacade;
     std::unique_ptr<CompilerCache> cache;
     std::unique_ptr<CompilerProductHelper> compilerProductHelper;
     std::unique_ptr<ReleaseHelper> releaseHelper;
diff --git a/shared/offline_compiler/source/offline_linker.cpp b/shared/offline_compiler/source/offline_linker.cpp
index d22469b744..e131a1984f 100644
--- a/shared/offline_compiler/source/offline_linker.cpp
+++ b/shared/offline_compiler/source/offline_linker.cpp
@@ -9,12 +9,12 @@
 
 #include "shared/offline_compiler/source/ocloc_arg_helper.h"
 #include "shared/offline_compiler/source/ocloc_error_code.h"
+#include "shared/offline_compiler/source/ocloc_igc_facade.h"
 #include "shared/source/compiler_interface/intermediate_representations.h"
 #include "shared/source/device_binary_format/elf/elf_encoder.h"
 #include "shared/source/device_binary_format/elf/ocl_elf.h"
 #include "shared/source/helpers/compiler_product_helper.h"
 #include "shared/source/helpers/string.h"
-#include "shared/source/os_interface/os_library.h"
 
 #include "cif/common/cif_main.h"
 #include "cif/import/library_api.h"
diff --git a/shared/offline_compiler/source/offline_linker.h b/shared/offline_compiler/source/offline_linker.h
index b0e6cd41f2..af4794e71b 100644
--- a/shared/offline_compiler/source/offline_linker.h
+++ b/shared/offline_compiler/source/offline_linker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include "shared/offline_compiler/source/ocloc_igc_facade.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/utilities/arrayref.h"
 
@@ -24,6 +23,7 @@ class OclocArgHelper;
 namespace NEO {
 
 class OsLibrary;
+class OclocIgcFacade;
 
 class OfflineLinker {
   protected:
@@ -76,7 +76,7 @@ class OfflineLinker {
     std::string options{};
     std::string internalOptions{};
 
-    std::unique_ptr<OclocIgcFacade> igcFacade{};
+    std::unique_ptr<OclocIgcFacade> igcFacade;
     HardwareInfo hwInfo{};
     std::string buildLog{};
 };