diff --git a/runtime/command_queue/CMakeLists.txt b/runtime/command_queue/CMakeLists.txt
index efc9f22f6e..94659de40b 100644
--- a/runtime/command_queue/CMakeLists.txt
+++ b/runtime/command_queue/CMakeLists.txt
@@ -9,7 +9,8 @@ set(RUNTIME_SRCS_COMMAND_QUEUE
   ${CMAKE_CURRENT_SOURCE_DIR}/command_queue.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/command_queue.h
   ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_hw.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_hw.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_hw_base.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_hw_bdw_plus.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/cpu_data_transfer_handler.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_barrier.h
   ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_common.h
diff --git a/runtime/command_queue/command_queue_hw.inl b/runtime/command_queue/command_queue_hw_base.inl
similarity index 73%
rename from runtime/command_queue/command_queue_hw.inl
rename to runtime/command_queue/command_queue_hw_base.inl
index ef87752bd6..c7ad13e682 100644
--- a/runtime/command_queue/command_queue_hw.inl
+++ b/runtime/command_queue/command_queue_hw_base.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -41,18 +41,5 @@ void CommandQueueHw<Family>::notifyEnqueueReadImage(Image *image, bool blockingR
         image->getGraphicsAllocation()->setAllocDumpable(blockingRead);
     }
 }
-template <typename Family>
-bool CommandQueueHw<Family>::requiresCacheFlushAfterWalkerBasedOnProperties(const cl_queue_properties *properties) {
-    return false;
-}
-template <typename GfxFamily>
-void CommandQueueHw<GfxFamily>::submitCacheFlush(Surface **surfaces,
-                                                 size_t numSurfaces,
-                                                 LinearStream *commandStream,
-                                                 uint64_t postSyncAddress) {
-}
-template <typename GfxFamily>
-bool CommandQueueHw<GfxFamily>::isCacheFlushCommand(uint32_t commandType) {
-    return false;
-}
+
 } // namespace NEO
diff --git a/runtime/command_queue/command_queue_hw_bdw_plus.inl b/runtime/command_queue/command_queue_hw_bdw_plus.inl
new file mode 100644
index 0000000000..b16433bc79
--- /dev/null
+++ b/runtime/command_queue/command_queue_hw_bdw_plus.inl
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "runtime/command_queue/command_queue_hw_base.inl"
+
+namespace NEO {
+
+template <typename GfxFamily>
+bool CommandQueueHw<GfxFamily>::requiresCacheFlushAfterWalkerBasedOnProperties(const cl_queue_properties *properties) {
+    return false;
+}
+
+template <typename GfxFamily>
+void CommandQueueHw<GfxFamily>::submitCacheFlush(Surface **surfaces,
+                                                 size_t numSurfaces,
+                                                 LinearStream *commandStream,
+                                                 uint64_t postSyncAddress) {
+}
+
+template <typename GfxFamily>
+bool CommandQueueHw<GfxFamily>::isCacheFlushCommand(uint32_t commandType) {
+    return false;
+}
+
+} // namespace NEO
diff --git a/runtime/gen10/command_queue_gen10.cpp b/runtime/gen10/command_queue_gen10.cpp
index e1c1ba1089..fe51908ee7 100644
--- a/runtime/gen10/command_queue_gen10.cpp
+++ b/runtime/gen10/command_queue_gen10.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "runtime/command_queue/command_queue_hw.h"
-#include "runtime/command_queue/command_queue_hw.inl"
+#include "runtime/command_queue/command_queue_hw_bdw_plus.inl"
 #include "runtime/command_queue/enqueue_resource_barrier.h"
 #include "runtime/memory_manager/svm_memory_manager.h"
 
diff --git a/runtime/gen11/command_queue_gen11.cpp b/runtime/gen11/command_queue_gen11.cpp
index ac0c9bf540..1c18e9a294 100644
--- a/runtime/gen11/command_queue_gen11.cpp
+++ b/runtime/gen11/command_queue_gen11.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "runtime/command_queue/command_queue_hw.h"
-#include "runtime/command_queue/command_queue_hw.inl"
+#include "runtime/command_queue/command_queue_hw_bdw_plus.inl"
 #include "runtime/command_queue/enqueue_resource_barrier.h"
 #include "runtime/memory_manager/svm_memory_manager.h"
 
diff --git a/runtime/gen8/command_queue_gen8.cpp b/runtime/gen8/command_queue_gen8.cpp
index 3e2b735e73..949a5c9439 100644
--- a/runtime/gen8/command_queue_gen8.cpp
+++ b/runtime/gen8/command_queue_gen8.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "runtime/command_queue/command_queue_hw.h"
-#include "runtime/command_queue/command_queue_hw.inl"
+#include "runtime/command_queue/command_queue_hw_bdw_plus.inl"
 #include "runtime/command_queue/enqueue_resource_barrier.h"
 #include "runtime/memory_manager/svm_memory_manager.h"
 
diff --git a/runtime/gen9/command_queue_gen9.cpp b/runtime/gen9/command_queue_gen9.cpp
index c926a05449..6ba488699c 100644
--- a/runtime/gen9/command_queue_gen9.cpp
+++ b/runtime/gen9/command_queue_gen9.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "runtime/command_queue/command_queue_hw.h"
-#include "runtime/command_queue/command_queue_hw.inl"
+#include "runtime/command_queue/command_queue_hw_bdw_plus.inl"
 #include "runtime/command_queue/enqueue_resource_barrier.h"
 #include "runtime/memory_manager/svm_memory_manager.h"