diff --git a/runtime/os_interface/linux/os_interface.cpp b/runtime/os_interface/linux/os_interface.cpp
index 4cacbd35e8..6ffaf55179 100644
--- a/runtime/os_interface/linux/os_interface.cpp
+++ b/runtime/os_interface/linux/os_interface.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "os_interface.h"
+#include "runtime/os_interface/linux/os_interface.h"
 
 namespace NEO {
 
diff --git a/runtime/os_interface/linux/os_interface.h b/runtime/os_interface/linux/os_interface.h
index 57546a56f9..2527c2bd15 100644
--- a/runtime/os_interface/linux/os_interface.h
+++ b/runtime/os_interface/linux/os_interface.h
@@ -6,11 +6,8 @@
  */
 
 #pragma once
-#include "runtime/os_interface/linux/drm_memory_operations_handler.h"
 #include "runtime/os_interface/os_interface.h"
 
-#include "drm_neo.h"
-
 namespace NEO {
 class Drm;
 
diff --git a/runtime/os_interface/os_context.h b/runtime/os_interface/os_context.h
index d21e241c79..abc7377c50 100644
--- a/runtime/os_interface/os_context.h
+++ b/runtime/os_interface/os_context.h
@@ -7,8 +7,8 @@
 
 #pragma once
 #include "core/command_stream/preemption_mode.h"
+#include "core/helpers/common_types.h"
 #include "core/utilities/reference_tracked_object.h"
-#include "runtime/memory_manager/memory_manager.h"
 
 #include "engine_node.h"
 
diff --git a/runtime/os_interface/os_interface.h b/runtime/os_interface/os_interface.h
index d7d926aa7a..6b52a01710 100644
--- a/runtime/os_interface/os_interface.h
+++ b/runtime/os_interface/os_interface.h
@@ -6,6 +6,7 @@
  */
 
 #pragma once
+#include <cstdint>
 
 namespace NEO {
 
@@ -24,7 +25,7 @@ class OSInterface {
     static bool osEnabled64kbPages;
     static bool osEnableLocalMemory;
     static bool are64kbPagesEnabled();
-    unsigned int getDeviceHandle() const;
+    uint32_t getDeviceHandle() const;
     void setGmmInputArgs(void *args);
 
   protected:
diff --git a/runtime/os_interface/windows/os_interface.cpp b/runtime/os_interface/windows/os_interface.cpp
index 1585b76387..010c01c913 100644
--- a/runtime/os_interface/windows/os_interface.cpp
+++ b/runtime/os_interface/windows/os_interface.cpp
@@ -9,7 +9,6 @@
 
 #include "runtime/os_interface/windows/sys_calls.h"
 #include "runtime/os_interface/windows/wddm/wddm.h"
-#include "runtime/os_interface/windows/wddm_memory_operations_handler.h"
 
 namespace NEO {
 
diff --git a/runtime/program/kernel_info.h b/runtime/program/kernel_info.h
index 2d0ecb140e..4129125e3d 100644
--- a/runtime/program/kernel_info.h
+++ b/runtime/program/kernel_info.h
@@ -7,10 +7,10 @@
 
 #pragma once
 #include "core/helpers/hw_info.h"
+#include "runtime/program/heap_info.h"
+#include "runtime/program/kernel_arg_info.h"
 
 #include "CL/cl.h"
-#include "heap_info.h"
-#include "kernel_arg_info.h"
 #include "ocl_igc_shared/gtpin/gtpin_driver_common.h"
 #include "patch_info.h"
 
diff --git a/unit_tests/os_interface/linux/drm_command_stream_mm_tests.cpp b/unit_tests/os_interface/linux/drm_command_stream_mm_tests.cpp
index aab98d6d21..2aa6a3ec52 100644
--- a/unit_tests/os_interface/linux/drm_command_stream_mm_tests.cpp
+++ b/unit_tests/os_interface/linux/drm_command_stream_mm_tests.cpp
@@ -9,6 +9,7 @@
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/os_interface/linux/drm_command_stream.h"
 #include "runtime/os_interface/linux/drm_memory_manager.h"
+#include "runtime/os_interface/linux/drm_memory_operations_handler.h"
 #include "runtime/os_interface/linux/os_interface.h"
 #include "runtime/platform/platform.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 9ce52ffb11..12ec655083 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
@@ -13,6 +13,7 @@
 #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/linux/drm_memory_operations_handler.h"
 #include "runtime/os_interface/linux/os_interface.h"
 #include "test.h"
 #include "unit_tests/mocks/mock_execution_environment.h"
diff --git a/unit_tests/os_interface/linux/drm_memory_manager_tests.h b/unit_tests/os_interface/linux/drm_memory_manager_tests.h
index ce6cd1664d..f3407def8f 100644
--- a/unit_tests/os_interface/linux/drm_memory_manager_tests.h
+++ b/unit_tests/os_interface/linux/drm_memory_manager_tests.h
@@ -6,6 +6,7 @@
  */
 
 #pragma once
+#include "runtime/os_interface/linux/drm_memory_operations_handler.h"
 #include "runtime/os_interface/linux/os_interface.h"
 #include "unit_tests/fixtures/memory_management_fixture.h"
 #include "unit_tests/mocks/linux/mock_drm_memory_manager.h"