diff --git a/dlls/user/spy.c b/dlls/user/spy.c
index e1c3d0b6da1..e46772e6f03 100644
--- a/dlls/user/spy.c
+++ b/dlls/user/spy.c
@@ -410,7 +410,9 @@ static const char * const MessageTypeNames[SPY_MAX_MSGNUM + 1] =
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 
     /* 0x01E0 */
-    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+    NULL,
+    "MN_GETHMENU",              /* 0x01E1 */
+    NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 
     /* 0x01F0 */
@@ -571,9 +573,11 @@ static const char * const MessageTypeNames[SPY_MAX_MSGNUM + 1] =
     "WM_PALETTECHANGED",
     "WM_HOTKEY",                /* 0x0312 */
           NULL, NULL, NULL, NULL,
-    "WM_PRINT",
-    "WM_PRINTCLIENT",
-    NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+    "WM_PRINT",                 /* 0x0317 */
+    "WM_PRINTCLIENT",           /* 0x0318 */
+    "WM_APPCOMMAND",            /* 0x0319 */
+    "WM_THEMECHANGED",          /* 0x031A */
+    NULL, NULL, NULL, NULL, NULL,
 
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -583,10 +587,18 @@ static const char * const MessageTypeNames[SPY_MAX_MSGNUM + 1] =
     /* 0x0340 */
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+    /* 0x0350 */
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+    "WM_HANDHELDFIRST",     /* 0x0358 */
+    "WM_HANDHELDFIRST+1",   /* 0x0359 */
+    "WM_HANDHELDFIRST+2",   /* 0x035A */
+    "WM_HANDHELDFIRST+3",   /* 0x035B */
+    "WM_HANDHELDFIRST+4",   /* 0x035C */
+    "WM_HANDHELDFIRST+5",   /* 0x035D */
+    "WM_HANDHELDFIRST+6",   /* 0x035E */
+    "WM_HANDHELDLAST",      /* 0x035F */
 
-    "WM_QUERYAFXWNDPROC",   /*  0x0360 */
+    "WM_QUERYAFXWNDPROC",   /*  0x0360 WM_AFXFIRST */
     "WM_SIZEPARENT",        /*  0x0361 */
     "WM_SETMESSAGESTRING",  /*  0x0362 */
     "WM_IDLEUPDATECMDUI",   /*  0x0363 */
@@ -613,7 +625,8 @@ static const char * const MessageTypeNames[SPY_MAX_MSGNUM + 1] =
     "WM_OCC_LOADFROMSTREAM_EX",  /* 0x037A */
     "WM_OCC_LOADFROMSTORAGE_EX", /* 0x037B */
 
-    NULL,NULL,NULL,NULL,
+    NULL,NULL,NULL,
+    "WM_AFXLAST",               /* 0x037F */
 
     "WM_PENWINFIRST",           /* 0x0380 */
     "WM_RCRESULT",              /* 0x0381 */
diff --git a/include/winuser.h b/include/winuser.h
index 27f77d18733..3d4795b7010 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -1189,8 +1189,6 @@ BOOL        WINAPI SetSysColors(INT,const INT*,const COLORREF*);
 #define WM_MOVING	    0x0216
 #define WM_POWERBROADCAST   0x0218
 #define WM_DEVICECHANGE     0x0219
-/* Win32 5.1 messages */
-#define WM_THEMECHANGED     0x031A
 
 /* wParam for WM_SIZING message */
 #define WMSZ_LEFT           1
@@ -1293,6 +1291,8 @@ BOOL        WINAPI SetSysColors(INT,const INT*,const COLORREF*);
 
 #define WM_PRINT             0x0317
 #define WM_PRINTCLIENT       0x0318
+#define WM_APPCOMMAND        0x0319
+#define WM_THEMECHANGED      0x031A
 
 #define WM_HANDHELDFIRST     0x0358
 #define WM_HANDHELDLAST      0x035F