diff --git a/Tests/Complex/Executable/complex.cxx b/Tests/Complex/Executable/complex.cxx
index 9af88ad6c..8202cee3f 100644
--- a/Tests/Complex/Executable/complex.cxx
+++ b/Tests/Complex/Executable/complex.cxx
@@ -19,7 +19,7 @@ void Passed(const char* Message, const char* m2="")
   passed++;
 }
 
-main()
+int main()
 {
   if(sharedFunction() != 1)
     {
diff --git a/Tests/Complex/cmTestConfigure.h.in b/Tests/Complex/cmTestConfigure.h.in
index 563463dff..a7bffb7a8 100644
--- a/Tests/Complex/cmTestConfigure.h.in
+++ b/Tests/Complex/cmTestConfigure.h.in
@@ -3,7 +3,7 @@
 #define STRING_VAR "${STRING_VAR}"
 
 
-#undef CMAKE_NO_STD_NAMESPACE
-#undef CMAKE_NO_ANSI_STREAM_HEADERS
-#undef CMAKE_NO_ANSI_FOR_SCOPE
+#cmakedefine CMAKE_NO_STD_NAMESPACE
+#cmakedefine CMAKE_NO_ANSI_STREAM_HEADERS
+#cmakedefine CMAKE_NO_ANSI_FOR_SCOPE
 
diff --git a/Tests/ComplexOneConfig/Executable/complex.cxx b/Tests/ComplexOneConfig/Executable/complex.cxx
index 9af88ad6c..8202cee3f 100644
--- a/Tests/ComplexOneConfig/Executable/complex.cxx
+++ b/Tests/ComplexOneConfig/Executable/complex.cxx
@@ -19,7 +19,7 @@ void Passed(const char* Message, const char* m2="")
   passed++;
 }
 
-main()
+int main()
 {
   if(sharedFunction() != 1)
     {
diff --git a/Tests/ComplexOneConfig/cmTestConfigure.h.in b/Tests/ComplexOneConfig/cmTestConfigure.h.in
index 563463dff..a7bffb7a8 100644
--- a/Tests/ComplexOneConfig/cmTestConfigure.h.in
+++ b/Tests/ComplexOneConfig/cmTestConfigure.h.in
@@ -3,7 +3,7 @@
 #define STRING_VAR "${STRING_VAR}"
 
 
-#undef CMAKE_NO_STD_NAMESPACE
-#undef CMAKE_NO_ANSI_STREAM_HEADERS
-#undef CMAKE_NO_ANSI_FOR_SCOPE
+#cmakedefine CMAKE_NO_STD_NAMESPACE
+#cmakedefine CMAKE_NO_ANSI_STREAM_HEADERS
+#cmakedefine CMAKE_NO_ANSI_FOR_SCOPE
 
diff --git a/Tests/ComplexRelativePaths/Executable/complex.cxx b/Tests/ComplexRelativePaths/Executable/complex.cxx
index 9af88ad6c..8202cee3f 100644
--- a/Tests/ComplexRelativePaths/Executable/complex.cxx
+++ b/Tests/ComplexRelativePaths/Executable/complex.cxx
@@ -19,7 +19,7 @@ void Passed(const char* Message, const char* m2="")
   passed++;
 }
 
-main()
+int main()
 {
   if(sharedFunction() != 1)
     {
diff --git a/Tests/ComplexRelativePaths/cmTestConfigure.h.in b/Tests/ComplexRelativePaths/cmTestConfigure.h.in
index 563463dff..a7bffb7a8 100644
--- a/Tests/ComplexRelativePaths/cmTestConfigure.h.in
+++ b/Tests/ComplexRelativePaths/cmTestConfigure.h.in
@@ -3,7 +3,7 @@
 #define STRING_VAR "${STRING_VAR}"
 
 
-#undef CMAKE_NO_STD_NAMESPACE
-#undef CMAKE_NO_ANSI_STREAM_HEADERS
-#undef CMAKE_NO_ANSI_FOR_SCOPE
+#cmakedefine CMAKE_NO_STD_NAMESPACE
+#cmakedefine CMAKE_NO_ANSI_STREAM_HEADERS
+#cmakedefine CMAKE_NO_ANSI_FOR_SCOPE