diff --git a/windows/spy.c b/windows/spy.c
index 96e06728a40..ddd2ab0c282 100644
--- a/windows/spy.c
+++ b/windows/spy.c
@@ -1240,38 +1240,39 @@ static const SPY_NOTIFY spnfy_array[] = {
     SPNFY(NM_KILLFOCUS,          NMHDR),
     SPNFY(NM_CUSTOMDRAW,         NMCUSTOMDRAW),
     SPNFY(NM_HOVER,              NMHDR),
-    SPNFY(NM_NCHITTEST,          NMHDR),
+    SPNFY(NM_NCHITTEST,          NMMOUSE),
     SPNFY(NM_KEYDOWN,            NMKEY),
     SPNFY(NM_RELEASEDCAPTURE,    NMHDR),
     SPNFY(NM_SETCURSOR,          NMMOUSE),
     SPNFY(NM_CHAR,               NMCHAR),
     SPNFY(NM_TOOLTIPSCREATED,    NMTOOLTIPSCREATED),  
     /* Listview       0U-100U  to  0U-199U  */
-    SPNFY(LVN_ITEMCHANGING,      NMHDR),
-    SPNFY(LVN_ITEMCHANGED,       NMHDR),
-    SPNFY(LVN_INSERTITEM,        NMHDR),
-    SPNFY(LVN_DELETEITEM,        NMHDR),
-    SPNFY(LVN_DELETEALLITEMS,    NMHDR),
-    SPNFY(LVN_BEGINLABELEDITA,   NMHDR),
-    SPNFY(LVN_ENDLABELEDITA,     NMHDR),
-    SPNFY(LVN_COLUMNCLICK,       NMHDR),
-    SPNFY(LVN_BEGINDRAG,         NMHDR),
-    SPNFY(LVN_BEGINRDRAG,        NMHDR),
-    SPNFY(LVN_ODCACHEHINT,       NMHDR),
-    SPNFY(LVN_ITEMACTIVATE,      NMHDR),
-    SPNFY(LVN_ODSTATECHANGED,    NMHDR),
-    SPNFY(LVN_HOTTRACK,          NMHDR),
-    SPNFY(LVN_GETDISPINFOA,      NMHDR),
-    SPNFY(LVN_SETDISPINFOA,      NMHDR),
-    SPNFY(LVN_KEYDOWN,           NMHDR),
-    SPNFY(LVN_MARQUEEBEGIN,      NMHDR),
-    SPNFY(LVN_GETINFOTIPA,       NMHDR),
-    SPNFY(LVN_GETINFOTIPW,      NMHDR),
-    SPNFY(LVN_BEGINLABELEDITW,   NMHDR),
-    SPNFY(LVN_ENDLABELEDITW,     NMHDR),
-    SPNFY(LVN_GETDISPINFOW,      NMHDR),
-    SPNFY(LVN_SETDISPINFOW,      NMHDR),
-    SPNFY(LVN_ODFINDITEMW,       NMHDR),
+    SPNFY(LVN_ITEMCHANGING,      NMLISTVIEW),
+    SPNFY(LVN_ITEMCHANGED,       NMLISTVIEW),
+    SPNFY(LVN_INSERTITEM,        NMLISTVIEW),
+    SPNFY(LVN_DELETEITEM,        NMLISTVIEW),
+    SPNFY(LVN_DELETEALLITEMS,    NMLISTVIEW),
+    SPNFY(LVN_BEGINLABELEDITA,   NMLVDISPINFOA),
+    SPNFY(LVN_ENDLABELEDITA,     NMLVDISPINFOA),
+    SPNFY(LVN_COLUMNCLICK,       NMLISTVIEW),
+    SPNFY(LVN_BEGINDRAG,         NMLISTVIEW),
+    SPNFY(LVN_BEGINRDRAG,        NMLISTVIEW),
+    SPNFY(LVN_ODCACHEHINT,       NMLVCACHEHINT),
+    SPNFY(LVN_ITEMACTIVATE,      NMITEMACTIVATE),
+    SPNFY(LVN_ODSTATECHANGED,    NMLVODSTATECHANGE),
+    SPNFY(LVN_HOTTRACK,          NMLISTVIEW),
+    SPNFY(LVN_GETDISPINFOA,      NMLVDISPINFOA),
+    SPNFY(LVN_SETDISPINFOA,      NMLVDISPINFOA),
+    SPNFY(LVN_ODFINDITEMA,       NMLVFINDITEM),
+    SPNFY(LVN_KEYDOWN,           NMLVKEYDOWN),
+    SPNFY(LVN_MARQUEEBEGIN,      NMLISTVIEW),
+    SPNFY(LVN_GETINFOTIPA,       NMLVGETINFOTIPA),
+    SPNFY(LVN_GETINFOTIPW,       NMLVGETINFOTIPW),
+    SPNFY(LVN_BEGINLABELEDITW,   NMLVDISPINFOW),
+    SPNFY(LVN_ENDLABELEDITW,     NMLVDISPINFOW),
+    SPNFY(LVN_GETDISPINFOW,      NMLVDISPINFOW),
+    SPNFY(LVN_SETDISPINFOW,      NMLVDISPINFOW),
+    SPNFY(LVN_ODFINDITEMW,       NMLVFINDITEM),
     /* Header         0U-300U  to  0U-399U  */
     SPNFY(HDN_ITEMCHANGINGA,     NMHDR),
     SPNFY(HDN_ITEMCHANGEDA,      NMHDR),