diff --git a/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt b/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt
index de26cd9b811..d258b19d755 100644
--- a/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt
+++ b/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt
@@ -1,11 +1,7 @@
 
-set_cpp(WITH_RTTI WITH_RUNTIME)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/dll/devmgr)
 
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/dll)
-
-list(APPEND SOURCE devmgmt.cpp)
-
-add_executable(devmgmt ${SOURCE} devmgmt.rc)
+add_executable(devmgmt devmgmt.c devmgmt.rc)
 set_module_type(devmgmt win32gui UNICODE)
-add_importlibs(devmgmt setupapi gdi32 user32 comctl32 advapi32 devmgr msvcrt kernel32)
+add_importlibs(devmgmt devmgr msvcrt kernel32)
 add_cd_file(TARGET devmgmt DESTINATION reactos/system32 FOR all)
diff --git a/reactos/base/applications/mscutils/devmgmt/devmgmt.c b/reactos/base/applications/mscutils/devmgmt/devmgmt.c
index 69ebea568c6..2c61051a2df 100644
--- a/reactos/base/applications/mscutils/devmgmt/devmgmt.c
+++ b/reactos/base/applications/mscutils/devmgmt/devmgmt.c
@@ -2,89 +2,31 @@
  * PROJECT:     ReactOS Device Managment
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        base/applications/mscutils/devmgmt/devmgmt.c
- * PURPOSE:     Program HQ
+ * PURPOSE:     Bootstrap for the device manager
  * COPYRIGHT:   Copyright 2006 Ged Murphy <gedmurphy@gmail.com>
- *
  */
 
-#include "precomp.h"
+#define WIN32_NO_STATUS
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
 
-#include <winnls.h>
-
-HINSTANCE hInstance;
-HANDLE ProcessHeap;
-HANDLE hMutex;
+#include <cfgmgr32.h>
+#include <devmgr.h>
 
 int WINAPI
-_tWinMain(HINSTANCE hThisInstance,
-          HINSTANCE hPrevInstance,
-          LPTSTR lpCmdLine,
-          int nCmdShow)
+wWinMain(HINSTANCE hThisInstance,
+         HINSTANCE hPrevInstance,
+         LPWSTR lpCmdLine,
+         int nCmdShow)
 {
-    LPTSTR lpAppName;
-    HWND hMainWnd;
-    MSG Msg;
-    int Ret = 1;
-    INITCOMMONCONTROLSEX icex;
-
-    hMutex = CreateMutex(NULL, TRUE, _T("devmgmt_mutex"));
-    if (hMutex == NULL || GetLastError() == ERROR_ALREADY_EXISTS)
+    if (!DeviceManager_ExecuteW(NULL,
+                                hThisInstance,
+                                NULL,
+                                nCmdShow))
     {
-        if (hMutex)
-        {
-            CloseHandle(hMutex);
-        }
-        return 0;
-    }
-    
-    switch (GetUserDefaultUILanguage())
-  {
-    case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT):
-      SetProcessDefaultLayout(LAYOUT_RTL);
-      break;
-
-    default:
-      break;
-  }
-    
-    hInstance = hThisInstance;
-    ProcessHeap = GetProcessHeap();
-
-    icex.dwSize = sizeof(INITCOMMONCONTROLSEX);
-    icex.dwICC = ICC_BAR_CLASSES | ICC_COOL_CLASSES;
-    InitCommonControlsEx(&icex);
-
-    if (!AllocAndLoadString(&lpAppName,
-                            hInstance,
-                            IDS_APPNAME))
-    {
-        return 1;
+        return GetLastError();
     }
 
-    if (InitMainWindowImpl())
-    {
-        hMainWnd = CreateMainWindow(lpAppName,
-                                    nCmdShow);
-        if (hMainWnd != NULL)
-        {
-            /* pump the message queue */
-            while( GetMessage( &Msg, NULL, 0, 0 ) )
-            {
-                TranslateMessage(&Msg);
-                DispatchMessage(&Msg);
-
-            }
-
-            Ret = 0;
-        }
-
-        UninitMainWindowImpl();
-    }
-
-    LocalFree((HLOCAL)lpAppName);
-    CloseHandle(hMutex);
-    return Ret;
+    return 0;
 }
-
-
-
diff --git a/reactos/base/applications/mscutils/devmgmt/devmgmt.cpp b/reactos/base/applications/mscutils/devmgmt/devmgmt.cpp
deleted file mode 100644
index 1256993414f..00000000000
--- a/reactos/base/applications/mscutils/devmgmt/devmgmt.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <cfgmgr32.h>
-#include <devmgr/devmgr.h>
-
-int WINAPI
-wWinMain(HINSTANCE hThisInstance,
-         HINSTANCE hPrevInstance,
-         LPWSTR lpCmdLine,
-         int nCmdShow)
-{
-    if (!DeviceManager_ExecuteW(NULL,
-                                hThisInstance,
-                                NULL,
-                                nCmdShow))
-    {
-        return GetLastError();
-    }
-    return 0;
-}
diff --git a/reactos/base/applications/mscutils/devmgmt/devmgmt.h b/reactos/base/applications/mscutils/devmgmt/devmgmt.h
deleted file mode 100644
index 6f70f09beec..00000000000
--- a/reactos/base/applications/mscutils/devmgmt/devmgmt.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once