diff --git a/opencl/source/enable_gens.cmake b/opencl/source/enable_gens.cmake
index 2ad19f8f30..3f92c3d1a4 100644
--- a/opencl/source/enable_gens.cmake
+++ b/opencl/source/enable_gens.cmake
@@ -26,7 +26,6 @@ set(RUNTIME_SRCS_GENX_CPP_BASE
     hw_info
     image
     sampler
-    state_base_address
     tbx_command_stream_receiver
 )
 
diff --git a/shared/source/enable_gens.cmake b/shared/source/enable_gens.cmake
index a6ea7299ac..297e62143a 100644
--- a/shared/source/enable_gens.cmake
+++ b/shared/source/enable_gens.cmake
@@ -17,6 +17,7 @@ set(CORE_RUNTIME_SRCS_GENX_CPP_BASE
     hw_helper
     preamble
     preemption
+    state_base_address
 )
 
 set(CORE_RUNTIME_SRCS_GENX_CPP_WINDOWS
diff --git a/opencl/source/gen11/state_base_address_gen11.cpp b/shared/source/gen11/state_base_address_gen11.cpp
similarity index 100%
rename from opencl/source/gen11/state_base_address_gen11.cpp
rename to shared/source/gen11/state_base_address_gen11.cpp
diff --git a/opencl/source/gen12lp/state_base_address_gen12lp.cpp b/shared/source/gen12lp/state_base_address_gen12lp.cpp
similarity index 100%
rename from opencl/source/gen12lp/state_base_address_gen12lp.cpp
rename to shared/source/gen12lp/state_base_address_gen12lp.cpp
diff --git a/opencl/source/gen8/state_base_address_gen8.cpp b/shared/source/gen8/state_base_address_gen8.cpp
similarity index 100%
rename from opencl/source/gen8/state_base_address_gen8.cpp
rename to shared/source/gen8/state_base_address_gen8.cpp
diff --git a/opencl/source/gen9/state_base_address_gen9.cpp b/shared/source/gen9/state_base_address_gen9.cpp
similarity index 100%
rename from opencl/source/gen9/state_base_address_gen9.cpp
rename to shared/source/gen9/state_base_address_gen9.cpp