diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec
index e83ac2457e176136769e8941f6186d386fa97f57..91144f70ccd10bbae9891bc515288f437dc3e93f 100644
--- a/dlls/ole32/ole32.spec
+++ b/dlls/ole32/ole32.spec
@@ -20,9 +20,9 @@ debug_channels (ole relay storage)
   6 stdcall CoCreateGuid(ptr) CoCreateGuid
   7 stdcall CoCreateInstance(ptr ptr long ptr ptr) CoCreateInstance
   8 stdcall CoDisconnectObject(ptr long) CoDisconnectObject
-  9 stdcall CoDosDateTimeToFileTime(long long ptr) DosDateTimeToFileTime
+  9 forward CoDosDateTimeToFileTime kernel32.DosDateTimeToFileTime
  10 stdcall CoFileTimeNow(ptr) CoFileTimeNow
- 11 stdcall CoFileTimeToDosDateTime(ptr ptr ptr) FileTimeToDosDateTime
+ 11 forward CoFileTimeToDosDateTime kernel32.FileTimeToDosDateTime
  12 stdcall CoFreeAllLibraries() CoFreeAllLibraries
  13 stdcall CoFreeLibrary(long) CoFreeLibrary
  14 stdcall CoFreeUnusedLibraries() CoFreeUnusedLibraries
diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec
index 644dc06efc1a3ff0a0e0d9787ecf075ddf97ed5a..a98699c4b523906f5233c14dfd166035b960e51e 100644
--- a/dlls/shell32/shell32.spec
+++ b/dlls/shell32/shell32.spec
@@ -249,28 +249,28 @@ debug_channels (exec pidl shell)
  299 stub Shl1632_ThunkData32
  300 stub Shl3216_ThunkData32
  301 forward StrChrA shlwapi.StrChrA   
- 302 stub StrChrIA
- 303 stub StrChrIW
+ 302 forward StrChrIA shlwapi.StrChrIA
+ 303 forward StrChrIW shlwapi.StrChrIW
  304 forward StrChrW shlwapi.StrChrW
  305 forward StrCmpNA shlwapi.StrCmpNA 
  306 forward StrCmpNIA shlwapi.StrCmpNIA
  307 forward StrCmpNIW shlwapi.StrCmpNIW
  308 forward StrCmpNW shlwapi.StrCmpNW
  309 stdcall StrCpyNA (ptr str long) lstrcpynA
- 310 stdcall StrCpyNW (ptr wstr long)lstrcpynW
- 311 stub StrNCmpA
- 312 stub StrNCmpIA
- 313 stub StrNCmpIW
- 314 stub StrNCmpW
+ 310 forward StrCpyNW shlwapi.StrCpyNW
+ 311 forward StrNCmpA shlwapi.StrCmpNA
+ 312 forward StrNCmpIA shlwapi.StrCmpNIA
+ 313 forward StrNCmpIW shlwapi.StrCmpNIW
+ 314 forward StrNCmpW shlwapi.StrCmpNW
  315 stdcall StrNCpyA (ptr str long) lstrcpynA
- 316 stdcall StrNCpyW (ptr wstr long)lstrcpynW
+ 316 forward StrNCpyW shlwapi.StrNCpyW
  317 forward StrRChrA shlwapi.StrRChrA
- 318 stub StrRChrIA
- 319 stub StrRChrIW
+ 318 forward StrRChrIA shlwapi.StrRChrIA
+ 319 forward StrRChrIW shlwapi.StrRChrIW
  320 forward StrRChrW shlwapi.StrRChrW
  321 stub StrRStrA
- 322 stub StrRStrIA
- 323 stub StrRStrIW
+ 322 forward StrRStrIA shlwapi.StrRStrIA
+ 323 forward StrRStrIW shlwapi.StrRStrIW
  324 stub StrRStrW
  325 forward StrStrA shlwapi.StrStrA
  326 forward StrStrIA shlwapi.StrStrIA
diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec
index d5cc0f907d9a6a7b5890e6f4927ec158ba0df553..8ec74b4e5c325b6297432b7a5139c3ec00315f22 100644
--- a/dlls/shlwapi/shlwapi.spec
+++ b/dlls/shlwapi/shlwapi.spec
@@ -623,13 +623,13 @@ debug_channels (shell)
 @ stub    StrChrIA
 @ stub    StrChrIW
 @ stdcall StrChrW (wstr long) StrChrW
-@ forward StrCmpIW kernel32.lstrcmpiW
+@ stdcall StrCmpIW (wstr wstr) StrCmpIW
 @ stdcall StrCmpNA (str str long) StrCmpNA
 @ stdcall StrCmpNIA (str str long) StrCmpNIA
 @ stdcall StrCmpNIW (wstr wstr long) StrCmpNIW
 @ stdcall StrCmpNW (wstr wstr long) StrCmpNW
-@ forward StrCmpW kernel32.lstrcmpW
-@ stdcall StrCpyNW (ptr wstr long) lstrcpynW
+@ stdcall StrCmpW (wstr wstr) StrCmpW
+@ stdcall StrCpyNW (wstr wstr long) StrCpyNW
 @ stdcall StrCpyW (ptr wstr) StrCpyW
 @ stdcall StrDupA (str) StrDupA
 @ stdcall StrDupW (wstr) StrDupW
diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c
index af04fc36198e3b221c73a43befdeb1c4cf4590a0..ab3a30f1fdb7b911f68c2a4830f4c9e62a55678c 100644
--- a/dlls/shlwapi/string.c
+++ b/dlls/shlwapi/string.c
@@ -35,6 +35,15 @@ LPWSTR WINAPI StrChrW (LPCWSTR str, WCHAR x )
 	return strchrW(str, x);
 }
 
+/*************************************************************************
+ * StrCmpIW					[SHLWAPI]
+ */
+int WINAPI StrCmpIW ( LPCWSTR wstr1, LPCWSTR wstr2 )
+{
+    TRACE("%s %s\n", debugstr_w(wstr1),debugstr_w(wstr2));
+    return strcmpiW( wstr1, wstr2 );
+}
+
 /*************************************************************************
  * StrCmpNA					[SHLWAPI]
  */
@@ -71,6 +80,15 @@ int WINAPI StrCmpNIW ( LPCWSTR wstr1, LPCWSTR wstr2, int len)
 	return strncmpiW(wstr1, wstr2, len);
 }
 
+/*************************************************************************
+ * StrCmpW					[SHLWAPI]
+ */
+int WINAPI StrCmpW ( LPCWSTR wstr1, LPCWSTR wstr2 )
+{
+    TRACE("%s %s\n", debugstr_w(wstr1),debugstr_w(wstr2));
+    return strcmpW( wstr1, wstr2 );
+}
+
 /*************************************************************************
  * StrCatW					[SHLWAPI]
  */
@@ -89,6 +107,15 @@ LPWSTR WINAPI StrCpyW( LPWSTR wstr1, LPCWSTR wstr2 )
 }
 
 
+/*************************************************************************
+ * StrCpyNW					[SHLWAPI]
+ */
+LPWSTR WINAPI StrCpyNW( LPWSTR wstr1, LPCWSTR wstr2, int n )
+{
+    return lstrcpynW( wstr1, wstr2, n );
+}
+
+
 /*************************************************************************
  * StrStrA					[SHLWAPI]
  */
diff --git a/dlls/win32s/w32skrnl.spec b/dlls/win32s/w32skrnl.spec
index be8e6c0db5161346b0d9a7156b170723802ade7d..5ecf7fb7a1b87632b58d3d71bf45b6a65b7d424b 100644
--- a/dlls/win32s/w32skrnl.spec
+++ b/dlls/win32s/w32skrnl.spec
@@ -35,7 +35,7 @@ debug_channels (dll)
 27 stub _NtDupSection@4
 28 stub _GetSelModName@20
 29 stub _FGetDscr@8
-30 stdcall _RtlNtStatusToDosError@4(long) RtlNtStatusToDosError #FIXME: not sure
+30 forward _RtlNtStatusToDosError ntdll.RtlNtStatusToDosError #FIXME: not sure
 31 stub _NtFlushVirtualMemory@16
 32 stub _snprintf
 33 stub _NtUnmapViewOfSection@8