diff --git a/shared/source/gen11/windows/product_helper_ehl.cpp b/shared/source/gen11/windows/product_helper_ehl.cpp
index 256fcf842c..2e6b50ca9e 100644
--- a/shared/source/gen11/windows/product_helper_ehl.cpp
+++ b/shared/source/gen11/windows/product_helper_ehl.cpp
@@ -12,4 +12,6 @@
 
 constexpr static auto gfxProduct = IGFX_ELKHARTLAKE;
 
+#include "shared/source/os_interface/product_helper_before_gen12lp.inl"
+
 template class NEO::ProductHelperHw<gfxProduct>;
diff --git a/shared/source/gen11/windows/product_helper_icllp.cpp b/shared/source/gen11/windows/product_helper_icllp.cpp
index 986df603f6..f66f9f1f59 100644
--- a/shared/source/gen11/windows/product_helper_icllp.cpp
+++ b/shared/source/gen11/windows/product_helper_icllp.cpp
@@ -13,5 +13,6 @@
 constexpr static auto gfxProduct = IGFX_ICELAKE_LP;
 
 #include "shared/source/gen11/icllp/os_agnostic_product_helper_icllp.inl"
+#include "shared/source/os_interface/product_helper_before_gen12lp.inl"
 
 template class NEO::ProductHelperHw<gfxProduct>;
diff --git a/shared/source/gen11/windows/product_helper_lkf.cpp b/shared/source/gen11/windows/product_helper_lkf.cpp
index 697600c798..c8a613d844 100644
--- a/shared/source/gen11/windows/product_helper_lkf.cpp
+++ b/shared/source/gen11/windows/product_helper_lkf.cpp
@@ -12,4 +12,6 @@
 
 constexpr static auto gfxProduct = IGFX_LAKEFIELD;
 
+#include "shared/source/os_interface/product_helper_before_gen12lp.inl"
+
 template class NEO::ProductHelperHw<gfxProduct>;
diff --git a/shared/source/gen8/windows/product_helper_bdw.cpp b/shared/source/gen8/windows/product_helper_bdw.cpp
index d8854b1a4a..599502e8e5 100644
--- a/shared/source/gen8/windows/product_helper_bdw.cpp
+++ b/shared/source/gen8/windows/product_helper_bdw.cpp
@@ -14,5 +14,6 @@
 constexpr static auto gfxProduct = IGFX_BROADWELL;
 
 #include "shared/source/gen8/bdw/os_agnostic_product_helper_bdw.inl"
+#include "shared/source/os_interface/product_helper_before_gen12lp.inl"
 
 template class NEO::ProductHelperHw<gfxProduct>;
diff --git a/shared/source/gen9/windows/product_helper_bxt.cpp b/shared/source/gen9/windows/product_helper_bxt.cpp
index 763b5c8a89..dbb1a89c04 100644
--- a/shared/source/gen9/windows/product_helper_bxt.cpp
+++ b/shared/source/gen9/windows/product_helper_bxt.cpp
@@ -13,5 +13,6 @@
 constexpr static auto gfxProduct = IGFX_BROXTON;
 
 #include "shared/source/gen9/bxt/os_agnostic_product_helper_bxt.inl"
+#include "shared/source/os_interface/product_helper_before_gen12lp.inl"
 
 template class NEO::ProductHelperHw<gfxProduct>;
diff --git a/shared/source/gen9/windows/product_helper_cfl.cpp b/shared/source/gen9/windows/product_helper_cfl.cpp
index ea7ce96744..8936e434fc 100644
--- a/shared/source/gen9/windows/product_helper_cfl.cpp
+++ b/shared/source/gen9/windows/product_helper_cfl.cpp
@@ -13,5 +13,6 @@
 constexpr static auto gfxProduct = IGFX_COFFEELAKE;
 
 #include "shared/source/gen9/cfl/os_agnostic_product_helper_cfl.inl"
+#include "shared/source/os_interface/product_helper_before_gen12lp.inl"
 
 template class NEO::ProductHelperHw<gfxProduct>;
diff --git a/shared/source/gen9/windows/product_helper_glk.cpp b/shared/source/gen9/windows/product_helper_glk.cpp
index 9e8f7f19ad..552a25a44c 100644
--- a/shared/source/gen9/windows/product_helper_glk.cpp
+++ b/shared/source/gen9/windows/product_helper_glk.cpp
@@ -13,5 +13,6 @@
 constexpr static auto gfxProduct = IGFX_GEMINILAKE;
 
 #include "shared/source/gen9/glk/os_agnostic_product_helper_glk.inl"
+#include "shared/source/os_interface/product_helper_before_gen12lp.inl"
 
 template class NEO::ProductHelperHw<gfxProduct>;
diff --git a/shared/source/gen9/windows/product_helper_kbl.cpp b/shared/source/gen9/windows/product_helper_kbl.cpp
index e9b093d827..0c09a15e94 100644
--- a/shared/source/gen9/windows/product_helper_kbl.cpp
+++ b/shared/source/gen9/windows/product_helper_kbl.cpp
@@ -13,5 +13,6 @@
 constexpr static auto gfxProduct = IGFX_KABYLAKE;
 
 #include "shared/source/gen9/kbl/os_agnostic_product_helper_kbl.inl"
+#include "shared/source/os_interface/product_helper_before_gen12lp.inl"
 
 template class NEO::ProductHelperHw<gfxProduct>;
diff --git a/shared/source/gen9/windows/product_helper_skl.cpp b/shared/source/gen9/windows/product_helper_skl.cpp
index 180a538df6..4f398876b8 100644
--- a/shared/source/gen9/windows/product_helper_skl.cpp
+++ b/shared/source/gen9/windows/product_helper_skl.cpp
@@ -13,5 +13,6 @@
 constexpr static auto gfxProduct = IGFX_SKYLAKE;
 
 #include "shared/source/gen9/skl/os_agnostic_product_helper_skl.inl"
+#include "shared/source/os_interface/product_helper_before_gen12lp.inl"
 
 template class NEO::ProductHelperHw<gfxProduct>;