diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 32175be65d..7dafd308d9 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -51,7 +51,9 @@ add_subdirectories()
 
 set(CORE_SOURCES ${CORE_SRCS_GENX_ALL_BASE})
 
-append_sources_from_properties(CORE_SOURCES NEO_CORE_COMMAND_CONTAINER)
+append_sources_from_properties(CORE_SOURCES 
+  NEO_CORE_COMMAND_CONTAINER 
+  NEO_CORE_EXECUTION_ENVIRONMENT)
 
 if(NOT MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -fPIC")
diff --git a/core/command_container/command_encoder.h b/core/command_container/command_encoder.h
index 7c45a4e3b4..683f89eb20 100644
--- a/core/command_container/command_encoder.h
+++ b/core/command_container/command_encoder.h
@@ -8,9 +8,9 @@
 #pragma once
 #include "core/command_container/cmdcontainer.h"
 #include "core/command_stream/linear_stream.h"
+#include "core/execution_environment/execution_environment.h"
 #include "core/helpers/simd_helper.h"
 #include "core/kernel/dispatch_kernel_encoder_interface.h"
-#include "runtime/execution_environment/execution_environment.h"
 
 #include <algorithm>
 
diff --git a/core/command_container/command_encoder.inl b/core/command_container/command_encoder.inl
index 8202a2fec6..580e985316 100644
--- a/core/command_container/command_encoder.inl
+++ b/core/command_container/command_encoder.inl
@@ -8,6 +8,7 @@
 #pragma once
 #include "core/command_container/command_encoder.h"
 #include "core/command_stream/linear_stream.h"
+#include "core/execution_environment/execution_environment.h"
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/preamble.h"
 #include "core/helpers/register_offsets.h"
@@ -15,7 +16,6 @@
 #include "core/helpers/string.h"
 #include "core/kernel/dispatch_kernel_encoder_interface.h"
 #include "runtime/device/device.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 
 #include <algorithm>
diff --git a/core/command_container/command_encoder_base.inl b/core/command_container/command_encoder_base.inl
index f140a88ed9..6384b3dd28 100644
--- a/core/command_container/command_encoder_base.inl
+++ b/core/command_container/command_encoder_base.inl
@@ -9,11 +9,11 @@
 #include "core/command_container/command_encoder.h"
 #include "core/command_stream/linear_stream.h"
 #include "core/command_stream/preemption.h"
+#include "core/execution_environment/execution_environment.h"
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/simd_helper.h"
 #include "core/helpers/state_base_address.h"
 #include "core/kernel/dispatch_kernel_encoder_interface.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 
 #include <algorithm>
diff --git a/core/command_stream/scratch_space_controller.cpp b/core/command_stream/scratch_space_controller.cpp
index 0fc7e09478..7745eb3817 100644
--- a/core/command_stream/scratch_space_controller.cpp
+++ b/core/command_stream/scratch_space_controller.cpp
@@ -7,10 +7,10 @@
 
 #include "core/command_stream/scratch_space_controller.h"
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/helpers/hw_helper.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "core/memory_manager/internal_allocation_storage.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/memory_manager/memory_manager.h"
 
 namespace NEO {
diff --git a/core/command_stream/scratch_space_controller_base.cpp b/core/command_stream/scratch_space_controller_base.cpp
index ceba5d7d23..8f3c365092 100644
--- a/core/command_stream/scratch_space_controller_base.cpp
+++ b/core/command_stream/scratch_space_controller_base.cpp
@@ -7,6 +7,7 @@
 
 #include "core/command_stream/scratch_space_controller_base.h"
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/preamble.h"
@@ -14,7 +15,6 @@
 #include "core/memory_manager/internal_allocation_storage.h"
 #include "core/memory_manager/memory_constants.h"
 #include "core/os_interface/os_context.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/memory_manager/memory_manager.h"
 
 namespace NEO {
diff --git a/core/compiler_interface/CMakeLists.txt b/core/compiler_interface/CMakeLists.txt
index 400fd99a50..9683554e95 100644
--- a/core/compiler_interface/CMakeLists.txt
+++ b/core/compiler_interface/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019 Intel Corporation
+# Copyright (C) 2019-2020 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -12,6 +12,7 @@ set(NEO_COMPILER_INTERFACE
   ${CMAKE_CURRENT_SOURCE_DIR}/compiler_interface.h
   ${CMAKE_CURRENT_SOURCE_DIR}/compiler_interface.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/create_main.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/default_cache_config.h
   ${CMAKE_CURRENT_SOURCE_DIR}/linker.h
   ${CMAKE_CURRENT_SOURCE_DIR}/linker.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/compiler_options/compiler_options_base.h
diff --git a/core/compiler_interface/default_cache_config.h b/core/compiler_interface/default_cache_config.h
new file mode 100644
index 0000000000..fae4fd8929
--- /dev/null
+++ b/core/compiler_interface/default_cache_config.h
@@ -0,0 +1,14 @@
+/*
+ * Copyright (C) 2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+
+#include "core/compiler_interface/compiler_cache.h"
+
+namespace NEO {
+CompilerCacheConfig getDefaultCompilerCacheConfig();
+}
diff --git a/core/execution_environment/CMakeLists.txt b/core/execution_environment/CMakeLists.txt
index ae3dbb40f8..337bf496e6 100644
--- a/core/execution_environment/CMakeLists.txt
+++ b/core/execution_environment/CMakeLists.txt
@@ -1,13 +1,16 @@
 #
-# Copyright (C) 2019 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 set(NEO_CORE_EXECUTION_ENVIRONMENT
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/execution_environment.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/execution_environment.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/root_device_environment.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/root_device_environment.h
+
 )
 
 set_property(GLOBAL PROPERTY NEO_CORE_EXECUTION_ENVIRONMENT ${NEO_CORE_EXECUTION_ENVIRONMENT})
diff --git a/runtime/execution_environment/execution_environment.cpp b/core/execution_environment/execution_environment.cpp
similarity index 96%
rename from runtime/execution_environment/execution_environment.cpp
rename to core/execution_environment/execution_environment.cpp
index fc4eca4d84..e4de7cb7ef 100644
--- a/runtime/execution_environment/execution_environment.cpp
+++ b/core/execution_environment/execution_environment.cpp
@@ -5,14 +5,14 @@
  *
  */
 
-#include "runtime/execution_environment/execution_environment.h"
+#include "core/execution_environment/execution_environment.h"
 
 #include "core/compiler_interface/compiler_interface.h"
+#include "core/compiler_interface/default_cache_config.h"
 #include "core/execution_environment/root_device_environment.h"
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/hw_helper.h"
 #include "runtime/built_ins/built_ins.h"
-#include "runtime/compiler_interface/default_cl_cache_config.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/source_level_debugger/source_level_debugger.h"
 
@@ -93,7 +93,7 @@ CompilerInterface *ExecutionEnvironment::getCompilerInterface() {
     if (this->compilerInterface.get() == nullptr) {
         std::lock_guard<std::mutex> autolock(this->mtx);
         if (this->compilerInterface.get() == nullptr) {
-            auto cache = std::make_unique<CompilerCache>(getDefaultClCompilerCacheConfig());
+            auto cache = std::make_unique<CompilerCache>(getDefaultCompilerCacheConfig());
             this->compilerInterface.reset(CompilerInterface::createInstance(std::move(cache), true));
         }
     }
diff --git a/runtime/execution_environment/execution_environment.h b/core/execution_environment/execution_environment.h
similarity index 100%
rename from runtime/execution_environment/execution_environment.h
rename to core/execution_environment/execution_environment.h
diff --git a/core/execution_environment/root_device_environment.cpp b/core/execution_environment/root_device_environment.cpp
index a89b419932..543a930ecc 100644
--- a/core/execution_environment/root_device_environment.cpp
+++ b/core/execution_environment/root_device_environment.cpp
@@ -7,11 +7,11 @@
 
 #include "core/execution_environment/root_device_environment.h"
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/gmm_helper/page_table_mngr.h"
 #include "core/memory_manager/memory_operations_handler.h"
 #include "core/os_interface/os_interface.h"
 #include "runtime/aub/aub_center.h"
-#include "runtime/execution_environment/execution_environment.h"
 
 namespace NEO {
 
diff --git a/core/helpers/hw_helper_base.inl b/core/helpers/hw_helper_base.inl
index 72707e3dbc..3d6ade1948 100644
--- a/core/helpers/hw_helper_base.inl
+++ b/core/helpers/hw_helper_base.inl
@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/gmm_helper/gmm.h"
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/aligned_memory.h"
@@ -15,7 +16,6 @@
 #include "core/memory_manager/memory_constants.h"
 #include "core/os_interface/os_interface.h"
 #include "runtime/aub_mem_dump/aub_mem_dump.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 
diff --git a/core/os_interface/device_factory.cpp b/core/os_interface/device_factory.cpp
index 6a831f41f1..da50ea7cdf 100644
--- a/core/os_interface/device_factory.cpp
+++ b/core/os_interface/device_factory.cpp
@@ -5,6 +5,8 @@
  *
  */
 
+#include "core/os_interface/device_factory.h"
+
 #include "core/debug_settings/debug_settings_manager.h"
 #include "core/execution_environment/root_device_environment.h"
 #include "core/helpers/hw_helper.h"
diff --git a/core/os_interface/linux/device_factory_linux.cpp b/core/os_interface/linux/device_factory_linux.cpp
index d5e391baa0..ec4b8be489 100644
--- a/core/os_interface/linux/device_factory_linux.cpp
+++ b/core/os_interface/linux/device_factory_linux.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "core/debug_settings/debug_settings_manager.h"
+#include "core/execution_environment/execution_environment.h"
 #include "core/execution_environment/root_device_environment.h"
 #include "core/helpers/hw_info.h"
 #include "core/os_interface/device_factory.h"
@@ -13,7 +14,6 @@
 #include "core/os_interface/linux/drm_memory_operations_handler.h"
 #include "core/os_interface/linux/drm_neo.h"
 #include "core/os_interface/linux/os_interface.h"
-#include "runtime/execution_environment/execution_environment.h"
 
 #include "drm/i915_drm.h"
 
diff --git a/runtime/built_ins/sip.cpp b/runtime/built_ins/sip.cpp
index 09ed0d029c..1b796296b1 100644
--- a/runtime/built_ins/sip.cpp
+++ b/runtime/built_ins/sip.cpp
@@ -7,6 +7,7 @@
 
 #include "runtime/built_ins/sip.h"
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/helpers/debug_helpers.h"
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/ptr_math.h"
@@ -14,7 +15,6 @@
 #include "core/memory_manager/graphics_allocation.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/device/device.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/program/kernel_info.h"
 #include "runtime/program/program.h"
 
diff --git a/runtime/command_stream/aub_command_stream_receiver.cpp b/runtime/command_stream/aub_command_stream_receiver.cpp
index 8865ea9aa8..b874cf17cd 100644
--- a/runtime/command_stream/aub_command_stream_receiver.cpp
+++ b/runtime/command_stream/aub_command_stream_receiver.cpp
@@ -7,11 +7,11 @@
 
 #include "runtime/command_stream/aub_command_stream_receiver.h"
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/helpers/debug_helpers.h"
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/hw_info.h"
 #include "core/helpers/options.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/os_interface/os_inc_base.h"
 
diff --git a/runtime/command_stream/aub_command_stream_receiver_hw_base.inl b/runtime/command_stream/aub_command_stream_receiver_hw_base.inl
index 3cf9ac9455..d656989e33 100644
--- a/runtime/command_stream/aub_command_stream_receiver_hw_base.inl
+++ b/runtime/command_stream/aub_command_stream_receiver_hw_base.inl
@@ -6,6 +6,7 @@
  */
 
 #include "core/debug_settings/debug_settings_manager.h"
+#include "core/execution_environment/execution_environment.h"
 #include "core/execution_environment/root_device_environment.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/debug_helpers.h"
@@ -24,7 +25,6 @@
 #include "runtime/command_stream/aub_stream_provider.h"
 #include "runtime/command_stream/aub_subcapture.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/hardware_context_controller.h"
 #include "runtime/helpers/neo_driver_version.h"
 #include "runtime/memory_manager/memory_banks.h"
diff --git a/runtime/command_stream/command_stream_receiver_hw.h b/runtime/command_stream/command_stream_receiver_hw.h
index 4493c306ab..f154230b49 100644
--- a/runtime/command_stream/command_stream_receiver_hw.h
+++ b/runtime/command_stream/command_stream_receiver_hw.h
@@ -6,11 +6,11 @@
  */
 
 #pragma once
+#include "core/execution_environment/execution_environment.h"
 #include "core/helpers/dirty_state_helpers.h"
 #include "core/helpers/hw_cmds.h"
 #include "core/helpers/hw_info.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/execution_environment/execution_environment.h"
 
 namespace NEO {
 template <typename GfxFamily>
diff --git a/runtime/command_stream/command_stream_receiver_with_aub_dump.inl b/runtime/command_stream/command_stream_receiver_with_aub_dump.inl
index 47f7535aa7..00ccf6bd6c 100644
--- a/runtime/command_stream/command_stream_receiver_with_aub_dump.inl
+++ b/runtime/command_stream/command_stream_receiver_with_aub_dump.inl
@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/execution_environment/root_device_environment.h"
 #include "runtime/aub/aub_center.h"
 #include "runtime/command_stream/aub_command_stream_receiver.h"
 #include "runtime/command_stream/command_stream_receiver_with_aub_dump.h"
-#include "runtime/execution_environment/execution_environment.h"
 
 namespace NEO {
 
diff --git a/runtime/command_stream/create_command_stream_impl.cpp b/runtime/command_stream/create_command_stream_impl.cpp
index 0453e32fb4..b02cb6e473 100644
--- a/runtime/command_stream/create_command_stream_impl.cpp
+++ b/runtime/command_stream/create_command_stream_impl.cpp
@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/os_interface/device_factory.h"
 #include "runtime/command_stream/aub_command_stream_receiver.h"
 #include "runtime/command_stream/command_stream_receiver_with_aub_dump.h"
 #include "runtime/command_stream/tbx_command_stream_receiver.h"
-#include "runtime/execution_environment/execution_environment.h"
 
 namespace NEO {
 
diff --git a/runtime/command_stream/tbx_command_stream_receiver.cpp b/runtime/command_stream/tbx_command_stream_receiver.cpp
index 0d581c298d..9485dc6636 100644
--- a/runtime/command_stream/tbx_command_stream_receiver.cpp
+++ b/runtime/command_stream/tbx_command_stream_receiver.cpp
@@ -7,8 +7,8 @@
 
 #include "runtime/command_stream/tbx_command_stream_receiver.h"
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/helpers/hw_info.h"
-#include "runtime/execution_environment/execution_environment.h"
 
 #include <string>
 
diff --git a/runtime/command_stream/tbx_command_stream_receiver_hw.inl b/runtime/command_stream/tbx_command_stream_receiver_hw.inl
index dd4efb9c72..da743ec17a 100644
--- a/runtime/command_stream/tbx_command_stream_receiver_hw.inl
+++ b/runtime/command_stream/tbx_command_stream_receiver_hw.inl
@@ -6,6 +6,7 @@
  */
 
 #include "core/debug_settings/debug_settings_manager.h"
+#include "core/execution_environment/execution_environment.h"
 #include "core/execution_environment/root_device_environment.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/debug_helpers.h"
@@ -19,7 +20,6 @@
 #include "runtime/aub_mem_dump/page_table_entry_bits.h"
 #include "runtime/command_stream/aub_command_stream_receiver.h"
 #include "runtime/command_stream/command_stream_receiver_with_aub_dump.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/helpers/hardware_context_controller.h"
 #include "runtime/memory_manager/memory_banks.h"
diff --git a/runtime/compiler_interface/default_cache_config.cpp b/runtime/compiler_interface/default_cache_config.cpp
new file mode 100644
index 0000000000..10ece8312a
--- /dev/null
+++ b/runtime/compiler_interface/default_cache_config.cpp
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "core/compiler_interface/default_cache_config.h"
+
+#include "runtime/compiler_interface/default_cl_cache_config.h"
+
+namespace NEO {
+CompilerCacheConfig getDefaultCompilerCacheConfig() {
+    return getDefaultClCompilerCacheConfig();
+}
+
+} // namespace NEO
diff --git a/runtime/compiler_interface/default_cl_cache_config.cpp b/runtime/compiler_interface/default_cl_cache_config.cpp
index 2ae788e9a5..6bc7d11686 100644
--- a/runtime/compiler_interface/default_cl_cache_config.cpp
+++ b/runtime/compiler_interface/default_cl_cache_config.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 Intel Corporation
+ * Copyright (C) 2019-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -29,5 +29,4 @@ CompilerCacheConfig getDefaultClCompilerCacheConfig() {
 
     return ret;
 }
-
 } // namespace NEO
diff --git a/runtime/core_files.cmake b/runtime/core_files.cmake
index 4bb27ae2ef..3f6f3f79ba 100644
--- a/runtime/core_files.cmake
+++ b/runtime/core_files.cmake
@@ -12,7 +12,6 @@ append_sources_from_properties(NEO_CORE_SOURCES
   NEO_CORE_COMMANDS
   NEO_CORE_DEBUG_SETTINGS
   NEO_CORE_COMMAND_ENCODERS
-  NEO_CORE_EXECUTION_ENVIRONMENT
   NEO_CORE_GMM_HELPER
   NEO_CORE_HELPERS
   NEO_CORE_INDIRECT_HEAP
diff --git a/runtime/device/device.h b/runtime/device/device.h
index 1a1d9a2497..5be2562463 100644
--- a/runtime/device/device.h
+++ b/runtime/device/device.h
@@ -6,11 +6,11 @@
  */
 
 #pragma once
+#include "core/execution_environment/execution_environment.h"
 #include "core/helpers/common_types.h"
 #include "core/helpers/engine_control.h"
 #include "core/helpers/hw_info.h"
 #include "runtime/device/device_info.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/os_interface/performance_counters.h"
 
 namespace NEO {
diff --git a/runtime/dll/CMakeLists.txt b/runtime/dll/CMakeLists.txt
index 15fb3d8480..f184b98289 100644
--- a/runtime/dll/CMakeLists.txt
+++ b/runtime/dll/CMakeLists.txt
@@ -28,6 +28,7 @@ set(RUNTIME_SRCS_DLL_BASE
   ${NEO_SOURCE_DIR}/core/utilities/cpuintrinsics.cpp
   ${NEO_SOURCE_DIR}/core/utilities/debug_settings_reader_creator.cpp
   ${NEO_SOURCE_DIR}/runtime/api/api.cpp
+  ${NEO_SOURCE_DIR}/runtime/compiler_interface/default_cache_config.cpp
   ${NEO_SOURCE_DIR}/runtime/helpers/built_ins_helper.cpp
   ${NEO_SOURCE_DIR}/runtime/program/evaluate_unhandled_token.cpp
 
diff --git a/runtime/dll/get_devices.cpp b/runtime/dll/get_devices.cpp
index 215550fff7..ca3091b6d2 100644
--- a/runtime/dll/get_devices.cpp
+++ b/runtime/dll/get_devices.cpp
@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/os_interface/device_factory.h"
 #include "runtime/command_stream/create_command_stream_impl.h"
-#include "runtime/execution_environment/execution_environment.h"
 
 namespace NEO {
 
diff --git a/runtime/dll/linux/create_drm_memory_manager.cpp b/runtime/dll/linux/create_drm_memory_manager.cpp
index 1e8ebf8c7c..80eb8ee689 100644
--- a/runtime/dll/linux/create_drm_memory_manager.cpp
+++ b/runtime/dll/linux/create_drm_memory_manager.cpp
@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/os_interface/linux/os_interface.h"
 #include "core/os_interface/os_interface.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/os_interface/linux/drm_memory_manager.h"
 
diff --git a/runtime/dll/linux/drm_neo_create.cpp b/runtime/dll/linux/drm_neo_create.cpp
index 18432cd7c0..5933d548db 100644
--- a/runtime/dll/linux/drm_neo_create.cpp
+++ b/runtime/dll/linux/drm_neo_create.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "core/debug_settings/debug_settings_manager.h"
+#include "core/execution_environment/execution_environment.h"
 #include "core/execution_environment/root_device_environment.h"
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/hw_cmds.h"
@@ -13,7 +14,6 @@
 #include "core/helpers/hw_info.h"
 #include "core/os_interface/linux/drm_neo.h"
 #include "core/os_interface/linux/drm_null_device.h"
-#include "runtime/execution_environment/execution_environment.h"
 
 #include "drm/i915_drm.h"
 
diff --git a/runtime/dll/windows/create_wddm_memory_manager.cpp b/runtime/dll/windows/create_wddm_memory_manager.cpp
index 854453dd82..ec99f27400 100644
--- a/runtime/dll/windows/create_wddm_memory_manager.cpp
+++ b/runtime/dll/windows/create_wddm_memory_manager.cpp
@@ -6,9 +6,9 @@
  */
 
 #include "core/debug_settings/debug_settings_manager.h"
+#include "core/execution_environment/execution_environment.h"
 #include "core/os_interface/os_interface.h"
 #include "core/os_interface/windows/os_interface.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/os_interface/windows/wddm_memory_manager.h"
 
diff --git a/runtime/execution_environment/CMakeLists.txt b/runtime/execution_environment/CMakeLists.txt
deleted file mode 100644
index 657e377c51..0000000000
--- a/runtime/execution_environment/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Copyright (C) 2018-2019 Intel Corporation
-#
-# SPDX-License-Identifier: MIT
-#
-
-set(RUNTIME_SRCS_EXECUTION_ENVIRONMENT
-  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/execution_environment.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/execution_environment.cpp
-)
-
-target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_EXECUTION_ENVIRONMENT})
-set_property(GLOBAL PROPERTY RUNTIME_SRCS_EXECUTION_ENVIRONMENT ${RUNTIME_SRCS_EXECUTION_ENVIRONMENT})
diff --git a/runtime/helpers/built_ins_helper.h b/runtime/helpers/built_ins_helper.h
index 1bedccc484..884261d31d 100644
--- a/runtime/helpers/built_ins_helper.h
+++ b/runtime/helpers/built_ins_helper.h
@@ -6,8 +6,8 @@
  */
 
 #pragma once
+#include "core/execution_environment/execution_environment.h"
 #include "runtime/built_ins/built_ins.h"
-#include "runtime/execution_environment/execution_environment.h"
 
 namespace NEO {
 class ClDevice;
diff --git a/runtime/helpers/flat_batch_buffer_helper.cpp b/runtime/helpers/flat_batch_buffer_helper.cpp
index 4aa8093635..742e3ad12b 100644
--- a/runtime/helpers/flat_batch_buffer_helper.cpp
+++ b/runtime/helpers/flat_batch_buffer_helper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2019 Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,8 +7,8 @@
 
 #include "runtime/helpers/flat_batch_buffer_helper.h"
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/memory_manager/graphics_allocation.h"
-#include "runtime/execution_environment/execution_environment.h"
 
 namespace NEO {
 
diff --git a/runtime/mem_obj/buffer_base.inl b/runtime/mem_obj/buffer_base.inl
index a40f413b80..3de612a57e 100644
--- a/runtime/mem_obj/buffer_base.inl
+++ b/runtime/mem_obj/buffer_base.inl
@@ -6,11 +6,11 @@
  */
 
 #include "common/helpers/bit_helpers.h"
+#include "core/execution_environment/execution_environment.h"
 #include "core/gmm_helper/gmm.h"
 #include "core/gmm_helper/resource_info.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/hw_cmds.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/mem_obj/buffer.h"
 
diff --git a/runtime/mem_obj/image.inl b/runtime/mem_obj/image.inl
index 9749fb5cfa..8f51b2711c 100644
--- a/runtime/mem_obj/image.inl
+++ b/runtime/mem_obj/image.inl
@@ -5,12 +5,12 @@
  *
  */
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/gmm_helper/gmm.h"
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/gmm_helper/resource_info.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/hw_cmds.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/mem_obj/image.h"
 
diff --git a/runtime/memory_manager/os_agnostic_memory_manager.cpp b/runtime/memory_manager/os_agnostic_memory_manager.cpp
index 113041c262..994fc53081 100644
--- a/runtime/memory_manager/os_agnostic_memory_manager.cpp
+++ b/runtime/memory_manager/os_agnostic_memory_manager.cpp
@@ -7,6 +7,7 @@
 
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/execution_environment/root_device_environment.h"
 #include "core/gmm_helper/gmm.h"
 #include "core/gmm_helper/gmm_helper.h"
@@ -19,7 +20,6 @@
 #include "core/memory_manager/residency.h"
 #include "core/os_interface/os_memory.h"
 #include "runtime/aub/aub_center.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/surface_formats.h"
 
 #include <cassert>
diff --git a/runtime/os_interface/linux/drm_command_stream.inl b/runtime/os_interface/linux/drm_command_stream.inl
index a08d270d0b..a781194c64 100644
--- a/runtime/os_interface/linux/drm_command_stream.inl
+++ b/runtime/os_interface/linux/drm_command_stream.inl
@@ -6,6 +6,7 @@
  */
 
 #include "core/command_stream/linear_stream.h"
+#include "core/execution_environment/execution_environment.h"
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/gmm_helper/page_table_mngr.h"
 #include "core/helpers/aligned_memory.h"
@@ -18,7 +19,6 @@
 #include "core/os_interface/linux/drm_neo.h"
 #include "core/os_interface/linux/os_context_linux.h"
 #include "core/os_interface/linux/os_interface.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/os_interface/linux/drm_command_stream.h"
 #include "runtime/os_interface/linux/drm_memory_manager.h"
diff --git a/runtime/os_interface/linux/drm_memory_manager.cpp b/runtime/os_interface/linux/drm_memory_manager.cpp
index 97869afca0..f1d0cf3603 100644
--- a/runtime/os_interface/linux/drm_memory_manager.cpp
+++ b/runtime/os_interface/linux/drm_memory_manager.cpp
@@ -7,6 +7,7 @@
 
 #include "runtime/os_interface/linux/drm_memory_manager.h"
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/execution_environment/root_device_environment.h"
 #include "core/gmm_helper/gmm.h"
 #include "core/gmm_helper/gmm_helper.h"
@@ -20,7 +21,6 @@
 #include "core/os_interface/linux/os_interface.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/device/device.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/surface_formats.h"
 
 #include "drm/i915_drm.h"
diff --git a/runtime/platform/platform.cpp b/runtime/platform/platform.cpp
index 045631ed46..1c47430ed2 100644
--- a/runtime/platform/platform.cpp
+++ b/runtime/platform/platform.cpp
@@ -9,6 +9,7 @@
 
 #include "core/compiler_interface/compiler_interface.h"
 #include "core/debug_settings/debug_settings_manager.h"
+#include "core/execution_environment/execution_environment.h"
 #include "core/execution_environment/root_device_environment.h"
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/debug_helpers.h"
@@ -22,7 +23,6 @@
 #include "runtime/device/cl_device.h"
 #include "runtime/device/root_device.h"
 #include "runtime/event/async_events_handler.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/gtpin/gtpin_notify.h"
 #include "runtime/helpers/built_ins_helper.h"
 #include "runtime/platform/extensions.h"
diff --git a/runtime/program/build.cpp b/runtime/program/build.cpp
index b9f90dcce4..e3126e1430 100644
--- a/runtime/program/build.cpp
+++ b/runtime/program/build.cpp
@@ -6,10 +6,10 @@
  */
 
 #include "core/compiler_interface/compiler_interface.h"
+#include "core/execution_environment/execution_environment.h"
 #include "core/utilities/time_measure_wrapper.h"
 #include "runtime/device/cl_device.h"
 #include "runtime/device/device.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/gtpin/gtpin_notify.h"
 #include "runtime/helpers/validators.h"
 #include "runtime/platform/platform.h"
diff --git a/runtime/program/compile.cpp b/runtime/program/compile.cpp
index e999cfa53a..dc581bc544 100644
--- a/runtime/program/compile.cpp
+++ b/runtime/program/compile.cpp
@@ -7,8 +7,8 @@
 
 #include "core/compiler_interface/compiler_interface.h"
 #include "core/elf/writer.h"
+#include "core/execution_environment/execution_environment.h"
 #include "runtime/device/cl_device.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/validators.h"
 #include "runtime/platform/platform.h"
 #include "runtime/source_level_debugger/source_level_debugger.h"
diff --git a/runtime/program/link.cpp b/runtime/program/link.cpp
index 3e5e7b3951..770eec105a 100644
--- a/runtime/program/link.cpp
+++ b/runtime/program/link.cpp
@@ -7,9 +7,9 @@
 
 #include "core/compiler_interface/compiler_interface.h"
 #include "core/elf/writer.h"
+#include "core/execution_environment/execution_environment.h"
 #include "core/utilities/stackvec.h"
 #include "runtime/device/cl_device.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/validators.h"
 #include "runtime/platform/platform.h"
 #include "runtime/program/program.h"
diff --git a/runtime/sharings/unified/unified_image.cpp b/runtime/sharings/unified/unified_image.cpp
index d3c225054c..ff5bb99377 100644
--- a/runtime/sharings/unified/unified_image.cpp
+++ b/runtime/sharings/unified/unified_image.cpp
@@ -7,13 +7,13 @@
 
 #include "unified_image.h"
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/gmm_helper/gmm.h"
 #include "core/gmm_helper/resource_info.h"
 #include "core/helpers/get_info.h"
 #include "core/helpers/hw_helper.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "runtime/context/context.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/memory_manager.h"
 
diff --git a/unit_tests/api/cl_add_comment_to_aub_tests.inl b/unit_tests/api/cl_add_comment_to_aub_tests.inl
index 96e702185e..2670e522a7 100644
--- a/unit_tests/api/cl_add_comment_to_aub_tests.inl
+++ b/unit_tests/api/cl_add_comment_to_aub_tests.inl
@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/execution_environment/root_device_environment.h"
 #include "runtime/context/context.h"
 #include "runtime/device/cl_device.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/platform/platform.h"
 #include "unit_tests/api/cl_api_tests.h"
 #include "unit_tests/mocks/mock_aub_center.h"
diff --git a/unit_tests/command_stream/command_stream_receiver_with_aub_dump_tests.cpp b/unit_tests/command_stream/command_stream_receiver_with_aub_dump_tests.cpp
index 0165f41cd2..f617312782 100644
--- a/unit_tests/command_stream/command_stream_receiver_with_aub_dump_tests.cpp
+++ b/unit_tests/command_stream/command_stream_receiver_with_aub_dump_tests.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "core/command_stream/preemption.h"
+#include "core/execution_environment/execution_environment.h"
 #include "core/helpers/flush_stamp.h"
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/timestamp_packet.h"
@@ -15,7 +16,6 @@
 #include "runtime/command_stream/command_stream_receiver_with_aub_dump.h"
 #include "runtime/command_stream/command_stream_receiver_with_aub_dump.inl"
 #include "runtime/command_stream/tbx_command_stream_receiver_hw.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/platform/platform.h"
 #include "test.h"
diff --git a/unit_tests/command_stream/create_command_stream_receiver_tests.cpp b/unit_tests/command_stream/create_command_stream_receiver_tests.cpp
index cfcf4d1000..b44cd2b706 100644
--- a/unit_tests/command_stream/create_command_stream_receiver_tests.cpp
+++ b/unit_tests/command_stream/create_command_stream_receiver_tests.cpp
@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/unit_tests/helpers/ult_hw_config.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/command_stream/command_stream_receiver_with_aub_dump.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "test.h"
 #include "unit_tests/fixtures/mock_aub_center_fixture.h"
diff --git a/unit_tests/command_stream/get_devices_tests.cpp b/unit_tests/command_stream/get_devices_tests.cpp
index 6fc9598adc..ce4df752f4 100644
--- a/unit_tests/command_stream/get_devices_tests.cpp
+++ b/unit_tests/command_stream/get_devices_tests.cpp
@@ -5,12 +5,12 @@
  *
  */
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/os_interface/device_factory.h"
 #include "core/os_interface/hw_info_config.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/unit_tests/helpers/ult_hw_config.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/platform/platform.h"
 #include "test.h"
diff --git a/unit_tests/execution_environment/execution_environment_tests.cpp b/unit_tests/execution_environment/execution_environment_tests.cpp
index f176d43282..15d9a2735a 100644
--- a/unit_tests/execution_environment/execution_environment_tests.cpp
+++ b/unit_tests/execution_environment/execution_environment_tests.cpp
@@ -7,6 +7,7 @@
 
 #include "core/command_stream/preemption.h"
 #include "core/compiler_interface/compiler_interface.h"
+#include "core/execution_environment/execution_environment.h"
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/hw_helper.h"
 #include "core/os_interface/os_interface.h"
@@ -15,7 +16,6 @@
 #include "runtime/aub/aub_center.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/device/device.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/platform/platform.h"
 #include "runtime/source_level_debugger/source_level_debugger.h"
diff --git a/unit_tests/fixtures/image_fixture.h b/unit_tests/fixtures/image_fixture.h
index c43d392634..9f25816bbb 100644
--- a/unit_tests/fixtures/image_fixture.h
+++ b/unit_tests/fixtures/image_fixture.h
@@ -6,9 +6,9 @@
  */
 
 #pragma once
+#include "core/execution_environment/execution_environment.h"
 #include "core/helpers/hw_info.h"
 #include "core/unit_tests/helpers/default_hw_info.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/memory_properties_flags_helpers.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/platform/platform.h"
diff --git a/unit_tests/fixtures/memory_allocator_fixture.h b/unit_tests/fixtures/memory_allocator_fixture.h
index 5932d014dc..00c87c1264 100644
--- a/unit_tests/fixtures/memory_allocator_fixture.h
+++ b/unit_tests/fixtures/memory_allocator_fixture.h
@@ -8,8 +8,8 @@
 #pragma once
 
 #include "core/command_stream/preemption.h"
+#include "core/execution_environment/execution_environment.h"
 #include "core/helpers/hw_helper.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "unit_tests/fixtures/memory_management_fixture.h"
 #include "unit_tests/mocks/mock_device.h"
diff --git a/unit_tests/fixtures/memory_allocator_multi_device_fixture.h b/unit_tests/fixtures/memory_allocator_multi_device_fixture.h
index 6a6d75599c..c3a49d5c47 100644
--- a/unit_tests/fixtures/memory_allocator_multi_device_fixture.h
+++ b/unit_tests/fixtures/memory_allocator_multi_device_fixture.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/unit_tests/helpers/ult_hw_config.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "unit_tests/fixtures/memory_management_fixture.h"
 #include "unit_tests/helpers/variable_backup.h"
diff --git a/unit_tests/fixtures/memory_manager_fixture.h b/unit_tests/fixtures/memory_manager_fixture.h
index d2ef378be3..a6640b54e9 100644
--- a/unit_tests/fixtures/memory_manager_fixture.h
+++ b/unit_tests/fixtures/memory_manager_fixture.h
@@ -1,13 +1,13 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
+#include "core/execution_environment/execution_environment.h"
 #include "core/helpers/options.h"
-#include "runtime/execution_environment/execution_environment.h"
 
 using namespace NEO;
 
diff --git a/unit_tests/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp b/unit_tests/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp
index f5ef979561..7dca7b6c7c 100644
--- a/unit_tests/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp
+++ b/unit_tests/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp
@@ -6,13 +6,13 @@
  */
 
 #include "core/command_stream/linear_stream.h"
+#include "core/execution_environment/execution_environment.h"
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/windows/gmm_callbacks.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/unit_tests/helpers/default_hw_info.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw.h"
 #include "runtime/command_stream/command_stream_receiver_with_aub_dump.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/os_interface/windows/wddm_device_command_stream.h"
 #include "runtime/platform/platform.h"
 #include "test.h"
diff --git a/unit_tests/gen8/coherency_tests_gen8.cpp b/unit_tests/gen8/coherency_tests_gen8.cpp
index d6a8499b8e..5f539544a7 100644
--- a/unit_tests/gen8/coherency_tests_gen8.cpp
+++ b/unit_tests/gen8/coherency_tests_gen8.cpp
@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/execution_environment/execution_environment.h"
 #include "runtime/command_stream/command_stream_receiver_hw.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/platform/platform.h"
 #include "test.h"
 #include "unit_tests/helpers/dispatch_flags_helper.h"
diff --git a/unit_tests/gen9/coherency_tests_gen9.cpp b/unit_tests/gen9/coherency_tests_gen9.cpp
index 67dd97add1..a4ad763ca3 100644
--- a/unit_tests/gen9/coherency_tests_gen9.cpp
+++ b/unit_tests/gen9/coherency_tests_gen9.cpp
@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/execution_environment/execution_environment.h"
 #include "runtime/command_stream/command_stream_receiver_hw.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/platform/platform.h"
 #include "test.h"
 #include "unit_tests/helpers/dispatch_flags_helper.h"
diff --git a/unit_tests/helpers/execution_environment_helper.h b/unit_tests/helpers/execution_environment_helper.h
index bb32b8e15b..f5fe18fda0 100644
--- a/unit_tests/helpers/execution_environment_helper.h
+++ b/unit_tests/helpers/execution_environment_helper.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2018-2019 Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "runtime/execution_environment/execution_environment.h"
+#include "core/execution_environment/execution_environment.h"
 
 #include "CL/cl.h"
 
diff --git a/unit_tests/libult/CMakeLists.txt b/unit_tests/libult/CMakeLists.txt
index a8420d1cc7..bf1e2bb870 100644
--- a/unit_tests/libult/CMakeLists.txt
+++ b/unit_tests/libult/CMakeLists.txt
@@ -25,6 +25,7 @@ apply_macro_for_each_gen("TESTED")
 set(IGDRCL_SRCS_LIB_ULT
   ${NEO_SOURCE_DIR}/core/helpers/allow_deferred_deleter.cpp
   ${NEO_SOURCE_DIR}/core/unit_tests/utilities/cpuintrinsics.cpp
+  ${NEO_SOURCE_DIR}/runtime/compiler_interface/default_cache_config.cpp
   ${NEO_SOURCE_DIR}/unit_tests/abort.cpp
   ${NEO_SOURCE_DIR}/unit_tests/helpers/built_ins_helper.cpp
   ${NEO_SOURCE_DIR}/unit_tests/helpers/debug_helpers.cpp
diff --git a/unit_tests/libult/ult_aub_command_stream_receiver.h b/unit_tests/libult/ult_aub_command_stream_receiver.h
index a60837239b..c007952b93 100644
--- a/unit_tests/libult/ult_aub_command_stream_receiver.h
+++ b/unit_tests/libult/ult_aub_command_stream_receiver.h
@@ -1,13 +1,13 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
+#include "core/execution_environment/execution_environment.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "unit_tests/mocks/mock_experimental_command_buffer.h"
 
diff --git a/unit_tests/libult/ult_command_stream_receiver.h b/unit_tests/libult/ult_command_stream_receiver.h
index 94a5b1ad69..c10c29ae77 100644
--- a/unit_tests/libult/ult_command_stream_receiver.h
+++ b/unit_tests/libult/ult_command_stream_receiver.h
@@ -6,10 +6,10 @@
  */
 
 #pragma once
+#include "core/execution_environment/execution_environment.h"
 #include "core/os_interface/os_context.h"
 #include "runtime/command_stream/command_stream_receiver_hw.h"
 #include "runtime/device/device.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "unit_tests/helpers/dispatch_flags_helper.h"
 #include "unit_tests/mocks/mock_experimental_command_buffer.h"
diff --git a/unit_tests/linux/drm_null_device_tests.cpp b/unit_tests/linux/drm_null_device_tests.cpp
index 034d69cc8d..1dd00278fd 100644
--- a/unit_tests/linux/drm_null_device_tests.cpp
+++ b/unit_tests/linux/drm_null_device_tests.cpp
@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/os_interface/linux/drm_null_device.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "test.h"
 #include "unit_tests/linux/drm_wrap.h"
 #include "unit_tests/linux/mock_os_layer.h"
diff --git a/unit_tests/linux/main_linux.cpp b/unit_tests/linux/main_linux.cpp
index 69203e1962..9a52b4e48a 100644
--- a/unit_tests/linux/main_linux.cpp
+++ b/unit_tests/linux/main_linux.cpp
@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/os_interface/linux/drm_neo.h"
 #include "core/os_interface/os_library.h"
 #include "core/unit_tests/helpers/default_hw_info.inl"
 #include "core/unit_tests/helpers/ult_hw_config.inl"
-#include "runtime/execution_environment/execution_environment.h"
 #include "test.h"
 #include "unit_tests/custom_event_listener.h"
 
diff --git a/unit_tests/linux/main_linux_dll.cpp b/unit_tests/linux/main_linux_dll.cpp
index 25eb356b98..e4f0bfa94c 100644
--- a/unit_tests/linux/main_linux_dll.cpp
+++ b/unit_tests/linux/main_linux_dll.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/basic_math.h"
 #include "core/os_interface/linux/allocator_helper.h"
@@ -12,7 +13,6 @@
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/unit_tests/helpers/default_hw_info.inl"
 #include "core/unit_tests/helpers/ult_hw_config.inl"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "test.h"
 #include "unit_tests/custom_event_listener.h"
diff --git a/unit_tests/memory_manager/host_ptr_manager_tests.cpp b/unit_tests/memory_manager/host_ptr_manager_tests.cpp
index 72ae1f5298..f1517d6b71 100644
--- a/unit_tests/memory_manager/host_ptr_manager_tests.cpp
+++ b/unit_tests/memory_manager/host_ptr_manager_tests.cpp
@@ -1,14 +1,14 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "core/memory_manager/memory_constants.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "test.h"
 #include "unit_tests/fixtures/memory_manager_fixture.h"
 #include "unit_tests/mocks/mock_allocation_properties.h"
diff --git a/unit_tests/memory_manager/memory_manager_allocate_in_device_pool_tests.inl b/unit_tests/memory_manager/memory_manager_allocate_in_device_pool_tests.inl
index 60fcbcf4ef..eb89a26d0f 100644
--- a/unit_tests/memory_manager/memory_manager_allocate_in_device_pool_tests.inl
+++ b/unit_tests/memory_manager/memory_manager_allocate_in_device_pool_tests.inl
@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2018-2019 Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "runtime/execution_environment/execution_environment.h"
+#include "core/execution_environment/execution_environment.h"
 #include "runtime/helpers/memory_properties_flags_helpers.h"
 #include "runtime/mem_obj/mem_obj_helper.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
diff --git a/unit_tests/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl b/unit_tests/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl
index 6530f6c625..54b736e5fe 100644
--- a/unit_tests/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl
+++ b/unit_tests/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/execution_environment/execution_environment.h"
+#include "core/execution_environment/execution_environment.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "test.h"
 #include "unit_tests/mocks/mock_allocation_properties.h"
diff --git a/unit_tests/mocks/mock_aub_csr.h b/unit_tests/mocks/mock_aub_csr.h
index 55cbad884f..1ac52f559f 100644
--- a/unit_tests/mocks/mock_aub_csr.h
+++ b/unit_tests/mocks/mock_aub_csr.h
@@ -8,11 +8,11 @@
 #pragma once
 
 #include "core/command_stream/preemption.h"
+#include "core/execution_environment/execution_environment.h"
 #include "core/execution_environment/root_device_environment.h"
 #include "core/helpers/hw_info.h"
 #include "core/unit_tests/helpers/default_hw_info.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/platform/platform.h"
 #include "unit_tests/mocks/mock_allocation_properties.h"
 
diff --git a/unit_tests/mocks/mock_csr.h b/unit_tests/mocks/mock_csr.h
index 77e9e606ff..6baab4ac06 100644
--- a/unit_tests/mocks/mock_csr.h
+++ b/unit_tests/mocks/mock_csr.h
@@ -6,6 +6,7 @@
  */
 
 #pragma once
+#include "core/execution_environment/execution_environment.h"
 #include "core/helpers/flush_stamp.h"
 #include "core/helpers/hw_info.h"
 #include "core/helpers/string.h"
@@ -13,7 +14,6 @@
 #include "core/os_interface/os_context.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/command_stream/command_stream_receiver_hw.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/flat_batch_buffer_helper_hw.h"
 #include "unit_tests/libult/ult_command_stream_receiver.h"
 
diff --git a/unit_tests/mocks/mock_execution_environment.h b/unit_tests/mocks/mock_execution_environment.h
index a8dd1d14f0..b016af5be0 100644
--- a/unit_tests/mocks/mock_execution_environment.h
+++ b/unit_tests/mocks/mock_execution_environment.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/helpers/hw_helper.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "unit_tests/fixtures/mock_aub_center_fixture.h"
 
 namespace NEO {
diff --git a/unit_tests/mocks/mock_memory_manager.h b/unit_tests/mocks/mock_memory_manager.h
index c79aaa02d3..93e3e422fc 100644
--- a/unit_tests/mocks/mock_memory_manager.h
+++ b/unit_tests/mocks/mock_memory_manager.h
@@ -6,8 +6,8 @@
  */
 
 #pragma once
+#include "core/execution_environment/execution_environment.h"
 #include "core/unit_tests/helpers/default_hw_info.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "unit_tests/mocks/mock_execution_environment.h"
 #include "unit_tests/mocks/mock_host_ptr_manager.h"
diff --git a/unit_tests/mocks/mock_tbx_csr.h b/unit_tests/mocks/mock_tbx_csr.h
index 345eb871a5..80a9a2bbe9 100644
--- a/unit_tests/mocks/mock_tbx_csr.h
+++ b/unit_tests/mocks/mock_tbx_csr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2019 Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,10 +8,10 @@
 #pragma once
 
 #include "core/command_stream/preemption.h"
+#include "core/execution_environment/execution_environment.h"
 #include "core/helpers/hw_info.h"
 #include "runtime/aub/aub_center.h"
 #include "runtime/command_stream/tbx_command_stream_receiver_hw.h"
-#include "runtime/execution_environment/execution_environment.h"
 
 #include "gmock/gmock.h"
 
diff --git a/unit_tests/mt_tests/os_interface/linux/drm_memory_manager_mt_tests.cpp b/unit_tests/mt_tests/os_interface/linux/drm_memory_manager_mt_tests.cpp
index c28ed68197..2e2bd54c38 100644
--- a/unit_tests/mt_tests/os_interface/linux/drm_memory_manager_mt_tests.cpp
+++ b/unit_tests/mt_tests/os_interface/linux/drm_memory_manager_mt_tests.cpp
@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/os_interface/linux/os_interface.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/os_interface/linux/drm_memory_manager.h"
 #include "unit_tests/mocks/linux/mock_drm_memory_manager.h"
 #include "unit_tests/mocks/mock_execution_environment.h"
diff --git a/unit_tests/os_interface/device_factory_tests.cpp b/unit_tests/os_interface/device_factory_tests.cpp
index 6121e0722b..2f26fa0ef0 100644
--- a/unit_tests/os_interface/device_factory_tests.cpp
+++ b/unit_tests/os_interface/device_factory_tests.cpp
@@ -5,13 +5,13 @@
  *
  */
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/helpers/hw_info.h"
 #include "core/memory_manager/memory_constants.h"
 #include "core/os_interface/device_factory.h"
 #include "core/os_interface/os_interface.h"
 #include "core/os_interface/os_library.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/platform/platform.h"
 #include "unit_tests/mocks/mock_execution_environment.h"
 
diff --git a/unit_tests/os_interface/linux/create_drm_memory_manager.cpp b/unit_tests/os_interface/linux/create_drm_memory_manager.cpp
index 866e685012..c0fcdb5736 100644
--- a/unit_tests/os_interface/linux/create_drm_memory_manager.cpp
+++ b/unit_tests/os_interface/linux/create_drm_memory_manager.cpp
@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/os_interface/linux/os_interface.h"
 #include "core/os_interface/os_interface.h"
 #include "core/unit_tests/helpers/ult_hw_config.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/os_interface/linux/drm_memory_manager.h"
 
diff --git a/unit_tests/os_interface/linux/device_factory_tests.h b/unit_tests/os_interface/linux/device_factory_tests.h
index 3456f86e86..b628f6b000 100644
--- a/unit_tests/os_interface/linux/device_factory_tests.h
+++ b/unit_tests/os_interface/linux/device_factory_tests.h
@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/os_interface/device_factory.h"
 #include "runtime/device/device.h"
 #include "test.h"
diff --git a/unit_tests/os_interface/linux/drm_gem_close_worker_tests.cpp b/unit_tests/os_interface/linux/drm_gem_close_worker_tests.cpp
index c1f140ac5a..ea3b188c9a 100644
--- a/unit_tests/os_interface/linux/drm_gem_close_worker_tests.cpp
+++ b/unit_tests/os_interface/linux/drm_gem_close_worker_tests.cpp
@@ -5,12 +5,12 @@
  *
  */
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/os_interface/linux/drm_buffer_object.h"
 #include "core/os_interface/linux/drm_memory_operations_handler.h"
 #include "core/os_interface/linux/os_interface.h"
 #include "runtime/command_stream/device_command_stream.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/os_interface/linux/drm_command_stream.h"
 #include "runtime/os_interface/linux/drm_gem_close_worker.h"
diff --git a/unit_tests/os_interface/linux/drm_memory_manager_allocate_in_device_pool_tests.cpp b/unit_tests/os_interface/linux/drm_memory_manager_allocate_in_device_pool_tests.cpp
index 5cb319c06a..cc3dabb48d 100644
--- a/unit_tests/os_interface/linux/drm_memory_manager_allocate_in_device_pool_tests.cpp
+++ b/unit_tests/os_interface/linux/drm_memory_manager_allocate_in_device_pool_tests.cpp
@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/os_interface/linux/os_interface.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/os_interface/linux/drm_memory_manager.h"
 #include "test.h"
 #include "unit_tests/mocks/linux/mock_drm_memory_manager.h"
diff --git a/unit_tests/os_interface/linux/drm_mock.h b/unit_tests/os_interface/linux/drm_mock.h
index 304661e819..3c8f42a56d 100644
--- a/unit_tests/os_interface/linux/drm_mock.h
+++ b/unit_tests/os_interface/linux/drm_mock.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/memory_manager/memory_constants.h"
 #include "core/os_interface/linux/drm_neo.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/platform/platform.h"
 
 #include "drm/i915_drm.h"
diff --git a/unit_tests/os_interface/windows/create_wddm_memory_manager.cpp b/unit_tests/os_interface/windows/create_wddm_memory_manager.cpp
index 242fc7753c..deb4e3a0c9 100644
--- a/unit_tests/os_interface/windows/create_wddm_memory_manager.cpp
+++ b/unit_tests/os_interface/windows/create_wddm_memory_manager.cpp
@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/os_interface/os_interface.h"
 #include "core/os_interface/windows/os_interface.h"
 #include "core/unit_tests/helpers/ult_hw_config.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/os_interface/windows/wddm_memory_manager.h"
 
diff --git a/unit_tests/os_interface/windows/driver_info_tests.cpp b/unit_tests/os_interface/windows/driver_info_tests.cpp
index 09ab24c619..67bb77d8d1 100644
--- a/unit_tests/os_interface/windows/driver_info_tests.cpp
+++ b/unit_tests/os_interface/windows/driver_info_tests.cpp
@@ -6,11 +6,11 @@
  */
 
 #include "core/command_stream/preemption.h"
+#include "core/execution_environment/execution_environment.h"
 #include "core/execution_environment/root_device_environment.h"
 #include "core/os_interface/windows/debug_registry_reader.h"
 #include "core/os_interface/windows/os_interface.h"
 #include "core/unit_tests/helpers/ult_hw_config.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/os_interface/windows/driver_info.h"
 #include "unit_tests/helpers/variable_backup.h"
diff --git a/unit_tests/os_interface/windows/wddm20_tests.cpp b/unit_tests/os_interface/windows/wddm20_tests.cpp
index 5d4c3ff949..56f6f08ae8 100644
--- a/unit_tests/os_interface/windows/wddm20_tests.cpp
+++ b/unit_tests/os_interface/windows/wddm20_tests.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/execution_environment/root_device_environment.h"
 #include "core/gmm_helper/gmm.h"
 #include "core/gmm_helper/gmm_helper.h"
@@ -17,7 +18,6 @@
 #include "core/os_interface/windows/wddm_allocation.h"
 #include "core/os_interface/windows/wddm_engine_mapper.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/os_interface/windows/wddm_memory_manager.h"
 #include "unit_tests/helpers/variable_backup.h"
diff --git a/unit_tests/os_interface/windows/wddm23_tests.cpp b/unit_tests/os_interface/windows/wddm23_tests.cpp
index bb1b7e1504..61a9158302 100644
--- a/unit_tests/os_interface/windows/wddm23_tests.cpp
+++ b/unit_tests/os_interface/windows/wddm23_tests.cpp
@@ -6,13 +6,13 @@
  */
 
 #include "core/command_stream/preemption.h"
+#include "core/execution_environment/execution_environment.h"
 #include "core/helpers/hw_helper.h"
 #include "core/memory_manager/memory_constants.h"
 #include "core/os_interface/windows/gdi_interface.h"
 #include "core/os_interface/windows/os_context_win.h"
 #include "core/os_interface/windows/os_interface.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/platform/platform.h"
 #include "test.h"
 #include "unit_tests/mocks/mock_wddm.h"
diff --git a/unit_tests/os_interface/windows/wddm_fixture.h b/unit_tests/os_interface/windows/wddm_fixture.h
index 7b268d1d0b..97fbeed847 100644
--- a/unit_tests/os_interface/windows/wddm_fixture.h
+++ b/unit_tests/os_interface/windows/wddm_fixture.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include "core/command_stream/preemption.h"
+#include "core/execution_environment/execution_environment.h"
 #include "core/execution_environment/root_device_environment.h"
 #include "core/helpers/hw_helper.h"
 #include "core/os_interface/windows/gdi_interface.h"
@@ -16,7 +17,6 @@
 #include "core/os_interface/windows/wddm_memory_operations_handler.h"
 #include "core/unit_tests/helpers/default_hw_info.h"
 #include "core/unit_tests/os_interface/windows/mock_gdi_interface.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/platform/platform.h"
 #include "test.h"
 #include "unit_tests/mocks/mock_wddm.h"
diff --git a/unit_tests/os_interface/windows/wddm_residency_controller_tests.cpp b/unit_tests/os_interface/windows/wddm_residency_controller_tests.cpp
index c007bd1400..29c7b08093 100644
--- a/unit_tests/os_interface/windows/wddm_residency_controller_tests.cpp
+++ b/unit_tests/os_interface/windows/wddm_residency_controller_tests.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "core/command_stream/preemption.h"
+#include "core/execution_environment/execution_environment.h"
 #include "core/execution_environment/root_device_environment.h"
 #include "core/helpers/hw_helper.h"
 #include "core/memory_manager/memory_operations_handler.h"
@@ -17,7 +18,6 @@
 #include "core/os_interface/windows/wddm_memory_operations_handler.h"
 #include "core/os_interface/windows/wddm_residency_controller.h"
 #include "core/unit_tests/os_interface/windows/mock_gdi_interface.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/platform/platform.h"
 #include "test.h"
 #include "unit_tests/mocks/mock_allocation_properties.h"
diff --git a/unit_tests/program/evaluate_unhandled_token_tests.cpp b/unit_tests/program/evaluate_unhandled_token_tests.cpp
index 898629d92a..c17f43f50f 100644
--- a/unit_tests/program/evaluate_unhandled_token_tests.cpp
+++ b/unit_tests/program/evaluate_unhandled_token_tests.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "core/device_binary_format/patchtokens_decoder.h"
+#include "core/execution_environment/execution_environment.h"
 #include "core/unit_tests/device_binary_format/patchtokens_tests.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/program/create.inl"
 #include "runtime/program/program.h"
 
diff --git a/unit_tests/program/kernel_info_tests.cpp b/unit_tests/program/kernel_info_tests.cpp
index 75e3efdc86..e3514bfd49 100644
--- a/unit_tests/program/kernel_info_tests.cpp
+++ b/unit_tests/program/kernel_info_tests.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/execution_environment/execution_environment.h"
+#include "core/execution_environment/execution_environment.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/program/kernel_arg_info.h"
 #include "runtime/program/kernel_info.h"
diff --git a/unit_tests/sharings/gl/windows/gl_arb_sync_event_tests.cpp b/unit_tests/sharings/gl/windows/gl_arb_sync_event_tests.cpp
index 4d9ee1df3c..ede475411d 100644
--- a/unit_tests/sharings/gl/windows/gl_arb_sync_event_tests.cpp
+++ b/unit_tests/sharings/gl/windows/gl_arb_sync_event_tests.cpp
@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/os_interface/os_interface.h"
 #include "runtime/context/context.h"
 #include "runtime/event/user_event.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/platform/platform.h"
 #include "runtime/sharings/gl/gl_arb_sync_event.h"
 #include "runtime/sharings/sharing.h"
diff --git a/unit_tests/ult_config_listener.cpp b/unit_tests/ult_config_listener.cpp
index 564099943b..3249a1eb69 100644
--- a/unit_tests/ult_config_listener.cpp
+++ b/unit_tests/ult_config_listener.cpp
@@ -7,9 +7,9 @@
 
 #include "unit_tests/ult_config_listener.h"
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/unit_tests/helpers/default_hw_info.h"
 #include "core/unit_tests/helpers/ult_hw_config.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/platform/platform.h"
 
diff --git a/unit_tests/windows/get_devices_tests.cpp b/unit_tests/windows/get_devices_tests.cpp
index f5791fbae8..a1ba5209bd 100644
--- a/unit_tests/windows/get_devices_tests.cpp
+++ b/unit_tests/windows/get_devices_tests.cpp
@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/execution_environment/execution_environment.h"
 #include "core/helpers/hw_info.h"
 #include "core/os_interface/device_factory.h"
-#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/platform/platform.h"
 #include "test.h"