diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index af12af93d3..9c19488f92 100644
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -502,7 +502,7 @@ public:
 #include "wx/hash.h"
 
 // pseudo-template HWND <-> wxWindow hash table
-WX_DECLARE_HASH(wxWindow, wxWindowList, wxWinHashTable);
+WX_DECLARE_HASH(wxWindowMSW, wxWindowList, wxWinHashTable);
 
 extern wxWinHashTable *wxWinHandleHash;
 
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 1fb5163574..81f0c914d1 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -2955,7 +2955,7 @@ wxWinHashTable *wxWinHandleHash = NULL;
 
 wxWindow *wxFindWinFromHandle(WXHWND hWnd)
 {
-    return wxWinHandleHash->Get((long)hWnd);
+    return (wxWindow*)wxWinHandleHash->Get((long)hWnd);
 }
 
 void wxAssociateWinWithHandle(HWND hWnd, wxWindowMSW *win)