diff --git a/unit_tests/os_interface/CMakeLists.txt b/unit_tests/os_interface/CMakeLists.txt
index bd4ac0c41d..b3744e3faf 100644
--- a/unit_tests/os_interface/CMakeLists.txt
+++ b/unit_tests/os_interface/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018 Intel Corporation
+# Copyright (C) 2018-2019 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -7,6 +7,7 @@
 set(IGDRCL_SRCS_tests_os_interface_base
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/32bit_memory_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_manager_fixture.h
   ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_manager_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/device_factory_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests.cpp
diff --git a/unit_tests/os_interface/debug_settings_manager_fixture.h b/unit_tests/os_interface/debug_settings_manager_fixture.h
index a017bc61b5..8dcf95be1e 100644
--- a/unit_tests/os_interface/debug_settings_manager_fixture.h
+++ b/unit_tests/os_interface/debug_settings_manager_fixture.h
@@ -7,15 +7,13 @@
 
 #pragma once
 
-#include "test.h"
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
 #include "runtime/helpers/file_io.h"
 #include "runtime/helpers/string_helpers.h"
-#include "unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/utilities/directory.h"
 
+#include <map>
+
 using namespace OCLRT;
 using namespace std;
 
diff --git a/unit_tests/os_interface/debug_settings_manager_tests.cpp b/unit_tests/os_interface/debug_settings_manager_tests.cpp
index bcb5460f98..af50dd01fb 100644
--- a/unit_tests/os_interface/debug_settings_manager_tests.cpp
+++ b/unit_tests/os_interface/debug_settings_manager_tests.cpp
@@ -5,14 +5,15 @@
  *
  */
 
-#include "unit_tests/mocks/mock_kernel.h"
-#include "unit_tests/mocks/mock_program.h"
-#include "unit_tests/mocks/mock_buffer.h"
-#include "unit_tests/mocks/mock_context.h"
-#include "unit_tests/mocks/mock_mdi.h"
 #include "unit_tests/fixtures/buffer_fixture.h"
 #include "unit_tests/fixtures/image_fixture.h"
+#include "unit_tests/helpers/debug_manager_state_restore.h"
 #include "unit_tests/helpers/memory_management.h"
+#include "unit_tests/mocks/mock_buffer.h"
+#include "unit_tests/mocks/mock_context.h"
+#include "unit_tests/mocks/mock_kernel.h"
+#include "unit_tests/mocks/mock_mdi.h"
+#include "unit_tests/mocks/mock_program.h"
 #include "unit_tests/os_interface/debug_settings_manager_fixture.h"
 
 #include <memory>
diff --git a/unit_tests/os_interface/linux/debug_settings_manager_linux_tests.cpp b/unit_tests/os_interface/linux/debug_settings_manager_linux_tests.cpp
index 2d65c153be..c7c46d2086 100644
--- a/unit_tests/os_interface/linux/debug_settings_manager_linux_tests.cpp
+++ b/unit_tests/os_interface/linux/debug_settings_manager_linux_tests.cpp
@@ -5,10 +5,10 @@
  *
  */
 
-#include "test.h"
 #include "runtime/os_interface/debug_settings_manager.h"
-#include "unit_tests/os_interface/debug_settings_manager_fixture.h"
 #include "unit_tests/mocks/mock_graphics_allocation.h"
+#include "unit_tests/os_interface/debug_settings_manager_fixture.h"
+#include "test.h"
 
 TEST(DebugSettingsManager, GivenDebugSettingsManagerWithLogAllocationsThenLogsCorrectInfo) {
     FullyEnabledTestDebugManager debugManager;
@@ -70,4 +70,4 @@ TEST(DebugSettingsManager, GivenDebugSettingsManagerWithoutLogAllocationsThenAll
         EXPECT_FALSE(str.find(memoryPoolCheck.str()) != std::string::npos);
         EXPECT_FALSE(str.find("AllocationType: BUFFER") != std::string::npos);
     }
-}
\ No newline at end of file
+}
diff --git a/unit_tests/os_interface/windows/debug_settings_manager_win_tests.cpp b/unit_tests/os_interface/windows/debug_settings_manager_win_tests.cpp
index a350ea7228..a6bb7dc986 100644
--- a/unit_tests/os_interface/windows/debug_settings_manager_win_tests.cpp
+++ b/unit_tests/os_interface/windows/debug_settings_manager_win_tests.cpp
@@ -5,11 +5,11 @@
  *
  */
 
-#include "test.h"
+#include "runtime/gmm_helper/gmm.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "unit_tests/os_interface/debug_settings_manager_fixture.h"
 #include "unit_tests/os_interface/windows/mock_wddm_allocation.h"
-#include "runtime/gmm_helper/gmm.h"
+#include "test.h"
 
 TEST(DebugSettingsManager, GivenDebugSettingsManagerWithLogAllocationsThenLogsCorrectInfo) {
     FullyEnabledTestDebugManager debugManager;
@@ -82,4 +82,4 @@ TEST(DebugSettingsManager, GivenDebugSettingsManagerWithoutLogAllocationsThenAll
         EXPECT_FALSE(str.find("AllocationType: BUFFER") != std::string::npos);
         EXPECT_FALSE(str.find("NonLocalOnly: 0") != std::string::npos);
     }
-}
\ No newline at end of file
+}