diff --git a/mozilla/xpcom/obsolete/Makefile.in b/mozilla/xpcom/obsolete/Makefile.in
index 8182e3fc127..1109da3557e 100644
--- a/mozilla/xpcom/obsolete/Makefile.in
+++ b/mozilla/xpcom/obsolete/Makefile.in
@@ -102,9 +102,9 @@ EXTRA_DSO_LDOPTS += -lbe
 endif
 
 ifeq ($(OS_ARCH),WINNT)
-EXTRA_DSO_LDOPTS += shell32.lib ole32.lib
+EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME, shell32 ole32)
 ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
-EXTRA_DSO_LDOPTS += imagehlp.lib
+EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME, imagehlp)
 endif
 endif # WINNT
 
diff --git a/mozilla/xpcom/obsolete/nsFileSpecWin.cpp b/mozilla/xpcom/obsolete/nsFileSpecWin.cpp
index 5b389243c26..3335f055340 100644
--- a/mozilla/xpcom/obsolete/nsFileSpecWin.cpp
+++ b/mozilla/xpcom/obsolete/nsFileSpecWin.cpp
@@ -301,7 +301,7 @@ PRBool nsFileSpec::IsSymlink() const
         
         if (SUCCEEDED(hres)) 
         {
-            WORD wsz[MAX_PATH]; 
+            WCHAR wsz[MAX_PATH]; 
             // Ensure that the string is Unicode. 
             MultiByteToWideChar(CP_ACP, 0, mPath, -1, wsz, MAX_PATH); 
  
@@ -352,7 +352,7 @@ nsresult nsFileSpec::ResolveSymlink(PRBool& wasSymlink)
         
         if (SUCCEEDED(hres)) 
         {
-            WORD wsz[MAX_PATH]; 
+            WCHAR wsz[MAX_PATH]; 
             // Ensure that the string is Unicode. 
             MultiByteToWideChar(CP_ACP, 0, mPath, -1, wsz, MAX_PATH); 
  
diff --git a/mozilla/xpcom_obsolete/Makefile.in b/mozilla/xpcom_obsolete/Makefile.in
index 8182e3fc127..1109da3557e 100644
--- a/mozilla/xpcom_obsolete/Makefile.in
+++ b/mozilla/xpcom_obsolete/Makefile.in
@@ -102,9 +102,9 @@ EXTRA_DSO_LDOPTS += -lbe
 endif
 
 ifeq ($(OS_ARCH),WINNT)
-EXTRA_DSO_LDOPTS += shell32.lib ole32.lib
+EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME, shell32 ole32)
 ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
-EXTRA_DSO_LDOPTS += imagehlp.lib
+EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME, imagehlp)
 endif
 endif # WINNT
 
diff --git a/mozilla/xpcom_obsolete/nsFileSpecWin.cpp b/mozilla/xpcom_obsolete/nsFileSpecWin.cpp
index 5b389243c26..3335f055340 100644
--- a/mozilla/xpcom_obsolete/nsFileSpecWin.cpp
+++ b/mozilla/xpcom_obsolete/nsFileSpecWin.cpp
@@ -301,7 +301,7 @@ PRBool nsFileSpec::IsSymlink() const
         
         if (SUCCEEDED(hres)) 
         {
-            WORD wsz[MAX_PATH]; 
+            WCHAR wsz[MAX_PATH]; 
             // Ensure that the string is Unicode. 
             MultiByteToWideChar(CP_ACP, 0, mPath, -1, wsz, MAX_PATH); 
  
@@ -352,7 +352,7 @@ nsresult nsFileSpec::ResolveSymlink(PRBool& wasSymlink)
         
         if (SUCCEEDED(hres)) 
         {
-            WORD wsz[MAX_PATH]; 
+            WCHAR wsz[MAX_PATH]; 
             // Ensure that the string is Unicode. 
             MultiByteToWideChar(CP_ACP, 0, mPath, -1, wsz, MAX_PATH);