diff --git a/opencl/source/enable_gens.cmake b/opencl/source/enable_gens.cmake
index 669cead548..c7e22d3379 100644
--- a/opencl/source/enable_gens.cmake
+++ b/opencl/source/enable_gens.cmake
@@ -41,7 +41,7 @@ macro(macro_for_each_platform)
 
   foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
     foreach(BRANCH ${BRANCH_DIR_LIST})
-      set(PLATFORM_FILE "hw_info_${PLATFORM_IT_LOWER}.inl")
+      set(PLATFORM_FILE "hw_info_${PLATFORM_IT_LOWER}.cpp")
       set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER}${BRANCH}${PLATFORM_FILE})
       if(EXISTS ${SRC_FILE})
         list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_BASE ${SRC_FILE})
diff --git a/opencl/source/gen11/hw_info_ehl.inl b/opencl/source/gen11/hw_info_ehl.cpp
similarity index 100%
rename from opencl/source/gen11/hw_info_ehl.inl
rename to opencl/source/gen11/hw_info_ehl.cpp
diff --git a/opencl/source/gen11/hw_info_gen11.cpp b/opencl/source/gen11/hw_info_gen11.cpp
index fd40e596e7..8e0d3920e6 100644
--- a/opencl/source/gen11/hw_info_gen11.cpp
+++ b/opencl/source/gen11/hw_info_gen11.cpp
@@ -5,15 +5,7 @@
  *
  */
 
-#ifdef SUPPORT_ICLLP
-#include "hw_info_icllp.inl"
-#endif
-#ifdef SUPPORT_LKF
-#include "hw_info_lkf.inl"
-#endif
-#ifdef SUPPORT_EHL
-#include "hw_info_ehl.inl"
-#endif
+#include "shared/source/gen11/hw_info_gen11.h"
 
 namespace NEO {
 const char *GfxFamilyMapper<IGFX_GEN11_CORE>::name = "Gen11";
diff --git a/opencl/source/gen11/hw_info_icllp.inl b/opencl/source/gen11/hw_info_icllp.cpp
similarity index 100%
rename from opencl/source/gen11/hw_info_icllp.inl
rename to opencl/source/gen11/hw_info_icllp.cpp
diff --git a/opencl/source/gen11/hw_info_lkf.inl b/opencl/source/gen11/hw_info_lkf.cpp
similarity index 100%
rename from opencl/source/gen11/hw_info_lkf.inl
rename to opencl/source/gen11/hw_info_lkf.cpp
diff --git a/opencl/source/gen12lp/hw_info_adls.inl b/opencl/source/gen12lp/hw_info_adls.cpp
similarity index 100%
rename from opencl/source/gen12lp/hw_info_adls.inl
rename to opencl/source/gen12lp/hw_info_adls.cpp
diff --git a/opencl/source/gen12lp/hw_info_dg1.inl b/opencl/source/gen12lp/hw_info_dg1.cpp
similarity index 100%
rename from opencl/source/gen12lp/hw_info_dg1.inl
rename to opencl/source/gen12lp/hw_info_dg1.cpp
diff --git a/opencl/source/gen12lp/hw_info_gen12lp.cpp b/opencl/source/gen12lp/hw_info_gen12lp.cpp
index c31bcc075c..4a7cef2682 100644
--- a/opencl/source/gen12lp/hw_info_gen12lp.cpp
+++ b/opencl/source/gen12lp/hw_info_gen12lp.cpp
@@ -1,23 +1,10 @@
 /*
- * Copyright (C) 2019-2020 Intel Corporation
+ * Copyright (C) 2019-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#ifdef SUPPORT_TGLLP
-#include "hw_info_tgllp.inl"
-#endif
-#ifdef SUPPORT_DG1
-#include "hw_info_dg1.inl"
-#endif
-#ifdef SUPPORT_RKL
-#include "hw_info_rkl.inl"
-#endif
-#ifdef SUPPORT_ADLS
-#include "hw_info_adls.inl"
-#endif
-
 #include "shared/source/gen12lp/hw_info_gen12lp.h"
 
 namespace NEO {
diff --git a/opencl/source/gen12lp/hw_info_rkl.inl b/opencl/source/gen12lp/hw_info_rkl.cpp
similarity index 100%
rename from opencl/source/gen12lp/hw_info_rkl.inl
rename to opencl/source/gen12lp/hw_info_rkl.cpp
diff --git a/opencl/source/gen12lp/hw_info_tgllp.inl b/opencl/source/gen12lp/hw_info_tgllp.cpp
similarity index 100%
rename from opencl/source/gen12lp/hw_info_tgllp.inl
rename to opencl/source/gen12lp/hw_info_tgllp.cpp
diff --git a/opencl/source/gen8/hw_info_bdw.inl b/opencl/source/gen8/hw_info_bdw.cpp
similarity index 100%
rename from opencl/source/gen8/hw_info_bdw.inl
rename to opencl/source/gen8/hw_info_bdw.cpp
diff --git a/opencl/source/gen8/hw_info_gen8.cpp b/opencl/source/gen8/hw_info_gen8.cpp
index f2e2332709..c7797108a3 100644
--- a/opencl/source/gen8/hw_info_gen8.cpp
+++ b/opencl/source/gen8/hw_info_gen8.cpp
@@ -5,9 +5,7 @@
  *
  */
 
-#ifdef SUPPORT_BDW
-#include "hw_info_bdw.inl"
-#endif
+#include "shared/source/gen8/hw_info_gen8.h"
 
 namespace NEO {
 const char *GfxFamilyMapper<IGFX_GEN8_CORE>::name = "Gen8";
diff --git a/opencl/source/gen9/hw_info_bxt.inl b/opencl/source/gen9/hw_info_bxt.cpp
similarity index 100%
rename from opencl/source/gen9/hw_info_bxt.inl
rename to opencl/source/gen9/hw_info_bxt.cpp
diff --git a/opencl/source/gen9/hw_info_cfl.inl b/opencl/source/gen9/hw_info_cfl.cpp
similarity index 100%
rename from opencl/source/gen9/hw_info_cfl.inl
rename to opencl/source/gen9/hw_info_cfl.cpp
diff --git a/opencl/source/gen9/hw_info_gen9.cpp b/opencl/source/gen9/hw_info_gen9.cpp
index 1ace36c66e..decf33da64 100644
--- a/opencl/source/gen9/hw_info_gen9.cpp
+++ b/opencl/source/gen9/hw_info_gen9.cpp
@@ -5,21 +5,7 @@
  *
  */
 
-#ifdef SUPPORT_BXT
-#include "hw_info_bxt.inl"
-#endif
-#ifdef SUPPORT_CFL
-#include "hw_info_cfl.inl"
-#endif
-#ifdef SUPPORT_GLK
-#include "hw_info_glk.inl"
-#endif
-#ifdef SUPPORT_KBL
-#include "hw_info_kbl.inl"
-#endif
-#ifdef SUPPORT_SKL
-#include "hw_info_skl.inl"
-#endif
+#include "shared/source/gen9/hw_info_gen9.h"
 
 namespace NEO {
 const char *GfxFamilyMapper<IGFX_GEN9_CORE>::name = "Gen9";
diff --git a/opencl/source/gen9/hw_info_glk.inl b/opencl/source/gen9/hw_info_glk.cpp
similarity index 100%
rename from opencl/source/gen9/hw_info_glk.inl
rename to opencl/source/gen9/hw_info_glk.cpp
diff --git a/opencl/source/gen9/hw_info_kbl.inl b/opencl/source/gen9/hw_info_kbl.cpp
similarity index 100%
rename from opencl/source/gen9/hw_info_kbl.inl
rename to opencl/source/gen9/hw_info_kbl.cpp
diff --git a/opencl/source/gen9/hw_info_skl.inl b/opencl/source/gen9/hw_info_skl.cpp
similarity index 100%
rename from opencl/source/gen9/hw_info_skl.inl
rename to opencl/source/gen9/hw_info_skl.cpp
diff --git a/opencl/source/xe_hp_core/hw_info_xe_hp_core.cpp b/opencl/source/xe_hp_core/hw_info_xe_hp_core.cpp
index f034250fc2..bd387500d7 100644
--- a/opencl/source/xe_hp_core/hw_info_xe_hp_core.cpp
+++ b/opencl/source/xe_hp_core/hw_info_xe_hp_core.cpp
@@ -5,9 +5,7 @@
  *
  */
 
-#ifdef SUPPORT_XE_HP_SDV
-#include "hw_info_xehp.inl"
-#endif
+#include "shared/source/xe_hp_core/hw_info_xe_hp_core.h"
 
 namespace NEO {
 const char *GfxFamilyMapper<IGFX_XE_HP_CORE>::name = "XE_HP_CORE";
diff --git a/opencl/source/xe_hp_core/hw_info_xehp.inl b/opencl/source/xe_hp_core/hw_info_xe_hp_sdv.cpp
similarity index 100%
rename from opencl/source/xe_hp_core/hw_info_xehp.inl
rename to opencl/source/xe_hp_core/hw_info_xe_hp_sdv.cpp
diff --git a/shared/offline_compiler/source/CMakeLists.txt b/shared/offline_compiler/source/CMakeLists.txt
index cb1d474307..05b83cec09 100644
--- a/shared/offline_compiler/source/CMakeLists.txt
+++ b/shared/offline_compiler/source/CMakeLists.txt
@@ -110,7 +110,7 @@ set(RUNTIME_GENX_CPP_FILES
 macro(macro_for_each_platform)
   foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
     foreach(BRANCH ${BRANCH_DIR_LIST})
-      set(SRC_FILE ${NEO_SOURCE_DIR}/opencl/source${BRANCH}${GEN_TYPE_LOWER}${BRANCH_DIR}hw_info_${PLATFORM_IT_LOWER}.inl)
+      set(SRC_FILE ${NEO_SOURCE_DIR}/opencl/source${BRANCH}${GEN_TYPE_LOWER}${BRANCH_DIR}hw_info_${PLATFORM_IT_LOWER}.cpp)
       if(EXISTS ${SRC_FILE})
         list(APPEND CLOC_LIB_SRCS_LIB ${SRC_FILE})
       endif()