clang-format: enable sorting includes

Include files are now grouped and sorted in following order: 1. Header file of the class the current file implements 2. Project files 3. Third party files 4. Standard library Change-Id: If31af05652184169f7fee1d7ad08f1b2ed602cf0 Signed-off-by: Filip Hazubski <filip.hazubski@intel.com>
2026-01-08 22:12:59 +08:00 · 2019-02-27 11:39:32 +01:00
parent 3eb10d0cc2
commit 8b57d28116
1208 changed files with 3921 additions and 4072 deletions
--- a/runtime/os_interface/32bit_memory.h
+++ b/runtime/os_interface/32bit_memory.h
@@ -7,8 +7,9 @@

 #pragma once
 #include "runtime/utilities/heap_allocator.h"
-#include <stdint.h>
+
 #include <memory>
+#include <stdint.h>

 namespace OCLRT {
 const uintptr_t max32BitAddress = 0xffffffff;
--- a/runtime/os_interface/debug_settings_manager.cpp
+++ b/runtime/os_interface/debug_settings_manager.cpp
@@ -6,15 +6,16 @@
 */

 #include "debug_settings_manager.h"
+
 #include "runtime/event/event.h"
-#include "runtime/kernel/kernel.h"
-#include "runtime/mem_obj/mem_obj.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/helpers/dispatch_info.h"
+#include "runtime/helpers/ptr_math.h"
 #include "runtime/helpers/string.h"
 #include "runtime/helpers/timestamp_packet.h"
-#include "runtime/utilities/debug_settings_reader_creator.h"
+#include "runtime/kernel/kernel.h"
+#include "runtime/mem_obj/mem_obj.h"
 #include "runtime/os_interface/definitions/translate_debug_settings.h"
+#include "runtime/utilities/debug_settings_reader_creator.h"

 #include "CL/cl.h"

--- a/runtime/os_interface/debug_settings_manager.h
+++ b/runtime/os_interface/debug_settings_manager.h
@@ -6,12 +6,12 @@
 */

 #pragma once
+#include <condition_variable>
+#include <fstream>
+#include <mutex>
 #include <sstream>
 #include <stdint.h>
 #include <string>
-#include <fstream>
-#include <condition_variable>
-#include <mutex>
 #include <thread>

 enum class DebugFunctionalityLevel {
--- a/runtime/os_interface/hw_info_config.h
+++ b/runtime/os_interface/hw_info_config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -7,10 +7,10 @@

 #pragma once

-#include "igfxfmid.h"
-
 #include "runtime/helpers/hw_info.h"

+#include "igfxfmid.h"
+
 namespace OCLRT {

 struct HardwareInfo;
--- a/runtime/os_interface/linux/api_linux.cpp
+++ b/runtime/os_interface/linux/api_linux.cpp
@@ -1,16 +1,16 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "runtime/api/dispatch.h"
 #include "runtime/api/api.h"
-#include "runtime/helpers/get_info.h"
+#include "runtime/api/dispatch.h"
 #include "runtime/context/context.h"
-#include "runtime/mem_obj/mem_obj.h"
+#include "runtime/helpers/get_info.h"
 #include "runtime/mem_obj/image.h"
+#include "runtime/mem_obj/mem_obj.h"

 void OCLRT::MemObj::getOsSpecificMemObjectInfo(const cl_mem_info &paramName, size_t *srcParamSize, void **srcParam) {
    switch (paramName) {
--- a/runtime/os_interface/linux/device_command_stream.inl
+++ b/runtime/os_interface/linux/device_command_stream.inl
@@ -5,11 +5,12 @@
 *
 */

-#include "runtime/command_stream/device_command_stream.h"
 #include "runtime/command_stream/command_stream_receiver_with_aub_dump.h"
+#include "runtime/command_stream/device_command_stream.h"
 #include "runtime/os_interface/linux/drm_command_stream.h"
-#include "hw_cmds.h"
+
 #include "drm_command_stream.h"
+#include "hw_cmds.h"

 namespace OCLRT {

--- a/runtime/os_interface/linux/device_factory_linux.cpp
+++ b/runtime/os_interface/linux/device_factory_linux.cpp
@@ -1,22 +1,23 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

+#include "runtime/device/device.h"
+#include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
 #include "runtime/os_interface/device_factory.h"
-#include "runtime/os_interface/linux/drm_neo.h"
 #include "runtime/os_interface/hw_info_config.h"
+#include "runtime/os_interface/linux/drm_neo.h"
 #include "runtime/os_interface/linux/os_interface.h"
-#include "drm/i915_drm.h"
-#include "runtime/gmm_helper/gmm_helper.h"
-#include "runtime/device/device.h"

-#include <vector>
+#include "drm/i915_drm.h"
+
 #include <cstring>
+#include <vector>

 namespace OCLRT {

--- a/runtime/os_interface/linux/drm_32bit_memory.cpp
+++ b/runtime/os_interface/linux/drm_32bit_memory.cpp
@@ -5,14 +5,14 @@
 *
 */

-#include <memory>
-#include "runtime/os_interface/32bit_memory.h"
-#include "runtime/os_interface/linux/allocator_helper.h"
 #include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/basic_math.h"
 #include "runtime/helpers/ptr_math.h"
+#include "runtime/os_interface/32bit_memory.h"
 #include "runtime/os_interface/debug_settings_manager.h"
+#include "runtime/os_interface/linux/allocator_helper.h"

+#include <memory>
 #include <sys/mman.h>
 using namespace OCLRT;
 constexpr uintptr_t maxMmap32BitAddress = 0x80000000;
--- a/runtime/os_interface/linux/drm_allocation.cpp
+++ b/runtime/os_interface/linux/drm_allocation.cpp
@@ -6,6 +6,7 @@
 */

 #include "runtime/os_interface/linux/drm_allocation.h"
+
 #include "runtime/os_interface/linux/drm_buffer_object.h"

 #include <sstream>
--- a/runtime/os_interface/linux/drm_buffer_object.cpp
+++ b/runtime/os_interface/linux/drm_buffer_object.cpp
@@ -5,27 +5,27 @@
 *
 */

+#include "runtime/os_interface/linux/drm_buffer_object.h"
+
 #include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/debug_helpers.h"
-#include "runtime/os_interface/linux/drm_buffer_object.h"
 #include "runtime/os_interface/linux/drm_memory_manager.h"
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "runtime/os_interface/linux/os_time_linux.h"
 #include "runtime/utilities/stackvec.h"

-#include <sys/syscall.h>
-#include <sys/mman.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdarg.h>
-
 #include "drm/i915_drm.h"

+#include <errno.h>
+#include <fcntl.h>
 #include <map>
+#include <stdarg.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/syscall.h>
+#include <sys/types.h>
+#include <unistd.h>

 namespace OCLRT {

--- a/runtime/os_interface/linux/drm_buffer_object.h
+++ b/runtime/os_interface/linux/drm_buffer_object.h
@@ -6,13 +6,12 @@
 */

 #pragma once
-#include <sys/ioctl.h>
-#include <errno.h>
-#include <stdint.h>
-#include <cstdlib>
-
 #include <atomic>
+#include <cstdlib>
+#include <errno.h>
 #include <set>
+#include <stdint.h>
+#include <sys/ioctl.h>
 #include <vector>

 struct drm_i915_gem_exec_object2;
--- a/runtime/os_interface/linux/drm_command_stream.h
+++ b/runtime/os_interface/linux/drm_command_stream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -8,6 +8,7 @@
 #pragma once
 #include "runtime/command_stream/device_command_stream.h"
 #include "runtime/os_interface/linux/drm_gem_close_worker.h"
+
 #include "drm/i915_drm.h"

 #include <vector>
--- a/runtime/os_interface/linux/drm_command_stream.inl
+++ b/runtime/os_interface/linux/drm_command_stream.inl
@@ -6,7 +6,6 @@
 */

 #include "runtime/command_stream/linear_stream.h"
-#include "hw_cmds.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/helpers/aligned_memory.h"
@@ -20,6 +19,9 @@
 #include "runtime/os_interface/linux/os_context_linux.h"
 #include "runtime/os_interface/linux/os_interface.h"
 #include "runtime/platform/platform.h"
+
+#include "hw_cmds.h"
+
 #include <cstdlib>
 #include <cstring>

--- a/runtime/os_interface/linux/drm_engine_mapper.cpp
+++ b/runtime/os_interface/linux/drm_engine_mapper.cpp
@@ -1,13 +1,14 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "hw_cmds.h"
 #include "runtime/os_interface/linux/drm_engine_mapper.h"
+
 #include "drm/i915_drm.h"
+#include "hw_cmds.h"

 namespace OCLRT {

--- a/runtime/os_interface/linux/drm_gem_close_worker.cpp
+++ b/runtime/os_interface/linux/drm_gem_close_worker.cpp
@@ -1,20 +1,22 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

+#include "runtime/os_interface/linux/drm_gem_close_worker.h"
+
+#include "runtime/helpers/aligned_memory.h"
+#include "runtime/os_interface/linux/drm_buffer_object.h"
+#include "runtime/os_interface/linux/drm_command_stream.h"
+#include "runtime/os_interface/linux/drm_memory_manager.h"
+#include "runtime/os_interface/os_thread.h"
+
 #include <atomic>
 #include <iostream>
 #include <queue>
 #include <stdio.h>
-#include "runtime/helpers/aligned_memory.h"
-#include "runtime/os_interface/linux/drm_buffer_object.h"
-#include "runtime/os_interface/linux/drm_command_stream.h"
-#include "runtime/os_interface/linux/drm_gem_close_worker.h"
-#include "runtime/os_interface/linux/drm_memory_manager.h"
-#include "runtime/os_interface/os_thread.h"

 namespace OCLRT {

--- a/runtime/os_interface/linux/drm_gem_close_worker.h
+++ b/runtime/os_interface/linux/drm_gem_close_worker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -8,11 +8,11 @@
 #pragma once
 #include <atomic>
 #include <condition_variable>
-#include <mutex>
-#include <map>
-#include <set>
-#include <queue>
 #include <cstdint>
+#include <map>
+#include <mutex>
+#include <queue>
+#include <set>

 namespace OCLRT {
 class DrmMemoryManager;
--- a/runtime/os_interface/linux/drm_limited_range.cpp
+++ b/runtime/os_interface/linux/drm_limited_range.cpp
@@ -1,13 +1,14 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "runtime/os_interface/linux/allocator_helper.h"
 #include "runtime/os_interface/linux/drm_limited_range.h"
+
 #include "runtime/os_interface/debug_settings_manager.h"
+#include "runtime/os_interface/linux/allocator_helper.h"

 using namespace OCLRT;

--- a/runtime/os_interface/linux/drm_limited_range.h
+++ b/runtime/os_interface/linux/drm_limited_range.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -10,8 +10,9 @@
 #include "runtime/helpers/basic_math.h"
 #include "runtime/helpers/ptr_math.h"
 #include "runtime/utilities/heap_allocator.h"
-#include <stdint.h>
+
 #include <memory>
+#include <stdint.h>
 #include <sys/mman.h>

 namespace OCLRT {
--- a/runtime/os_interface/linux/drm_memory_manager.cpp
+++ b/runtime/os_interface/linux/drm_memory_manager.cpp
@@ -5,26 +5,26 @@
 *
 */

+#include "runtime/os_interface/linux/drm_memory_manager.h"
+
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/device/device.h"
-#include "runtime/helpers/ptr_math.h"
+#include "runtime/gmm_helper/gmm.h"
+#include "runtime/gmm_helper/gmm_helper.h"
+#include "runtime/gmm_helper/resource_info.h"
 #include "runtime/helpers/options.h"
+#include "runtime/helpers/ptr_math.h"
+#include "runtime/helpers/surface_formats.h"
 #include "runtime/memory_manager/host_ptr_manager.h"
 #include "runtime/os_interface/32bit_memory.h"
 #include "runtime/os_interface/linux/drm_allocation.h"
 #include "runtime/os_interface/linux/drm_buffer_object.h"
-#include "runtime/os_interface/linux/drm_memory_manager.h"
 #include "runtime/os_interface/linux/os_context_linux.h"
-#include "runtime/helpers/surface_formats.h"
-#include <cstring>
-#include <iostream>

 #include "drm/i915_drm.h"
-#include "drm/drm.h"

-#include "runtime/gmm_helper/gmm.h"
-#include "runtime/gmm_helper/gmm_helper.h"
-#include "runtime/gmm_helper/resource_info.h"
+#include <cstring>
+#include <iostream>

 namespace OCLRT {

--- a/runtime/os_interface/linux/drm_memory_manager.h
+++ b/runtime/os_interface/linux/drm_memory_manager.h
@@ -6,12 +6,14 @@
 */

 #pragma once
-#include "drm_gem_close_worker.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/os_interface/linux/drm_allocation.h"
 #include "runtime/os_interface/linux/drm_buffer_object.h"
-#include "runtime/os_interface/linux/drm_neo.h"
 #include "runtime/os_interface/linux/drm_limited_range.h"
+#include "runtime/os_interface/linux/drm_neo.h"
+
+#include "drm_gem_close_worker.h"
+
 #include <map>
 #include <sys/mman.h>

--- a/runtime/os_interface/linux/drm_neo.cpp
+++ b/runtime/os_interface/linux/drm_neo.cpp
@@ -1,13 +1,15 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

 #include "drm_neo.h"
+
 #include "runtime/os_interface/os_inc_base.h"
 #include "runtime/utilities/directory.h"
+
 #include "drm/i915_drm.h"

 #include <cstdio>
--- a/runtime/os_interface/linux/drm_neo.h
+++ b/runtime/os_interface/linux/drm_neo.h
@@ -6,14 +6,15 @@
 */

 #pragma once
-#include "igfxfmid.h"
 #include "runtime/utilities/api_intercept.h"

-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <unistd.h>
+#include "igfxfmid.h"
+
 #include <cerrno>
+#include <fcntl.h>
 #include <string>
+#include <sys/ioctl.h>
+#include <unistd.h>

 struct GT_SYSTEM_INFO;

--- a/runtime/os_interface/linux/drm_neo_create.cpp
+++ b/runtime/os_interface/linux/drm_neo_create.cpp
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "runtime/os_interface/linux/drm_neo.h"
 #include "runtime/helpers/options.h"
+#include "runtime/os_interface/linux/drm_neo.h"

 namespace OCLRT {

--- a/runtime/os_interface/linux/drm_null_device.h
+++ b/runtime/os_interface/linux/drm_null_device.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -8,6 +8,7 @@
 #pragma once
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "runtime/os_interface/linux/os_time_linux.h"
+
 #include "drm/i915_drm.h"

 #include <cstdio>
--- a/runtime/os_interface/linux/hw_info_config.cpp
+++ b/runtime/os_interface/linux/hw_info_config.cpp
@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

 #include "runtime/os_interface/hw_info_config.h"
+
 #include "runtime/command_stream/preemption.h"
 #include "runtime/gen_common/hw_cmds.h"
 #include "runtime/helpers/hw_helper.h"
--- a/runtime/os_interface/linux/os_context_linux.cpp
+++ b/runtime/os_interface/linux/os_context_linux.cpp
@@ -5,11 +5,12 @@
 *
 */

-#include "runtime/os_interface/os_context.h"
+#include "runtime/os_interface/linux/os_context_linux.h"
+
 #include "runtime/os_interface/linux/drm_engine_mapper.h"
 #include "runtime/os_interface/linux/drm_neo.h"
-#include "runtime/os_interface/linux/os_context_linux.h"
 #include "runtime/os_interface/linux/os_interface.h"
+#include "runtime/os_interface/os_context.h"

 namespace OCLRT {

--- a/runtime/os_interface/linux/os_interface.h
+++ b/runtime/os_interface/linux/os_interface.h
@@ -1,27 +1,13 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
+ * SPDX-License-Identifier: MIT
 *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
 */

 #pragma once
 #include "runtime/os_interface/os_interface.h"
+
 #include "drm_neo.h"

 namespace OCLRT {
--- a/runtime/os_interface/linux/os_library.cpp
+++ b/runtime/os_interface/linux/os_library.cpp
@@ -1,13 +1,16 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "runtime/helpers/debug_helpers.h"
 #include "runtime/os_interface/os_library.h"
+
+#include "runtime/helpers/debug_helpers.h"
+
 #include "os_library.h"
+
 #include <dlfcn.h>

 namespace OCLRT {
--- a/runtime/os_interface/linux/os_thread_linux.h
+++ b/runtime/os_interface/linux/os_thread_linux.h
@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

 #include "runtime/os_interface/os_thread.h"
+
 #include <pthread.h>

 namespace OCLRT {
--- a/runtime/os_interface/linux/os_time_linux.cpp
+++ b/runtime/os_interface/linux/os_time_linux.cpp
@@ -1,16 +1,19 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include <time.h>
-#include "runtime/os_interface/linux/drm_neo.h"
-#include "drm/i915_drm.h"
-#include "runtime/os_interface/linux/os_interface.h"
 #include "runtime/os_interface/linux/os_time_linux.h"

+#include "runtime/os_interface/linux/drm_neo.h"
+#include "runtime/os_interface/linux/os_interface.h"
+
+#include "drm/i915_drm.h"
+
+#include <time.h>
+
 namespace OCLRT {

 OSTimeLinux::OSTimeLinux(OSInterface *osInterface) {
--- a/runtime/os_interface/linux/os_time_linux.h
+++ b/runtime/os_interface/linux/os_time_linux.h
@@ -1,13 +1,16 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

 #pragma once
+#include "runtime/os_interface/linux/drm_neo.h"
 #include "runtime/os_interface/os_time.h"

+#include <sys/ioctl.h>
+
 #define OCLRT_NUM_TIMESTAMP_BITS (36)
 #define OCLRT_NUM_TIMESTAMP_BITS_FALLBACK (32)
 #define TIMESTAMP_HIGH_REG 0x0235C
--- a/runtime/os_interface/linux/performance_counters_linux.h
+++ b/runtime/os_interface/linux/performance_counters_linux.h
@@ -1,28 +1,15 @@
 /*
-* Copyright (c) 2017, Intel Corporation
-*
-* Permission is hereby granted, free of charge, to any person obtaining a
-* copy of this software and associated documentation files (the "Software"),
-* to deal in the Software without restriction, including without limitation
-* the rights to use, copy, modify, merge, publish, distribute, sublicense,
-* and/or sell copies of the Software, and to permit persons to whom the
-* Software is furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included
-* in all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-* OTHER DEALINGS IN THE SOFTWARE.
-*/
+ * Copyright (C) 2017-2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */

 #pragma once
-#include "os_interface.h"
 #include "runtime/os_interface/performance_counters.h"
+
+#include "os_interface.h"
+
 #include <dlfcn.h>

 typedef struct _drm_intel_context drm_intel_context;
--- a/runtime/os_interface/linux/print.cpp
+++ b/runtime/os_interface/linux/print.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -7,8 +7,8 @@

 #include "runtime/os_interface/print.h"

-#include <iostream>
 #include <cstdio>
+#include <iostream>

 void printToSTDOUT(const char *str) {
    fprintf(stdout, "%s", str);
--- a/runtime/os_interface/os_context.h
+++ b/runtime/os_interface/os_context.h
@@ -8,7 +8,9 @@
 #pragma once
 #include "runtime/command_stream/preemption_mode.h"
 #include "runtime/utilities/reference_tracked_object.h"
+
 #include "engine_node.h"
+
 #include <memory>

 namespace OCLRT {
--- a/runtime/os_interface/os_time.cpp
+++ b/runtime/os_interface/os_time.cpp
@@ -1,28 +1,14 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
+ * SPDX-License-Identifier: MIT
 *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
 */

-#include "runtime/helpers/hw_info.h"
 #include "runtime/os_interface/os_time.h"

+#include "runtime/helpers/hw_info.h"
+
 namespace OCLRT {

 double OSTime::getDeviceTimerResolution(HardwareInfo const &hwInfo) {
--- a/runtime/os_interface/performance_counters.cpp
+++ b/runtime/os_interface/performance_counters.cpp
@@ -1,16 +1,18 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "CL/cl.h"
-#include "runtime/helpers/debug_helpers.h"
 #include "runtime/os_interface/performance_counters.h"
+
+#include "runtime/helpers/debug_helpers.h"
 #include "runtime/os_interface/os_interface.h"
 #include "runtime/os_interface/os_time.h"

+#include "CL/cl.h"
+
 namespace OCLRT {
 decltype(&instrGetPerfCountersQueryData) getPerfCountersQueryDataFactory[IGFX_MAX_CORE] = {
    nullptr,
--- a/runtime/os_interface/performance_counters.h
+++ b/runtime/os_interface/performance_counters.h
@@ -1,15 +1,16 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

 #pragma once
-#include "CL/cl.h"
 #include "runtime/event/perf_counter.h"
 #include "runtime/helpers/hw_info.h"

+#include "CL/cl.h"
+
 #include <memory>
 #include <mutex>

--- a/runtime/os_interface/windows/api_win.cpp
+++ b/runtime/os_interface/windows/api_win.cpp
@@ -1,21 +1,21 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "runtime/api/dispatch.h"
 #include "runtime/api/api.h"
-#include "runtime/platform/platform.h"
-#include "runtime/device/device.h"
+#include "runtime/api/dispatch.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/context/context.h"
+#include "runtime/device/device.h"
 #include "runtime/helpers/get_info.h"
-#include "runtime/sharings/d3d/d3d_buffer.h"
-#include "runtime/sharings/d3d/d3d_texture.h"
-#include "runtime/sharings/d3d/d3d_surface.h"
 #include "runtime/mem_obj/image.h"
+#include "runtime/platform/platform.h"
+#include "runtime/sharings/d3d/d3d_buffer.h"
+#include "runtime/sharings/d3d/d3d_surface.h"
+#include "runtime/sharings/d3d/d3d_texture.h"
 #include "runtime/utilities/api_intercept.h"

 using namespace OCLRT;
--- a/runtime/os_interface/windows/d3d_sharing_functions.h
+++ b/runtime/os_interface/windows/d3d_sharing_functions.h
@@ -7,12 +7,14 @@

 #pragma once
 #include "runtime/api/dispatch.h"
+#include "runtime/helpers/array_count.h"
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/sharings/sharing.h"
+
 #include "DXGI1_2.h"
+
 #include <map>
 #include <vector>
-#include "runtime/helpers/array_count.h"

 namespace OCLRT {
 namespace D3DTypesHelper {
--- a/runtime/os_interface/windows/debug_registry_reader.cpp
+++ b/runtime/os_interface/windows/debug_registry_reader.cpp
@@ -1,15 +1,16 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

 #include "runtime/os_interface/debug_settings_manager.h"
-#include "runtime/utilities/debug_settings_reader.h"
-#include <stdint.h>
-#include "runtime/os_interface/windows/windows_wrapper.h"
 #include "runtime/os_interface/windows/registry_reader.h"
+#include "runtime/os_interface/windows/windows_wrapper.h"
+#include "runtime/utilities/debug_settings_reader.h"
+
+#include <stdint.h>

 namespace OCLRT {

--- a/runtime/os_interface/windows/deferrable_deletion_win.cpp
+++ b/runtime/os_interface/windows/deferrable_deletion_win.cpp
@@ -1,13 +1,14 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "runtime/os_interface/windows/wddm/wddm.h"
 #include "runtime/os_interface/windows/deferrable_deletion_win.h"

+#include "runtime/os_interface/windows/wddm/wddm.h"
+
 namespace OCLRT {

 template <typename... Args>
--- a/runtime/os_interface/windows/deferrable_deletion_win.h
+++ b/runtime/os_interface/windows/deferrable_deletion_win.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -9,6 +9,7 @@
 #include "runtime/memory_manager/deferrable_deletion.h"
 #include "runtime/os_interface/os_context.h"
 #include "runtime/os_interface/windows/windows_wrapper.h"
+
 #include <d3dkmthk.h>

 namespace OCLRT {
--- a/runtime/os_interface/windows/device_command_stream.inl
+++ b/runtime/os_interface/windows/device_command_stream.inl
@@ -9,10 +9,11 @@
 // Current order must be preserved due to two versions of igfxfmid.h
 #pragma warning(push)
 #pragma warning(disable : 4005)
-#include "hw_cmds.h"
-#include "runtime/command_stream/device_command_stream.h"
 #include "runtime/command_stream/command_stream_receiver_with_aub_dump.h"
+#include "runtime/command_stream/device_command_stream.h"
 #include "runtime/os_interface/windows/wddm_device_command_stream.h"
+
+#include "hw_cmds.h"
 #pragma warning(pop)

 namespace OCLRT {
--- a/runtime/os_interface/windows/driver_info.cpp
+++ b/runtime/os_interface/windows/driver_info.cpp
@@ -1,15 +1,16 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "runtime/os_interface/windows/wddm/wddm.h"
 #include "runtime/device/driver_info.h"
+
 #include "runtime/os_interface/windows/driver_info.h"
 #include "runtime/os_interface/windows/os_interface.h"
 #include "runtime/os_interface/windows/registry_reader.h"
+#include "runtime/os_interface/windows/wddm/wddm.h"

 namespace OCLRT {

--- a/runtime/os_interface/windows/driver_info.h
+++ b/runtime/os_interface/windows/driver_info.h
@@ -1,28 +1,14 @@
 /*
-* Copyright (c) 2017, Intel Corporation
-*
-* Permission is hereby granted, free of charge, to any person obtaining a
-* copy of this software and associated documentation files (the "Software"),
-* to deal in the Software without restriction, including without limitation
-* the rights to use, copy, modify, merge, publish, distribute, sublicense,
-* and/or sell copies of the Software, and to permit persons to whom the
-* Software is furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included
-* in all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-* OTHER DEALINGS IN THE SOFTWARE.
-*/
+ * Copyright (C) 2017-2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */

 #pragma once

 #include "runtime/device/driver_info.h"
+
 #include <memory>
 #include <string>

--- a/runtime/os_interface/windows/gdi_interface.h
+++ b/runtime/os_interface/windows/gdi_interface.h
@@ -9,12 +9,14 @@
 #include "runtime/helpers/options.h"
 #include "runtime/os_interface/windows/os_inc.h"
 #include "runtime/os_interface/windows/os_library.h"
-#include <d3d9types.h>
-#include <d3dkmthk.h>
-#include <string>
-
 #include "runtime/os_interface/windows/thk_wrapper.h"

+#include <d3d9types.h>
+
+#include <d3dkmthk.h>
+
+#include <string>
+
 namespace OCLRT {

 class Gdi {
--- a/runtime/os_interface/windows/gl/gl_arb_sync_event_os.cpp
+++ b/runtime/os_interface/windows/gl/gl_arb_sync_event_os.cpp
@@ -1,24 +1,23 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "runtime/sharings/gl/gl_arb_sync_event.h"
-
+#include "public/cl_gl_private_intel.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/context/context.h"
 #include "runtime/helpers/timestamp_packet.h"
 #include "runtime/os_interface/os_interface.h"
+#include "runtime/os_interface/windows/gdi_interface.h"
 #include "runtime/os_interface/windows/os_context_win.h"
 #include "runtime/os_interface/windows/os_interface.h"
 #include "runtime/os_interface/windows/wddm/wddm.h"
-#include "runtime/os_interface/windows/gdi_interface.h"
+#include "runtime/sharings/gl/gl_arb_sync_event.h"
 #include "runtime/sharings/gl/gl_sharing.h"

 #include <GL/gl.h>
-#include "public/cl_gl_private_intel.h"

 namespace OCLRT {

--- a/runtime/os_interface/windows/gl/gl_sharing_win.cpp
+++ b/runtime/os_interface/windows/gl/gl_sharing_win.cpp
@@ -5,13 +5,14 @@
 *
 */

-#include <cstdint>
-#include <memory>
 #include "runtime/helpers/timestamp_packet.h"
 #include "runtime/os_interface/windows/windows_wrapper.h"
 #include "runtime/sharings/gl/gl_arb_sync_event.h"
 #include "runtime/sharings/gl/gl_sharing.h"

+#include <cstdint>
+#include <memory>
+
 namespace Os {
 extern const char *openglDllName;
 }
--- a/runtime/os_interface/windows/hw_info_config.cpp
+++ b/runtime/os_interface/windows/hw_info_config.cpp
@@ -1,16 +1,17 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

+#include "runtime/os_interface/hw_info_config.h"
+
 #include "runtime/command_stream/preemption.h"
 #include "runtime/gen_common/hw_cmds.h"
-#include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/hw_helper.h"
+#include "runtime/helpers/hw_info.h"
 #include "runtime/memory_manager/memory_constants.h"
-#include "runtime/os_interface/hw_info_config.h"
 #include "runtime/os_interface/debug_settings_manager.h"

 #include "instrumentation.h"
--- a/runtime/os_interface/windows/kmdaf_listener.h
+++ b/runtime/os_interface/windows/kmdaf_listener.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -7,6 +7,7 @@

 #pragma once
 #include "runtime/os_interface/windows/windows_wrapper.h"
+
 #include <d3dkmthk.h>

 namespace OCLRT {
--- a/runtime/os_interface/windows/os_context_win.cpp
+++ b/runtime/os_interface/windows/os_context_win.cpp
@@ -6,9 +6,10 @@
 */

 #include "runtime/os_interface/windows/os_context_win.h"
+
+#include "runtime/os_interface/windows/os_interface.h"
 #include "runtime/os_interface/windows/wddm/wddm.h"
 #include "runtime/os_interface/windows/wddm/wddm_interface.h"
-#include "runtime/os_interface/windows/os_interface.h"

 namespace OCLRT {

--- a/runtime/os_interface/windows/os_context_win.h
+++ b/runtime/os_interface/windows/os_context_win.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -8,7 +8,6 @@
 #pragma once
 #include "runtime/os_interface/os_context.h"
 #include "runtime/os_interface/windows/wddm_residency_controller.h"
-#include <d3dkmthk.h>

 namespace OCLRT {

--- a/runtime/os_interface/windows/os_interface.cpp
+++ b/runtime/os_interface/windows/os_interface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -7,8 +7,8 @@

 #include "os_interface.h"

-#include "runtime/os_interface/windows/wddm/wddm.h"
 #include "runtime/os_interface/windows/sys_calls.h"
+#include "runtime/os_interface/windows/wddm/wddm.h"

 namespace OCLRT {

--- a/runtime/os_interface/windows/os_interface.h
+++ b/runtime/os_interface/windows/os_interface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -10,10 +10,11 @@
 #include "runtime/os_interface/os_interface.h"
 #include "runtime/os_interface/windows/windows_wrapper.h"

-#include <d3dkmthk.h>
-#include <memory>
 #include "profileapi.h"
 #include "umKmInc/sharedata.h"
+#include <d3dkmthk.h>
+
+#include <memory>

 namespace OCLRT {
 class Wddm;
--- a/runtime/os_interface/windows/os_library.cpp
+++ b/runtime/os_interface/windows/os_library.cpp
@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

 #include "runtime/os_interface/os_library.h"
+
 #include "os_library.h"

 namespace OCLRT {
--- a/runtime/os_interface/windows/os_thread_win.h
+++ b/runtime/os_interface/windows/os_thread_win.h
@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

 #include "runtime/os_interface/os_thread.h"
+
 #include <thread>

 namespace OCLRT {
--- a/runtime/os_interface/windows/os_time_win.cpp
+++ b/runtime/os_interface/windows/os_time_win.cpp
@@ -5,11 +5,13 @@
 *
 */

-#include <memory>
-#include "runtime/os_interface/windows/wddm/wddm.h"
-#include "runtime/os_interface/windows/os_interface.h"
 #include "runtime/os_interface/windows/os_time_win.h"

+#include "runtime/os_interface/windows/os_interface.h"
+#include "runtime/os_interface/windows/wddm/wddm.h"
+
+#include <memory>
+
 #undef WIN32_NO_STATUS

 namespace OCLRT {
@@ -27,7 +29,7 @@ bool runEscape(Wddm *wddm, TimeStampDataHeader &escapeInfo) {

        escapeCommand.Flags.Value = 0;
        escapeCommand.hAdapter = (D3DKMT_HANDLE)0;
-        escapeCommand.hContext = (D3DKMT_HANDLE)0; // escape is not context specific
+        escapeCommand.hContext = (D3DKMT_HANDLE)0;                // escape is not context specific
        escapeCommand.hDevice = (D3DKMT_HANDLE)wddm->getDevice(); // escape not device specific, passing only for instrumentation
        escapeCommand.pPrivateDriverData = &escapeInfo;
        escapeCommand.PrivateDriverDataSize = sizeof(escapeInfo);
--- a/runtime/os_interface/windows/os_time_win.h
+++ b/runtime/os_interface/windows/os_time_win.h
@@ -1,14 +1,15 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

 #pragma once
-#include "runtime/os_interface/windows/windows_wrapper.h"
-#include "gfxEscape.h"
 #include "runtime/os_interface/os_time.h"
+#include "runtime/os_interface/windows/windows_wrapper.h"
+
+#include "gfxEscape.h"

 namespace OCLRT {
 class Wddm;
--- a/runtime/os_interface/windows/performance_counters_win.cpp
+++ b/runtime/os_interface/windows/performance_counters_win.cpp
@@ -1,13 +1,14 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "runtime/os_interface/windows/windows_wrapper.h"
 #include "performance_counters_win.h"
+
 #include "runtime/os_interface/windows/os_interface.h"
+#include "runtime/os_interface/windows/windows_wrapper.h"

 namespace OCLRT {
 std::unique_ptr<PerformanceCounters> PerformanceCounters::create(OSTime *osTime) {
--- a/runtime/os_interface/windows/print.cpp
+++ b/runtime/os_interface/windows/print.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -7,12 +7,13 @@

 #include "runtime/os_interface/print.h"

-#include <cstdint>
-#include <cctype>
-#include <iostream>
 #include "runtime/os_interface/windows/windows_wrapper.h"
-#include <io.h>
+
+#include <cctype>
+#include <cstdint>
 #include <fcntl.h>
+#include <io.h>
+#include <iostream>

 void printToSTDOUT(const char *str) {
    int fd = 0;
--- a/runtime/os_interface/windows/registry_reader.h
+++ b/runtime/os_interface/windows/registry_reader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -8,11 +8,13 @@
 #pragma once

 #include "runtime/utilities/debug_settings_reader.h"
+
 #include "os_inc.h"
-#include <string>
-#include <stdint.h>
 #include <Windows.h>

+#include <stdint.h>
+#include <string>
+
 namespace OCLRT {
 class RegistryReader : public SettingsReader {
  public:
--- a/runtime/os_interface/windows/thk_wrapper.h
+++ b/runtime/os_interface/windows/thk_wrapper.h
@@ -8,6 +8,8 @@
 #pragma once
 #include "runtime/utilities/api_intercept.h"

+#include <d3dkmthk.h>
+
 namespace OCLRT {
 // IDs for easy system times identification
 enum SystemCallsIds {
--- a/runtime/os_interface/windows/wddm/wddm.cpp
+++ b/runtime/os_interface/windows/wddm/wddm.cpp
@@ -5,24 +5,26 @@
 *
 */

-#include "gmm_memory.h"
-#include "runtime/os_interface/windows/kmdaf_listener.h"
+#include "runtime/os_interface/windows/wddm/wddm.h"
+
 #include "runtime/gmm_helper/gmm.h"
 #include "runtime/gmm_helper/gmm_helper.h"
-#include "runtime/gmm_helper/resource_info.h"
 #include "runtime/gmm_helper/page_table_mngr.h"
+#include "runtime/gmm_helper/resource_info.h"
+#include "runtime/helpers/wddm_helper.h"
 #include "runtime/memory_manager/memory_manager.h"
-#include "runtime/os_interface/windows/wddm/wddm.h"
 #include "runtime/os_interface/hw_info_config.h"
 #include "runtime/os_interface/windows/gdi_interface.h"
+#include "runtime/os_interface/windows/kmdaf_listener.h"
 #include "runtime/os_interface/windows/os_context_win.h"
+#include "runtime/os_interface/windows/registry_reader.h"
 #include "runtime/os_interface/windows/wddm/wddm_interface.h"
 #include "runtime/os_interface/windows/wddm_allocation.h"
 #include "runtime/os_interface/windows/wddm_engine_mapper.h"
-#include "runtime/os_interface/windows/registry_reader.h"
-#include "runtime/helpers/wddm_helper.h"
 #include "runtime/sku_info/operations/sku_info_receiver.h"

+#include "gmm_memory.h"
+
 namespace OCLRT {
 extern Wddm::CreateDXGIFactoryFcn getCreateDxgiFactory();
 extern Wddm::GetSystemInfoFcn getGetSystemInfo();
--- a/runtime/os_interface/windows/wddm/wddm.h
+++ b/runtime/os_interface/windows/wddm/wddm.h
@@ -11,7 +11,9 @@
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/os_interface/os_context.h"
 #include "runtime/utilities/spinlock.h"
+
 #include "sku_info.h"
+
 #include <memory>
 #include <mutex>

--- a/runtime/os_interface/windows/wddm/wddm_calls.cpp
+++ b/runtime/os_interface/windows/wddm/wddm_calls.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -7,6 +7,7 @@

 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/os_interface/windows/wddm/wddm.h"
+
 #include <dxgi.h>

 namespace OCLRT {
--- a/runtime/os_interface/windows/wddm/wddm_interface.cpp
+++ b/runtime/os_interface/windows/wddm/wddm_interface.cpp
@@ -1,15 +1,16 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

+#include "runtime/os_interface/windows/wddm/wddm_interface.h"
+
 #include "runtime/memory_manager/memory_constants.h"
 #include "runtime/os_interface/windows/gdi_interface.h"
-#include "runtime/os_interface/windows/wddm/wddm_interface.h"
-#include "runtime/os_interface/windows/wddm/wddm.h"
 #include "runtime/os_interface/windows/os_context_win.h"
+#include "runtime/os_interface/windows/wddm/wddm.h"

 using namespace OCLRT;

--- a/runtime/os_interface/windows/wddm/wddm_interface.h
+++ b/runtime/os_interface/windows/wddm/wddm_interface.h
@@ -1,16 +1,18 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

 #pragma once
+#include "runtime/helpers/hw_info.h"
 #include "runtime/os_interface/os_context.h"
 #include "runtime/os_interface/windows/windows_wrapper.h"
+
 #include <d3dkmthk.h>
+
 #include <cstdint>
-#include "runtime/helpers/hw_info.h"

 namespace OCLRT {
 class Gdi;
--- a/runtime/os_interface/windows/wddm_32bit_memory.cpp
+++ b/runtime/os_interface/windows/wddm_32bit_memory.cpp
@@ -5,8 +5,8 @@
 *
 */

-#include "runtime/os_interface/32bit_memory.h"
 #include "runtime/helpers/aligned_memory.h"
+#include "runtime/os_interface/32bit_memory.h"
 using namespace OCLRT;

 bool OCLRT::is32BitOsAllocatorAvailable = is64bit;
--- a/runtime/os_interface/windows/wddm_allocation.h
+++ b/runtime/os_interface/windows/wddm_allocation.h
@@ -10,6 +10,7 @@
 #include "runtime/helpers/aligned_memory.h"
 #include "runtime/memory_manager/graphics_allocation.h"
 #include "runtime/os_interface/windows/windows_wrapper.h"
+
 #include <d3dkmthk.h>

 namespace OCLRT {
--- a/runtime/os_interface/windows/wddm_device_command_stream.inl
+++ b/runtime/os_interface/windows/wddm_device_command_stream.inl
@@ -9,7 +9,6 @@
 // Current order must be preserved due to two versions of igfxfmid.h
 #pragma warning(push)
 #pragma warning(disable : 4005)
-#include "hw_cmds.h"
 #include "runtime/command_stream/linear_stream.h"
 #include "runtime/command_stream/preemption.h"
 #include "runtime/device/device.h"
@@ -19,6 +18,8 @@
 #include "runtime/mem_obj/mem_obj.h"
 #include "runtime/os_interface/windows/wddm/wddm.h"
 #include "runtime/os_interface/windows/wddm_device_command_stream.h"
+
+#include "hw_cmds.h"
 #pragma warning(pop)

 #undef max
--- a/runtime/os_interface/windows/wddm_engine_mapper.cpp
+++ b/runtime/os_interface/windows/wddm_engine_mapper.cpp
@@ -1,13 +1,14 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "hw_cmds.h"
 #include "runtime/os_interface/windows/wddm_engine_mapper.h"

+#include "hw_cmds.h"
+
 namespace OCLRT {

 GPUNODE_ORDINAL WddmEngineMapper::engineNodeMap(EngineType engineType) {
--- a/runtime/os_interface/windows/wddm_engine_mapper.h
+++ b/runtime/os_interface/windows/wddm_engine_mapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -7,9 +7,10 @@

 #pragma once

-#include "engine_node.h"
 #include "runtime/os_interface/windows/wddm/wddm.h"

+#include "engine_node.h"
+
 namespace OCLRT {

 class WddmEngineMapper {
--- a/runtime/os_interface/windows/wddm_memory_manager.cpp
+++ b/runtime/os_interface/windows/wddm_memory_manager.cpp
@@ -6,6 +6,7 @@
 */

 #include "runtime/os_interface/windows/wddm_memory_manager.h"
+
 #include "runtime/command_stream/command_stream_receiver_hw.h"
 #include "runtime/device/device.h"
 #include "runtime/gmm_helper/gmm.h"
@@ -17,11 +18,12 @@
 #include "runtime/memory_manager/deferrable_deletion.h"
 #include "runtime/memory_manager/deferred_deleter.h"
 #include "runtime/memory_manager/host_ptr_manager.h"
+#include "runtime/os_interface/windows/os_context_win.h"
 #include "runtime/os_interface/windows/wddm/wddm.h"
 #include "runtime/os_interface/windows/wddm_allocation.h"
 #include "runtime/os_interface/windows/wddm_residency_controller.h"
-#include "runtime/os_interface/windows/os_context_win.h"
 #include "runtime/platform/platform.h"
+
 #include <algorithm>

 namespace OCLRT {
--- a/runtime/os_interface/windows/wddm_memory_manager.h
+++ b/runtime/os_interface/windows/wddm_memory_manager.h
@@ -11,7 +11,9 @@
 #include "runtime/os_interface/os_context.h"
 #include "runtime/os_interface/windows/wddm_allocation.h"
 #include "runtime/os_interface/windows/windows_wrapper.h"
+
 #include <d3dkmthk.h>
+
 #include <map>
 #include <mutex>
 #include <vector>
--- a/runtime/os_interface/windows/wddm_residency_controller.cpp
+++ b/runtime/os_interface/windows/wddm_residency_controller.cpp
@@ -6,11 +6,11 @@
 */

 #include "runtime/os_interface/windows/wddm_residency_controller.h"
-#include "runtime/os_interface/windows/wddm_allocation.h"
-#include "runtime/os_interface/debug_settings_manager.h"
-#include "runtime/os_interface/windows/wddm_memory_manager.h"
-#include "runtime/os_interface/windows/wddm/wddm.h"

+#include "runtime/os_interface/debug_settings_manager.h"
+#include "runtime/os_interface/windows/wddm/wddm.h"
+#include "runtime/os_interface/windows/wddm_allocation.h"
+#include "runtime/os_interface/windows/wddm_memory_manager.h"
 #include "runtime/utilities/spinlock.h"

 namespace OCLRT {
--- a/runtime/os_interface/windows/wddm_residency_controller.h
+++ b/runtime/os_interface/windows/wddm_residency_controller.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -8,8 +8,8 @@
 #pragma once

 #include "runtime/memory_manager/residency_container.h"
-#include "runtime/os_interface/windows/windows_wrapper.h"
 #include "runtime/os_interface/windows/windows_defs.h"
+#include "runtime/os_interface/windows/windows_wrapper.h"
 #include "runtime/utilities/spinlock.h"

 #include <atomic>
--- a/runtime/os_interface/windows/windows_defs.h
+++ b/runtime/os_interface/windows/windows_defs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -7,7 +7,9 @@

 #pragma once

+#include "Windows.h"
 #include <d3dkmthk.h>
+
 #include <cstdint>

 namespace OCLRT {