diff --git a/include/boost/detail/workaround.hpp b/include/boost/detail/workaround.hpp
index 4933a531..b6b64125 100644
--- a/include/boost/detail/workaround.hpp
+++ b/include/boost/detail/workaround.hpp
@@ -45,10 +45,15 @@
 #else
 #define __BORLANDC___WORKAROUND_GUARD 0
 #endif
-#ifndef __MSC_VER
-#define __MSC_VER_WORKAROUND_GUARD 1
+#ifndef __CODEGEARC__
+#define __CODEGEARC___WORKAROUND_GUARD 1
 #else
-#define __MSC_VER_WORKAROUND_GUARD 0
+#define __CODEGEARC___WORKAROUND_GUARD 0
+#endif
+#ifndef _MSC_VER
+#define _MSC_VER_WORKAROUND_GUARD 1
+#else
+#define _MSC_VER_WORKAROUND_GUARD 0
 #endif
 #ifndef _MSC_FULL_VER
 #define _MSC_FULL_VER_WORKAROUND_GUARD 1
@@ -95,6 +100,11 @@
 #else
 #define __MWERKS___WORKAROUND_GUARD 0
 #endif
+#ifndef __EDG__
+#define __EDG___WORKAROUND_GUARD 1
+#else
+#define __EDG___WORKAROUND_GUARD 0
+#endif
 #ifndef __EDG_VERSION__
 #define __EDG_VERSION___WORKAROUND_GUARD 1
 #else
@@ -105,6 +115,11 @@
 #else
 #define __HP_aCC_WORKAROUND_GUARD 0
 #endif
+#ifndef __hpxstd98
+#define __hpxstd98_WORKAROUND_GUARD 1
+#else
+#define __hpxstd98_WORKAROUND_GUARD 0
+#endif
 #ifndef _CRAYC
 #define _CRAYC_WORKAROUND_GUARD 1
 #else
@@ -120,12 +135,47 @@
 #else
 #define MPW_CPLUS_WORKAROUND_GUARD 0
 #endif
+#ifndef __COMO__
+#define __COMO___WORKAROUND_GUARD 1
+#else
+#define __COMO___WORKAROUND_GUARD 0
+#endif
+#ifndef __COMO_VERSION__
+#define __COMO_VERSION___WORKAROUND_GUARD 1
+#else
+#define __COMO_VERSION___WORKAROUND_GUARD 0
+#endif
+#ifndef __INTEL_COMPILER
+#define __INTEL_COMPILER_WORKAROUND_GUARD 1
+#else
+#define __INTEL_COMPILER_WORKAROUND_GUARD 0
+#endif
+#ifndef __ICL
+#define __ICL_WORKAROUND_GUARD 1
+#else
+#define __ICL_WORKAROUND_GUARD 0
+#endif
+#ifndef _COMPILER_VERSION
+#define _COMPILER_VERSION_WORKAROUND_GUARD 1
+#else
+#define _COMPILER_VERSION_WORKAROUND_GUARD 0
+#endif
 
 #ifndef _RWSTD_VER
 #define _RWSTD_VER_WORKAROUND_GUARD 1
 #else
 #define _RWSTD_VER_WORKAROUND_GUARD 0
 #endif
+#ifndef BOOST_RWSTD_VER
+#define BOOST_RWSTD_VER_WORKAROUND_GUARD 1
+#else
+#define BOOST_RWSTD_VER_WORKAROUND_GUARD 0
+#endif
+#ifndef __GLIBCPP__
+#define __GLIBCPP___WORKAROUND_GUARD 1
+#else
+#define __GLIBCPP___WORKAROUND_GUARD 0
+#endif
 #ifndef _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC
 #define _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC_WORKAROUND_GUARD 1
 #else
@@ -141,6 +191,16 @@
 #else
 #define _STLPORT_VERSION_WORKAROUND_GUARD 0
 #endif
+#ifndef __LIBCOMO_VERSION__
+#define __LIBCOMO_VERSION___WORKAROUND_GUARD 1
+#else
+#define __LIBCOMO_VERSION___WORKAROUND_GUARD 0
+#endif
+#ifndef _CPPLIB_VER
+#define _CPPLIB_VER_WORKAROUND_GUARD 1
+#else
+#define _CPPLIB_VER_WORKAROUND_GUARD 0
+#endif
 
 #ifndef BOOST_INTEL_CXX_VERSION
 #define BOOST_INTEL_CXX_VERSION_WORKAROUND_GUARD 1