diff --git a/reactos/base/services/umpnpmgr/CMakeLists.txt b/reactos/base/services/umpnpmgr/CMakeLists.txt
index 958fad22c1b..9667d98d88f 100644
--- a/reactos/base/services/umpnpmgr/CMakeLists.txt
+++ b/reactos/base/services/umpnpmgr/CMakeLists.txt
@@ -1,9 +1,6 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl)
 
-remove_definitions(-D_WIN32_WINNT=0x502)
-add_definitions(-D_WIN32_WINNT=0x600)
-
 add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/pnp.idl)
 
 
@@ -17,5 +14,5 @@ target_link_libraries(umpnpmgr
     ${PSEH_LIB})
 
 set_module_type(umpnpmgr win32cui UNICODE)
-add_importlibs(umpnpmgr advapi32 rpcrt4 userenv msvcrt kernel32 ntdll)
+add_importlibs(umpnpmgr advapi32 rpcrt4 userenv shlwapi msvcrt kernel32 ntdll)
 add_cd_file(TARGET umpnpmgr DESTINATION reactos/system32 FOR all)
diff --git a/reactos/base/services/umpnpmgr/umpnpmgr.c b/reactos/base/services/umpnpmgr/umpnpmgr.c
index f683e9f5b40..d8fbfa7a5a0 100644
--- a/reactos/base/services/umpnpmgr/umpnpmgr.c
+++ b/reactos/base/services/umpnpmgr/umpnpmgr.c
@@ -44,6 +44,7 @@
 #include <cfgmgr32.h>
 #include <regstr.h>
 #include <userenv.h>
+#include <shlwapi.h>
 #include <pnp_s.h>
 
 #define NDEBUG
@@ -1142,7 +1143,7 @@ DWORD PNP_DeleteClassKey(
 
     if (ulFlags & CM_DELETE_CLASS_SUBKEYS)
     {
-        if (RegDeleteTreeW(hClassKey, pszClassGuid) != ERROR_SUCCESS)
+        if (SHDeleteKeyW(hClassKey, pszClassGuid) != ERROR_SUCCESS)
             ret = CR_REGISTRY_ERROR;
     }
     else