diff --git a/reactos/subsystems/win32/win32k/include/cursoricon.h b/reactos/subsystems/win32/win32k/include/cursoricon.h
index 75a20f5f8ed..ca48c934f02 100644
--- a/reactos/subsystems/win32/win32k/include/cursoricon.h
+++ b/reactos/subsystems/win32/win32k/include/cursoricon.h
@@ -68,9 +68,8 @@ VOID FASTCALL IntCleanupCurIcons(struct _EPROCESS *Process, PPROCESSINFO Win32Pr
 BOOL UserDrawIconEx(HDC hDc, INT xLeft, INT yTop, PCURICON_OBJECT pIcon, INT cxWidth,
    INT cyHeight, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags);
 PCURICON_OBJECT FASTCALL UserGetCurIconObject(HCURSOR hCurIcon);
-
 BOOL UserSetCursorPos( INT x, INT y, DWORD flags, ULONG_PTR dwExtraInfo, BOOL Hook);
-
+BOOL APIENTRY UserClipCursor(RECTL *prcl);
 PSYSTEM_CURSORINFO IntGetSysCursorInfo(VOID);
 
 #define IntReleaseCurIconObject(CurIconObj) \
diff --git a/reactos/subsystems/win32/win32k/ntuser/display.c b/reactos/subsystems/win32/win32k/ntuser/display.c
index 27aa234b8b5..4bb036d9c5b 100644
--- a/reactos/subsystems/win32/win32k/ntuser/display.c
+++ b/reactos/subsystems/win32/win32k/ntuser/display.c
@@ -11,7 +11,6 @@ DBG_DEFAULT_CHANNEL(UserDisplay);
 
 BOOL gbBaseVideo = 0;
 
-static const PWCHAR KEY_ROOT = L"";
 static const PWCHAR KEY_VIDEO = L"\\Registry\\Machine\\HARDWARE\\DEVICEMAP\\VIDEO";
 
 VOID
@@ -384,7 +383,7 @@ NtUserEnumDisplayDevices(
    }
 
     /* Acquire global USER lock */
-    UserEnterExclusive();
+    UserEnterShared();
 
     /* Call the internal function */
     Status = UserEnumDisplayDevices(pustrDevice, iDevNum, &dispdev, dwFlags);
@@ -551,7 +550,6 @@ UserEnumRegistryDisplaySettings(
     return Status ;
 }
 
-
 NTSTATUS
 APIENTRY
 NtUserEnumDisplaySettings(
@@ -593,7 +591,7 @@ NtUserEnumDisplaySettings(
    }
 
     /* Acquire global USER lock */
-    UserEnterExclusive();
+    UserEnterShared();
 
     if (iModeNum == ENUM_REGISTRY_SETTINGS)
     {
@@ -647,9 +645,6 @@ NtUserEnumDisplaySettings(
     return Status;
 }
 
-BOOL APIENTRY UserClipCursor(RECTL *prcl);
-VOID APIENTRY UserRedrawDesktop();
-
 LONG
 APIENTRY
 UserChangeDisplaySettings(