diff --git a/runtime/enable_gens.cmake b/runtime/enable_gens.cmake
index 6efb5a64a0..2cbd8c6ef6 100644
--- a/runtime/enable_gens.cmake
+++ b/runtime/enable_gens.cmake
@@ -73,7 +73,7 @@ macro(macro_for_each_platform)
     list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_BASE ${GENX_PREFIX}/${PLATFORM_FILE})
   endforeach()
 
-  list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_LINUX ${GENX_PREFIX}/linux/hw_info_config_${PLATFORM_IT_LOWER}.cpp)
+  list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_LINUX ${GENX_PREFIX}/linux/hw_info_config_${PLATFORM_IT_LOWER}.inl)
   list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_WINDOWS ${GENX_PREFIX}/windows/hw_info_config_${PLATFORM_IT_LOWER}.cpp)
 
   # Enable platform
@@ -98,6 +98,8 @@ macro(macro_for_each_gen)
 
   apply_macro_for_each_platform()
 
+  list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_LINUX ${GENX_PREFIX}/linux/hw_info_config_${GEN_TYPE_LOWER}.cpp)
+  
   list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${GENX_PREFIX}/enable_family_full_${GEN_TYPE_LOWER}.cpp)
   list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${GENX_PREFIX}/enable_hw_info_config_${GEN_TYPE_LOWER}.cpp)
 
diff --git a/runtime/gen8/linux/hw_info_config_bdw.cpp b/runtime/gen8/linux/hw_info_config_bdw.inl
similarity index 98%
rename from runtime/gen8/linux/hw_info_config_bdw.cpp
rename to runtime/gen8/linux/hw_info_config_bdw.inl
index f5a24cc802..931a83d2e4 100644
--- a/runtime/gen8/linux/hw_info_config_bdw.cpp
+++ b/runtime/gen8/linux/hw_info_config_bdw.inl
@@ -22,7 +22,6 @@
 
 #include "runtime/helpers/hw_info.h"
 #include "runtime/os_interface/hw_info_config.h"
-#include "runtime/os_interface/hw_info_config.inl"
 
 namespace OCLRT {
 
diff --git a/runtime/gen8/linux/hw_info_config_gen8.cpp b/runtime/gen8/linux/hw_info_config_gen8.cpp
new file mode 100644
index 0000000000..1e90e8d07a
--- /dev/null
+++ b/runtime/gen8/linux/hw_info_config_gen8.cpp
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 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"),
+ * 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.
+ */
+
+#include "runtime/os_interface/hw_info_config.inl"
+
+#ifdef SUPPORT_BDW
+#include "hw_info_config_bdw.inl"
+#endif
\ No newline at end of file
diff --git a/runtime/gen9/linux/hw_info_config_bxt.cpp b/runtime/gen9/linux/hw_info_config_bxt.inl
similarity index 98%
rename from runtime/gen9/linux/hw_info_config_bxt.cpp
rename to runtime/gen9/linux/hw_info_config_bxt.inl
index 51819557ef..e20dd94791 100644
--- a/runtime/gen9/linux/hw_info_config_bxt.cpp
+++ b/runtime/gen9/linux/hw_info_config_bxt.inl
@@ -22,7 +22,6 @@
 
 #include "runtime/helpers/hw_info.h"
 #include "runtime/os_interface/hw_info_config.h"
-#include "runtime/os_interface/hw_info_config.inl"
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "runtime/os_interface/linux/os_interface.h"
 
diff --git a/runtime/gen9/linux/hw_info_config_cfl.cpp b/runtime/gen9/linux/hw_info_config_cfl.inl
similarity index 98%
rename from runtime/gen9/linux/hw_info_config_cfl.cpp
rename to runtime/gen9/linux/hw_info_config_cfl.inl
index de7a8a2676..411a851e31 100644
--- a/runtime/gen9/linux/hw_info_config_cfl.cpp
+++ b/runtime/gen9/linux/hw_info_config_cfl.inl
@@ -22,7 +22,6 @@
 
 #include "runtime/helpers/hw_info.h"
 #include "runtime/os_interface/hw_info_config.h"
-#include "runtime/os_interface/hw_info_config.inl"
 
 namespace OCLRT {
 
diff --git a/runtime/gen9/linux/hw_info_config_gen9.cpp b/runtime/gen9/linux/hw_info_config_gen9.cpp
new file mode 100644
index 0000000000..717a812324
--- /dev/null
+++ b/runtime/gen9/linux/hw_info_config_gen9.cpp
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 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"),
+ * 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.
+ */
+
+#include "runtime/os_interface/hw_info_config.inl"
+
+#ifdef SUPPORT_BXT
+#include "hw_info_config_bxt.inl"
+#endif
+#ifdef SUPPORT_CFL
+#include "hw_info_config_cfl.inl"
+#endif
+#ifdef SUPPORT_GLK
+#include "hw_info_config_glk.inl"
+#endif
+#ifdef SUPPORT_KBL
+#include "hw_info_config_kbl.inl"
+#endif
+#ifdef SUPPORT_SKL
+#include "hw_info_config_skl.inl"
+#endif
\ No newline at end of file
diff --git a/runtime/gen9/linux/hw_info_config_glk.cpp b/runtime/gen9/linux/hw_info_config_glk.inl
similarity index 98%
rename from runtime/gen9/linux/hw_info_config_glk.cpp
rename to runtime/gen9/linux/hw_info_config_glk.inl
index d560873cdd..9c535aa5a8 100644
--- a/runtime/gen9/linux/hw_info_config_glk.cpp
+++ b/runtime/gen9/linux/hw_info_config_glk.inl
@@ -22,7 +22,6 @@
 
 #include "runtime/helpers/hw_info.h"
 #include "runtime/os_interface/hw_info_config.h"
-#include "runtime/os_interface/hw_info_config.inl"
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "runtime/os_interface/linux/os_interface.h"
 
diff --git a/runtime/gen9/linux/hw_info_config_kbl.cpp b/runtime/gen9/linux/hw_info_config_kbl.inl
similarity index 98%
rename from runtime/gen9/linux/hw_info_config_kbl.cpp
rename to runtime/gen9/linux/hw_info_config_kbl.inl
index 4943625cda..9971679382 100644
--- a/runtime/gen9/linux/hw_info_config_kbl.cpp
+++ b/runtime/gen9/linux/hw_info_config_kbl.inl
@@ -22,7 +22,6 @@
 
 #include "runtime/helpers/hw_info.h"
 #include "runtime/os_interface/hw_info_config.h"
-#include "runtime/os_interface/hw_info_config.inl"
 
 namespace OCLRT {
 
diff --git a/runtime/gen9/linux/hw_info_config_skl.cpp b/runtime/gen9/linux/hw_info_config_skl.inl
similarity index 98%
rename from runtime/gen9/linux/hw_info_config_skl.cpp
rename to runtime/gen9/linux/hw_info_config_skl.inl
index 900fb3c745..73122da37f 100644
--- a/runtime/gen9/linux/hw_info_config_skl.cpp
+++ b/runtime/gen9/linux/hw_info_config_skl.inl
@@ -22,7 +22,6 @@
 
 #include "runtime/helpers/hw_info.h"
 #include "runtime/os_interface/hw_info_config.h"
-#include "runtime/os_interface/hw_info_config.inl"
 #include "runtime/gen_common/hw_cmds.h"
 
 namespace OCLRT {