diff --git a/reactos/dll/win32/user32/windows/defwnd.c b/reactos/dll/win32/user32/windows/defwnd.c
index 327046cad25..0db1e229978 100644
--- a/reactos/dll/win32/user32/windows/defwnd.c
+++ b/reactos/dll/win32/user32/windows/defwnd.c
@@ -1410,7 +1410,7 @@ User32DefWindowProc(HWND hWnd,
 
         case WM_SHOWWINDOW:
         {
-            NtUserMessageCall( hWnd, Msg, wParam, lParam, 0, NUMC_DEFWINDOWPROC, FALSE);
+            NtUserMessageCall( hWnd, Msg, wParam, lParam, 0, FNID_DEFWINDOWPROC, FALSE);
             break;
         }
 
diff --git a/reactos/dll/win32/user32/windows/message.c b/reactos/dll/win32/user32/windows/message.c
index 5fae7fb6432..56db32c198f 100644
--- a/reactos/dll/win32/user32/windows/message.c
+++ b/reactos/dll/win32/user32/windows/message.c
@@ -1851,7 +1851,7 @@ SendMessageCallbackA(
                          wParam,
                          lParam,
          (ULONG_PTR)&lpCallBack,
-       NUMC_SENDMESSAGECALLBACK,
+       FNID_SENDMESSAGECALLBACK,
                            TRUE);
 }
 
@@ -1873,7 +1873,7 @@ SendMessageCallbackW(
                          wParam,
                          lParam,
          (ULONG_PTR)&lpCallBack,
-       NUMC_SENDMESSAGECALLBACK,
+       FNID_SENDMESSAGECALLBACK,
                           FALSE);
 }
 
@@ -2636,7 +2636,7 @@ IntBroadcastSystemMessage(
                                             wParam,
                                             lParam,
                                   (ULONG_PTR)&parm,
-                       NUMC_BROADCASTSYSTEMMESSAGE,
+                       FNID_BROADCASTSYSTEMMESSAGE,
                                               Ansi);
     }
 
diff --git a/reactos/include/reactos/win32k/ntuser.h b/reactos/include/reactos/win32k/ntuser.h
index 5ba31e6d317..eb8110799e5 100644
--- a/reactos/include/reactos/win32k/ntuser.h
+++ b/reactos/include/reactos/win32k/ntuser.h
@@ -204,23 +204,34 @@ typedef struct _PFNCLIENTWORKER
 } PFNCLIENTWORKER, *PPFNCLIENTWORKER;
 
 
-// FNID's for NtUserSetWindowFNID
-#define FNID_SCROLLBAR   0x029A
-#define FNID_ICONTITLE   0x029B
-#define FNID_MENU        0x029C
-#define FNID_DESKTOP     0x029D
-#define FNID_SWITCH      0x02A0
-#define FNID_BUTTON      0x02A1
-#define FNID_COMBOBOX    0x02A2
-#define FNID_COMBOLBOX   0x02A3
-#define FNID_DIALOG      0x02A4
-#define FNID_EDIT        0x02A5
-#define FNID_LISTBOX     0x02A6
-#define FNID_MDICLIENT   0x02A7
-#define FNID_STATIC      0x02A8
-#define FNID_IME         0x02A9
-#define FNID_TOOLTIPS    0x02B5
-#define FNID_UNKNOWN     0x02B6
+// FNID's for NtUserSetWindowFNID, NtUserMessageCall
+#define FNID_SCROLLBAR              0x029A
+#define FNID_ICONTITLE              0x029B
+#define FNID_MENU                   0x029C
+#define FNID_DESKTOP                0x029D
+#define FNID_DEFWINDOWPROC          0x029E
+#define FNID_SWITCH                 0x02A0
+#define FNID_BUTTON                 0x02A1
+#define FNID_COMBOBOX               0x02A2
+#define FNID_COMBOLBOX              0x02A3
+#define FNID_DIALOG                 0x02A4
+#define FNID_EDIT                   0x02A5
+#define FNID_LISTBOX                0x02A6
+#define FNID_MDICLIENT              0x02A7
+#define FNID_STATIC                 0x02A8
+#define FNID_IME                    0x02A9
+#define FNID_CALLWNDPROC            0x02AA
+#define FNID_CALLWNDPROCRET         0x02AB
+#define FNID_SENDMESSAGE            0x02B0
+// Kernel has option to use TimeOut or normal msg send, based on type of msg.
+#define FNID_SENDMESSAGEWTOOPTION   0x02B1
+#define FNID_SENDMESSAGETIMEOUT     0x02B2
+#define FNID_BROADCASTSYSTEMMESSAGE 0x02B4
+#define FNID_TOOLTIPS               0x02B5
+#define FNID_UNKNOWN                0x02B6
+#define FNID_SENDNOTIFYMESSAGE      0x02B7
+#define FNID_SENDMESSAGECALLBACK    0x02B8
+
  
 #define FNID_DDEML       0x2000 // Registers DDEML
 #define FNID_DESTROY     0x4000 // This is sent when WM_NCDESTROY or in the support routine.
@@ -1725,15 +1736,6 @@ NtUserMapVirtualKeyEx( UINT keyCode,
 		       UINT transType,
 		       DWORD keyboardId,
 		       HKL dwhkl );
-// Look like fnID's
-#define NUMC_DEFWINDOWPROC          0x029E
-#define NUMC_SENDMESSAGE            0x02B0
-// Kernel has option to use TO or normal msg send, based on type of msg.
-#define NUMC_SENDMESSAGEWTOOPTION   0x02B1
-#define NUMC_SENDMESSAGETIMEOUT     0x02B2
-#define NUMC_BROADCASTSYSTEMMESSAGE 0x02B4
-#define NUMC_SENDNOTIFYMESSAGE      0x02B7
-#define NUMC_SENDMESSAGECALLBACK    0x02B8
 LRESULT
 NTAPI
 NtUserMessageCall(
@@ -1742,7 +1744,7 @@ NtUserMessageCall(
   WPARAM wParam,
   LPARAM lParam,
   ULONG_PTR ResultInfo,
-  DWORD dwType, // NUMC_XX types
+  DWORD dwType, // FNID_XX types
   BOOL Ansi);
 
 DWORD
diff --git a/reactos/subsystems/win32/win32k/ntuser/message.c b/reactos/subsystems/win32/win32k/ntuser/message.c
index e3a85306078..3a6a8fd0461 100644
--- a/reactos/subsystems/win32/win32k/ntuser/message.c
+++ b/reactos/subsystems/win32/win32k/ntuser/message.c
@@ -1861,7 +1861,7 @@ NtUserMessageCall(
    UserRefObjectCo(Window, &Ref);
    switch(dwType)
    {
-      case NUMC_DEFWINDOWPROC:
+      case FNID_DEFWINDOWPROC:
          lResult = IntDefWindowProc(Window, Msg, wParam, lParam);
       break;
    }