diff --git a/reactos/include/wine/shlguid.h b/reactos/include/wine/shlguid.h
index 82293e97beb..03280f3bf24 100644
--- a/reactos/include/wine/shlguid.h
+++ b/reactos/include/wine/shlguid.h
@@ -58,19 +58,21 @@ DEFINE_SHLGUID(IID_IRemoteComputer,     0x000214FEL, 0, 0);
 DEFINE_SHLGUID(IID_IQueryInfo,          0x00021500L, 0, 0);
 
 /* avoid duplicate definitions with shobjidl.h (FIXME) */
-/* DEFINE_SHLGUID(IID_IExtractIconA,       0x000214EBL, 0, 0); */
-/* DEFINE_SHLGUID(IID_IExtractIconW,       0x000214FAL, 0, 0); */
-/* DEFINE_SHLGUID(IID_IContextMenu,        0x000214E4L, 0, 0); */
-/* DEFINE_SHLGUID(IID_IContextMenu2,       0x000214F4L, 0, 0); */
-/* DEFINE_SHLGUID(IID_ICommDlgBrowser,     0x000214F1L, 0, 0); */
-/* DEFINE_SHLGUID(IID_IShellBrowser,       0x000214E2L, 0, 0); */
-/* DEFINE_SHLGUID(IID_IShellView,          0x000214E3L, 0, 0); */
-/* DEFINE_SHLGUID(IID_IShellFolder,        0x000214E6L, 0, 0); */
-/* DEFINE_SHLGUID(IID_IShellExtInit,       0x000214E8L, 0, 0); */
-/* DEFINE_SHLGUID(IID_IPersistFolder,      0x000214EAL, 0, 0); */
-/* DEFINE_SHLGUID(IID_IShellLinkA,         0x000214EEL, 0, 0); */
-/* DEFINE_SHLGUID(IID_IEnumIDList,         0x000214F2L, 0, 0); */
-/* DEFINE_SHLGUID(IID_IShellLinkW,         0x000214F9L, 0, 0); */
+#ifdef __REACTOS__
+DEFINE_SHLGUID(IID_IExtractIconA,       0x000214EBL, 0, 0);
+DEFINE_SHLGUID(IID_IExtractIconW,       0x000214FAL, 0, 0);
+DEFINE_SHLGUID(IID_IContextMenu,        0x000214E4L, 0, 0);
+DEFINE_SHLGUID(IID_IContextMenu2,       0x000214F4L, 0, 0);
+DEFINE_SHLGUID(IID_ICommDlgBrowser,     0x000214F1L, 0, 0);
+DEFINE_SHLGUID(IID_IShellBrowser,       0x000214E2L, 0, 0);
+DEFINE_SHLGUID(IID_IShellView,          0x000214E3L, 0, 0);
+DEFINE_SHLGUID(IID_IShellFolder,        0x000214E6L, 0, 0);
+DEFINE_SHLGUID(IID_IShellExtInit,       0x000214E8L, 0, 0);
+DEFINE_SHLGUID(IID_IPersistFolder,      0x000214EAL, 0, 0);
+DEFINE_SHLGUID(IID_IShellLinkA,         0x000214EEL, 0, 0);
+DEFINE_SHLGUID(IID_IEnumIDList,         0x000214F2L, 0, 0);
+DEFINE_SHLGUID(IID_IShellLinkW,         0x000214F9L, 0, 0);
+#endif
 
 DEFINE_GUID(SID_STopLevelBrowser, 0x4C96BE40L, 0x915C, 0x11CF, 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37);
 
diff --git a/reactos/include/wine/unicode.h b/reactos/include/wine/unicode.h
index 57e58794952..ee09f9fdc4b 100644
--- a/reactos/include/wine/unicode.h
+++ b/reactos/include/wine/unicode.h
@@ -11,8 +11,8 @@
 #define strncmpW(s1,s2,n) wcsncmp((const wchar_t *)s1,(const wchar_t *)s2,n)
 #define strncpyW(s1,s2,n) wcsncpy((wchar_t *)s1,(const wchar_t *)s2,n)
 #define strcmpW(s1,s2) wcscmp((const wchar_t *)s1,(const wchar_t *)s2)
-#define strcmpiW(s1,s2) wcsicmp((const wchar_t *)s1,(const wchar_t *)s2)
-#define strncmpiW(s1,s2,n) wcsnicmp((const wchar_t *)s1,(const wchar_t *)s2,n)
+#define strcmpiW(s1,s2) _wcsicmp((const wchar_t *)s1,(const wchar_t *)s2)
+#define strncmpiW(s1,s2,n) _wcsnicmp((const wchar_t *)s1,(const wchar_t *)s2,n)
 #define tolowerW(n) towlower((wint_t)n)
 #define toupperW(n) towupper((wint_t)n)
 #define islowerW(n) iswlower((wint_t)n)
diff --git a/reactos/lib/kernel32/kernel32.def b/reactos/lib/kernel32/kernel32.def
index 3826460180c..dc2597d64c6 100644
--- a/reactos/lib/kernel32/kernel32.def
+++ b/reactos/lib/kernel32/kernel32.def
@@ -474,6 +474,8 @@ GetSystemTimeAsFileTime@4
 GetSystemTimes@12
 GetSystemWow64DirectoryA@8
 GetSystemWow64DirectoryW@8
+GetSystemWindowsDirectoryA@8
+GetSystemWindowsDirectoryW@8
 GetWindowsDirectoryA@8
 GetWindowsDirectoryW@8
 GetTapeParameters@16
diff --git a/reactos/lib/shlwapi/assoc.c b/reactos/lib/shlwapi/assoc.c
index f69638bb07e..f49c376a08b 100644
--- a/reactos/lib/shlwapi/assoc.c
+++ b/reactos/lib/shlwapi/assoc.c
@@ -19,6 +19,7 @@
  */
 #include <stdarg.h>
 
+#define INITGUID
 #ifdef __REACTOS__
 #include "wine/icom.h"
 #endif
diff --git a/reactos/lib/shlwapi/makefile b/reactos/lib/shlwapi/makefile
index f1a2d962378..1f6287c2c75 100644
--- a/reactos/lib/shlwapi/makefile
+++ b/reactos/lib/shlwapi/makefile
@@ -33,7 +33,9 @@ TARGET_RCFLAGS += -D__REACTOS__	-D_WIN32_IE=0x600 -D_WIN32_WINNT=0x501
 
 TARGET_LFLAGS = -nostartfiles -nostdlib
 
-TARGET_SDKLIBS = libwine.a ole32.a user32.a gdi32.a advapi32.a kernel32.a msvcrt.a
+TARGET_SDKLIBS = libwine.a ntdll.a user32.a gdi32.a ole32.a kernel32.a msvcrt.a
+
+TARGET_GCCLIBS = advapi32 uuid shell32 gcc
 
 TARGET_BASE = 0x76120000
 
diff --git a/reactos/lib/shlwapi/path.c b/reactos/lib/shlwapi/path.c
index 5260cf7bc91..446f0f509aa 100644
--- a/reactos/lib/shlwapi/path.c
+++ b/reactos/lib/shlwapi/path.c
@@ -38,6 +38,9 @@
 #define NO_SHLWAPI_STREAM
 #include "shlwapi.h"
 #include "wine/debug.h"
+#ifdef __REACTOS__
+UINT WINAPI GetSystemWindowsDirectoryW(LPWSTR,UINT);
+#endif
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
diff --git a/reactos/lib/shlwapi/string.c b/reactos/lib/shlwapi/string.c
index ed739fea73a..d189630a875 100644
--- a/reactos/lib/shlwapi/string.c
+++ b/reactos/lib/shlwapi/string.c
@@ -678,7 +678,7 @@ LPWSTR WINAPI StrStrIW(LPCWSTR lpszStr, LPCWSTR lpszSearch)
   TRACE("(%s,%s)\n", debugstr_w(lpszStr), debugstr_w(lpszSearch));
 
 #ifdef __REACTOS__
-  return SHLWAPI_StrStrHelperW(lpszStr, lpszSearch, wcsnicmp);
+  return SHLWAPI_StrStrHelperW(lpszStr, lpszSearch, _wcsnicmp);
 #else
   return SHLWAPI_StrStrHelperW(lpszStr, lpszSearch, strncmpiW);
 #endif