diff --git a/reactos/subsystems/win32/win32k/include/win32.h b/reactos/subsystems/win32/win32k/include/win32.h
index e33ac6d218d..788edf70783 100644
--- a/reactos/subsystems/win32/win32k/include/win32.h
+++ b/reactos/subsystems/win32/win32k/include/win32.h
@@ -37,11 +37,14 @@ typedef struct _THREADINFO
     struct _DESKTOP*    Desktop;
     PDESKTOPINFO        pDeskInfo;
     PCLIENTINFO         pClientInfo;
+    FLONG               TIF_flags;
+    HANDLE              hDesktop;
+    UINT                cPaintsReady;
+    UINT                cTimersReady;
     LIST_ENTRY          PtiLink;
 
   LIST_ENTRY WindowListHead;
   LIST_ENTRY W32CallbackListHead;
-  HANDLE hDesktop;
   BOOLEAN IsExiting;
   SINGLE_LIST_ENTRY  ReferencesList;
   ULONG Hooks;
diff --git a/reactos/subsystems/win32/win32k/ntuser/msgqueue.c b/reactos/subsystems/win32/win32k/ntuser/msgqueue.c
index cef59f6dd76..ee52c8b6b63 100644
--- a/reactos/subsystems/win32/win32k/ntuser/msgqueue.c
+++ b/reactos/subsystems/win32/win32k/ntuser/msgqueue.c
@@ -120,7 +120,6 @@ IntMsqClearWakeMask(VOID)
    MessageQueue = Win32Thread->MessageQueue;
 // HACK!!!!!!! Newbies that wrote this should hold your head down in shame! (jt)
    MessageQueue->WakeMask = ~0;
-   MessageQueue->WakeMask &= ~QS_TIMER;
 
    return TRUE;
 }
@@ -1436,7 +1435,6 @@ MsqInitializeMessageQueue(struct _ETHREAD *Thread, PUSER_MESSAGE_QUEUE MessageQu
    MessageQueue->PaintCount = 0;
 // HACK!!!!!!! Newbies that wrote this should hold your head down in shame! (jt)
    MessageQueue->WakeMask = ~0;
-   MessageQueue->WakeMask &= ~QS_TIMER;
    MessageQueue->NewMessagesHandle = NULL;
 
    Status = ZwCreateEvent(&MessageQueue->NewMessagesHandle, EVENT_ALL_ACCESS,