diff --git a/include/boost/system/cygwin_error.hpp b/include/boost/system/cygwin_error.hpp
index 15be3a6..4955be9 100644
--- a/include/boost/system/cygwin_error.hpp
+++ b/include/boost/system/cygwin_error.hpp
@@ -46,7 +46,7 @@ namespace boost
     namespace cygwin_error
     {
       inline error_code make_error_code( cygwin_errno e )
-        { return error_code( e, system_category ); }
+        { return error_code( e, get_system_category() ); }
     }
   }
 }
diff --git a/include/boost/system/error_code.hpp b/include/boost/system/error_code.hpp
index df14fde..d06ddef 100644
--- a/include/boost/system/error_code.hpp
+++ b/include/boost/system/error_code.hpp
@@ -219,7 +219,7 @@ namespace boost
     public:
 
       // constructors:
-      error_condition() : m_val(0), m_cat(&posix_category) {}
+      error_condition() : m_val(0), m_cat(&get_posix_category()) {}
       error_condition( int val, const error_category & cat ) : m_val(val), m_cat(&cat) {}
 
       template <class ConditionEnum>
@@ -248,7 +248,7 @@ namespace boost
       void clear()
       {
         m_val = 0;
-        m_cat = &posix_category;
+        m_cat = &get_posix_category();
       }
 
       // observers:
@@ -306,7 +306,7 @@ namespace boost
     public:
 
       // constructors:
-      error_code() : m_val(0), m_cat(&system_category) {}
+      error_code() : m_val(0), m_cat(&get_system_category()) {}
       error_code( int val, const error_category & cat ) : m_val(val), m_cat(&cat) {}
 
       template <class CodeEnum>
@@ -334,7 +334,7 @@ namespace boost
       void clear()
       {
         m_val = 0;
-        m_cat = &system_category;
+        m_cat = &get_system_category();
       }
 
       // observers:
@@ -442,11 +442,11 @@ namespace boost
     {
       //  explicit conversion:
       inline error_code make_error_code( posix_errno e )
-        { return error_code( e, posix_category ); }
+        { return error_code( e, get_posix_category() ); }
 
       //  implicit conversion:
       inline error_condition make_error_condition( posix_errno e )
-        { return error_condition( e, posix_category ); }
+        { return error_condition( e, get_posix_category() ); }
     }
 
     //  error_category default implementation  -------------------------------//
diff --git a/include/boost/system/linux_error.hpp b/include/boost/system/linux_error.hpp
index 2e5d475..2998253 100644
--- a/include/boost/system/linux_error.hpp
+++ b/include/boost/system/linux_error.hpp
@@ -99,7 +99,7 @@ namespace boost
     namespace linux_error
     {
       inline error_code make_error_code( linux_errno e )
-        { return error_code( e, system_category ); }
+        { return error_code( e, get_system_category() ); }
     }
 
   }  // namespace system
diff --git a/include/boost/system/windows_error.hpp b/include/boost/system/windows_error.hpp
index 2fb212e..b6d2f0f 100644
--- a/include/boost/system/windows_error.hpp
+++ b/include/boost/system/windows_error.hpp
@@ -107,7 +107,7 @@ namespace boost
     namespace windows_error
     {
       inline error_code make_error_code( windows_error_code e )
-        { return error_code( e, system_category ); }
+        { return error_code( e, get_system_category() ); }
     }
 
   }  // namespace system