diff --git a/runtime/os_interface/windows/CMakeLists.txt b/runtime/os_interface/windows/CMakeLists.txt
index 444c3f82b6..cf92785b59 100644
--- a/runtime/os_interface/windows/CMakeLists.txt
+++ b/runtime/os_interface/windows/CMakeLists.txt
@@ -65,6 +65,7 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS
   ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/wddm/wddm.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/wddm/wddm.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/wddm${BRANCH_DIR_SUFFIX}/wddm_configure_device.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/wddm/wddm_interface.h
   ${CMAKE_CURRENT_SOURCE_DIR}/wddm/wddm_interface.cpp
 )
diff --git a/runtime/os_interface/windows/wddm/wddm.cpp b/runtime/os_interface/windows/wddm/wddm.cpp
index 71c49c626f..8b9db4a957 100644
--- a/runtime/os_interface/windows/wddm/wddm.cpp
+++ b/runtime/os_interface/windows/wddm/wddm.cpp
@@ -875,7 +875,7 @@ int Wddm::virtualFree(void *ptr, size_t size, unsigned long flags) {
     return virtualFreeFnc(ptr, size, flags);
 }
 
-bool Wddm::configureDeviceAddressSpace() {
+bool Wddm::configureDeviceAddressSpaceImpl() {
     SYSTEM_INFO sysInfo;
     Wddm::getSystemInfo(&sysInfo);
     maximumApplicationAddress = reinterpret_cast<uintptr_t>(sysInfo.lpMaximumApplicationAddress);
diff --git a/runtime/os_interface/windows/wddm/wddm.h b/runtime/os_interface/windows/wddm/wddm.h
index e506394fae..d35abc8071 100644
--- a/runtime/os_interface/windows/wddm/wddm.h
+++ b/runtime/os_interface/windows/wddm/wddm.h
@@ -190,6 +190,7 @@ class Wddm {
     bool closeAdapter();
     void getDeviceState();
     void handleCompletion(OsContextWin &osContext);
+    bool configureDeviceAddressSpaceImpl();
 
     static CreateDXGIFactoryFcn createDxgiFactory;
     static GetSystemInfoFcn getSystemInfo;
diff --git a/runtime/os_interface/windows/wddm/wddm_configure_device.cpp b/runtime/os_interface/windows/wddm/wddm_configure_device.cpp
new file mode 100644
index 0000000000..adb19507a1
--- /dev/null
+++ b/runtime/os_interface/windows/wddm/wddm_configure_device.cpp
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "runtime/os_interface/windows/wddm/wddm.h"
+
+namespace NEO {
+bool Wddm::configureDeviceAddressSpace() {
+    return configureDeviceAddressSpaceImpl();
+}
+
+} // namespace NEO