diff --git a/dll/win32/kernel32/client/proc.c b/dll/win32/kernel32/client/proc.c
index 1354030d45db2..e0583f6dc6332 100644
--- a/dll/win32/kernel32/client/proc.c
+++ b/dll/win32/kernel32/client/proc.c
@@ -3769,6 +3769,7 @@ CreateProcessInternalW(IN HANDLE hUserToken,
         ASSERT(NT_SUCCESS(ImageDbgStatus));
         ImageDbgStatus = RtlAppendUnicodeToString(&DebuggerString, lpCommandLine);
         ASSERT(NT_SUCCESS(ImageDbgStatus));
+        UNREFERENCED_PARAMETER(ImageDbgStatus);
 
         /* Make sure it all looks nice */
         DbgPrint("BASE: Calling debugger with '%wZ'\n", &DebuggerString);
@@ -4810,7 +4811,7 @@ WinExec(LPCSTR lpCmdLine,
 }
 
 
-BOOL GetProcessGroupAffinity(HANDLE hProcess, PUSHORT GroupCount, PUSHORT GroupArray)
+BOOL WINAPI GetProcessGroupAffinity(HANDLE hProcess, PUSHORT GroupCount, PUSHORT GroupArray)
 {
    PROCESS_INFORMATION ProcessInfo;
    NTSTATUS Status;
@@ -4834,7 +4835,7 @@ BOOL GetProcessGroupAffinity(HANDLE hProcess, PUSHORT GroupCount, PUSHORT GroupA
 
 }
 
-BOOL SetThreadGroupAffinity(HANDLE hThread, const GROUP_AFFINITY *GroupAffinity, PGROUP_AFFINITY PreviousGroupAffinity)
+BOOL WINAPI SetThreadGroupAffinity(HANDLE hThread, const GROUP_AFFINITY *GroupAffinity, PGROUP_AFFINITY PreviousGroupAffinity)
 
 {
 		DWORD_PTR ProcessAffinityMask;
@@ -4857,7 +4858,7 @@ BOOL SetThreadGroupAffinity(HANDLE hThread, const GROUP_AFFINITY *GroupAffinity,
 		return SetThreadAffinityMask(hThread, GroupAffinity->Mask);
 }
 
-BOOL GetThreadGroupAffinity(HANDLE hThread, PGROUP_AFFINITY GroupAffinity)
+BOOL WINAPI GetThreadGroupAffinity(HANDLE hThread, PGROUP_AFFINITY GroupAffinity)
 
 {
 		DWORD_PTR ProcessAffinityMask;
@@ -4879,7 +4880,7 @@ BOOL GetThreadGroupAffinity(HANDLE hThread, PGROUP_AFFINITY GroupAffinity)
 		return TRUE;
 }
 
-BOOL GetThreadIdealProcessorEx(HANDLE hThread, PPROCESSOR_NUMBER lpIdealProcessor)
+BOOL WINAPI GetThreadIdealProcessorEx(HANDLE hThread, PPROCESSOR_NUMBER lpIdealProcessor)
 
 {
 		lpIdealProcessor->Number = SetThreadIdealProcessor(hThread, MAXIMUM_PROCESSORS);
@@ -4891,7 +4892,7 @@ BOOL GetThreadIdealProcessorEx(HANDLE hThread, PPROCESSOR_NUMBER lpIdealProcesso
 			return TRUE;
 }
 
-BOOL SetThreadIdealProcessorEx(HANDLE hThread, PPROCESSOR_NUMBER lpIdealProcessor,
+BOOL WINAPI SetThreadIdealProcessorEx(HANDLE hThread, PPROCESSOR_NUMBER lpIdealProcessor,
 		PPROCESSOR_NUMBER lpPreviousIdealProcessor)
 {
 	lpPreviousIdealProcessor->Number = SetThreadIdealProcessor(hThread, lpIdealProcessor->Number);
@@ -4907,7 +4908,7 @@ BOOL
 WINAPI
 GetLogicalProcessorInformation(OUT PSYSTEM_LOGICAL_PROCESSOR_INFORMATION Buffer,
                                IN OUT PDWORD ReturnLength);
-BOOL GetLogicalProcessorInformationEx(LOGICAL_PROCESSOR_RELATIONSHIP RelationshipType, PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX Buffer, PDWORD ReturnedLength)
+BOOL WINAPI GetLogicalProcessorInformationEx(LOGICAL_PROCESSOR_RELATIONSHIP RelationshipType, PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX Buffer, PDWORD ReturnedLength)
 {
  PSYSTEM_LOGICAL_PROCESSOR_INFORMATION BufferClassic;
 	PSYSTEM_LOGICAL_PROCESSOR_INFORMATION Ptr;
diff --git a/dll/win32/kernel32/kernel32_vista/proc.c b/dll/win32/kernel32/kernel32_vista/proc.c
index 25b6dbfe4bd81..4dbd1bff4afd2 100644
--- a/dll/win32/kernel32/kernel32_vista/proc.c
+++ b/dll/win32/kernel32/kernel32_vista/proc.c
@@ -146,6 +146,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH InitializeProcThreadAttributeList( struct _PROC_TH
 }
 
 BOOL 
+WINAPI
 K32QueryWorkingSet(
         HANDLE hProcess,
         PVOID  pv,
@@ -157,6 +158,7 @@ K32QueryWorkingSet(
 }
 
 BOOL 
+WINAPI
 K32QueryWorkingSetEx(
         HANDLE hProcess,
         PVOID  pv,
diff --git a/dll/win32/powrprof/powrprof.c b/dll/win32/powrprof/powrprof.c
index cdcfc391e5f44..9f8438e816932 100644
--- a/dll/win32/powrprof/powrprof.c
+++ b/dll/win32/powrprof/powrprof.c
@@ -1332,6 +1332,7 @@ typedef enum _POWER_PLATFORM_ROLE {
 } POWER_PLATFORM_ROLE, *PPOWER_PLATFORM_ROLE;
 
 POWER_PLATFORM_ROLE
+WINAPI
 PowerDeterminePlatformRoleEx(ULONG Version)
 {
     return PlatformRoleDesktop;
diff --git a/dll/win32/psapi/psapi.c b/dll/win32/psapi/psapi.c
index d439b395d8e42..c328273cd941f 100644
--- a/dll/win32/psapi/psapi.c
+++ b/dll/win32/psapi/psapi.c
@@ -1659,7 +1659,9 @@ QueryWorkingSetEx(IN HANDLE hProcess,
     return TRUE;
 }
 
-BOOL EnumProcessModulesEx(
+BOOL
+WINAPI
+EnumProcessModulesEx(
     HANDLE  hProcess,
     HMODULE *lphModule,
     DWORD   cb,
diff --git a/dll/win32_vista/CMakeLists.txt b/dll/win32_vista/CMakeLists.txt
index 5da28ce967124..38c05fcba0e44 100644
--- a/dll/win32_vista/CMakeLists.txt
+++ b/dll/win32_vista/CMakeLists.txt
@@ -13,10 +13,10 @@ add_subdirectory(mfreadwrite)
 add_subdirectory(ncrypt)
 add_subdirectory(ndfapi)
 #add_subdirectory(rstrtmgr)
-add_subdirectory(shcore)
+#add_subdirectory(shcore)
 add_subdirectory(sspicli)
 add_subdirectory(uianimation)
-add_subdirectory(uiautomationcore)
+#add_subdirectory(uiautomationcore)
 #add_subdirectory(winecrt)
 add_subdirectory(winusb)
 #add_subdirectory(wsdapi)
diff --git a/dll/win32_vista/shcore/shcore.rc b/dll/win32_vista/shcore/shcore.rc
index 14f433dd1378e..b6f63da821414 100644
--- a/dll/win32_vista/shcore/shcore.rc
+++ b/dll/win32_vista/shcore/shcore.rc
@@ -1,24 +1,5 @@
-/*
- * Copyright 2009 Henri Verbeet for CodeWeavers
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#define WINE_FILEDESCRIPTION_STR "Wine Shell Windows core for One-Core-API"
-#define WINE_FILENAME_STR "shcore.dll"
-#define WINE_FILEVERSION 6,0,6003,18010
-#define WINE_FILEVERSION_STR "2.10.0"
-#define WINE_PRODUCTVERSION 2,10,0
-#define WINE_PRODUCTVERSION_STR "6.0.6003.18010"
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS cryptbase"
+#define REACTOS_STR_INTERNAL_NAME     "cryptbase"
+#define REACTOS_STR_ORIGINAL_FILENAME "cryptbase.dll"
+#include <reactos/version.rc>
diff --git a/dll/win32_vista/uianimation/CMakeLists.txt b/dll/win32_vista/uianimation/CMakeLists.txt
index ed345ceebd4e1..4577c9398ae2d 100644
--- a/dll/win32_vista/uianimation/CMakeLists.txt
+++ b/dll/win32_vista/uianimation/CMakeLists.txt
@@ -21,5 +21,5 @@ add_dependencies(uianimation uianimation_idlheader stdole2)
 set_module_type(uianimation win32dll ENTRYPOINT DllMain)
 target_link_libraries(uianimation wine uuid)
 add_delay_importlibs(uianimation user32)
-add_importlibs(uianimation ntdll kernel32 msvcrt)
+add_importlibs(uianimation msvcrt ntdll ntdll_vista kernel32 kernel32_vista)
 add_cd_file(TARGET uianimation DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32_vista/uianimation/version.rc b/dll/win32_vista/uianimation/version.rc
index b3ae8defd5532..b6f63da821414 100644
--- a/dll/win32_vista/uianimation/version.rc
+++ b/dll/win32_vista/uianimation/version.rc
@@ -1,24 +1,5 @@
-/*
- * Copyright 2009 Henri Verbeet for CodeWeavers
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
- 
-#define WINE_FILEDESCRIPTION_STR "Wine Animation Manager"
-#define WINE_FILENAME_STR "uianimation.dll"
-#define WINE_FILEVERSION 6,0,6003,18010
-#define WINE_FILEVERSION_STR "2.10.0"
-#define WINE_PRODUCTVERSION 2,10,0
-#define WINE_PRODUCTVERSION_STR "6.0.6003.18010"
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS cryptbase"
+#define REACTOS_STR_INTERNAL_NAME     "cryptbase"
+#define REACTOS_STR_ORIGINAL_FILENAME "cryptbase.dll"
+#include <reactos/version.rc>
diff --git a/dll/win32_vista/uiautomationcore/uiautomationcore.rc b/dll/win32_vista/uiautomationcore/uiautomationcore.rc
index ef875c6421d0c..b6f63da821414 100644
--- a/dll/win32_vista/uiautomationcore/uiautomationcore.rc
+++ b/dll/win32_vista/uiautomationcore/uiautomationcore.rc
@@ -1,25 +1,5 @@
-/*
- * Copyright 2009 Henri Verbeet for CodeWeavers
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#define WINE_FILEDESCRIPTION_STR "Wine UI Automation Core"
-#define WINE_FILENAME_STR "uiautomationcore.dll"
-#define WINE_FILEVERSION 6,0,6003,18010
-#define WINE_FILEVERSION_STR "2.10.0"
-#define WINE_PRODUCTVERSION 2,10,0
-#define WINE_PRODUCTVERSION_STR "6.0.6003.18010"
-
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS cryptbase"
+#define REACTOS_STR_INTERNAL_NAME     "cryptbase"
+#define REACTOS_STR_ORIGINAL_FILENAME "cryptbase.dll"
+#include <reactos/version.rc>
diff --git a/dll/win32_vista/winusb/version.rc b/dll/win32_vista/winusb/version.rc
index 6f81d38469351..b6f63da821414 100644
--- a/dll/win32_vista/winusb/version.rc
+++ b/dll/win32_vista/winusb/version.rc
@@ -1,24 +1,5 @@
-/*
- * Copyright 2009 Henri Verbeet for CodeWeavers
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#define WINE_FILEDESCRIPTION_STR "Wine USB Driver User Library"
-#define WINE_FILENAME_STR "winusb.dll"
-#define WINE_FILEVERSION 6,0,6003,18010
-#define WINE_FILEVERSION_STR "2.10.0"
-#define WINE_PRODUCTVERSION 2,10,0
-#define WINE_PRODUCTVERSION_STR "6.0.6003.18010"
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS cryptbase"
+#define REACTOS_STR_INTERNAL_NAME     "cryptbase"
+#define REACTOS_STR_ORIGINAL_FILENAME "cryptbase.dll"
+#include <reactos/version.rc>