diff --git a/level_zero/core/test/unit_tests/sources/module/test_module_2.cpp b/level_zero/core/test/unit_tests/sources/module/test_module_2.cpp
index 5f61fd4d27..393b337c17 100644
--- a/level_zero/core/test/unit_tests/sources/module/test_module_2.cpp
+++ b/level_zero/core/test/unit_tests/sources/module/test_module_2.cpp
@@ -1,10 +1,11 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/compiler_interface/compiler_options.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/file_io.h"
 #include "shared/test/common/helpers/test_files.h"
diff --git a/opencl/source/api/api.cpp b/opencl/source/api/api.cpp
index 30bd7314cb..25c53ab7ec 100644
--- a/opencl/source/api/api.cpp
+++ b/opencl/source/api/api.cpp
@@ -21,6 +21,7 @@
 
 #include "opencl/source/accelerators/intel_motion_estimation.h"
 #include "opencl/source/api/additional_extensions.h"
+#include "opencl/source/api/api_enter.h"
 #include "opencl/source/built_ins/vme_builtin.h"
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/command_queue/command_queue.h"
diff --git a/opencl/source/api/api.h b/opencl/source/api/api.h
index d13f3e8b52..002040282f 100644
--- a/opencl/source/api/api.h
+++ b/opencl/source/api/api.h
@@ -1,14 +1,11 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-
-#include "opencl/extensions/public/cl_ext_private.h"
-#include "opencl/source/api/api_enter.h"
 #include "opencl/source/api/dispatch.h"
 
 #include "CL/cl.h"
diff --git a/opencl/source/built_ins/builtins_dispatch_builder.cpp b/opencl/source/built_ins/builtins_dispatch_builder.cpp
index be70f5ca05..d04444421a 100644
--- a/opencl/source/built_ins/builtins_dispatch_builder.cpp
+++ b/opencl/source/built_ins/builtins_dispatch_builder.cpp
@@ -8,7 +8,6 @@
 #include "opencl/source/built_ins/builtins_dispatch_builder.h"
 
 #include "shared/source/built_ins/built_ins.h"
-#include "shared/source/compiler_interface/compiler_options.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/debug_helpers.h"
diff --git a/opencl/source/helpers/surface_formats.h b/opencl/source/helpers/surface_formats.h
index 918c7c413f..0ddf526da9 100644
--- a/opencl/source/helpers/surface_formats.h
+++ b/opencl/source/helpers/surface_formats.h
@@ -1,12 +1,11 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "shared/source/gmm_helper/gmm_lib.h"
 #include "shared/source/helpers/surface_format_info.h"
 #include "shared/source/utilities/arrayref.h"
 
diff --git a/opencl/source/os_interface/windows/api_win.cpp b/opencl/source/os_interface/windows/api_win.cpp
index 54982d72e1..83911ca380 100644
--- a/opencl/source/os_interface/windows/api_win.cpp
+++ b/opencl/source/os_interface/windows/api_win.cpp
@@ -13,6 +13,7 @@
 #include "shared/source/utilities/api_intercept.h"
 
 #include "opencl/source/api/api.h"
+#include "opencl/source/api/api_enter.h"
 #include "opencl/source/api/dispatch.h"
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/command_queue/command_queue.h"
diff --git a/opencl/source/program/program.cpp b/opencl/source/program/program.cpp
index 40226c8be3..b9b0050de8 100644
--- a/opencl/source/program/program.cpp
+++ b/opencl/source/program/program.cpp
@@ -9,6 +9,7 @@
 
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/compiler_interface/compiler_cache.h"
+#include "shared/source/compiler_interface/compiler_options.h"
 #include "shared/source/compiler_interface/external_functions.h"
 #include "shared/source/compiler_interface/intermediate_representations.h"
 #include "shared/source/device/device.h"
diff --git a/opencl/source/sharings/gl/windows/cl_gl_api.cpp b/opencl/source/sharings/gl/windows/cl_gl_api.cpp
index a0f6fc9426..1e03285a79 100644
--- a/opencl/source/sharings/gl/windows/cl_gl_api.cpp
+++ b/opencl/source/sharings/gl/windows/cl_gl_api.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -12,6 +12,7 @@
 #include "shared/source/utilities/api_intercept.h"
 
 #include "opencl/source/api/api.h"
+#include "opencl/source/api/api_enter.h"
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/context/context.h"
diff --git a/opencl/source/sharings/va/cl_va_api.cpp b/opencl/source/sharings/va/cl_va_api.cpp
index 86163ebc3e..d5ac1aaeb0 100644
--- a/opencl/source/sharings/va/cl_va_api.cpp
+++ b/opencl/source/sharings/va/cl_va_api.cpp
@@ -11,6 +11,7 @@
 #include "shared/source/utilities/api_intercept.h"
 
 #include "opencl/source/api/api.h"
+#include "opencl/source/api/api_enter.h"
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/context/context.h"
diff --git a/opencl/test/unit_test/api/cl_link_program_tests.inl b/opencl/test/unit_test/api/cl_link_program_tests.inl
index 8464b7f8bd..f823fcd10e 100644
--- a/opencl/test/unit_test/api/cl_link_program_tests.inl
+++ b/opencl/test/unit_test/api/cl_link_program_tests.inl
@@ -1,10 +1,11 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/compiler_interface/compiler_options.h"
 #include "shared/source/device_binary_format/elf/elf_decoder.h"
 #include "shared/source/helpers/file_io.h"
 #include "shared/test/common/helpers/test_files.h"
diff --git a/opencl/test/unit_test/built_ins/built_in_tests.cpp b/opencl/test/unit_test/built_ins/built_in_tests.cpp
index 428ea8e702..2bd7f3cbee 100644
--- a/opencl/test/unit_test/built_ins/built_in_tests.cpp
+++ b/opencl/test/unit_test/built_ins/built_in_tests.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "shared/source/built_ins/built_ins.h"
-#include "shared/source/compiler_interface/compiler_options.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
diff --git a/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp
index c28b8e2e8b..3a757aa2ba 100644
--- a/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp
+++ b/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "shared/source/built_ins/sip.h"
-#include "shared/source/compiler_interface/compiler_options.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/os_interface/os_context.h"
 #include "shared/source/source_level_debugger/source_level_debugger.h"
diff --git a/opencl/test/unit_test/program/program_tests.cpp b/opencl/test/unit_test/program/program_tests.cpp
index 9d062c590f..0b0c2bab36 100644
--- a/opencl/test/unit_test/program/program_tests.cpp
+++ b/opencl/test/unit_test/program/program_tests.cpp
@@ -9,7 +9,6 @@
 
 #include "shared/source/ail/ail_configuration.h"
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
-#include "shared/source/compiler_interface/compiler_options.h"
 #include "shared/source/compiler_interface/compiler_warnings/compiler_warnings.h"
 #include "shared/source/compiler_interface/intermediate_representations.h"
 #include "shared/source/device_binary_format/elf/elf_decoder.h"
diff --git a/opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp b/opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp
index da33ca129d..ee2dbb52be 100644
--- a/opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp
+++ b/opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/compiler_interface/compiler_options.h"
 #include "shared/source/device_binary_format/patchtokens_decoder.h"
 #include "shared/test/common/device_binary_format/elf/elf_tests_data.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
diff --git a/shared/offline_compiler/source/ocloc_fatbinary.cpp b/shared/offline_compiler/source/ocloc_fatbinary.cpp
index e3e6324d59..178a3c7fbd 100644
--- a/shared/offline_compiler/source/ocloc_fatbinary.cpp
+++ b/shared/offline_compiler/source/ocloc_fatbinary.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,7 +9,9 @@
 
 #include "shared/offline_compiler/source/ocloc_error_code.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/elf/elf_encoder.h"
 #include "shared/source/device_binary_format/elf/ocl_elf.h"
 #include "shared/source/helpers/file_io.h"
diff --git a/shared/offline_compiler/source/ocloc_fatbinary.h b/shared/offline_compiler/source/ocloc_fatbinary.h
index 127ed62975..a259030e92 100644
--- a/shared/offline_compiler/source/ocloc_fatbinary.h
+++ b/shared/offline_compiler/source/ocloc_fatbinary.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,7 +8,6 @@
 #pragma once
 
 #include "shared/offline_compiler/source/offline_compiler.h"
-#include "shared/source/compiler_interface/compiler_options.h"
 #include "shared/source/device_binary_format/ar/ar_encoder.h"
 #include "shared/source/utilities/const_stringref.h"
 
diff --git a/shared/source/built_ins/built_ins.h b/shared/source/built_ins/built_ins.h
index f689556bed..00b7e6ad51 100644
--- a/shared/source/built_ins/built_ins.h
+++ b/shared/source/built_ins/built_ins.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,6 +10,7 @@
 #include "shared/source/built_ins/sip_kernel_type.h"
 #include "shared/source/compiler_interface/compiler_options.h"
 #include "shared/source/helpers/debug_helpers.h"
+#include "shared/source/utilities/stackvec.h"
 
 #include <cstdint>
 #include <memory>
diff --git a/shared/source/command_stream/csr_deps.h b/shared/source/command_stream/csr_deps.h
index a0cf5bcc68..cca21ecea7 100644
--- a/shared/source/command_stream/csr_deps.h
+++ b/shared/source/command_stream/csr_deps.h
@@ -6,7 +6,6 @@
  */
 
 #pragma once
-#include "shared/source/command_stream/task_count_helper.h"
 #include "shared/source/utilities/stackvec.h"
 
 namespace NEO {
diff --git a/shared/source/command_stream/submissions_aggregator.h b/shared/source/command_stream/submissions_aggregator.h
index 6f66fa8f83..80b3cd0dc2 100644
--- a/shared/source/command_stream/submissions_aggregator.h
+++ b/shared/source/command_stream/submissions_aggregator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,7 @@
 #pragma once
 #include "shared/source/command_container/cmdcontainer.h"
 #include "shared/source/command_stream/csr_definitions.h"
+#include "shared/source/command_stream/task_count_helper.h"
 #include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/utilities/idlist.h"
 
diff --git a/shared/source/compiler_interface/CMakeLists.txt b/shared/source/compiler_interface/CMakeLists.txt
index e0d145c5b2..370dcc9dd4 100644
--- a/shared/source/compiler_interface/CMakeLists.txt
+++ b/shared/source/compiler_interface/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019-2022 Intel Corporation
+# Copyright (C) 2019-2023 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -23,6 +23,7 @@ set(NEO_CORE_COMPILER_INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/intermediate_representations.h
     ${CMAKE_CURRENT_SOURCE_DIR}/linker.h
     ${CMAKE_CURRENT_SOURCE_DIR}/linker.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/tokenized_string.h
 )
 
 set_property(GLOBAL PROPERTY NEO_CORE_COMPILER_INTERFACE ${NEO_CORE_COMPILER_INTERFACE})
diff --git a/shared/source/compiler_interface/compiler_options.cpp b/shared/source/compiler_interface/compiler_options.cpp
index 8661a92bff..3dba8cd74c 100644
--- a/shared/source/compiler_interface/compiler_options.cpp
+++ b/shared/source/compiler_interface/compiler_options.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 Intel Corporation
+ * Copyright (C) 2019-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/compiler_interface/compiler_options.h"
 
+#include "shared/source/compiler_interface/tokenized_string.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 
 #include <cstring>
diff --git a/shared/source/compiler_interface/compiler_options.h b/shared/source/compiler_interface/compiler_options.h
index d64063f305..bf4d4481ac 100644
--- a/shared/source/compiler_interface/compiler_options.h
+++ b/shared/source/compiler_interface/compiler_options.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 Intel Corporation
+ * Copyright (C) 2019-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,7 +8,6 @@
 #pragma once
 
 #include "shared/source/utilities/const_stringref.h"
-#include "shared/source/utilities/stackvec.h"
 
 #include <algorithm>
 #include <functional>
@@ -181,8 +180,6 @@ bool contains(const char *options, ConstStringRef optionToFind);
 bool contains(const std::string &options, ConstStringRef optionToFind);
 
 std::string wrapInQuotes(const std::string &stringToWrap);
-using TokenizedString = StackVec<ConstStringRef, 32>;
-TokenizedString tokenize(ConstStringRef src, char sperator = ' ');
 
 void applyAdditionalInternalOptions(std::string &internalOptions);
 void applyAdditionalApiOptions(std::string &apiOptions);
diff --git a/shared/source/compiler_interface/tokenized_string.h b/shared/source/compiler_interface/tokenized_string.h
new file mode 100644
index 0000000000..3013e289d0
--- /dev/null
+++ b/shared/source/compiler_interface/tokenized_string.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2023 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+#include "shared/source/utilities/const_stringref.h"
+#include "shared/source/utilities/stackvec.h"
+
+namespace NEO {
+namespace CompilerOptions {
+
+using TokenizedString = StackVec<ConstStringRef, 32>;
+TokenizedString tokenize(ConstStringRef src, char sperator = ' ');
+
+} // namespace CompilerOptions
+} // namespace NEO
\ No newline at end of file
diff --git a/shared/source/helpers/engine_node_helper.h b/shared/source/helpers/engine_node_helper.h
index de96fbc457..0404db5b39 100644
--- a/shared/source/helpers/engine_node_helper.h
+++ b/shared/source/helpers/engine_node_helper.h
@@ -8,7 +8,6 @@
 #pragma once
 
 #include "shared/source/helpers/device_bitfield.h"
-#include "shared/source/utilities/stackvec.h"
 
 #include "aubstream/engine_node.h"
 
@@ -31,7 +30,6 @@ enum class EngineUsage : uint32_t {
 };
 
 using EngineTypeUsage = std::pair<aub_stream::EngineType, EngineUsage>;
-using EngineInstancesContainer = StackVec<EngineTypeUsage, 32>;
 
 struct EngineDescriptor {
     EngineDescriptor() = delete;
diff --git a/shared/source/helpers/hw_helper.h b/shared/source/helpers/hw_helper.h
index e30e3b30cc..8e0a203b8b 100644
--- a/shared/source/helpers/hw_helper.h
+++ b/shared/source/helpers/hw_helper.h
@@ -11,6 +11,7 @@
 #include "shared/source/helpers/definitions/engine_group_types.h"
 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/helpers/options.h"
+#include "shared/source/utilities/stackvec.h"
 
 #include "aubstream/aubstream.h"
 #include "igfxfmid.h"
@@ -42,6 +43,8 @@ struct RootDeviceEnvironment;
 struct PipeControlArgs;
 class ProductHelper;
 class GfxCoreHelper;
+
+using EngineInstancesContainer = StackVec<EngineTypeUsage, 32>;
 using GfxCoreHelperCreateFunctionType = std::unique_ptr<GfxCoreHelper> (*)();
 
 class GfxCoreHelper {
diff --git a/shared/source/kernel/kernel_arg_metadata.h b/shared/source/kernel/kernel_arg_metadata.h
index bc522a58c2..b471b0d004 100644
--- a/shared/source/kernel/kernel_arg_metadata.h
+++ b/shared/source/kernel/kernel_arg_metadata.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "shared/source/compiler_interface/compiler_options.h"
+#include "shared/source/compiler_interface/tokenized_string.h"
 #include "shared/source/utilities/const_stringref.h"
 
 #include <cstdint>
diff --git a/shared/source/program/program_info.cpp b/shared/source/program/program_info.cpp
index b2341e85e4..f5f9db5880 100644
--- a/shared/source/program/program_info.cpp
+++ b/shared/source/program/program_info.cpp
@@ -7,6 +7,7 @@
 
 #include "shared/source/program/program_info.h"
 
+#include "shared/source/compiler_interface/compiler_options.h"
 #include "shared/source/compiler_interface/external_functions.h"
 #include "shared/source/compiler_interface/linker.h"
 #include "shared/source/device/device.h"
diff --git a/shared/test/unit_test/compiler_interface/compiler_options_tests.cpp b/shared/test/unit_test/compiler_interface/compiler_options_tests.cpp
index 2af79f6d68..5dfec9185a 100644
--- a/shared/test/unit_test/compiler_interface/compiler_options_tests.cpp
+++ b/shared/test/unit_test/compiler_interface/compiler_options_tests.cpp
@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2019-2022 Intel Corporation
+ * Copyright (C) 2019-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/compiler_interface/compiler_options.h"
+#include "shared/source/compiler_interface/tokenized_string.h"
 #include "shared/test/common/test_macros/test.h"
 
 TEST(CompilerOptions, WhenConcatenationLengthIsCalledThenReturnsSumOfLengthsAndSeperators) {
diff --git a/shared/test/unit_test/os_interface/linux/os_interface_linux_tests.cpp b/shared/test/unit_test/os_interface/linux/os_interface_linux_tests.cpp
index a0ff8ae031..eb62101a5d 100644
--- a/shared/test/unit_test/os_interface/linux/os_interface_linux_tests.cpp
+++ b/shared/test/unit_test/os_interface/linux/os_interface_linux_tests.cpp
@@ -1,12 +1,11 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/command_stream/preemption.h"
-#include "shared/source/gmm_helper/gmm_lib.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/os_interface/linux/os_context_linux.h"
 #include "shared/source/os_interface/os_interface.h"
diff --git a/shared/test/unit_test/program/program_info_tests.cpp b/shared/test/unit_test/program/program_info_tests.cpp
index 4b223e2505..8e2a6397ef 100644
--- a/shared/test/unit_test/program/program_info_tests.cpp
+++ b/shared/test/unit_test/program/program_info_tests.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/compiler_interface/compiler_options.h"
 #include "shared/source/compiler_interface/external_functions.h"
 #include "shared/source/compiler_interface/linker.h"
 #include "shared/source/program/kernel_info.h"
diff --git a/shared/test/unit_test/sku_info/sku_info_base_reference.h b/shared/test/unit_test/sku_info/sku_info_base_reference.h
index 22b54a6f54..d9a207a89c 100644
--- a/shared/test/unit_test/sku_info/sku_info_base_reference.h
+++ b/shared/test/unit_test/sku_info/sku_info_base_reference.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include "shared/source/gmm_helper/gmm_lib.h"
-
 #include "sku_info.h"
 
 namespace NEO {