diff --git a/include/boost/system/error_code.hpp b/include/boost/system/error_code.hpp
index 314778f..3ca5426 100644
--- a/include/boost/system/error_code.hpp
+++ b/include/boost/system/error_code.hpp
@@ -496,7 +496,7 @@ namespace boost
     template<> struct is_error_code_enum<cygwin::cygwin_errno>
       { static const bool value = true; };
 
-    inline error_code make_error_code(cygwin::cygwin_errno e)
+    template<> inline error_code make_error_code(cygwin::cygwin_errno e)
       { return error_code( e, system_category ); }
 
 # elif defined(linux) || defined(__linux) || defined(__linux__)
@@ -563,7 +563,7 @@ namespace boost
     template<> struct is_error_code_enum<Linux::linux_error>
       { static const bool value = true; };
 
-    inline error_code make_error_code(Linux::linux_error e)
+    template<> inline error_code make_error_code(Linux::linux_error e)
       { return error_code( e, system_category ); }
 
 # endif
@@ -647,7 +647,7 @@ namespace boost
     template<> struct is_error_code_enum<windows::windows_error>
       { static const bool value = true; };
 
-    inline error_code make_error_code(windows::windows_error e)
+    template<> inline error_code make_error_code(windows::windows_error e)
       { return error_code( e, system_category ); }
 
 #else
diff --git a/test/error_code_user_test.cpp b/test/error_code_user_test.cpp
index 9cbf046..58ddcae 100644
--- a/test/error_code_user_test.cpp
+++ b/test/error_code_user_test.cpp
@@ -88,7 +88,7 @@ namespace boost
     template<> struct is_error_code_enum<boost::lib3::error>
       { static const bool value = true; };
 
-    inline error_code make_error_code(boost::lib3::error e)
+    template<> inline error_code make_error_code(boost::lib3::error e)
       { return error_code(e,boost::lib3::lib3_error_category); }
   }
 
@@ -244,7 +244,7 @@ namespace lib4
 //  const boost::system::error_category & user_error_category
 //    = user_error_category_const;
 //
-//  inline boost::system::error_code make_error_code(user_err e)
+//  template<> inline boost::system::error_code make_error_code(user_err e)
 //  {
 //    return boost::system::error_code(e, user_error_category);
 //  }