diff --git a/reactos/dll/win32/user32/include/user32.h b/reactos/dll/win32/user32/include/user32.h
index 976241bce63..5b57c79df12 100644
--- a/reactos/dll/win32/user32/include/user32.h
+++ b/reactos/dll/win32/user32/include/user32.h
@@ -96,11 +96,11 @@ IsThreadHooked(PW32THREADINFO ti)
     return ti->Hooks != 0;
 }
 
-static __inline PDESKTOP
+static __inline PDESKTOPINFO
 GetThreadDesktopInfo(VOID)
 {
     PW32THREADINFO ti;
-    PDESKTOP di = NULL;
+    PDESKTOPINFO di = NULL;
 
     ti = GetW32ThreadInfo();
     if (ti != NULL)
diff --git a/reactos/dll/win32/user32/misc/desktop.c b/reactos/dll/win32/user32/misc/desktop.c
index 8d3d2832fd6..be978d1a15f 100644
--- a/reactos/dll/win32/user32/misc/desktop.c
+++ b/reactos/dll/win32/user32/misc/desktop.c
@@ -703,7 +703,7 @@ SetShellWindow(HWND hwndShell)
 HWND STDCALL
 GetShellWindow(VOID)
 {
-   PDESKTOP pdi;
+   PDESKTOPINFO pdi;
    pdi = GetThreadDesktopInfo();
    if (pdi) return pdi->hShellWindow;
    return NULL;
diff --git a/reactos/dll/win32/user32/windows/defwnd.c b/reactos/dll/win32/user32/windows/defwnd.c
index 9a86a47db10..c5e22e17f06 100644
--- a/reactos/dll/win32/user32/windows/defwnd.c
+++ b/reactos/dll/win32/user32/windows/defwnd.c
@@ -1620,7 +1620,7 @@ User32DefWindowProc(HWND hWnd,
 
             if (Action == UIS_INITIALIZE)
             {
-                PDESKTOP Desk = GetThreadDesktopInfo();
+                PDESKTOPINFO Desk = GetThreadDesktopInfo();
                 if (Desk == NULL)
                     break;
 
@@ -1702,7 +1702,7 @@ User32DefWindowProc(HWND hWnd,
 
             if (Action == UIS_INITIALIZE)
             {
-                PDESKTOP Desk = GetThreadDesktopInfo();
+                PDESKTOPINFO Desk = GetThreadDesktopInfo();
                 if (Desk == NULL)
                     break;
 
diff --git a/reactos/include/reactos/win32k/ntuser.h b/reactos/include/reactos/win32k/ntuser.h
index 5c5065f6b2c..f5013e1160b 100644
--- a/reactos/include/reactos/win32k/ntuser.h
+++ b/reactos/include/reactos/win32k/ntuser.h
@@ -35,7 +35,7 @@ typedef struct _USER_OBJHDR
     HANDLE Handle;
 } USER_OBJHDR, PUSER_OBJHDR;
 
-typedef struct _DESKTOP
+typedef struct _DESKTOPINFO
 {
     HANDLE hKernelHeap;
     ULONG_PTR HeapLimit;
@@ -54,7 +54,7 @@ typedef struct _DESKTOP
     };
 
     WCHAR szDesktopName[1];
-} DESKTOP, *PDESKTOP;
+} DESKTOPINFO, *PDESKTOPINFO;
 
 typedef struct _CALLPROC
 {
@@ -70,7 +70,7 @@ typedef struct _WINDOWCLASS
     struct _WINDOWCLASS *Next;
     struct _WINDOWCLASS *Clone;
     struct _WINDOWCLASS *Base;
-    PDESKTOP Desktop;
+    PDESKTOPINFO Desktop;
     RTL_ATOM Atom;
     ULONG Windows;
 
@@ -309,7 +309,7 @@ typedef struct _W32THREADINFO
 {
     PW32PROCESSINFO pi; /* [USER] */
     PW32PROCESSINFO kpi; /* [KERNEL] */
-    PDESKTOP Desktop;
+    PDESKTOPINFO Desktop;
     PVOID DesktopHeapBase;
     ULONG_PTR DesktopHeapLimit;
     ULONG_PTR DesktopHeapDelta;
diff --git a/reactos/subsystems/win32/win32k/include/class.h b/reactos/subsystems/win32/win32k/include/class.h
index 8ce9c51ed44..188115c2913 100644
--- a/reactos/subsystems/win32/win32k/include/class.h
+++ b/reactos/subsystems/win32/win32k/include/class.h
@@ -23,15 +23,15 @@ WNDPROC
 GetCallProcHandle(IN PCALLPROC CallProc);
 
 VOID
-DestroyCallProc(IN PDESKTOP Desktop,
+DestroyCallProc(IN PDESKTOPINFO Desktop,
                 IN OUT PCALLPROC CallProc);
 
 PCALLPROC
-CloneCallProc(IN PDESKTOP Desktop,
+CloneCallProc(IN PDESKTOPINFO Desktop,
               IN PCALLPROC CallProc);
 
 PCALLPROC
-CreateCallProc(IN PDESKTOP Desktop,
+CreateCallProc(IN PDESKTOPINFO Desktop,
                IN WNDPROC WndProc,
                IN BOOL Unicode,
                IN PW32PROCESSINFO pi);
@@ -46,11 +46,11 @@ DestroyProcessClasses(PW32PROCESS Process );
 PWINDOWCLASS
 IntReferenceClass(IN OUT PWINDOWCLASS BaseClass,
                   IN OUT PWINDOWCLASS *ClassLink,
-                  IN PDESKTOP Desktop);
+                  IN PDESKTOPINFO Desktop);
 
 VOID
 IntDereferenceClass(IN OUT PWINDOWCLASS Class,
-                    IN PDESKTOP Desktop,
+                    IN PDESKTOPINFO Desktop,
                     IN PW32PROCESSINFO pi);
 
 RTL_ATOM
@@ -95,7 +95,7 @@ IntGetAtomFromStringOrAtom(IN PUNICODE_STRING ClassName,
                            OUT RTL_ATOM *Atom);
 
 BOOL
-IntCheckProcessDesktopClasses(IN PDESKTOP Desktop,
+IntCheckProcessDesktopClasses(IN PDESKTOPINFO Desktop,
                               IN BOOL FreeOnFailure);
 
 #endif /* _WIN32K_CLASS_H */
diff --git a/reactos/subsystems/win32/win32k/include/desktop.h b/reactos/subsystems/win32/win32k/include/desktop.h
index 796366c870c..8508917cf34 100644
--- a/reactos/subsystems/win32/win32k/include/desktop.h
+++ b/reactos/subsystems/win32/win32k/include/desktop.h
@@ -25,7 +25,7 @@ typedef struct _DESKTOP_OBJECT
 
     HANDLE hDesktopHeap;
     PSECTION_OBJECT DesktopHeapSection;
-    PDESKTOP DesktopInfo;
+    PDESKTOPINFO DesktopInfo;
 } DESKTOP_OBJECT, *PDESKTOP_OBJECT;
 
 extern PDESKTOP_OBJECT InputDesktop;
@@ -134,7 +134,7 @@ VOID co_IntShellHookNotify(WPARAM Message, LPARAM lParam);
 
 
 static __inline PVOID
-DesktopHeapAlloc(IN PDESKTOP Desktop,
+DesktopHeapAlloc(IN PDESKTOPINFO Desktop,
                  IN SIZE_T Bytes)
 {
     return RtlAllocateHeap(Desktop->hKernelHeap,
@@ -143,7 +143,7 @@ DesktopHeapAlloc(IN PDESKTOP Desktop,
 }
 
 static __inline BOOL
-DesktopHeapFree(IN PDESKTOP Desktop,
+DesktopHeapFree(IN PDESKTOPINFO Desktop,
                 IN PVOID lpMem)
 {
     return RtlFreeHeap(Desktop->hKernelHeap,
@@ -152,7 +152,7 @@ DesktopHeapFree(IN PDESKTOP Desktop,
 }
 
 static __inline PVOID
-DesktopHeapReAlloc(IN PDESKTOP Desktop,
+DesktopHeapReAlloc(IN PDESKTOPINFO Desktop,
                    IN PVOID lpMem,
                    IN SIZE_T Bytes)
 {
diff --git a/reactos/subsystems/win32/win32k/include/window.h b/reactos/subsystems/win32/win32k/include/window.h
index d501ff757bf..6f0b4979ec0 100644
--- a/reactos/subsystems/win32/win32k/include/window.h
+++ b/reactos/subsystems/win32/win32k/include/window.h
@@ -26,7 +26,7 @@ typedef struct _WINDOW_OBJECT
   /* Pointer to the thread information */
   PW32THREADINFO ti;
   /* Pointer to the desktop */
-  PDESKTOP Desktop;
+  PDESKTOPINFO Desktop;
   /* system menu handle. */
   HMENU SystemMenu;
   /* Entry in the thread's list of windows. */
diff --git a/reactos/subsystems/win32/win32k/ntuser/callproc.c b/reactos/subsystems/win32/win32k/ntuser/callproc.c
index 134fe092263..63219127d36 100644
--- a/reactos/subsystems/win32/win32k/ntuser/callproc.c
+++ b/reactos/subsystems/win32/win32k/ntuser/callproc.c
@@ -43,7 +43,7 @@ GetCallProcHandle(IN PCALLPROC CallProc)
 }
 
 VOID
-DestroyCallProc(IN PDESKTOP Desktop,
+DestroyCallProc(IN PDESKTOPINFO Desktop,
                 IN OUT PCALLPROC CallProc)
 {
     /* FIXME - use new object manager! */
@@ -54,7 +54,7 @@ DestroyCallProc(IN PDESKTOP Desktop,
 }
 
 PCALLPROC
-CloneCallProc(IN PDESKTOP Desktop,
+CloneCallProc(IN PDESKTOPINFO Desktop,
               IN PCALLPROC CallProc)
 {
     PCALLPROC NewCallProc;
@@ -78,7 +78,7 @@ CloneCallProc(IN PDESKTOP Desktop,
 }
 
 PCALLPROC
-CreateCallProc(IN PDESKTOP Desktop,
+CreateCallProc(IN PDESKTOPINFO Desktop,
                IN WNDPROC WndProc,
                IN BOOL Unicode,
                IN PW32PROCESSINFO pi)
diff --git a/reactos/subsystems/win32/win32k/ntuser/class.c b/reactos/subsystems/win32/win32k/ntuser/class.c
index fd8a0ba73f9..97bd1a9a2e1 100644
--- a/reactos/subsystems/win32/win32k/ntuser/class.c
+++ b/reactos/subsystems/win32/win32k/ntuser/class.c
@@ -395,7 +395,7 @@ IntSetClassWndProc(IN OUT PWINDOWCLASS Class,
 static PWINDOWCLASS
 IntGetClassForDesktop(IN OUT PWINDOWCLASS BaseClass,
                       IN OUT PWINDOWCLASS *ClassLink,
-                      IN PDESKTOP Desktop)
+                      IN PDESKTOPINFO Desktop)
 {
     SIZE_T ClassSize;
     PWINDOWCLASS Class;
@@ -502,7 +502,7 @@ IntGetClassForDesktop(IN OUT PWINDOWCLASS BaseClass,
 PWINDOWCLASS
 IntReferenceClass(IN OUT PWINDOWCLASS BaseClass,
                   IN OUT PWINDOWCLASS *ClassLink,
-                  IN PDESKTOP Desktop)
+                  IN PDESKTOPINFO Desktop)
 {
     PWINDOWCLASS Class;
 
@@ -563,7 +563,7 @@ IntMakeCloneBaseClass(IN OUT PWINDOWCLASS Class,
 
 VOID
 IntDereferenceClass(IN OUT PWINDOWCLASS Class,
-                    IN PDESKTOP Desktop,
+                    IN PDESKTOPINFO Desktop,
                     IN PW32PROCESSINFO pi)
 {
     PWINDOWCLASS *PrevLink, BaseClass, CurrentClass;
@@ -680,7 +680,7 @@ IntMoveClassToSharedHeap(IN OUT PWINDOWCLASS Class,
 }
 
 static VOID
-IntCheckDesktopClasses(IN PDESKTOP Desktop,
+IntCheckDesktopClasses(IN PDESKTOPINFO Desktop,
                        IN OUT PWINDOWCLASS *ClassList,
                        IN BOOL FreeOnFailure,
                        OUT BOOL *Ret)
@@ -749,7 +749,7 @@ IntCheckDesktopClasses(IN PDESKTOP Desktop,
 }
 
 BOOL
-IntCheckProcessDesktopClasses(IN PDESKTOP Desktop,
+IntCheckProcessDesktopClasses(IN PDESKTOPINFO Desktop,
                               IN BOOL FreeOnFailure)
 {
     PW32PROCESSINFO pi;
@@ -792,7 +792,7 @@ IntCreateClass(IN CONST WNDCLASSEXW* lpwcx,
                IN PUNICODE_STRING MenuName,
                IN WNDPROC wpExtra,
                IN DWORD dwFlags,
-               IN PDESKTOP Desktop,
+               IN PDESKTOPINFO Desktop,
                IN PW32PROCESSINFO pi)
 {
     SIZE_T ClassSize;
diff --git a/reactos/subsystems/win32/win32k/ntuser/desktop.c b/reactos/subsystems/win32/win32k/ntuser/desktop.c
index e0974b37f45..48c694a1251 100644
--- a/reactos/subsystems/win32/win32k/ntuser/desktop.c
+++ b/reactos/subsystems/win32/win32k/ntuser/desktop.c
@@ -991,7 +991,7 @@ NtUserCreateDesktop(
        RETURN(NULL);
    }
 
-   DesktopInfoSize = FIELD_OFFSET(DESKTOP,
+   DesktopInfoSize = FIELD_OFFSET(DESKTOPINFO,
                                   szDesktopName[(lpszDesktopName->Length / sizeof(WCHAR)) + 1]);
 
    DesktopObject->DesktopInfo = RtlAllocateHeap(DesktopObject->hDesktopHeap,
diff --git a/reactos/subsystems/win32/win32k/ntuser/msgqueue.c b/reactos/subsystems/win32/win32k/ntuser/msgqueue.c
index b5a005dd910..b06acec9b37 100644
--- a/reactos/subsystems/win32/win32k/ntuser/msgqueue.c
+++ b/reactos/subsystems/win32/win32k/ntuser/msgqueue.c
@@ -520,7 +520,7 @@ co_MsqPeekHardwareMessage(PUSER_MESSAGE_QUEUE MessageQueue, HWND hWnd,
    NTSTATUS WaitStatus;
    DECLARE_RETURN(BOOL);
    USER_REFERENCE_ENTRY Ref;
-   PDESKTOP Desk = NULL;
+   PDESKTOPINFO Desk = NULL;
 
    WaitObjects[1] = MessageQueue->NewMessages;
    WaitObjects[0] = &HardwareMessageQueueLock;
diff --git a/reactos/subsystems/win32/win32k/ntuser/window.c b/reactos/subsystems/win32/win32k/ntuser/window.c
index db4b2b190eb..1270284e334 100644
--- a/reactos/subsystems/win32/win32k/ntuser/window.c
+++ b/reactos/subsystems/win32/win32k/ntuser/window.c
@@ -3195,7 +3195,7 @@ NtUserSetShellWindowEx(HWND hwndShell, HWND hwndListView)
    WinStaObject->ShellListView = hwndListView;
 
    ti = GetW32ThreadInfo();
-   if (ti->Desktop) ((PDESKTOP)ti->Desktop)->hShellWindow = hwndShell;
+   if (ti->Desktop) ti->Desktop->hShellWindow = hwndShell;
 
    UserDerefObjectCo(WndShell);