diff --git a/accessible/public/ia2/Makefile.in b/accessible/public/ia2/Makefile.in
index 64068531d333..538c21363c64 100644
--- a/accessible/public/ia2/Makefile.in
+++ b/accessible/public/ia2/Makefile.in
@@ -107,6 +107,7 @@ OS_LIBS = \
   rpcndr.lib \
   rpcns4.lib \
   rpcrt4.lib \
+  ole32.lib \
   oleaut32.lib \
   $(NULL)
 
diff --git a/accessible/src/msaa/nsAccessibleWrap.cpp b/accessible/src/msaa/nsAccessibleWrap.cpp
index 8de53b8eff4f..31c93d30331e 100644
--- a/accessible/src/msaa/nsAccessibleWrap.cpp
+++ b/accessible/src/msaa/nsAccessibleWrap.cpp
@@ -1199,11 +1199,11 @@ nsAccessibleWrap::get_uniqueID(long *uniqueID)
 }
 
 STDMETHODIMP
-nsAccessibleWrap::get_windowHandle(OLE_HANDLE *windowHandle)
+nsAccessibleWrap::get_windowHandle(HWND *windowHandle)
 {
   void **handle = nsnull;
   if (NS_SUCCEEDED(GetOwnerWindow(handle))) {
-    *windowHandle = NS_REINTERPRET_POINTER_CAST(OLE_HANDLE, *handle);
+    *windowHandle = NS_REINTERPRET_POINTER_CAST(HWND, *handle);
     return S_OK;
   }
   return E_FAIL;
diff --git a/accessible/src/msaa/nsAccessibleWrap.h b/accessible/src/msaa/nsAccessibleWrap.h
index 7a8f4a7117fc..0b5914ea6085 100644
--- a/accessible/src/msaa/nsAccessibleWrap.h
+++ b/accessible/src/msaa/nsAccessibleWrap.h
@@ -211,7 +211,7 @@ class nsAccessibleWrap : public nsAccessible,
         /* [retval][out] */ long *uniqueID);
 
     virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_windowHandle(
-        /* [retval][out] */ OLE_HANDLE *windowHandle);
+        /* [retval][out] */ HWND *windowHandle);
 
     virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_indexInParent(
         /* [retval][out] */ long *indexInParent);
diff --git a/other-licenses/ia2/Accessible2.idl b/other-licenses/ia2/Accessible2.idl
index d1fe827d8e66..bded3c8a6197 100644
--- a/other-licenses/ia2/Accessible2.idl
+++ b/other-licenses/ia2/Accessible2.idl
@@ -324,7 +324,7 @@ interface IAccessible2 : IAccessible
   */
   [propget] HRESULT windowHandle
     (
-     [out, retval] OLE_HANDLE *windowHandle
+     [out, retval] HWND *windowHandle
     );
  
   /** @brief Returns the index of this object in its parent object.