diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 4204b53c9..0b3aef590 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -24,11 +24,9 @@
 #define CMAKE_TO_STRING(x) CMAKE_TO_STRING0(x)
 #define CMAKE_TO_STRING0(x) #x
 
-// include configure generated  header to define
-// CMAKE_NO_ANSI_STREAM_HEADERS and CMAKE_NO_STD_NAMESPACE
-#if defined(CMAKE_HAS_AUTOCONF) || defined(CMAKE_BUILD_WITH_CMAKE)
+// include configure generated  header to define CMAKE_NO_ANSI_STREAM_HEADERS,
+// CMAKE_NO_STD_NAMESPACE, and other macros.
 #include "cmConfigure.h"
-#endif
 
 #define CMake_VERSION_STRING \
   CMAKE_TO_STRING(CMake_VERSION_MAJOR) "." \
diff --git a/Tests/Complex/CMakeLists.txt b/Tests/Complex/CMakeLists.txt
index 54170d062..e6444abd2 100644
--- a/Tests/Complex/CMakeLists.txt
+++ b/Tests/Complex/CMakeLists.txt
@@ -56,6 +56,7 @@ LOAD_CACHE(${Complex_SOURCE_DIR}/Cache
 INCLUDE_DIRECTORIES(
   ${Complex_SOURCE_DIR}/Library
   ${Complex_SOURCE_DIR}/../../Source
+  ${Complex_BINARY_DIR}/../../Source
 )
 
 INCLUDE_DIRECTORIES(BEFORE
diff --git a/Tests/ComplexOneConfig/CMakeLists.txt b/Tests/ComplexOneConfig/CMakeLists.txt
index 54170d062..e6444abd2 100644
--- a/Tests/ComplexOneConfig/CMakeLists.txt
+++ b/Tests/ComplexOneConfig/CMakeLists.txt
@@ -56,6 +56,7 @@ LOAD_CACHE(${Complex_SOURCE_DIR}/Cache
 INCLUDE_DIRECTORIES(
   ${Complex_SOURCE_DIR}/Library
   ${Complex_SOURCE_DIR}/../../Source
+  ${Complex_BINARY_DIR}/../../Source
 )
 
 INCLUDE_DIRECTORIES(BEFORE
diff --git a/Tests/ComplexRelativePaths/CMakeLists.txt b/Tests/ComplexRelativePaths/CMakeLists.txt
index 54170d062..e6444abd2 100644
--- a/Tests/ComplexRelativePaths/CMakeLists.txt
+++ b/Tests/ComplexRelativePaths/CMakeLists.txt
@@ -56,6 +56,7 @@ LOAD_CACHE(${Complex_SOURCE_DIR}/Cache
 INCLUDE_DIRECTORIES(
   ${Complex_SOURCE_DIR}/Library
   ${Complex_SOURCE_DIR}/../../Source
+  ${Complex_BINARY_DIR}/../../Source
 )
 
 INCLUDE_DIRECTORIES(BEFORE