diff --git a/common/waifu2x.cpp b/common/waifu2x.cpp
index 0cb9934..27652f5 100644
--- a/common/waifu2x.cpp
+++ b/common/waifu2x.cpp
@@ -2,7 +2,9 @@
 #include <caffe/caffe.hpp>
 #include <cudnn.h>
 #include <mutex>
-#include <opencv2/opencv.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/imgcodecs.hpp>
 #include <rapidjson/document.h>
 #include <tclap/CmdLine.h>
 #include <boost/filesystem.hpp>
@@ -40,6 +42,23 @@
 #endif
 
 #ifdef _MSC_VER
+
+#pragma comment(lib, "opencv_core" CV_VERSION_STR CV_EXT_STR)
+#pragma comment(lib, "opencv_imgcodecs" CV_VERSION_STR CV_EXT_STR)
+#pragma comment(lib, "opencv_imgproc" CV_VERSION_STR CV_EXT_STR)
+//#pragma comment(lib, "IlmImf" CV_EXT_STR)
+//#pragma comment(lib, "libjasper" CV_EXT_STR)
+//#pragma comment(lib, "libjpeg" CV_EXT_STR)
+//#pragma comment(lib, "libpng" CV_EXT_STR)
+//#pragma comment(lib, "libtiff" CV_EXT_STR)
+//#pragma comment(lib, "libwebp" CV_EXT_STR)
+
+#pragma comment(lib, "libopenblas.dll.a")
+#pragma comment(lib, "cudart.lib")
+#pragma comment(lib, "curand.lib")
+#pragma comment(lib, "cublas.lib")
+#pragma comment(lib, "cudnn.lib")
+
 #ifdef _DEBUG
 #pragma comment(lib, "caffe-d.lib")
 #pragma comment(lib, "proto-d.lib")
@@ -52,22 +71,6 @@
 #pragma comment(lib, "libhdf5_hl_D.lib")
 #pragma comment(lib, "libhdf5_D.lib")
 #pragma comment(lib, "zlibstaticd.lib")
-#pragma comment(lib, "libopenblas.dll.a")
-#pragma comment(lib, "cudart.lib")
-#pragma comment(lib, "curand.lib")
-#pragma comment(lib, "cublas.lib")
-#pragma comment(lib, "cudnn.lib")
-
-#pragma comment(lib, "opencv_core" CV_VERSION_STR CV_EXT_STR)
-#pragma comment(lib, "opencv_imgcodecs" CV_VERSION_STR CV_EXT_STR)
-#pragma comment(lib, "opencv_imgproc" CV_VERSION_STR CV_EXT_STR)
-//#pragma comment(lib, "IlmImf" CV_EXT_STR)
-//#pragma comment(lib, "libjasper" CV_EXT_STR)
-//#pragma comment(lib, "libjpeg" CV_EXT_STR)
-//#pragma comment(lib, "libpng" CV_EXT_STR)
-//#pragma comment(lib, "libtiff" CV_EXT_STR)
-//#pragma comment(lib, "libwebp" CV_EXT_STR)
-//#pragma comment(lib, "ippicvmt.lib")
 
 #pragma comment(lib, "libboost_iostreams-vc120-mt-gd-1_59.lib")
 #else
@@ -82,22 +85,6 @@
 #pragma comment(lib, "libhdf5_hl.lib")
 #pragma comment(lib, "libhdf5.lib")
 #pragma comment(lib, "zlibstatic.lib")
-#pragma comment(lib, "libopenblas.dll.a")
-#pragma comment(lib, "cudart.lib")
-#pragma comment(lib, "curand.lib")
-#pragma comment(lib, "cublas.lib")
-#pragma comment(lib, "cudnn.lib")
-
-#pragma comment(lib, "opencv_core" CV_VERSION_STR CV_EXT_STR)
-#pragma comment(lib, "opencv_imgcodecs" CV_VERSION_STR CV_EXT_STR)
-#pragma comment(lib, "opencv_imgproc" CV_VERSION_STR CV_EXT_STR)
-//#pragma comment(lib, "IlmImf" CV_EXT_STR)
-//#pragma comment(lib, "libjasper" CV_EXT_STR)
-//#pragma comment(lib, "libjpeg" CV_EXT_STR)
-//#pragma comment(lib, "libpng" CV_EXT_STR)
-//#pragma comment(lib, "libtiff" CV_EXT_STR)
-//#pragma comment(lib, "libwebp" CV_EXT_STR)
-//#pragma comment(lib, "ippicvmt.lib")
 
 #pragma comment(lib, "libboost_iostreams-vc120-mt-1_59.lib")
 #endif
diff --git a/common/waifu2x.h b/common/waifu2x.h
index ece3c4a..b7569c7 100644
--- a/common/waifu2x.h
+++ b/common/waifu2x.h
@@ -8,7 +8,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/optional.hpp>
-#include <opencv2/opencv.hpp>
+#include <opencv2/core.hpp>
 
 #define CUDNN_DLL_NAME "cudnn64_5.dll"
 #define CUDNN_REQUIRE_VERION_TEXT "v5 RC"
diff --git a/waifu2x-caffe-dll/waifu2x-caffe-dll.vcxproj b/waifu2x-caffe-dll/waifu2x-caffe-dll.vcxproj
index 7e5b6e7..8346cf7 100644
--- a/waifu2x-caffe-dll/waifu2x-caffe-dll.vcxproj
+++ b/waifu2x-caffe-dll/waifu2x-caffe-dll.vcxproj
@@ -41,15 +41,15 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>D:\caffe-build\install\include;D:\caffe-build\install\include\boost-1_59;$(CUDA_PATH_V7_5)\include;C:\opencv310\build\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv310\build\x64\vc12\lib;D:\program\boost_1_59_0\stage\x64\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>D:\caffe-build\install\include;D:\caffe-build\install\include\boost-1_59;$(CUDA_PATH_V7_5)\include;D:\opencv310\build_vc\install\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
+    <LibraryPath>D:\opencv310\build_vc\install\x64\vc12\lib;D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);D:\program\boost_1_59_0\stage\x64\lib;$(LibraryPath)</LibraryPath>
     <TargetName>waifu2x-caffed</TargetName>
     <OutDir>$(SolutionDir)bin</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>D:\caffe-build\install\include;D:\caffe-build\install\include\boost-1_59;$(CUDA_PATH_V7_5)\include;C:\opencv310\build\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv310\build\x64\vc12\lib;D:\program\boost_1_59_0\stage\x64\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>D:\caffe-build\install\include;D:\caffe-build\install\include\boost-1_59;$(CUDA_PATH_V7_5)\include;D:\opencv310\build_vc\install\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
+    <LibraryPath>D:\opencv310\build_vc\install\x64\vc12\lib;D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);D:\program\boost_1_59_0\stage\x64\lib;$(LibraryPath)</LibraryPath>
     <TargetName>waifu2x-caffe</TargetName>
     <OutDir>$(SolutionDir)bin</OutDir>
   </PropertyGroup>
diff --git a/waifu2x-caffe-gui/MainDialog.cpp b/waifu2x-caffe-gui/MainDialog.cpp
index 5d594bc..55abccb 100644
--- a/waifu2x-caffe-gui/MainDialog.cpp
+++ b/waifu2x-caffe-gui/MainDialog.cpp
@@ -10,7 +10,9 @@
 #include <boost/foreach.hpp>
 #include <boost/math/common_factor_rt.hpp>
 #include <boost/lexical_cast.hpp>
-#include <opencv2/opencv.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/imgcodecs.hpp>
 #include "../common/waifu2x.h"
 #include "CDialog.h"
 #include "CControl.h"
diff --git a/waifu2x-caffe-gui/waifu2x-caffe-gui.vcxproj b/waifu2x-caffe-gui/waifu2x-caffe-gui.vcxproj
index 59bf4cd..03f8981 100644
--- a/waifu2x-caffe-gui/waifu2x-caffe-gui.vcxproj
+++ b/waifu2x-caffe-gui/waifu2x-caffe-gui.vcxproj
@@ -41,15 +41,15 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>D:\caffe-build\install\include;D:\caffe-build\install\include\boost-1_59;$(CUDA_PATH_V7_5)\include;C:\opencv310\build\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv310\build\x64\vc12\lib;D:\program\boost_1_59_0\stage\x64\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>D:\caffe-build\install\include;D:\caffe-build\install\include\boost-1_59;$(CUDA_PATH_V7_5)\include;D:\opencv310\build_vc\install\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
+    <LibraryPath>D:\opencv310\build_vc\install\x64\vc12\lib;D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);D:\program\boost_1_59_0\stage\x64\lib;$(LibraryPath)</LibraryPath>
     <OutDir>$(SolutionDir)bin</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>D:\caffe-build\install\include;D:\caffe-build\install\include\boost-1_59;$(CUDA_PATH_V7_5)\include;C:\opencv310\build\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv310\build\x64\vc12\lib;D:\program\boost_1_59_0\stage\x64\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>D:\caffe-build\install\include;D:\caffe-build\install\include\boost-1_59;$(CUDA_PATH_V7_5)\include;D:\opencv310\build_vc\install\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
+    <LibraryPath>D:\opencv310\build_vc\install\x64\vc12\lib;D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);D:\program\boost_1_59_0\stage\x64\lib;$(LibraryPath)</LibraryPath>
     <OutDir>$(SolutionDir)bin</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
diff --git a/waifu2x-caffe/waifu2x-caffe.vcxproj b/waifu2x-caffe/waifu2x-caffe.vcxproj
index 0b927f0..085af60 100644
--- a/waifu2x-caffe/waifu2x-caffe.vcxproj
+++ b/waifu2x-caffe/waifu2x-caffe.vcxproj
@@ -41,15 +41,15 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>D:\caffe-build\install\include;D:\caffe-build\install\include\boost-1_59;$(CUDA_PATH_V7_5)\include;C:\opencv310\build\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv310\build\x64\vc12\lib;D:\program\boost_1_59_0\stage\x64\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>D:\caffe-build\install\include;D:\caffe-build\install\include\boost-1_59;$(CUDA_PATH_V7_5)\include;D:\opencv310\build_vc\install\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
+    <LibraryPath>D:\opencv310\build_vc\install\x64\vc12\lib;D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);D:\program\boost_1_59_0\stage\x64\lib;$(LibraryPath)</LibraryPath>
     <OutDir>$(SolutionDir)bin</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>D:\caffe-build\install\include;D:\caffe-build\install\include\boost-1_59;$(CUDA_PATH_V7_5)\include;C:\opencv310\build\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv310\build\x64\vc12\lib;D:\program\boost_1_59_0\stage\x64\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>D:\caffe-build\install\include;D:\caffe-build\install\include\boost-1_59;$(CUDA_PATH_V7_5)\include;D:\opencv310\build_vc\install\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
+    <LibraryPath>D:\opencv310\build_vc\install\x64\vc12\lib;D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);D:\program\boost_1_59_0\stage\x64\lib;$(LibraryPath)</LibraryPath>
     <OutDir>$(SolutionDir)bin</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">