diff --git a/CMakeLists.txt b/CMakeLists.txt
index 853a359b..a1ba4f58 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,9 @@ IF (MSGPACK_CXX11)
    ELSEIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
       SET (CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
    ELSEIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-      MESSAGE ( FATAL_ERROR "MSVC doesn't support C++11 yet.")
+      IF (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19)
+          MESSAGE ( FATAL_ERROR "MSVC doesn't support C++11.")
+      ENDIF ()
    ENDIF ()
 ENDIF ()
 
@@ -59,6 +61,9 @@ IF (MSGPACK_BOOST)
    SET (Boost_USE_MULTITHREADED      ON)
    SET (Boost_USE_STATIC_RUNTIME    OFF)
    FIND_PACKAGE (Boost COMPONENTS chrono timer system)
+   INCLUDE_DIRECTORIES (
+       ${MSGPACK_BOOST_DIR}
+   )
 ENDIF ()
 
 FILE (GLOB_RECURSE PREDEF_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/external/boost/predef/include/boost ${CMAKE_CURRENT_SOURCE_DIR}/external/boost/predef/include/boost/*.h)
diff --git a/appveyor.yml b/appveyor.yml
index 969c5337..d2765411 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,6 +2,8 @@ version: 1.1.0.{build}
 before_build:
 - appveyor DownloadFile http://googletest.googlecode.com/files/gtest-1.7.0.zip -FileName gtest-1.7.0.zip
 - 7z x gtest-1.7.0.zip > NUL
+- appveyor DownloadFile http://sourceforge.net/projects/boost/files/boost/1.58.0/boost_1_58_0.zip
+- 7z x boost_1_58_0.zip > NUL
 - cd gtest-1.7.0
 - md build
 - cd build
@@ -21,10 +23,20 @@ before_build:
 - cd ..
 - cd ..
 
+environment:
+  matrix:
+    - cpp11: -DMSGPACK_CXX11=ON
+      boost: -DMSGPACK_BOOST=ON
+    - cpp11: -DMSGPACK_CXX11=OFF
+      boost: -DMSGPACK_BOOST=ON
+    - cpp11: -DMSGPACK_CXX11=ON
+      boost: -DMSGPACK_BOOST=OFF
+    - cpp11: -DMSGPACK_CXX11=OFF
+      boost: -DMSGPACK_BOOST=OFF
 build_script:
 - md build
 - cd build
-- cmake -DMSGPACK_BOOST=ON -DMSGPACK_BOOST_DIR=C:\Libraries\boost -DGTEST_LIBRARY=%APPVEYOR_BUILD_FOLDER%\gtest-1.7.0\build\Release\gtest.lib -DGTEST_MAIN_LIBRARY=%APPVEYOR_BUILD_FOLDER%\gtest-1.7.0\build\Release\gtest_main.lib -DGTEST_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\gtest-1.7.0\include -DZLIB_LIBRARY=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.8\build\Release\zlib.lib -DZLIB_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.8 ..
+- cmake %cpp11% %boost% -DMSGPACK_BOOST_DIR=%APPVEYOR_BUILD_FOLDER%\boost_1_58_0 -DGTEST_LIBRARY=%APPVEYOR_BUILD_FOLDER%\gtest-1.7.0\build\Release\gtest.lib -DGTEST_MAIN_LIBRARY=%APPVEYOR_BUILD_FOLDER%\gtest-1.7.0\build\Release\gtest_main.lib -DGTEST_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\gtest-1.7.0\include -DZLIB_LIBRARY=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.8\build\Release\zlib.lib -DZLIB_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.8 ..
 - cmake --build . --config Release
 
 test_script:
diff --git a/example/cpp03/CMakeLists.txt b/example/cpp03/CMakeLists.txt
index e26e822e..8f73a80a 100644
--- a/example/cpp03/CMakeLists.txt
+++ b/example/cpp03/CMakeLists.txt
@@ -27,10 +27,6 @@ IF (MSGPACK_BOOST)
 ENDIF ()
 
 FOREACH (source_file ${exec_PROGRAMS})
-    INCLUDE_DIRECTORIES (
-        ../include
-        ${MSGPACK_BOOST_DIR}
-    )
     GET_FILENAME_COMPONENT (source_file_we ${source_file} NAME_WE)
     ADD_EXECUTABLE (
         ${source_file_we}
@@ -49,10 +45,6 @@ FOREACH (source_file ${exec_PROGRAMS})
 ENDFOREACH ()
 
 FOREACH (source_file ${with_pthread_PROGRAMS})
-    INCLUDE_DIRECTORIES (
-        ../include
-        ${MSGPACK_BOOST_DIR}
-    )
     GET_FILENAME_COMPONENT (source_file_we ${source_file} NAME_WE)
     ADD_EXECUTABLE (
         ${source_file_we}
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 9dcbb107..f0888588 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -5,7 +5,6 @@ FIND_PACKAGE (Threads REQUIRED)
 INCLUDE_DIRECTORIES (
     ${GTEST_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIRS}
-    ${MSGPACK_BOOST_DIR}
 )
 
 LIST (APPEND check_PROGRAMS