diff --git a/include/boost/process/v2/detail/environment_posix.hpp b/include/boost/process/v2/detail/environment_posix.hpp
index 21b23428..756432d6 100644
--- a/include/boost/process/v2/detail/environment_posix.hpp
+++ b/include/boost/process/v2/detail/environment_posix.hpp
@@ -76,8 +76,6 @@ inline bool is_executable(const filesystem::path & pth, error_code & ec)
   return filesystem::is_regular_file(pth, ec) && has_x_access(pth.c_str());
 }
 
-BOOST_PROCESS_V2_DECL
-
 }
 
 }
diff --git a/src/detail/environment_posix.cpp b/src/detail/environment_posix.cpp
index 077e4fe6..c3006ca1 100644
--- a/src/detail/environment_posix.cpp
+++ b/src/detail/environment_posix.cpp
@@ -66,7 +66,7 @@ native_iterator find_end(native_handle_type nh)
     return nh;
 }
 
-BOOST_PROCESS_V2_DECL bool has_x_access(const char * pth)
+bool has_x_access(const char * pth)
 {
   return (::access(pth, X_OK) == 0);
 }
diff --git a/src/ext/cmd.cpp b/src/ext/cmd.cpp
index e3392d28..3a5ea9e3 100644
--- a/src/ext/cmd.cpp
+++ b/src/ext/cmd.cpp
@@ -399,7 +399,7 @@ shell cmd(boost::process::v2::pid_type pid, boost::system::error_code & ec)
 #else
 filesystem::path cmd(boost::process::v2::pid_type, boost::system::error_code & ec)
 {
-  BOOST_PROCESS_V2_ASSIGN_EC(ec, ENOTSUP, boost::system::system_category())
+  BOOST_PROCESS_V2_ASSIGN_EC(ec, ENOTSUP, system_category())
   return "";
 }
 #endif
diff --git a/src/ext/cwd.cpp b/src/ext/cwd.cpp
index 63a351c1..d9a0dc7a 100644
--- a/src/ext/cwd.cpp
+++ b/src/ext/cwd.cpp
@@ -202,7 +202,7 @@ filesystem::path cwd(boost::process::v2::pid_type pid, boost::system::error_code
 #else
 filesystem::path cwd(boost::process::v2::pid_type pid, boost::system::error_code & ec)
 {
-  BOOST_PROCESS_V2_ASSIGN_EC(ec, ENOTSUP, boost::system::system_category())
+  BOOST_PROCESS_V2_ASSIGN_EC(ec, ENOTSUP, system_category())
   return "";
 }
 #endif
diff --git a/src/ext/env.cpp b/src/ext/env.cpp
index bae3e68c..bddd8cd7 100644
--- a/src/ext/env.cpp
+++ b/src/ext/env.cpp
@@ -174,7 +174,7 @@ env_view env(HANDLE proc, boost::system::error_code & ec)
 
     if (error)
     {
-        BOOST_PROCESS_V2_ASSIGN_EC(ec, error, boost::system::system_category())
+        BOOST_PROCESS_V2_ASSIGN_EC(ec, error, system_category())
         return {};
     }
 
diff --git a/src/ext/exe.cpp b/src/ext/exe.cpp
index ce1b273c..5240d251 100644
--- a/src/ext/exe.cpp
+++ b/src/ext/exe.cpp
@@ -173,14 +173,14 @@ filesystem::path exe(boost::process::v2::pid_type pid, boost::system::error_code
 
 filesystem::path exe(boost::process::v2::pid_type pid, boost::system::error_code & ec)
 {
-    BOOST_PROCESS_V2_ASSIGN_EC(ec, ENOTSUP, boost::system::system_category())
+    BOOST_PROCESS_V2_ASSIGN_EC(ec, ENOTSUP, system_category())
     return "";
 }
 
 #else
 filesystem::path exe(boost::process::v2::pid_type pid, boost::system::error_code & ec)
 {
-  BOOST_PROCESS_V2_ASSIGN_EC(ec, ENOTSUP, boost::system::system_category())
+  BOOST_PROCESS_V2_ASSIGN_EC(ec, ENOTSUP, system_category())
   return "";
 }
 #endif
diff --git a/src/ext/proc_info.cpp b/src/ext/proc_info.cpp
index 57ec6a08..22bdfa0d 100644
--- a/src/ext/proc_info.cpp
+++ b/src/ext/proc_info.cpp
@@ -43,7 +43,7 @@ std::wstring cwd_cmd_from_proc(HANDLE proc, int type, boost::system::error_code
 
     if (error)
     {
-        BOOST_PROCESS_V2_ASSIGN_EC(ec, error, boost::system::system_category())
+        BOOST_PROCESS_V2_ASSIGN_EC(ec, error, system_category())
         return {};
     }
 
diff --git a/src/shell.cpp b/src/shell.cpp
index 0fffc501..b563819e 100644
--- a/src/shell.cpp
+++ b/src/shell.cpp
@@ -38,7 +38,7 @@ struct shell_category_t final : public error_category
 
     const char* name() const noexcept
     {
-        return "process.v2.utf8";
+        return "process.v2.shell";
     }
     std::string message(int value) const
     {