diff --git a/runtime/command_queue/command_queue.h b/runtime/command_queue/command_queue.h
index e47da9589c..b1064ecbd3 100644
--- a/runtime/command_queue/command_queue.h
+++ b/runtime/command_queue/command_queue.h
@@ -465,12 +465,4 @@ class CommandQueue : public BaseObject<_cl_command_queue> {
 typedef CommandQueue *(*CommandQueueCreateFunc)(
     Context *context, Device *device, const cl_queue_properties *properties);
 
-template <typename GfxFamily, unsigned int eventType>
-LinearStream &getCommandStream(CommandQueue &commandQueue,
-                               bool reserveProfilingCmdsSpace,
-                               bool reservePerfCounterCmdsSpace,
-                               const Kernel *pKernel);
-
-template <typename GfxFamily, IndirectHeap::Type heapType>
-IndirectHeap &getIndirectHeap(CommandQueue &commandQueue, const Kernel &kernel);
 } // namespace NEO
diff --git a/runtime/command_queue/command_queue_hw.h b/runtime/command_queue/command_queue_hw.h
index 5eb77cfb68..1d370504cf 100644
--- a/runtime/command_queue/command_queue_hw.h
+++ b/runtime/command_queue/command_queue_hw.h
@@ -7,6 +7,7 @@
 
 #pragma once
 #include "runtime/command_queue/command_queue.h"
+#include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/command_stream/preemption.h"
 #include "runtime/device_queue/device_queue_hw.h"