diff --git a/runtime/enable_gens.cmake b/runtime/enable_gens.cmake
index ab4e2b7c9f..447504c9cf 100644
--- a/runtime/enable_gens.cmake
+++ b/runtime/enable_gens.cmake
@@ -21,7 +21,6 @@
 set(RUNTIME_SRCS_GENX_CPP_WINDOWS
   windows/command_stream_receiver
   windows/translationtable_callbacks
-  windows/wddm_engine_mapper
   windows/wddm
 )
 
diff --git a/runtime/gen8/windows/wddm_engine_mapper_gen8.cpp b/runtime/gen8/windows/wddm_engine_mapper_gen8.cpp
deleted file mode 100644
index 98e25cb297..0000000000
--- a/runtime/gen8/windows/wddm_engine_mapper_gen8.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2017 - 2018, Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include "hw_cmds.h"
-#include "runtime/os_interface/windows/wddm_engine_mapper.h"
-#include "runtime/os_interface/windows/wddm_engine_mapper.inl"
-
-namespace OCLRT {
-
-template class WddmEngineMapper<BDWFamily>;
-} // namespace OCLRT
diff --git a/runtime/gen8/windows/wddm_gen8.cpp b/runtime/gen8/windows/wddm_gen8.cpp
index 512b796c31..50d283644a 100644
--- a/runtime/gen8/windows/wddm_gen8.cpp
+++ b/runtime/gen8/windows/wddm_gen8.cpp
@@ -23,6 +23,8 @@
 #include "hw_cmds.h"
 #include "runtime/os_interface/windows/wddm/wddm.h"
 #include "runtime/os_interface/windows/wddm/wddm.inl"
+#include "runtime/os_interface/windows/wddm_engine_mapper.h"
+#include "runtime/os_interface/windows/wddm_engine_mapper.inl"
 
 namespace OCLRT {
 
@@ -31,4 +33,6 @@ typedef BDWFamily Family;
 template bool Wddm::init<Family>();
 
 template bool Wddm::configureDeviceAddressSpace<Family>();
+
+template class WddmEngineMapper<BDWFamily>;
 } // namespace OCLRT
diff --git a/runtime/gen9/windows/wddm_engine_mapper_gen9.cpp b/runtime/gen9/windows/wddm_engine_mapper_gen9.cpp
deleted file mode 100644
index 97ea386c35..0000000000
--- a/runtime/gen9/windows/wddm_engine_mapper_gen9.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2017 - 2018, Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include "hw_cmds.h"
-#include "runtime/os_interface/windows/wddm_engine_mapper.h"
-#include "runtime/os_interface/windows/wddm_engine_mapper.inl"
-
-namespace OCLRT {
-
-template class WddmEngineMapper<SKLFamily>;
-} // namespace OCLRT
diff --git a/runtime/gen9/windows/wddm_gen9.cpp b/runtime/gen9/windows/wddm_gen9.cpp
index a39fcca385..1b73d924dd 100644
--- a/runtime/gen9/windows/wddm_gen9.cpp
+++ b/runtime/gen9/windows/wddm_gen9.cpp
@@ -23,6 +23,8 @@
 #include "hw_cmds.h"
 #include "runtime/os_interface/windows/wddm/wddm.h"
 #include "runtime/os_interface/windows/wddm/wddm.inl"
+#include "runtime/os_interface/windows/wddm_engine_mapper.h"
+#include "runtime/os_interface/windows/wddm_engine_mapper.inl"
 
 namespace OCLRT {
 
@@ -31,4 +33,6 @@ typedef SKLFamily Family;
 template bool Wddm::configureDeviceAddressSpace<Family>();
 
 template bool Wddm::init<Family>();
+
+template class WddmEngineMapper<SKLFamily>;
 } // namespace OCLRT