Cleanup includes 14

Cleaned up files:
shared/source/device/device.h

Related-To: NEO-5548

Signed-off-by: Warchulski, Jaroslaw <jaroslaw.warchulski@intel.com>

level_zero/core/source/cmdlist/cmdlist_hw.inl

@@ -12,6 +12,7 @@
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/debugger/debugger_l0.h"
 #include "shared/source/device/device.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/blit_commands_helper.h"

level_zero/core/source/cmdqueue/cmdqueue_hw.inl

@@ -19,6 +19,7 @@
 #include "shared/source/command_stream/wait_status.h"
 #include "shared/source/debugger/debugger_l0.h"
 #include "shared/source/device/device.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/logical_state_helper.h"

level_zero/core/source/context/context_imp.cpp

@@ -8,6 +8,8 @@
 #include "level_zero/core/source/context/context_imp.h"
 
 #include "shared/source/command_container/implicit_scaling.h"
+#include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/source/helpers/basic_math.h"
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/memory_manager/memory_operations_handler.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"

level_zero/core/source/context/context_imp_drm_or_wddm.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/os_interface/os_interface.h"
 

level_zero/core/source/device/device_imp_drm/device_imp_peer.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
 #include "shared/source/os_interface/linux/sys_calls.h"
 #include "shared/source/utilities/directory.h"

level_zero/core/source/device/device_imp_drm_or_wddm/device_imp.cpp

@@ -8,6 +8,7 @@
 #include "level_zero/core/source/device/device_imp.h"
 
 #include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/source/os_interface/windows/hw_device_id.h"
 #include "shared/source/os_interface/windows/os_context_win.h"

level_zero/core/source/driver/driver_handle_imp.cpp

@@ -10,6 +10,7 @@
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/debugger/debugger_l0.h"
 #include "shared/source/device/device.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/memory_manager/memory_manager.h"

level_zero/core/source/fabric/linux/fabric_device_iaf.cpp

@@ -8,6 +8,7 @@
 #include "level_zero/core/source/fabric/linux/fabric_device_iaf.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
 #include "shared/source/os_interface/linux/pci_path.h"
 #include "shared/source/os_interface/os_interface.h"

level_zero/core/source/image/image_hw.inl

@@ -8,6 +8,7 @@
 #pragma once
 
 #include "shared/source/command_container/command_encoder.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/helpers/surface_format_info.h"

level_zero/core/source/module/module_imp.cpp

@@ -18,6 +18,8 @@
 #include "shared/source/device_binary_format/elf/elf.h"
 #include "shared/source/device_binary_format/elf/elf_encoder.h"
 #include "shared/source/device_binary_format/elf/ocl_elf.h"
+#include "shared/source/execution_environment/execution_environment.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/addressing_mode_helper.h"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/compiler_hw_info_config.h"

level_zero/tools/source/debug/debug_session_imp.cpp

@@ -8,6 +8,7 @@
 #include "level_zero/tools/source/debug/debug_session_imp.h"
 
 #include "shared/source/built_ins/sip.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/sleep.h"

level_zero/tools/source/debug/windows/debug_session.cpp

@@ -7,6 +7,7 @@
 
 #include "level_zero/tools/source/debug/windows/debug_session.h"
 
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/register_offsets.h"
 #include "shared/source/os_interface/windows/wddm_debug.h"

level_zero/tools/source/sysman/global_operations/linux/os_global_operations_imp.cpp

@@ -7,6 +7,7 @@
 
 #include "level_zero/tools/source/sysman/global_operations/linux/os_global_operations_imp.h"
 
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/os_interface/device_factory.h"
 #include "shared/source/os_interface/linux/pci_path.h"
 

level_zero/tools/source/sysman/linux/os_sysman_imp.cpp

@@ -7,6 +7,7 @@
 
 #include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/sleep.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/os_interface/device_factory.h"

level_zero/tools/source/sysman/linux/os_sysman_imp.h

@@ -6,6 +6,7 @@
  */
 
 #pragma once
+#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
 #include "shared/source/os_interface/os_interface.h"

opencl/source/cl_device/cl_device_caps.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/os_interface/driver_info.h"

opencl/source/cl_device/cl_device_info.cpp

@@ -9,6 +9,7 @@
 
 #include "shared/source/device/device.h"
 #include "shared/source/device/device_info.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/get_info.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/os_interface/os_time.h"

opencl/source/command_queue/command_queue.cpp

@@ -9,6 +9,7 @@
 
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/debugger/debugger_l0.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/array_count.h"
 #include "shared/source/helpers/bit_helpers.h"

opencl/source/event/event.cpp

@@ -10,6 +10,7 @@
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/command_stream/task_count_helper.h"
 #include "shared/source/device/device.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/get_info.h"
 #include "shared/source/helpers/mt_helpers.h"

opencl/source/kernel/kernel.cpp

@@ -10,6 +10,7 @@
 #include "shared/source/built_ins/built_ins.h"
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/basic_math.h"

opencl/source/mem_obj/buffer.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/command_container/implicit_scaling.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/local_memory_access_modes.h"
 #include "shared/source/memory_manager/host_ptr_manager.h"
 #include "shared/source/memory_manager/memory_operations_handler.h"

opencl/source/mem_obj/image.cpp

@@ -8,6 +8,7 @@
 #include "opencl/source/mem_obj/image.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/resource_info.h"
 #include "shared/source/helpers/aligned_memory.h"

opencl/source/mem_obj/mem_obj_helper.cpp

@@ -7,6 +7,7 @@
 
 #include "opencl/source/mem_obj/mem_obj_helper.h"
 
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/memory_properties_helpers.h"
 
 #include "opencl/source/cl_device/cl_device.h"

opencl/source/os_interface/windows/api_win.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/get_info.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/os_interface.h"

opencl/source/program/process_device_binary.cpp

@@ -8,6 +8,7 @@
 #include "shared/source/device/device.h"
 #include "shared/source/device_binary_format/device_binary_formats.h"
 #include "shared/source/device_binary_format/zebin_decoder.h"
+#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/ptr_math.h"

opencl/source/program/program.cpp

@@ -12,6 +12,8 @@
 #include "shared/source/device/device.h"
 #include "shared/source/device_binary_format/elf/elf_encoder.h"
 #include "shared/source/device_binary_format/elf/ocl_elf.h"
+#include "shared/source/execution_environment/execution_environment.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/compiler_hw_info_config.h"
 #include "shared/source/helpers/compiler_options_parser.h"

opencl/source/sharings/d3d/d3d_texture.cpp

@@ -7,6 +7,7 @@
 
 #include "opencl/source/sharings/d3d/d3d_texture.h"
 
+#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/resource_info.h"

opencl/source/sharings/gl/windows/cl_gl_api.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/get_info.h"
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/source/os_interface/windows/wddm/wddm.h"

opencl/source/sharings/gl/windows/gl_buffer_windows.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/helpers/get_info.h"
 #include "shared/source/memory_manager/allocation_properties.h"

opencl/source/sharings/va/va_device_shared.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/device/device.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
 #include "shared/source/os_interface/linux/pci_path.h"
 #include "shared/source/os_interface/os_interface.h"

opencl/source/xe_hpg_core/cl_hw_helper_xe_hpg_core.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/populate_factory.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"

opencl/test/unit_test/fixtures/kernel_data_fixture.cpp

@@ -8,6 +8,7 @@
 #include "opencl/test/unit_test/fixtures/kernel_data_fixture.h"
 
 #include "shared/source/device_binary_format/patchtokens_decoder.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/memory_manager/graphics_allocation.h"

opencl/test/unit_test/mocks/mock_debug_program.cpp

@@ -8,6 +8,8 @@
 #include "opencl/test/unit_test/mocks/mock_debug_program.h"
 
 #include "shared/source/device/device.h"
+#include "shared/source/execution_environment/execution_environment.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/ptr_math.h"
 #include "shared/source/program/kernel_info.h"
 #include "shared/test/common/mocks/mock_compiler_interface.h"

opencl/test/unit_test/test_macros/test_checks_ocl.cpp

@@ -8,6 +8,7 @@
 #include "opencl/test/unit_test/test_macros/test_checks_ocl.h"
 
 #include "shared/source/device/device_info.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 

shared/source/built_ins/built_ins_storage.cpp

@@ -8,6 +8,7 @@
 #include "shared/source/built_ins/built_ins.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/hw_helper.h"
 

shared/source/built_ins/sip.cpp

@@ -12,6 +12,7 @@
 #include "shared/source/debugger/debugger.h"
 #include "shared/source/device/device.h"
 #include "shared/source/execution_environment/execution_environment.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/hw_helper.h"

shared/source/command_container/command_encoder.inl

@@ -11,6 +11,7 @@
 #include "shared/source/debugger/debugger_l0.h"
 #include "shared/source/device/device.h"
 #include "shared/source/execution_environment/execution_environment.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/api_specific_config.h"

shared/source/command_container/command_encoder_xehp_and_later.inl

@@ -14,6 +14,7 @@
 #include "shared/source/command_stream/stream_properties.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/execution_environment/execution_environment.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/basic_math.h"

shared/source/command_stream/preemption.cpp

@@ -9,6 +9,7 @@
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/kernel/kernel_descriptor.h"
 

shared/source/command_stream/scratch_space_controller_base.cpp

@@ -8,6 +8,7 @@
 #include "shared/source/command_stream/scratch_space_controller_base.h"
 
 #include "shared/source/execution_environment/execution_environment.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/constants.h"
 #include "shared/source/helpers/hw_helper.h"

shared/source/debugger/debugger_l0.cpp

@@ -10,6 +10,7 @@
 #include "shared/source/command_container/cmdcontainer.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/constants.h"
 #include "shared/source/helpers/hw_helper.h"

shared/source/debugger/linux/debugger_l0_linux.cpp

@@ -7,6 +7,8 @@
 
 #include "shared/source/debugger/debugger_l0.h"
 #include "shared/source/device/sub_device.h"
+#include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/kernel/debug_data.h"
 #include "shared/source/os_interface/linux/drm_allocation.h"

shared/source/debugger/windows/debugger_l0_windows.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/debugger/debugger_l0.h"
 #include "shared/source/device/device.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/kernel/debug_data.h"
 #include "shared/source/os_interface/windows/wddm/wddm.h"

shared/source/device/device.cpp

@@ -435,6 +435,10 @@ bool Device::isDebuggerActive() const {
     return deviceInfo.debuggerActive;
 }
 
+Debugger *Device::getDebugger() const {
+    return getRootDeviceEnvironment().debugger.get();
+}
+
 bool Device::areSharedSystemAllocationsAllowed() const {
     auto sharedSystemAllocationsSupport = static_cast<bool>(getHardwareInfo().capabilityTable.sharedSystemMemCapabilities);
     if (DebugManager.flags.EnableSharedSystemUsmSupport.get() != -1) {
@@ -578,6 +582,18 @@ const std::vector<EngineControl> &Device::getAllEngines() const {
     return this->allEngines;
 }
 
+const RootDeviceEnvironment &Device::getRootDeviceEnvironment() const {
+    return *executionEnvironment->rootDeviceEnvironments[getRootDeviceIndex()];
+}
+
+RootDeviceEnvironment &Device::getRootDeviceEnvironmentRef() const {
+    return *executionEnvironment->rootDeviceEnvironments[getRootDeviceIndex()];
+}
+
+bool Device::isFullRangeSvm() const {
+    return getRootDeviceEnvironment().isFullRangeSvm();
+}
+
 EngineControl &Device::getInternalEngine() {
     if (this->allEngines[0].commandStreamReceiver->getType() != CommandStreamReceiverType::CSR_HW) {
         return this->getDefaultEngine();
@@ -842,4 +858,19 @@ void Device::allocateRTDispatchGlobals(uint32_t maxBvhLevels) {
     rtDispatchGlobalsInfos[maxBvhLevels] = dispatchGlobalsInfo.release();
 }
 
+MemoryManager *Device::getMemoryManager() const {
+    return executionEnvironment->memoryManager.get();
+}
+
+GmmHelper *Device::getGmmHelper() const {
+    return getRootDeviceEnvironment().getGmmHelper();
+}
+
+CompilerInterface *Device::getCompilerInterface() const {
+    return executionEnvironment->rootDeviceEnvironments[getRootDeviceIndex()]->getCompilerInterface();
+}
+
+BuiltIns *Device::getBuiltIns() const {
+    return executionEnvironment->rootDeviceEnvironments[getRootDeviceIndex()]->getBuiltIns();
+}
 } // namespace NEO

shared/source/device/device.h

@@ -7,8 +7,6 @@
 
 #pragma once
 #include "shared/source/device/device_info.h"
-#include "shared/source/execution_environment/execution_environment.h"
-#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/engine_control.h"
 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/helpers/non_copyable_or_moveable.h"
@@ -16,6 +14,13 @@
 #include "shared/source/os_interface/performance_counters.h"
 
 namespace NEO {
+class BindlessHeapsHelper;
+class BuiltIns;
+class CompilerInterface;
+class ExecutionEnvironment;
+class Debugger;
+class GmmClientContext;
+class GmmHelper;
 class SyncBufferHandler;
 enum class EngineGroupType : uint32_t;
 class DebuggerL0;
@@ -89,18 +94,16 @@ class Device : public ReferenceTrackedObject<Device> {
     PerformanceCounters *getPerformanceCounters() { return performanceCounters.get(); }
     PreemptionMode getPreemptionMode() const { return preemptionMode; }
     MOCKABLE_VIRTUAL bool isDebuggerActive() const;
-    Debugger *getDebugger() const { return getRootDeviceEnvironment().debugger.get(); }
+    Debugger *getDebugger() const;
     NEO::SourceLevelDebugger *getSourceLevelDebugger();
     DebuggerL0 *getL0Debugger();
     const EnginesT &getAllEngines() const;
     const std::string getDeviceName(const HardwareInfo &hwInfo) const;
 
     ExecutionEnvironment *getExecutionEnvironment() const { return executionEnvironment; }
-    const RootDeviceEnvironment &getRootDeviceEnvironment() const { return *executionEnvironment->rootDeviceEnvironments[getRootDeviceIndex()]; }
-    RootDeviceEnvironment &getRootDeviceEnvironmentRef() const { return *executionEnvironment->rootDeviceEnvironments[getRootDeviceIndex()]; }
-    bool isFullRangeSvm() const {
-        return getRootDeviceEnvironment().isFullRangeSvm();
-    }
+    const RootDeviceEnvironment &getRootDeviceEnvironment() const;
+    RootDeviceEnvironment &getRootDeviceEnvironmentRef() const;
+    bool isFullRangeSvm() const;
     static bool isBlitSplitEnabled();
     bool isBcsSplitSupported();
     bool areSharedSystemAllocationsAllowed() const;
@@ -227,21 +230,6 @@ inline EngineControl &Device::getDefaultEngine() {
     return allEngines[defaultEngineIndex];
 }
 
-inline MemoryManager *Device::getMemoryManager() const {
-    return executionEnvironment->memoryManager.get();
-}
-
-inline GmmHelper *Device::getGmmHelper() const {
-    return getRootDeviceEnvironment().getGmmHelper();
-}
-
-inline CompilerInterface *Device::getCompilerInterface() const {
-    return executionEnvironment->rootDeviceEnvironments[getRootDeviceIndex()]->getCompilerInterface();
-}
-inline BuiltIns *Device::getBuiltIns() const {
-    return executionEnvironment->rootDeviceEnvironments[getRootDeviceIndex()]->getBuiltIns();
-}
-
 inline SelectorCopyEngine &Device::getSelectorCopyEngine() {
     return selectorCopyEngine;
 }

shared/source/device/device_caps.cpp

@@ -10,6 +10,7 @@
 #include "shared/source/compiler_interface/compiler_interface.h"
 #include "shared/source/debugger/debugger.h"
 #include "shared/source/device/device.h"
+#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/api_specific_config.h"

shared/source/device/root_device.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/sub_device.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/memory_manager/memory_manager.h"

shared/source/device/windows/device_windows.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/device/device.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/os_interface/windows/wddm/wddm.h"
 
 namespace NEO {

shared/source/direct_submission/direct_submission_hw.inl

@@ -13,6 +13,7 @@
 #include "shared/source/direct_submission/direct_submission_hw.h"
 #include "shared/source/direct_submission/direct_submission_hw_diagnostic_mode.h"
 #include "shared/source/direct_submission/relaxed_ordering_helper.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/flush_stamp.h"
 #include "shared/source/helpers/logical_state_helper.h"
 #include "shared/source/helpers/ptr_math.h"

shared/source/dll/linux/debugger_l0_dll_linux.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/debugger/debugger_l0.h"
 #include "shared/source/device/device.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
 #include "shared/source/os_interface/os_interface.h"
 

shared/source/dll/windows/debugger_l0_windows.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/debugger/debugger_l0.h"
 #include "shared/source/device/device.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 
 namespace NEO {
 std::unique_ptr<NEO::Debugger> DebuggerL0::create(NEO::Device *device) {

shared/source/gen12lp/preamble_gen12lp.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/command_stream/csr_definitions.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gen12lp/hw_cmds_base.h"
 #include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/pipeline_select_helper.h"

shared/source/helpers/engine_node_helper.cpp

@@ -9,6 +9,7 @@
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/hw_helper.h"
 
 namespace NEO::EngineHelpers {

shared/source/helpers/kernel_helpers.cpp

@@ -9,6 +9,7 @@
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/hw_helper.h"

shared/source/memory_manager/memory_manager.cpp

@@ -9,6 +9,7 @@
 
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"

shared/source/memory_manager/unified_memory_manager.cpp

@@ -8,6 +8,8 @@
 #include "shared/source/memory_manager/unified_memory_manager.h"
 
 #include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/execution_environment/execution_environment.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/memory_properties_helpers.h"

shared/source/os_interface/device_factory.cpp

@@ -10,6 +10,7 @@
 #include "shared/source/aub/aub_center.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/root_device.h"
+#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/compiler_hw_info_config.h"
 #include "shared/source/helpers/hw_helper.h"

shared/source/os_interface/linux/drm_memory_operations_handler_bind.cpp

@@ -10,6 +10,8 @@
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
+#include "shared/source/execution_environment/execution_environment.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/os_interface/linux/drm_allocation.h"
 #include "shared/source/os_interface/linux/drm_buffer_object.h"

shared/source/os_interface/windows/wddm_memory_manager.cpp

@@ -9,6 +9,7 @@
 
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
 #include "shared/source/debugger/debugger_l0.h"
+#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/cache_settings_helper.h"
 #include "shared/source/gmm_helper/client_context/gmm_client_context.h"

shared/source/page_fault_manager/cpu_page_fault_manager.cpp

@@ -9,6 +9,7 @@
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/memory_properties_helpers.h"
+#include "shared/source/helpers/options.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"
 #include "shared/source/utilities/spinlock.h"
 

shared/source/page_fault_manager/linux/cpu_page_fault_manager_linux.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,6 +9,7 @@
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/memory_manager/memory_operations_handler.h"
 

shared/source/xe_hpc_core/linux/hw_info_config_pvc.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/device/sub_device.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/constants.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/kernel/kernel_properties.h"

shared/source/xe_hpc_core/preemption_xe_hpc_core.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/command_stream/preemption.inl"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
 namespace NEO {

shared/source/xe_hpg_core/linux/hw_info_config_dg2.cpp

@@ -8,6 +8,7 @@
 #include "shared/source/command_stream/stream_properties.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/driver_model_type.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/string.h"

shared/source/xe_hpg_core/preamble_xe_hpg_core.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
 namespace NEO {

shared/source/xe_hpg_core/preemption_xe_hpg_core.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/command_stream/preemption.inl"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
 namespace NEO {

shared/test/common/mocks/debugger_l0_create.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/device/device.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/test/common/mocks/mock_l0_debugger.h"
 
 NEO::DebugerL0CreateFn mockDebuggerL0HwFactory[IGFX_MAX_CORE];

shared/test/common/mocks/mock_device.h

@@ -10,6 +10,8 @@
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/device/root_device.h"
 #include "shared/source/device/sub_device.h"
+#include "shared/source/execution_environment/execution_environment.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/helpers/variable_backup.h"
 

shared/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp

@@ -9,6 +9,7 @@
 #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.h"
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/execution_environment/execution_environment.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/windows/gmm_callbacks.h"
 #include "shared/source/os_interface/windows/wddm_device_command_stream.h"