diff --git a/reactos/subsys/win32k/ntuser/msgqueue.c b/reactos/subsys/win32k/ntuser/msgqueue.c
index 9e72614f69b..2f946fe73e4 100644
--- a/reactos/subsys/win32k/ntuser/msgqueue.c
+++ b/reactos/subsys/win32k/ntuser/msgqueue.c
@@ -526,8 +526,8 @@ MsqPeekHardwareMessage(PUSER_MESSAGE_QUEUE MessageQueue, HWND hWnd,
         {
           MSLLHOOKSTRUCT MouseHookData;
 
-          MouseHookData.pt.x = GET_X_LPARAM(Msg.lParam); 
-          MouseHookData.pt.y = GET_Y_LPARAM(Msg.lParam); 
+          MouseHookData.pt.x = LOWORD(Msg.lParam); 
+          MouseHookData.pt.y = HIWORD(Msg.lParam); 
           switch(Msg.message)
             {
               case WM_MOUSEWHEEL:
diff --git a/reactos/subsys/win32k/objects/gdiobj.c b/reactos/subsys/win32k/objects/gdiobj.c
index 992b7b5403c..213c1089072 100644
--- a/reactos/subsys/win32k/objects/gdiobj.c
+++ b/reactos/subsys/win32k/objects/gdiobj.c
@@ -776,10 +776,10 @@ GDIOBJ_LockObj (HGDIOBJ hObj, DWORD ObjectType)
             }
             else
             {
-               InterlockedIncrement(&GdiHdr->Locks);
+               InterlockedIncrement((PLONG)&GdiHdr->Locks);
                if (GdiHdr->LockingThread != Thread)
                {
-                  InterlockedDecrement(&GdiHdr->Locks);
+                  InterlockedDecrement((PLONG)&GdiHdr->Locks);
 
                   /* Unlock the handle table entry. */
                   InterlockedExchangePointer(&HandleEntry->ProcessId, PrevProcId);
@@ -917,13 +917,13 @@ GDIOBJ_ShareLockObj (HGDIOBJ hObj, DWORD ObjectType)
             PGDIOBJHDR GdiHdr = GDIBdyToHdr(HandleEntry->KernelData);
 
 #ifdef GDI_DEBUG
-            if (InterlockedIncrement(&GdiHdr->Locks) == 1)
+            if (InterlockedIncrement((PLONG)&GdiHdr->Locks) == 1)
             {
                GdiHdr->lockfile = file;
                GdiHdr->lockline = line;
             }
 #else
-            InterlockedIncrement(&GdiHdr->Locks);
+            InterlockedIncrement((PLONG)&GdiHdr->Locks);
 #endif
             Object = HandleEntry->KernelData;
          }
@@ -987,13 +987,13 @@ GDIOBJ_UnlockObjByPtr(PGDIOBJ Object)
 {
    PGDIOBJHDR GdiHdr = GDIBdyToHdr(Object);
 #ifdef GDI_DEBUG
-   if (InterlockedDecrement(&GdiHdr->Locks) == 0)
+   if (InterlockedDecrement((PLONG)&GdiHdr->Locks) == 0)
    {
       GdiHdr->lockfile = NULL;
       GdiHdr->lockline = 0;
    }
 #else
-   InterlockedDecrement(&GdiHdr->Locks);
+   InterlockedDecrement((PLONG)&GdiHdr->Locks);
 #endif
 }
 
diff --git a/reactos/subsys/win32k/w32k.h b/reactos/subsys/win32k/w32k.h
index 142eae567ec..5abb6a2630c 100644
--- a/reactos/subsys/win32k/w32k.h
+++ b/reactos/subsys/win32k/w32k.h
@@ -17,12 +17,10 @@
 /* DDK/NDK/SDK Headers */
 #include <ddk/ntddk.h>
 #include <ddk/ntifs.h>
-#include <ddk/ddrawint.h>
-#include <ddk/d3dnthal.h>
 #include <ddk/winddi.h>
 #include <ddk/ntddmou.h>
 #include <windows.h>    /* FIXME ? */
-#include <windowsx.h>   /* FIXME ? */
+//#include <windowsx.h>   /* FIXME ? */
 #include <ndk/ntndk.h>
 
 /* FIXME: ReactOS will be R-Rated if I really write what I'm about to */