diff --git a/test/config_info.cpp b/test/config_info.cpp
index 5c869c93..ffe0cc88 100644
--- a/test/config_info.cpp
+++ b/test/config_info.cpp
@@ -115,13 +115,18 @@ void print_compiler_macros()
   PRINT_MACRO(__STDC__);
   PRINT_MACRO(__TLS__);
   PRINT_MACRO(_WCHAR_T);
-  PRINT_MACRO(_WCHAR_T_DEFINED);
   PRINT_MACRO(_Windows);
   PRINT_MACRO(__WIN32__);
   PRINT_MACRO(_WIN32);
   PRINT_MACRO(WIN32);
   PRINT_MACRO(_RTLDLL);
   PRINT_MACRO(__DEBUG);
+
+// Internal MSVC 7 error workaround (Peter Dimov)
+
+#ifndef _NATIVE_WCHAR_T_DEFINED
+  PRINT_MACRO(_WCHAR_T_DEFINED);
+#endif
   // MSVC macros:
   PRINT_MACRO(_CPPRTTI);
   PRINT_MACRO(_DLL);
@@ -133,6 +138,7 @@ void print_compiler_macros()
   PRINT_MACRO(_MSC_EXTENSIONS);
   PRINT_MACRO(_MSC_VER);
   PRINT_MACRO(_MT);
+  PRINT_MACRO(_NATIVE_WCHAR_T_DEFINED);
   // GNUC options:
   PRINT_MACRO(__GNUC__);
   PRINT_MACRO(__GNUC_MINOR__);
@@ -835,6 +841,7 @@ void print_boost_macros()
    PRINT_MACRO(BOOST_NO_CWCTYPE);
    PRINT_MACRO(BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS);
    PRINT_MACRO(BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS);
+   PRINT_MACRO(BOOST_NO_FUNCTION_TEMPLATE_ORDERING);
    PRINT_MACRO(BOOST_NO_HASH);
    PRINT_MACRO(BOOST_NO_INCLASS_MEMBER_INITIALIZATION);
    PRINT_MACRO(BOOST_NO_INT64_T);
@@ -863,6 +870,7 @@ void print_boost_macros()
    PRINT_MACRO(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS);
    PRINT_MACRO(BOOST_DISABLE_THREADS);
    PRINT_MACRO(BOOST_NO_USING_TEMPLATE);
+   PRINT_MACRO(BOOST_NO_VOID_RETURNS);
    PRINT_MACRO(BOOST_STD_EXTENSION_NAMESPACE);
    PRINT_MACRO(BOOST_HAS_STDINT_H);
 }