diff --git a/CHANGELOG.md b/CHANGELOG.md
index 552c077c..819a9e47 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ Version 100:
 * Remove unused test header
 * Rename test macros
 * Reorder define test macro params
+* vcxproj workaround for include symlinks
 
 WebSocket:
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fcae6165..61382d11 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,6 +61,10 @@ else()
     endif ()
 endif()
 
+# Must come before Boost includes, otherwise the
+# IDE sees the wrong file due to boost/ symlinks.
+include_directories (include)
+
 #-------------------------------------------------------------------------------
 #
 # Boost
@@ -163,7 +167,6 @@ endif()
 # Tests and examples
 #
 
-include_directories (include)
 include_directories (.)
 
 if (OPENSSL_FOUND)