diff --git a/include/windowsx.h b/include/windowsx.h
index 4ba4939a272f3b659f2eb037b969ff0b9303d9e1..eae33d1e58b87fda0766bc3a8ee6ba0ae3ec6eeb 100644
--- a/include/windowsx.h
+++ b/include/windowsx.h
@@ -93,14 +93,13 @@ extern "C" {
 
 /****** KERNEL Macro APIs ******************************************************/
 
-#define     GetInstanceModule(hInst) (GetModuleHandle((LPCSTR)MAKELP(0, hInst)))
-#define     GlobalPtrHandle(lp)      ((HGLOBAL)LOWORD(GlobalHandle(SELECTOROF(lp))))
-#define     GlobalLockPtr(lp)        ((BOOL)SELECTOROF(GlobalLock(GlobalPtrHandle(lp))))
-#define     GlobalUnlockPtr(lp)      (GlobalUnlock(GlobalPtrHandle(lp)))
-#define     GlobalAllocPtr(flags,cb) (GlobalLock(GlobalAlloc((flags), (cb))))
-#define     GlobalReAllocPtr(lp, cbNew, flags) (GlobalUnlockPtr(lp), \
-                               GlobalLock(GlobalReAlloc(GlobalPtrHandle(lp) , (cbNew), (flags))))
-#define     GlobalFreePtr(lp)        (GlobalUnlockPtr(lp), (BOOL)GlobalFree(GlobalPtrHandle(lp)))
+#define GetInstanceModule(hInst)                (HMODULE)(hInst)
+#define GlobalPtrHandle(lp)                     ((HGLOBAL)GlobalHandle(lp))
+#define GlobalLockPtr(lp)                       ((BOOL)GlobalLock(GlobalPtrHandle(lp)))
+#define GlobalUnlockPtr(lp)                     GlobalUnlock(GlobalPtrHandle(lp))
+#define GlobalAllocPtr(flags, cb)               (GlobalLock(GlobalAlloc((flags), (cb))))
+#define GlobalReAllocPtr(lp, cbNew, flags)      (GlobalUnlockPtr(lp), GlobalLock(GlobalReAlloc(GlobalPtrHandle(lp) , (cbNew), (flags))))
+#define GlobalFreePtr(lp)                       (GlobalUnlockPtr(lp), (BOOL)(ULONG_PTR)GlobalFree(GlobalPtrHandle(lp)))
 
 /****** USER Macro APIs ******************************************************/