diff --git a/include/boost/config/auto_link.hpp b/include/boost/config/auto_link.hpp
index cc285e56..a0493d12 100644
--- a/include/boost/config/auto_link.hpp
+++ b/include/boost/config/auto_link.hpp
@@ -67,10 +67,11 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
 ***************************************************************************/
 
 #if defined(_MSC_VER) || defined(__BORLANDC__)
-
+#ifdef __cplusplus
 #ifndef BOOST_CONFIG_HPP
 #  include <boost/config.hpp>
 #endif
+#endif
 #ifndef BOOST_VERSION_HPP
 #  include <boost/version.hpp>
 #endif
@@ -88,6 +89,16 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
 #  error "Incompatible build options"
 #endif
 //
+// C language compatability (no, honestly)
+//
+#ifndef __cplusplus
+#  if defined(_MSC_VER) && !defined(__COMO__) && !defined(__ICL)
+#     define BOOST_MSVC _MSC_VER
+#  endif
+#  define BOOST_STRINGIZE(X) BOOST_DO_STRINGIZE(X)
+#  define BOOST_DO_STRINGIZE(X) #X
+#endif
+//
 // select toolset:
 //
 #if defined(BOOST_MSVC) && (BOOST_MSVC == 1200)