diff --git a/CMakeLists.txt b/CMakeLists.txt
index 799460da..33296910 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -232,17 +232,4 @@ else(WIN32)
   add_custom_target( COPY_FILES${CONFORMANCE_SUFFIX} )
 endif(WIN32)
 
-# Copy required CL include directories into the build directory
-# as required for the compiler testing.
-
-# ... For running the compiler test on the command line.
-file(COPY "${CLConform_SOURCE_DIR}/test_conformance/compiler/includeTestDirectory" DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_conformance/compiler)
-file(COPY "${CLConform_SOURCE_DIR}/test_conformance/compiler/secondIncludeTestDirectory" DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_conformance/compiler)
-
-# ... For running the compiler test with VisualStudio.
-if(MSVC)
-  file(COPY "${CLConform_SOURCE_DIR}/test_conformance/compiler/includeTestDirectory" DESTINATION "${CLConform_SOURCE_DIR}/build/test_conformance/compiler")
-  file(COPY "${CLConform_SOURCE_DIR}/test_conformance/compiler/secondIncludeTestDirectory" DESTINATION "${CLConform_SOURCE_DIR}/build/test_conformance/compiler")
-endif(MSVC)
-
 set_property(TARGET COPY_FILES${CONFORMANCE_SUFFIX} PROPERTY FOLDER "CONFORMANCE${CONFORMANCE_SUFFIX}")
diff --git a/test_conformance/compiler/CMakeLists.txt b/test_conformance/compiler/CMakeLists.txt
index 69ad51c6..59fe654b 100644
--- a/test_conformance/compiler/CMakeLists.txt
+++ b/test_conformance/compiler/CMakeLists.txt
@@ -13,3 +13,20 @@ set(${MODULE_NAME}_SOURCES
 )
 
 include(../CMakeCommon.txt)
+
+# Copy required CL include directories into the binary directory
+
+set(COMPILER_SOURCE_DIR ${CLConform_SOURCE_DIR}/test_conformance/compiler)
+set(COMPILER_TARGET ${${MODULE_NAME}_OUT})
+
+add_custom_command(
+    TARGET  ${COMPILER_TARGET}
+    COMMAND ${CMAKE_COMMAND} -E copy_directory
+            "${COMPILER_SOURCE_DIR}/includeTestDirectory"
+            $<TARGET_FILE_DIR:${COMPILER_TARGET}>/includeTestDirectory)
+
+add_custom_command(
+    TARGET  ${COMPILER_TARGET}
+    COMMAND ${CMAKE_COMMAND} -E copy_directory
+            "${COMPILER_SOURCE_DIR}/secondIncludeTestDirectory"
+            $<TARGET_FILE_DIR:${COMPILER_TARGET}>/secondIncludeTestDirectory)
diff --git a/test_conformance/computeinfo/extended_versioning.cpp b/test_conformance/computeinfo/extended_versioning.cpp
index f9c29b92..841526cc 100644
--- a/test_conformance/computeinfo/extended_versioning.cpp
+++ b/test_conformance/computeinfo/extended_versioning.cpp
@@ -17,6 +17,7 @@
 
 #include <vector>
 #include <set>
+#include <iterator>
 #include <algorithm>
 #include <cstring>
 #include "harness/testHarness.h"