diff --git a/reactos/dll/win32/version/info.c b/reactos/dll/win32/version/info.c
index 2e1536c5dcc..89a5e6def9c 100644
--- a/reactos/dll/win32/version/info.c
+++ b/reactos/dll/win32/version/info.c
@@ -764,7 +764,7 @@ static BOOL WINAPI VersionInfo32_QueryValue( VS_VERSION_INFO_STRUCT32 *info, LPC
 /***********************************************************************
  *           VerQueryValueA              [VERSION.@]
  */
-BOOL WINAPI VerQueryValueA( LPVOID pBlock, LPCSTR lpSubBlock,
+BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock,
                                LPVOID *lplpBuffer, UINT *puLen )
 {
     static const char rootA[] = "\\";
@@ -814,7 +814,7 @@ BOOL WINAPI VerQueryValueA( LPVOID pBlock, LPCSTR lpSubBlock,
 /***********************************************************************
  *           VerQueryValueW              [VERSION.@]
  */
-BOOL WINAPI VerQueryValueW( LPVOID pBlock, LPCWSTR lpSubBlock,
+BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock,
                                LPVOID *lplpBuffer, UINT *puLen )
 {
     static const WCHAR rootW[] = { '\\', 0 };
diff --git a/reactos/include/psdk/basetsd.h b/reactos/include/psdk/basetsd.h
index dc90e67105a..16428fdbf34 100644
--- a/reactos/include/psdk/basetsd.h
+++ b/reactos/include/psdk/basetsd.h
@@ -26,6 +26,7 @@
 #define ADDRESS_TAG_BIT 0x80000000UL
 #define HandleToUlong( h ) ((ULONG)(ULONG_PTR)(h) )
 #define HandleToLong( h ) ((LONG)(LONG_PTR) (h) )
+#define ULongToHandle( h) ((HANDLE)(ULONG_PTR) (h))
 #define LongToHandle( h) ((HANDLE)(LONG_PTR) (h))
 #define PtrToUlong( p ) ((ULONG)(ULONG_PTR) (p) )
 #define PtrToLong( p ) ((LONG)(LONG_PTR) (p) )
@@ -77,6 +78,8 @@ inline unsigned long HandleToUlong(const void* h )
     { return((unsigned long) h ); }
 inline long HandleToLong( const void* h )
     { return((long) h ); }
+inline void* ULongToHandle( const long h )
+    { return((void*) (UINT_PTR) h ); }
 inline void* LongToHandle( const long h )
     { return((void*) (INT_PTR) h ); }
 inline unsigned long PtrToUlong( const void* p)
diff --git a/reactos/include/psdk/commctrl.h b/reactos/include/psdk/commctrl.h
index 32018f223db..f939ff05a13 100644
--- a/reactos/include/psdk/commctrl.h
+++ b/reactos/include/psdk/commctrl.h
@@ -715,7 +715,7 @@ BOOL WINAPI GetWindowSubclass(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR*);
 BOOL WINAPI RemoveWindowSubclass(HWND, SUBCLASSPROC, UINT_PTR);
 LRESULT WINAPI DefSubclassProc(HWND, UINT, WPARAM, LPARAM);
 
-int WINAPI DrawShadowText(HDC, LPCWSTR, UINT, RECT*, DWORD, COLORREF, COLORREF, int, int);
+int WINAPI DrawShadowText(HDC, LPCWSTR, UINT, const RECT*, DWORD, COLORREF, COLORREF, int, int);
 
 /* Header control */
 
diff --git a/reactos/include/psdk/winver.h b/reactos/include/psdk/winver.h
index d0d089bae3e..534556e5ddf 100644
--- a/reactos/include/psdk/winver.h
+++ b/reactos/include/psdk/winver.h
@@ -108,8 +108,8 @@ BOOL WINAPI GetFileVersionInfoA(LPCSTR,DWORD,DWORD,PVOID);
 BOOL WINAPI GetFileVersionInfoW(LPCWSTR,DWORD,DWORD,PVOID);
 DWORD WINAPI VerLanguageNameA(DWORD,LPSTR,DWORD);
 DWORD WINAPI VerLanguageNameW(DWORD,LPWSTR,DWORD);
-BOOL WINAPI VerQueryValueA(const LPVOID,LPCSTR,LPVOID*,PUINT);
-BOOL WINAPI VerQueryValueW(const LPVOID,LPCWSTR,LPVOID*,PUINT);
+BOOL WINAPI VerQueryValueA(LPCVOID,LPCSTR,LPVOID*,PUINT);
+BOOL WINAPI VerQueryValueW(LPCVOID,LPCWSTR,LPVOID*,PUINT);
 #ifdef UNICODE
 #define VerFindFile VerFindFileW
 #define VerQueryValue VerQueryValueW
diff --git a/reactos/include/reactos/wine/unicode.h b/reactos/include/reactos/wine/unicode.h
index d65876d5d6e..4d73c6f349f 100644
--- a/reactos/include/reactos/wine/unicode.h
+++ b/reactos/include/reactos/wine/unicode.h
@@ -10,6 +10,7 @@
 #define strlenW(s) wcslen((const wchar_t *)(s))
 #define strcpyW(d,s) wcscpy((wchar_t *)(d),(const wchar_t *)(s))
 #define strcatW(d,s) wcscat((wchar_t *)(d),(const wchar_t *)(s))
+#define strcspnW(d,s) wcscspn((wchar_t *)(d),(const wchar_t *)(s))
 #define strstrW(d,s) wcsstr((const wchar_t *)(d),(const wchar_t *)(s))
 #define strtolW(s,e,b) wcstol((const wchar_t *)(s),(wchar_t **)(e),(b))
 #define strchrW(s,c) wcschr((const wchar_t *)(s),(wchar_t)(c))