diff --git a/build/Aegisub/Aegisub.targets b/build/Aegisub/Aegisub.targets
index 07f0e5de3..438a7790b 100644
--- a/build/Aegisub/Aegisub.targets
+++ b/build/Aegisub/Aegisub.targets
@@ -146,7 +146,6 @@
$(SrcDir)include\;
- $(AegisubContribBase)iconv\include;
$(AegisubSourceBase)libaegisub\include;
$(AegisubSourceBase)build;
$(AegisubSourceBase)include;
diff --git a/build/boost/boost.vcxproj b/build/boost/boost.vcxproj
index 7af7d369b..f708057d9 100644
--- a/build/boost/boost.vcxproj
+++ b/build/boost/boost.vcxproj
@@ -25,10 +25,6 @@
BOOST_THREAD_BUILD_LIB;
%(PreprocessorDefinitions)
-
- $(AegisubContribBase)iconv\include;
- %(AdditionalIncludeDirectories)
-
diff --git a/build/csrihelper/csrihelper.vcxproj b/build/csrihelper/csrihelper.vcxproj
index 93fb6a037..4f9ff8290 100644
--- a/build/csrihelper/csrihelper.vcxproj
+++ b/build/csrihelper/csrihelper.vcxproj
@@ -5,6 +5,7 @@
{C832EAF3-860D-4373-A02C-933626B47A5E}
csrihelper
+
lib
@@ -13,6 +14,7 @@
+
@@ -20,7 +22,13 @@
$(SrcDir)include\;$(SrcDir)lib\;$(SrcDir)lib\win32\;%(AdditionalIncludeDirectories)
+
+
+
+ csri\
+
+
diff --git a/build/libaegisub/libaegisub.vcxproj b/build/libaegisub/libaegisub.vcxproj
index a8126c3f9..293c84a9f 100644
--- a/build/libaegisub/libaegisub.vcxproj
+++ b/build/libaegisub/libaegisub.vcxproj
@@ -18,7 +18,6 @@
$(SrcDir);
$(SrcDir)include;
- $(AegisubContribBase)iconv\include;
%(AdditionalIncludeDirectories)
diff --git a/build/libass/libass.vcxproj b/build/libass/libass.vcxproj
index 23b78747a..282aeb2d5 100644
--- a/build/libass/libass.vcxproj
+++ b/build/libass/libass.vcxproj
@@ -21,7 +21,6 @@
$(LibassSrcDir)\libass;
$(MSBuildThisFileDirectory);
$(AegisubSourceBase)\include\fribidi;
- $(AegisubContribBase)iconv\include;
%(AdditionalIncludeDirectories)
diff --git a/build/libiconv/libiconv.vcxproj b/build/libiconv/libiconv.vcxproj
index c86b91668..cc2e00d28 100644
--- a/build/libiconv/libiconv.vcxproj
+++ b/build/libiconv/libiconv.vcxproj
@@ -4,6 +4,7 @@
{965054D2-44F2-4EB2-9879-051CC3D7EF08}
libiconv
+
lib
@@ -12,6 +13,7 @@
+
@@ -20,7 +22,11 @@
CompileAsC
+
+
+
+
diff --git a/src/subtitles_provider_csri.cpp b/src/subtitles_provider_csri.cpp
index 3bf710f37..dffd5bd3a 100644
--- a/src/subtitles_provider_csri.cpp
+++ b/src/subtitles_provider_csri.cpp
@@ -49,11 +49,10 @@
#ifdef WIN32
#define CSRIAPI
-#include "../../contrib/csri/include/csri/csri.h"
-#else
-#include
#endif
+#include
+
// CSRI renderers are not required to be thread safe (and VSFilter very much
// is not)
static std::mutex csri_mutex;