diff --git a/include/tscpp/util/Makefile.am b/include/tscpp/util/Makefile.am
index a60c6c1058f..a1d18fd1900 100644
--- a/include/tscpp/util/Makefile.am
+++ b/include/tscpp/util/Makefile.am
@@ -22,6 +22,7 @@ library_include_HEADERS = \
 	IntrusiveDList.h \
 	LocalBuffer.h \
 	PostScript.h \
+	Strerror.h \
 	string_view_util.h \
 	TextView.h \
 	TsSharedMutex.h
diff --git a/include/tscpp/util/Strerror.h b/include/tscpp/util/Strerror.h
new file mode 100644
index 00000000000..eb1e6731ca5
--- /dev/null
+++ b/include/tscpp/util/Strerror.h
@@ -0,0 +1,82 @@
+/** @file
+
+  A convenience wrapper for the thread-safe strerror_r() function, either
+  GNU or XSI version.  Allows the avoidance of use of the thread-unsafe
+  strerror() function.
+
+  @section license License
+
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ */
+
+#pragma once
+
+#include <string.h>
+
+namespace ts
+{
+// Typically this class is used to create anonymous temporaries, for example:
+//
+// if ((fd = open(file_path, O_RDONLY)) < 0) {
+//   Error("%s Can not open %s file : %s", module_name, file_path, Strerror(errno).c_str());
+//   return nullptr;
+// }
+//
+class Strerror
+{
+public:
+  Strerror(int err_num)
+  {
+    // Handle either GNU or XSI version of strerror_r().
+    //
+    if (!_success(strerror_r(err_num, _buf, 256))) {
+      _c_str = "strerror_r() call failed";
+    } else {
+      _buf[255] = '\0';
+      _c_str    = _buf;
+    }
+
+    // Make sure there are no unused function warnings.
+    //
+    static_cast<void>(_success(0));
+    static_cast<void>(_success(nullptr));
+  }
+
+  char const *
+  c_str() const
+  {
+    return (_c_str);
+  }
+
+private:
+  char _buf[256];
+  char const *_c_str;
+
+  bool
+  _success(int retval)
+  {
+    return retval == 0;
+  }
+
+  bool
+  _success(char *retval)
+  {
+    return retval != nullptr;
+  }
+};
+
+} // end namespace ts
diff --git a/include/tscpp/util/TsSharedMutex.h b/include/tscpp/util/TsSharedMutex.h
index 3ac7f2ea948..df0fd2c23ee 100644
--- a/include/tscpp/util/TsSharedMutex.h
+++ b/include/tscpp/util/TsSharedMutex.h
@@ -25,7 +25,7 @@
 #pragma once
 
 #include <pthread.h>
-#include <string.h>
+#include <tscpp/util/Strerror.h>
 
 #if __has_include(<ts/ts.h>)
 #include <ts/ts.h>
@@ -54,49 +54,6 @@
 
 namespace ts
 {
-class Strerror
-{
-public:
-  Strerror(int err_num)
-  {
-    // Handle either GNU or XSI version of strerror_r().
-    //
-    if (!_success(strerror_r(err_num, _buf, 256))) {
-      _c_str = "strerror_r() call failed";
-    } else {
-      _buf[255] = '\0';
-      _c_str    = _buf;
-    }
-
-    // Make sure there are no unused function warnings.
-    //
-    static_cast<void>(_success(0));
-    static_cast<void>(_success(nullptr));
-  }
-
-  char const *
-  c_str() const
-  {
-    return (_c_str);
-  }
-
-private:
-  char _buf[256];
-  char const *_c_str;
-
-  bool
-  _success(int retval)
-  {
-    return retval == 0;
-  }
-
-  bool
-  _success(char *retval)
-  {
-    return retval != nullptr;
-  }
-};
-
 // A class with the same interface as std::shared_mutex, but which is not prone to writer starvation.
 //
 class shared_mutex