diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4dcda426ec..03e9c2b50d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,6 +41,12 @@ if(NOT CMAKE_BUILD_TYPE)
 	set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type: [Release, ReleaseInternal, Debug]" FORCE)
 endif()
 
+add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_1_APIS -DCL_USE_DEPRECATED_OPENCL_1_2_APIS -DCL_USE_DEPRECATED_OPENCL_2_0_APIS)
+
+if(WIN32)
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+endif()
+
 set(CMAKE_C_FLAGS_RELEASEINTERNAL ${CMAKE_C_FLAGS_RELEASE})
 set(CMAKE_CXX_FLAGS_RELEASEINTERNAL ${CMAKE_CXX_FLAGS_RELEASE})
 set(CMAKE_SHARED_LINKER_FLAGS_RELEASEINTERNAL ${CMAKE_SHARED_LINKER_FLAGS_RELEASE})
@@ -537,11 +543,6 @@ if(EXISTS ${IGDRCL_SOURCE_DIR}/../internal)
 	add_subdirectory(${IGDRCL_SOURCE_DIR}/../internal ${IGDRCL_BUILD_DIR}/internal)
 endif(EXISTS ${IGDRCL_SOURCE_DIR}/../internal)
 
-set(CL_USE_DEPRECATED_OPENCL_1_1_APIS 1)
-set(CL_USE_DEPRECATED_OPENCL_1_2_APIS 1)
-set(CL_USE_DEPRECATED_OPENCL_2_0_APIS 1)
-set(_CRT_SECURE_NO_WARNINGS 1)
-
 include(package.cmake)
 
 configure_file(config.h.in ${IGDRCL_BUILD_DIR}/config.h)
diff --git a/config.h.in b/config.h.in
index aa76218eed..1dfa6edac6 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -23,11 +23,6 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#cmakedefine CL_USE_DEPRECATED_OPENCL_1_1_APIS
-#cmakedefine CL_USE_DEPRECATED_OPENCL_1_2_APIS
-#cmakedefine CL_USE_DEPRECATED_OPENCL_2_0_APIS
-#cmakedefine _CRT_SECURE_NO_WARNINGS
-
 #cmakedefine USE_CL_CACHE
 #if defined(USE_CL_CACHE)
 static const bool clCacheEnabled = true;
diff --git a/offline_compiler/main.cpp b/offline_compiler/main.cpp
index 919a0f026f..dc5c87a3fc 100644
--- a/offline_compiler/main.cpp
+++ b/offline_compiler/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,8 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
-
 #include "offline_compiler/offline_compiler.h"
 #include "runtime/os_interface/os_library.h"
 
diff --git a/runtime/api/api.h b/runtime/api/api.h
index 6d531479c4..a334f17253 100644
--- a/runtime/api/api.h
+++ b/runtime/api/api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,8 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
-
 #include "CL/cl.h"
 #include "CL/cl_gl.h"
 #include "runtime/api/dispatch.h"
diff --git a/runtime/api/cl_types.h b/runtime/api/cl_types.h
index 3584267eac..b90d13238c 100644
--- a/runtime/api/cl_types.h
+++ b/runtime/api/cl_types.h
@@ -21,7 +21,6 @@
  */
 
 #pragma once
-#include "config.h"
 #include "runtime/api/dispatch.h"
 #include <cstdint>
 
diff --git a/runtime/api/dispatch.h b/runtime/api/dispatch.h
index 19eeca4266..72f18544a6 100644
--- a/runtime/api/dispatch.h
+++ b/runtime/api/dispatch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,7 +21,6 @@
  */
 
 #pragma once
-#include "config.h"
 
 #include "CL/cl.h"
 #include "CL/cl_ext.h"
diff --git a/runtime/aub_mem_dump/aub_mem_dump.cpp b/runtime/aub_mem_dump/aub_mem_dump.cpp
index 222967b264..dd70a1a89c 100644
--- a/runtime/aub_mem_dump/aub_mem_dump.cpp
+++ b/runtime/aub_mem_dump/aub_mem_dump.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "aub_mem_dump.h"
 #include "runtime/helpers/ptr_math.h"
 #include "runtime/helpers/debug_helpers.h"
diff --git a/runtime/aub_mem_dump/aub_mem_dump.inl b/runtime/aub_mem_dump/aub_mem_dump.inl
index 90b5925878..2a72fa900d 100644
--- a/runtime/aub_mem_dump/aub_mem_dump.inl
+++ b/runtime/aub_mem_dump/aub_mem_dump.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "aub_mem_dump.h"
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/ptr_math.h"
diff --git a/runtime/built_ins/built_ins.h b/runtime/built_ins/built_ins.h
index 3d579601f4..2d1b7baadb 100644
--- a/runtime/built_ins/built_ins.h
+++ b/runtime/built_ins/built_ins.h
@@ -21,7 +21,6 @@
  */
 
 #pragma once
-#include "config.h"
 #include "CL/cl.h"
 #include "runtime/built_ins/sip.h"
 #include "runtime/utilities/vec.h"
diff --git a/runtime/built_ins/builtins_dispatch_builder.h b/runtime/built_ins/builtins_dispatch_builder.h
index bb4cf50048..676f7ec7d8 100644
--- a/runtime/built_ins/builtins_dispatch_builder.h
+++ b/runtime/built_ins/builtins_dispatch_builder.h
@@ -21,7 +21,6 @@
  */
 
 #pragma once
-#include "config.h"
 #include "CL/cl.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/kernel/kernel.h"
diff --git a/runtime/builtin_kernels_simulation/gen8/scheduler_simulation.cpp b/runtime/builtin_kernels_simulation/gen8/scheduler_simulation.cpp
index e1592e3317..d1a92bfe41 100644
--- a/runtime/builtin_kernels_simulation/gen8/scheduler_simulation.cpp
+++ b/runtime/builtin_kernels_simulation/gen8/scheduler_simulation.cpp
@@ -20,7 +20,6 @@
 * OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "config.h"
 #include "CL/cl.h"
 #include "runtime/builtin_kernels_simulation/opencl_c.h"
 #include "runtime/builtin_kernels_simulation/scheduler_simulation.h"
diff --git a/runtime/builtin_kernels_simulation/gen9/scheduler_simulation.cpp b/runtime/builtin_kernels_simulation/gen9/scheduler_simulation.cpp
index ec3bb7fd2c..bd7219fede 100644
--- a/runtime/builtin_kernels_simulation/gen9/scheduler_simulation.cpp
+++ b/runtime/builtin_kernels_simulation/gen9/scheduler_simulation.cpp
@@ -20,7 +20,6 @@
 * OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "config.h"
 #include "CL/cl.h"
 #include "runtime/builtin_kernels_simulation/opencl_c.h"
 #include "runtime/builtin_kernels_simulation/scheduler_simulation.h"
diff --git a/runtime/builtin_kernels_simulation/opencl_c.cpp b/runtime/builtin_kernels_simulation/opencl_c.cpp
index d775cb6287..38dce0edae 100644
--- a/runtime/builtin_kernels_simulation/opencl_c.cpp
+++ b/runtime/builtin_kernels_simulation/opencl_c.cpp
@@ -21,7 +21,6 @@
  */
 
 #include <cstdint>
-#include "config.h"
 #include "CL/cl.h"
 #include "opencl_c.h"
 #include "runtime/helpers/string.h"
diff --git a/runtime/compiler_interface/binary_cache.h b/runtime/compiler_interface/binary_cache.h
index 561b00ae6c..196b542cc6 100644
--- a/runtime/compiler_interface/binary_cache.h
+++ b/runtime/compiler_interface/binary_cache.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 #pragma once
-#include "config.h"
 
 #include <cstdint>
 #include <cstring>
diff --git a/runtime/compiler_interface/compiler_interface.h b/runtime/compiler_interface/compiler_interface.h
index badcaf6df5..dfc0ee8368 100644
--- a/runtime/compiler_interface/compiler_interface.h
+++ b/runtime/compiler_interface/compiler_interface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,6 @@
 
 #pragma once
 #include "cif/common/cif_main.h"
-#include "config.h"
 #include "ocl_igc_interface/code_type.h"
 #include "ocl_igc_interface/igc_ocl_device_ctx.h"
 #include "ocl_igc_interface/fcl_ocl_device_ctx.h"
diff --git a/runtime/device/device.cpp b/runtime/device/device.cpp
index b9621f5c55..17fa55604a 100644
--- a/runtime/device/device.cpp
+++ b/runtime/device/device.cpp
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "hw_cmds.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/command_stream/command_stream_receiver.h"
diff --git a/runtime/device/device_info.h b/runtime/device/device_info.h
index 2479c884ae..08addd83d8 100644
--- a/runtime/device/device_info.h
+++ b/runtime/device/device_info.h
@@ -21,7 +21,6 @@
  */
 
 #pragma once
-#include "config.h"
 #include "CL/cl.h"
 #include "CL/cl_ext.h"
 #include <cstdint>
diff --git a/runtime/device/device_info_map.h b/runtime/device/device_info_map.h
index 14d0578c9b..0f34c9f3c6 100644
--- a/runtime/device/device_info_map.h
+++ b/runtime/device/device_info_map.h
@@ -21,7 +21,6 @@
  */
 
 #pragma once
-#include "config.h"
 #include <CL/cl.h>
 #include <CL/cl_ext.h>
 #include "CL/cl_ext_intel.h"
diff --git a/runtime/dll/options.cpp b/runtime/dll/options.cpp
index 18d61f803b..b4bd1d1b12 100644
--- a/runtime/dll/options.cpp
+++ b/runtime/dll/options.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "hw_cmds.h"
 #include "runtime/helpers/options.h"
 #include "runtime/helpers/array_count.h"
diff --git a/runtime/event/event_builder.h b/runtime/event/event_builder.h
index f4274c7680..be3fb9e64d 100644
--- a/runtime/event/event_builder.h
+++ b/runtime/event/event_builder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,7 +21,6 @@
  */
 
 #pragma once
-#include "config.h"
 #include "CL/cl.h"
 #include <type_traits>
 #include "runtime/utilities/arrayref.h"
diff --git a/runtime/gen8/aub_mem_dump.cpp b/runtime/gen8/aub_mem_dump.cpp
index 549a7c2158..72781eb897 100644
--- a/runtime/gen8/aub_mem_dump.cpp
+++ b/runtime/gen8/aub_mem_dump.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "aub_mapper.h"
 #include "runtime/aub_mem_dump/aub_mem_dump.inl"
 
diff --git a/runtime/gen9/aub_mem_dump.cpp b/runtime/gen9/aub_mem_dump.cpp
index 52e3988548..fc8d75b494 100644
--- a/runtime/gen9/aub_mem_dump.cpp
+++ b/runtime/gen9/aub_mem_dump.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "aub_mapper.h"
 #include "runtime/aub_mem_dump/aub_mem_dump.inl"
 
diff --git a/runtime/gtpin/gtpin_callback_stubs.cpp b/runtime/gtpin/gtpin_callback_stubs.cpp
index a9b581464d..2ede6b62a2 100644
--- a/runtime/gtpin/gtpin_callback_stubs.cpp
+++ b/runtime/gtpin/gtpin_callback_stubs.cpp
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "CL/cl.h"
 #include <cstdint>
 
diff --git a/runtime/gtpin/gtpin_callbacks.cpp b/runtime/gtpin/gtpin_callbacks.cpp
index 6acb727e9f..ee9db7b28e 100644
--- a/runtime/gtpin/gtpin_callbacks.cpp
+++ b/runtime/gtpin/gtpin_callbacks.cpp
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "gtpin_ocl_interface.h"
 #include "CL/cl.h"
 #include "runtime/command_queue/command_queue.h"
diff --git a/runtime/gtpin/gtpin_defs.h b/runtime/gtpin/gtpin_defs.h
index bd4305ca21..395301b63a 100644
--- a/runtime/gtpin/gtpin_defs.h
+++ b/runtime/gtpin/gtpin_defs.h
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "gtpin_ocl_interface.h"
 #include "CL/cl.h"
 #include "runtime/command_queue/command_queue.h"
diff --git a/runtime/gtpin/gtpin_helpers.cpp b/runtime/gtpin/gtpin_helpers.cpp
index c735af6678..bfc7549aad 100644
--- a/runtime/gtpin/gtpin_helpers.cpp
+++ b/runtime/gtpin/gtpin_helpers.cpp
@@ -21,7 +21,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "gtpin_ocl_interface.h"
 #include "gtpin_helpers.h"
 #include "CL/cl.h"
diff --git a/runtime/gtpin/gtpin_init.cpp b/runtime/gtpin/gtpin_init.cpp
index 7eb432d2e2..b1824c17d6 100644
--- a/runtime/gtpin/gtpin_init.cpp
+++ b/runtime/gtpin/gtpin_init.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "gtpin_init.h"
 #include "gtpin_helpers.h"
 #include "CL/cl.h"
diff --git a/runtime/helpers/base_object.h b/runtime/helpers/base_object.h
index a27737c9c1..515bd4d43a 100644
--- a/runtime/helpers/base_object.h
+++ b/runtime/helpers/base_object.h
@@ -21,7 +21,6 @@
  */
 
 #pragma once
-#include "config.h"
 #include "CL/cl.h"
 #include "runtime/api/dispatch.h"
 #include "runtime/utilities/reference_tracked_object.h"
diff --git a/runtime/helpers/convert_color.h b/runtime/helpers/convert_color.h
index 45d26152e9..c17b61b5a3 100644
--- a/runtime/helpers/convert_color.h
+++ b/runtime/helpers/convert_color.h
@@ -21,7 +21,6 @@
  */
 
 #pragma once
-#include "config.h"
 #include "runtime/helpers/basic_math.h"
 #include "CL/cl.h"
 #include <utility>
diff --git a/runtime/helpers/get_info.h b/runtime/helpers/get_info.h
index f13341a566..35f451b584 100644
--- a/runtime/helpers/get_info.h
+++ b/runtime/helpers/get_info.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,7 +21,6 @@
  */
 
 #pragma once
-#include "config.h"
 #include "CL/cl.h"
 #include <cstring>
 
diff --git a/runtime/helpers/mipmap.h b/runtime/helpers/mipmap.h
index f195d124e3..387d609a58 100644
--- a/runtime/helpers/mipmap.h
+++ b/runtime/helpers/mipmap.h
@@ -21,7 +21,6 @@
 */
 
 #pragma once
-#include "config.h"
 #include "CL/cl.h"
 
 #include <cstdint>
diff --git a/runtime/helpers/options.h b/runtime/helpers/options.h
index a6c8db1802..ef71ff715c 100644
--- a/runtime/helpers/options.h
+++ b/runtime/helpers/options.h
@@ -24,7 +24,6 @@
 #include "runtime/helpers/debug_helpers.h"
 #include <cstdint>
 #include <cstddef>
-#include "config.h"
 
 #ifndef OCL_RUNTIME_PROFILING
 #define OCL_RUNTIME_PROFILING 0
diff --git a/runtime/helpers/sampler_helpers.h b/runtime/helpers/sampler_helpers.h
index b4f3d42d8f..1a6c834299 100644
--- a/runtime/helpers/sampler_helpers.h
+++ b/runtime/helpers/sampler_helpers.h
@@ -21,7 +21,6 @@
  */
 
 #pragma once
-#include "config.h"
 #include "CL/cl.h"
 
 // It's max SSH size per kernel (MAX_BINDING_TABLE_INDEX * 64)
diff --git a/runtime/helpers/string_helpers.h b/runtime/helpers/string_helpers.h
index 6a1435954b..12f0d94a4c 100644
--- a/runtime/helpers/string_helpers.h
+++ b/runtime/helpers/string_helpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,7 +21,6 @@
  */
 
 #pragma once
-#include "config.h"
 #include <cstdint>
 #include <cstring>
 #include <string>
diff --git a/runtime/helpers/surface_formats.h b/runtime/helpers/surface_formats.h
index 9874b0d582..c5d0640729 100644
--- a/runtime/helpers/surface_formats.h
+++ b/runtime/helpers/surface_formats.h
@@ -21,7 +21,6 @@
  */
 
 #pragma once
-#include "config.h"
 #include "CL/cl.h"
 
 #ifndef SUPPORT_YUV
diff --git a/runtime/memory_manager/address_mapper.cpp b/runtime/memory_manager/address_mapper.cpp
index ee5bd288df..e4a9698207 100644
--- a/runtime/memory_manager/address_mapper.cpp
+++ b/runtime/memory_manager/address_mapper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "runtime/helpers/aligned_memory.h"
 #include "runtime/memory_manager/address_mapper.h"
 
diff --git a/runtime/memory_manager/page_table.cpp b/runtime/memory_manager/page_table.cpp
index 7ca1bd488e..211248408d 100644
--- a/runtime/memory_manager/page_table.cpp
+++ b/runtime/memory_manager/page_table.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "runtime/memory_manager/page_table.h"
 
 #include <inttypes.h>
diff --git a/runtime/os_interface/debug_settings_manager.cpp b/runtime/os_interface/debug_settings_manager.cpp
index 63b45b5a08..9096e215ad 100644
--- a/runtime/os_interface/debug_settings_manager.cpp
+++ b/runtime/os_interface/debug_settings_manager.cpp
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "debug_settings_manager.h"
 #include "runtime/event/event.h"
 #include "runtime/kernel/kernel.h"
diff --git a/runtime/os_interface/performance_counters.cpp b/runtime/os_interface/performance_counters.cpp
index 37231b5cf8..3b274a899d 100644
--- a/runtime/os_interface/performance_counters.cpp
+++ b/runtime/os_interface/performance_counters.cpp
@@ -20,7 +20,6 @@
 * OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "config.h"
 #include "CL/cl.h"
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/os_interface/performance_counters.h"
diff --git a/runtime/os_interface/performance_counters.h b/runtime/os_interface/performance_counters.h
index ebcef60c78..ba02ab8ca4 100644
--- a/runtime/os_interface/performance_counters.h
+++ b/runtime/os_interface/performance_counters.h
@@ -21,7 +21,6 @@
 */
 
 #pragma once
-#include "config.h"
 #include "CL/cl.h"
 #include "runtime/event/perf_counter.h"
 #include "runtime/helpers/hw_info.h"
diff --git a/runtime/os_interface/windows/performance_counters_win.cpp b/runtime/os_interface/windows/performance_counters_win.cpp
index 57ba74d2ab..33443056e0 100644
--- a/runtime/os_interface/windows/performance_counters_win.cpp
+++ b/runtime/os_interface/windows/performance_counters_win.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2017, Intel Corporation
+* Copyright (c) 2017 - 2018, Intel Corporation
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,6 @@
 * OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "config.h"
 #include "runtime/os_interface/windows/windows_wrapper.h"
 #include "performance_counters_win.h"
 #include "runtime/os_interface/windows/os_interface.h"
diff --git a/runtime/os_interface/windows/wddm.cpp b/runtime/os_interface/windows/wddm.cpp
index 1e0fe347a1..b2a2d303cf 100644
--- a/runtime/os_interface/windows/wddm.cpp
+++ b/runtime/os_interface/windows/wddm.cpp
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/options.h"
 #include "runtime/os_interface/windows/gdi_interface.h"
diff --git a/runtime/platform/platform.h b/runtime/platform/platform.h
index ea5513ef7e..7464185f4c 100644
--- a/runtime/platform/platform.h
+++ b/runtime/platform/platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,7 +21,6 @@
  */
 
 #pragma once
-#include "config.h"
 #include "platform_info.h"
 #include "runtime/api/cl_types.h"
 #include "runtime/device/device_vector.h"
diff --git a/runtime/program/build.cpp b/runtime/program/build.cpp
index 36f156b6ed..ebd97a482d 100644
--- a/runtime/program/build.cpp
+++ b/runtime/program/build.cpp
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "runtime/compiler_interface/compiler_interface.h"
 #include "runtime/compiler_interface/compiler_options.h"
 #include "runtime/os_interface/debug_settings_manager.h"
diff --git a/runtime/program/compile.cpp b/runtime/program/compile.cpp
index 8f20d7329d..c3544f3418 100644
--- a/runtime/program/compile.cpp
+++ b/runtime/program/compile.cpp
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "elf/writer.h"
 #include "runtime/compiler_interface/compiler_interface.h"
 #include "runtime/compiler_interface/compiler_options.h"
diff --git a/runtime/program/kernel_arg_info.h b/runtime/program/kernel_arg_info.h
index 1cdb1dea26..21533de366 100644
--- a/runtime/program/kernel_arg_info.h
+++ b/runtime/program/kernel_arg_info.h
@@ -21,7 +21,6 @@
  */
 
 #pragma once
-#include "config.h"
 #include "CL/cl.h"
 #include <cstdint>
 #include <string>
diff --git a/runtime/program/kernel_info.h b/runtime/program/kernel_info.h
index 1487b683b7..d745684225 100644
--- a/runtime/program/kernel_info.h
+++ b/runtime/program/kernel_info.h
@@ -21,7 +21,6 @@
  */
 
 #pragma once
-#include "config.h"
 #include "CL/cl.h"
 #include "heap_info.h"
 #include "kernel_arg_info.h"
diff --git a/runtime/program/link.cpp b/runtime/program/link.cpp
index a1bf4b407b..271dcbcd4c 100644
--- a/runtime/program/link.cpp
+++ b/runtime/program/link.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "runtime/compiler_interface/compiler_interface.h"
 #include "runtime/platform/platform.h"
 #include "runtime/helpers/validators.h"
diff --git a/runtime/sharings/d3d/cl_d3d_api.h b/runtime/sharings/d3d/cl_d3d_api.h
index d9cc11a5ca..91a9477b59 100644
--- a/runtime/sharings/d3d/cl_d3d_api.h
+++ b/runtime/sharings/d3d/cl_d3d_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "config.h"
 
 #include "CL/cl.h"
 #include <d3d10_1.h>
diff --git a/runtime/sharings/sharing.cpp b/runtime/sharings/sharing.cpp
index a0700b213f..80e8ecd464 100644
--- a/runtime/sharings/sharing.cpp
+++ b/runtime/sharings/sharing.cpp
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "CL/cl.h"
 #include "runtime/mem_obj/mem_obj.h"
 #include "sharing.h"
diff --git a/runtime/sharings/sharing_factory.cpp b/runtime/sharings/sharing_factory.cpp
index 2dfedf8569..b0b42e0713 100644
--- a/runtime/sharings/sharing_factory.cpp
+++ b/runtime/sharings/sharing_factory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,6 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
  */
-#include "config.h"
 #include "sharing_factory.h"
 
 namespace OCLRT {
diff --git a/runtime/sharings/sharing_factory.h b/runtime/sharings/sharing_factory.h
index c7817b7829..b240287995 100644
--- a/runtime/sharings/sharing_factory.h
+++ b/runtime/sharings/sharing_factory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,7 +21,6 @@
  */
 
 #pragma once
-#include "config.h"
 #include "CL/cl.h"
 
 #include <memory>
diff --git a/runtime/sharings/va/cl_va_api.cpp b/runtime/sharings/va/cl_va_api.cpp
index 1fba18eb4e..158ccc168b 100644
--- a/runtime/sharings/va/cl_va_api.cpp
+++ b/runtime/sharings/va/cl_va_api.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "runtime/api/api.h"
 #include "CL/cl.h"
 #include "runtime/command_queue/command_queue.h"
diff --git a/runtime/sharings/va/va_sharing_defines.h b/runtime/sharings/va/va_sharing_defines.h
index 479092785a..feb3ec49ef 100644
--- a/runtime/sharings/va/va_sharing_defines.h
+++ b/runtime/sharings/va/va_sharing_defines.h
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "config.h"
 #include "CL/cl.h"
 #include "CL/cl_va_api_media_sharing_intel.h"
 
diff --git a/unit_tests/api/cl_build_program_tests.cpp b/unit_tests/api/cl_build_program_tests.cpp
index 2981599dff..e73cfe9d3e 100644
--- a/unit_tests/api/cl_build_program_tests.cpp
+++ b/unit_tests/api/cl_build_program_tests.cpp
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "cl_api_tests.h"
 #include "runtime/compiler_interface/compiler_interface.h"
 #include "runtime/context/context.h"
diff --git a/unit_tests/api/cl_compile_program_tests.cpp b/unit_tests/api/cl_compile_program_tests.cpp
index 72c4aea168..f6c453e5fa 100644
--- a/unit_tests/api/cl_compile_program_tests.cpp
+++ b/unit_tests/api/cl_compile_program_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "cl_api_tests.h"
 #include "runtime/compiler_interface/compiler_interface.h"
 #include "runtime/context/context.h"
diff --git a/unit_tests/api/cl_link_program_tests.cpp b/unit_tests/api/cl_link_program_tests.cpp
index ae4822e1b3..3698b83eed 100644
--- a/unit_tests/api/cl_link_program_tests.cpp
+++ b/unit_tests/api/cl_link_program_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "cl_api_tests.h"
 #include "runtime/context/context.h"
 #include "runtime/compiler_interface/compiler_interface.h"
diff --git a/unit_tests/command_queue/command_queue_fixture.h b/unit_tests/command_queue/command_queue_fixture.h
index 3e459863fb..f37d516113 100644
--- a/unit_tests/command_queue/command_queue_fixture.h
+++ b/unit_tests/command_queue/command_queue_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,7 +21,6 @@
  */
 
 #pragma once
-#include "config.h"
 #include "gtest/gtest.h"
 #include "CL/cl.h"
 #include "runtime/command_queue/command_queue.h"
diff --git a/unit_tests/fixtures/context_fixture.cpp b/unit_tests/fixtures/context_fixture.cpp
index a4bd87a983..245ddcf901 100644
--- a/unit_tests/fixtures/context_fixture.cpp
+++ b/unit_tests/fixtures/context_fixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "context_fixture.h"
 #include "unit_tests/mocks/mock_context.h"
 #include "gtest/gtest.h"
diff --git a/unit_tests/fixtures/hello_world_fixture.h b/unit_tests/fixtures/hello_world_fixture.h
index 91634ec78a..b803cc5d4b 100644
--- a/unit_tests/fixtures/hello_world_fixture.h
+++ b/unit_tests/fixtures/hello_world_fixture.h
@@ -21,7 +21,6 @@
  */
 
 #pragma once
-#include "config.h"
 #include "test.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/helpers/aligned_memory.h"
diff --git a/unit_tests/fixtures/simple_arg_kernel_fixture.h b/unit_tests/fixtures/simple_arg_kernel_fixture.h
index c15bfacc53..441b638e3c 100644
--- a/unit_tests/fixtures/simple_arg_kernel_fixture.h
+++ b/unit_tests/fixtures/simple_arg_kernel_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,7 +21,6 @@
  */
 
 #pragma once
-#include "config.h"
 #include "gtest/gtest.h"
 #include "CL/cl.h"
 #include "runtime/device/device.h"
diff --git a/unit_tests/gtpin/gtpin_tests.cpp b/unit_tests/gtpin/gtpin_tests.cpp
index 8c81aedd53..ff90f7f200 100644
--- a/unit_tests/gtpin/gtpin_tests.cpp
+++ b/unit_tests/gtpin/gtpin_tests.cpp
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "runtime/context/context.h"
 #include "runtime/device/device.h"
 #include "runtime/gtpin/gtpin_defs.h"
diff --git a/unit_tests/kernel/clone_kernel_tests.cpp b/unit_tests/kernel/clone_kernel_tests.cpp
index 34f36a069f..2f30edaac9 100644
--- a/unit_tests/kernel/clone_kernel_tests.cpp
+++ b/unit_tests/kernel/clone_kernel_tests.cpp
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "CL/cl.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/mem_obj/pipe.h"
diff --git a/unit_tests/kernel/kernel_accelerator_arg_tests.cpp b/unit_tests/kernel/kernel_accelerator_arg_tests.cpp
index f563977ebe..7d790e2677 100644
--- a/unit_tests/kernel/kernel_accelerator_arg_tests.cpp
+++ b/unit_tests/kernel/kernel_accelerator_arg_tests.cpp
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "CL/cl.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/mem_obj/buffer.h"
diff --git a/unit_tests/kernel/kernel_arg_buffer_fixture.cpp b/unit_tests/kernel/kernel_arg_buffer_fixture.cpp
index d077f6df3d..5e8e28dd7f 100644
--- a/unit_tests/kernel/kernel_arg_buffer_fixture.cpp
+++ b/unit_tests/kernel/kernel_arg_buffer_fixture.cpp
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "CL/cl.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/mem_obj/buffer.h"
diff --git a/unit_tests/kernel/kernel_arg_buffer_fixture.h b/unit_tests/kernel/kernel_arg_buffer_fixture.h
index 1e08176653..363644267e 100644
--- a/unit_tests/kernel/kernel_arg_buffer_fixture.h
+++ b/unit_tests/kernel/kernel_arg_buffer_fixture.h
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 #pragma once
-#include "config.h"
 #include "CL/cl.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/mem_obj/buffer.h"
diff --git a/unit_tests/kernel/kernel_arg_buffer_tests.cpp b/unit_tests/kernel/kernel_arg_buffer_tests.cpp
index 4434180bde..66e2ad23f4 100644
--- a/unit_tests/kernel/kernel_arg_buffer_tests.cpp
+++ b/unit_tests/kernel/kernel_arg_buffer_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "CL/cl.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/mem_obj/buffer.h"
diff --git a/unit_tests/kernel/kernel_arg_pipe_tests.cpp b/unit_tests/kernel/kernel_arg_pipe_tests.cpp
index 14187d2a73..0f912bb4fc 100644
--- a/unit_tests/kernel/kernel_arg_pipe_tests.cpp
+++ b/unit_tests/kernel/kernel_arg_pipe_tests.cpp
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "CL/cl.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/mem_obj/pipe.h"
diff --git a/unit_tests/kernel/kernel_arg_svm_tests.cpp b/unit_tests/kernel/kernel_arg_svm_tests.cpp
index 6fb5c7760a..00f3cbb343 100644
--- a/unit_tests/kernel/kernel_arg_svm_tests.cpp
+++ b/unit_tests/kernel/kernel_arg_svm_tests.cpp
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "CL/cl.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/mem_obj/buffer.h"
diff --git a/unit_tests/kernel/kernel_immediate_arg_tests.cpp b/unit_tests/kernel/kernel_immediate_arg_tests.cpp
index 95bae02b04..92f7eb0407 100644
--- a/unit_tests/kernel/kernel_immediate_arg_tests.cpp
+++ b/unit_tests/kernel/kernel_immediate_arg_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "CL/cl.h"
 #include "runtime/kernel/kernel.h"
 #include "unit_tests/fixtures/device_fixture.h"
diff --git a/unit_tests/kernel/kernel_slm_arg_tests.cpp b/unit_tests/kernel/kernel_slm_arg_tests.cpp
index 73c989f842..68c2ca0dbb 100644
--- a/unit_tests/kernel/kernel_slm_arg_tests.cpp
+++ b/unit_tests/kernel/kernel_slm_arg_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "runtime/helpers/basic_math.h"
 #include "runtime/helpers/ptr_math.h"
 #include "runtime/kernel/kernel.h"
diff --git a/unit_tests/memory_manager/address_mapper_tests.cpp b/unit_tests/memory_manager/address_mapper_tests.cpp
index eb97b03da2..65e0b8282c 100644
--- a/unit_tests/memory_manager/address_mapper_tests.cpp
+++ b/unit_tests/memory_manager/address_mapper_tests.cpp
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/selectors.h"
 #include "runtime/memory_manager/address_mapper.h"
diff --git a/unit_tests/memory_manager/page_table_tests.cpp b/unit_tests/memory_manager/page_table_tests.cpp
index 5b8957fd61..2992084e0c 100644
--- a/unit_tests/memory_manager/page_table_tests.cpp
+++ b/unit_tests/memory_manager/page_table_tests.cpp
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "runtime/helpers/selectors.h"
 #include "runtime/memory_manager/page_table.h"
 #include "test.h"
diff --git a/unit_tests/offline_compiler/main.cpp b/unit_tests/offline_compiler/main.cpp
index 7bda72b93e..c91d84e193 100644
--- a/unit_tests/offline_compiler/main.cpp
+++ b/unit_tests/offline_compiler/main.cpp
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "environment.h"
 #include "runtime/os_interface/os_library.h"
 #include "unit_tests/custom_event_listener.h"
diff --git a/unit_tests/offline_compiler/offline_compiler_tests.cpp b/unit_tests/offline_compiler/offline_compiler_tests.cpp
index 1a4e2d9684..c581add28b 100644
--- a/unit_tests/offline_compiler/offline_compiler_tests.cpp
+++ b/unit_tests/offline_compiler/offline_compiler_tests.cpp
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "environment.h"
 #include "mock/mock_offline_compiler.h"
 #include "offline_compiler_tests.h"
diff --git a/unit_tests/os_interface/linux/mock_performance_counters_linux.cpp b/unit_tests/os_interface/linux/mock_performance_counters_linux.cpp
index 8864721f9b..84ef003454 100644
--- a/unit_tests/os_interface/linux/mock_performance_counters_linux.cpp
+++ b/unit_tests/os_interface/linux/mock_performance_counters_linux.cpp
@@ -19,7 +19,6 @@
 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 * OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "config.h"
 #include "mock_performance_counters_linux.h"
 #include "unit_tests/os_interface/linux/drm_mock.h"
 #include "unit_tests/os_interface/linux/mock_os_time_linux.h"
diff --git a/unit_tests/os_interface/linux/performance_counters_linux_tests.cpp b/unit_tests/os_interface/linux/performance_counters_linux_tests.cpp
index 769a0d0e52..4c21ac0a36 100644
--- a/unit_tests/os_interface/linux/performance_counters_linux_tests.cpp
+++ b/unit_tests/os_interface/linux/performance_counters_linux_tests.cpp
@@ -19,7 +19,6 @@
 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 * OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "config.h"
 #include "runtime/helpers/options.h"
 #include "mock_performance_counters_linux.h"
 #include "unit_tests/os_interface/linux/drm_mock.h"
diff --git a/unit_tests/os_interface/windows/mock_performance_counters_win.cpp b/unit_tests/os_interface/windows/mock_performance_counters_win.cpp
index 2da1fdd3c8..6a5d89d220 100644
--- a/unit_tests/os_interface/windows/mock_performance_counters_win.cpp
+++ b/unit_tests/os_interface/windows/mock_performance_counters_win.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2017, Intel Corporation
+* Copyright (c) 2017 - 2018, Intel Corporation
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
@@ -21,7 +21,6 @@
 */
 
 #include "runtime/os_interface/windows/windows_wrapper.h"
-#include "config.h"
 #include "mock_performance_counters_win.h"
 
 namespace OCLRT {
diff --git a/unit_tests/os_interface/windows/performance_counters_win_tests.cpp b/unit_tests/os_interface/windows/performance_counters_win_tests.cpp
index e958dfe53a..a4f833ec01 100644
--- a/unit_tests/os_interface/windows/performance_counters_win_tests.cpp
+++ b/unit_tests/os_interface/windows/performance_counters_win_tests.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2017, Intel Corporation
+* Copyright (c) 2017 - 2018, Intel Corporation
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
@@ -21,7 +21,6 @@
 */
 
 #include "runtime/os_interface/windows/windows_wrapper.h"
-#include "config.h"
 #include "unit_tests/os_interface/windows/mock_performance_counters_win.h"
 #include "gtest/gtest.h"
 
diff --git a/unit_tests/perf_tests/api/context_tests.cpp b/unit_tests/perf_tests/api/context_tests.cpp
index a3695cc75a..0e26dbe029 100644
--- a/unit_tests/perf_tests/api/context_tests.cpp
+++ b/unit_tests/perf_tests/api/context_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "config.h"
 #include "cl_api_tests.h"
 #include "runtime/compiler_interface/compiler_interface.h"
 #include "runtime/helpers/file_io.h"
diff --git a/unit_tests/perf_tests/fixtures/command_queue_fixture.h b/unit_tests/perf_tests/fixtures/command_queue_fixture.h
index ba8bada405..0b84ca02a7 100644
--- a/unit_tests/perf_tests/fixtures/command_queue_fixture.h
+++ b/unit_tests/perf_tests/fixtures/command_queue_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,7 +21,6 @@
  */
 
 #pragma once
-#include "config.h"
 #include "gtest/gtest.h"
 #include "CL/cl.h"
 #include "runtime/command_queue/command_queue.h"