diff --git a/include/boost/exception/errinfo_errno.hpp b/include/boost/exception/errinfo_errno.hpp
index f3ee8d2..310ceb7 100644
--- a/include/boost/exception/errinfo_errno.hpp
+++ b/include/boost/exception/errinfo_errno.hpp
@@ -8,6 +8,7 @@
 
 #include "boost/exception/info.hpp"
 #include <errno.h>
+#include <string.h>
 
 namespace
 boost
diff --git a/test/errinfos_test.cpp b/test/errinfos_test.cpp
index a496e87..3e8aa19 100644
--- a/test/errinfos_test.cpp
+++ b/test/errinfos_test.cpp
@@ -42,7 +42,7 @@ main()
         BOOST_TEST(false);
         }
     catch(
-    exception & e )
+    boost::exception & e )
         {
         BOOST_TEST(get_error_info<errinfo_api_function>(e) && *get_error_info<errinfo_api_function>(e)==std::string("failed_api_function"));
         BOOST_TEST(get_error_info<errinfo_at_line>(e) && *get_error_info<errinfo_at_line>(e)==42);