diff --git a/src/windows/SolutionSettings/SolutionSettings.props b/src/windows/SolutionSettings/SolutionSettings.props
index 105f5166..2e9d8144 100644
--- a/src/windows/SolutionSettings/SolutionSettings.props
+++ b/src/windows/SolutionSettings/SolutionSettings.props
@@ -4,7 +4,7 @@
   <PropertyGroup Label="UserMacros">
     <pthreads>C:\recolldeps\pthreads-w32\Pre-built.2</pthreads>
     <libiconv>c:\recolldeps\iconv64</libiconv>
-    <xapian>C:\recolldeps\xapian\xapian-core-1.2.8</xapian>
+    <xapian>C:\recolldeps\xapian-core-1.2.21</xapian>
     <zlib>C:\recolldeps\zlib</zlib>
   </PropertyGroup>
   <PropertyGroup />
diff --git a/src/windows/Win32ProjectRecoll.sln b/src/windows/Win32ProjectRecoll.sln
index 7327f0ec..0a059964 100644
--- a/src/windows/Win32ProjectRecoll.sln
+++ b/src/windows/Win32ProjectRecoll.sln
@@ -4,15 +4,20 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Win32ProjectRecoll", "Win32ProjectRecoll.vcxproj", "{23FF40E1-BA87-4E5F-9B22-2EB760FF403D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{7713CDF1-27B3-4F9B-B207-C7CEB801C24B} = {7713CDF1-27B3-4F9B-B207-C7CEB801C24B}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recollindex", "recollindex\recollindex.vcxproj", "{A513D65F-798C-4166-B66E-49F69ADA4F59}"
 	ProjectSection(ProjectDependencies) = postProject
 		{23FF40E1-BA87-4E5F-9B22-2EB760FF403D} = {23FF40E1-BA87-4E5F-9B22-2EB760FF403D}
+		{7713CDF1-27B3-4F9B-B207-C7CEB801C24B} = {7713CDF1-27B3-4F9B-B207-C7CEB801C24B}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recollq", "recollq\recollq.vcxproj", "{C1D0CCD2-0015-44AC-A606-AC48BB80C133}"
 	ProjectSection(ProjectDependencies) = postProject
 		{23FF40E1-BA87-4E5F-9B22-2EB760FF403D} = {23FF40E1-BA87-4E5F-9B22-2EB760FF403D}
+		{7713CDF1-27B3-4F9B-B207-C7CEB801C24B} = {7713CDF1-27B3-4F9B-B207-C7CEB801C24B}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SolutionSettings", "SolutionSettings\SolutionSettings.vcxproj", "{7713CDF1-27B3-4F9B-B207-C7CEB801C24B}"
diff --git a/src/windows/Win32ProjectRecoll.vcxproj b/src/windows/Win32ProjectRecoll.vcxproj
index 411410a1..5cbf1f95 100644
--- a/src/windows/Win32ProjectRecoll.vcxproj
+++ b/src/windows/Win32ProjectRecoll.vcxproj
@@ -186,6 +186,7 @@
     <ClCompile Include="..\common\syngroups.cpp" />
     <ClCompile Include="..\common\textsplit.cpp" />
     <ClCompile Include="..\common\unacpp.cpp" />
+    <ClCompile Include="..\index\checkretryfailed.cpp" />
     <ClCompile Include="..\index\fetcher.cpp" />
     <ClCompile Include="..\index\fsfetcher.cpp" />
     <ClCompile Include="..\index\fsindexer.cpp" />
@@ -222,6 +223,8 @@
     <ClCompile Include="..\unac\unac.cpp" />
     <ClCompile Include="..\utils\appformime.cpp" />
     <ClCompile Include="..\utils\base64.cpp" />
+    <ClCompile Include="..\utils\cancelcheck.cpp" />
+    <ClCompile Include="..\utils\chrono.cpp" />
     <ClCompile Include="..\utils\circache.cpp" />
     <ClCompile Include="..\utils\conftree.cpp" />
     <ClCompile Include="..\utils\copyfile.cpp" />
diff --git a/src/windows/Win32ProjectRecoll.vcxproj.filters b/src/windows/Win32ProjectRecoll.vcxproj.filters
index d57ce63c..aa2cb2ee 100644
--- a/src/windows/Win32ProjectRecoll.vcxproj.filters
+++ b/src/windows/Win32ProjectRecoll.vcxproj.filters
@@ -311,6 +311,15 @@
     <ClCompile Include="..\internfile\mh_execm.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\utils\cancelcheck.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\utils\chrono.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\index\checkretryfailed.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="ClassDiagram.cd" />
diff --git a/src/windows/recollindex/recollindex.vcxproj b/src/windows/recollindex/recollindex.vcxproj
index 2c85542e..c1e8d4d7 100644
--- a/src/windows/recollindex/recollindex.vcxproj
+++ b/src/windows/recollindex/recollindex.vcxproj
@@ -110,7 +110,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;__WIN32__;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(pthreads)\include;$(solutiondir)..\xaposix;$(solutiondir)..\utils;$(solutiondir)..\unac;$(solutiondir)..\rcldb;$(solutiondir)..\internfile;$(solutiondir)..\index;$(solutiondir)..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(pthreads)\include;$(solutiondir)..\xaposix;$(solutiondir)..\utils;$(solutiondir)..\unac;$(solutiondir)..\rcldb;$(solutiondir)..\internfile;$(solutiondir)..\index;$(solutiondir)..\common;$(solutiondir)..\windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4800</DisableSpecificWarnings>
     </ClCompile>
     <Link>