Prepare for 2.9.0.2

Signed-off-by: Laurent Bercot <ska@appnovation.com>

62 files changed, 78 insertions, 63 deletions

diff --git a/INSTALL b/INSTALL
index c49cfa2..fded1c8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,8 +6,8 @@ Build Instructions
 
   - A POSIX-compliant C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.12.0.0 or later: https://skarnet.org/software/skalibs/
-  - Optional: nsss version 0.2.0.1 or later: https://skarnet.org/software/nsss/
+  - skalibs version 2.13.0.0 or later: https://skarnet.org/software/skalibs/
+  - Optional: nsss version 0.2.0.2 or later: https://skarnet.org/software/nsss/
 
  This software will run on any operating system that implements
 POSIX.1-2008, available at:
diff --git a/NEWS b/NEWS
index 7bce7de..475ed87 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for execline.
 
+In 2.9.0.2
+----------
+
+ - Adaptation to skalibs-2.9.0.2.
+
+
 In 2.9.0.1
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index 792ff42..f9c985a 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -51,7 +51,7 @@ shell's syntax, and has no security issues.
  <li> A POSIX-compliant system with a standard C development environment </li>
  <li> GNU make, version 3.81 or later. </li>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version
-2.12.0.0 or later. It's a build-time requirement. It's also a run-time
+2.13.0.0 or later. It's a build-time requirement. It's also a run-time
 requirement if you link against the shared version of the skalibs
 library. </li>
 </ul>
@@ -64,7 +64,7 @@ library. </li>
  <li> If you're using <a href="https://www.musl-libc.org/">musl</a> and
 want nsswitch-like functionality:
 <a href="//skarnet.org/software/nsss/">nsss</a> version
-0.2.0.1 or later (build-time and boot-time) </li>
+0.2.0.2 or later (build-time and boot-time) </li>
 </ul>
 
 <h3> Licensing </h3>
@@ -77,7 +77,7 @@ want nsswitch-like functionality:
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of execline is <a href="execline-2.9.0.1.tar.gz">2.9.0.1</a>. </li>
+ <li> The current released version of execline is <a href="execline-2.9.0.2.tar.gz">2.9.0.2</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/execline/">execline
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 74ffc02..26e119d 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,15 @@
 
 <h1> What has changed in execline </h1>
 
+<h2> in 2.9.0.2 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.13.0.0. </li>
+ <li> <a href="//skarnet.org/software/nsss/">nsss</a>
+optional dependency bumped to 0.2.0.2. </li>
+</ul>
+
 <h2> in 2.9.0.1 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 6012896..2ff5910 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=execline
-version=2.9.0.1
+version=2.9.0.2
 category=admin
 package_macro_name=EXECLINE
diff --git a/src/execline/background.c b/src/execline/background.c
index 31bffb5..7fefa1a 100644
--- a/src/execline/background.c
+++ b/src/execline/background.c
@@ -3,7 +3,7 @@
 #include <skalibs/posixplz.h>
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/exec.h>
 
 #include <execline/execline.h>
diff --git a/src/execline/backtick.c b/src/execline/backtick.c
index b7cd7cc..881c06a 100644
--- a/src/execline/backtick.c
+++ b/src/execline/backtick.c
@@ -5,7 +5,7 @@
 #include <unistd.h>
 
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/exec.h>
diff --git a/src/execline/case.c b/src/execline/case.c
index b026256..ae5b5db 100644
--- a/src/execline/case.c
+++ b/src/execline/case.c
@@ -7,7 +7,7 @@
 #include <skalibs/gccattributes.h>
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/exec.h>
 
 #include <execline/execline.h>
diff --git a/src/execline/define.c b/src/execline/define.c
index 52ee67d..14eb1b7 100644
--- a/src/execline/define.c
+++ b/src/execline/define.c
@@ -1,6 +1,6 @@
 /* ISC license. */
 
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include "exlsn.h"
 
 #define USAGE "define [ -N | -n ] [ -s ] [ -C | -c ] [ -d delim ] key value prog..."
diff --git a/src/execline/dollarat.c b/src/execline/dollarat.c
index 0b89aa7..18c3422 100644
--- a/src/execline/dollarat.c
+++ b/src/execline/dollarat.c
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/buffer.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/types.h>
 #include <skalibs/netstring.h>
diff --git a/src/execline/elgetopt.c b/src/execline/elgetopt.c
index e450038..040be31 100644
--- a/src/execline/elgetopt.c
+++ b/src/execline/elgetopt.c
@@ -4,7 +4,7 @@
 
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/env.h>
 #include <skalibs/exec.h>
 #include <skalibs/skamisc.h>
diff --git a/src/execline/elgetpositionals.c b/src/execline/elgetpositionals.c
index 3ce4b69..45b3df4 100644
--- a/src/execline/elgetpositionals.c
+++ b/src/execline/elgetpositionals.c
@@ -1,6 +1,6 @@
 /* ISC license. */
 
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include "exlsn.h"
 
 #define USAGE "elgetpositionals [ -P num ] prog..."
diff --git a/src/execline/elglob.c b/src/execline/elglob.c
index ffff74a..654e899 100644
--- a/src/execline/elglob.c
+++ b/src/execline/elglob.c
@@ -1,6 +1,6 @@
 /* ISC license. */
 
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include "exlsn.h"
 
 #define USAGE "elglob [ -v ] [ -w ] [ -s ] [ -m ] [ -e ] [ -0 ] key pattern prog..."
diff --git a/src/execline/emptyenv.c b/src/execline/emptyenv.c
index 503dce6..3c5b287 100644
--- a/src/execline/emptyenv.c
+++ b/src/execline/emptyenv.c
@@ -5,7 +5,7 @@
 #include <skalibs/gccattributes.h>
 #include <skalibs/bytestr.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/env.h>
 #include <skalibs/exec.h>
diff --git a/src/execline/envfile.c b/src/execline/envfile.c
index dcd85e7..3b95c54 100644
--- a/src/execline/envfile.c
+++ b/src/execline/envfile.c
@@ -7,7 +7,7 @@
 #include <skalibs/bytestr.h>
 #include <skalibs/types.h>
 #include <skalibs/buffer.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/fmtscan.h>
 #include <skalibs/env.h>
diff --git a/src/execline/exec.c b/src/execline/exec.c
index d2c1290..ba57e52 100644
--- a/src/execline/exec.c
+++ b/src/execline/exec.c
@@ -3,7 +3,7 @@
 #include <string.h>
 
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/exec.h>
 
 #define USAGE "exec [ -c ] [ -l ] [ -a argv0 ] prog..."
diff --git a/src/execline/execline-cd.c b/src/execline/execline-cd.c
index 80ddec0..1762708 100644
--- a/src/execline/execline-cd.c
+++ b/src/execline/execline-cd.c
@@ -2,7 +2,7 @@
 
 #include <unistd.h>
 
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/exec.h>
 
 #define USAGE "cd path prog..."
diff --git a/src/execline/execline-umask.c b/src/execline/execline-umask.c
index d7eeb5b..c5aacda 100644
--- a/src/execline/execline-umask.c
+++ b/src/execline/execline-umask.c
@@ -3,7 +3,7 @@
 #include <sys/stat.h>
 
 #include <skalibs/types.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/exec.h>
 
 #define USAGE "umask value prog..."
diff --git a/src/execline/execlineb.c b/src/execline/execlineb.c
index 02e8e97..c115b72 100644
--- a/src/execline/execlineb.c
+++ b/src/execline/execlineb.c
@@ -7,7 +7,7 @@
 #include <skalibs/allreadwrite.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/buffer.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/genalloc.h>
 #include <skalibs/env.h>
diff --git a/src/execline/exit.c b/src/execline/exit.c
index bdfe4a0..48b0d43 100644
--- a/src/execline/exit.c
+++ b/src/execline/exit.c
@@ -1,7 +1,7 @@
 /* ISC license. */
 
 #include <unistd.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/types.h>
 
 #define USAGE "exit [ exitcode ]"
diff --git a/src/execline/export.c b/src/execline/export.c
index 7b306c7..45ed489 100644
--- a/src/execline/export.c
+++ b/src/execline/export.c
@@ -2,7 +2,7 @@
 
 #include <string.h>
 
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/exec.h>
 
 #define USAGE "export variable value prog..."
diff --git a/src/execline/fdblock.c b/src/execline/fdblock.c
index b0aefde..798b174 100644
--- a/src/execline/fdblock.c
+++ b/src/execline/fdblock.c
@@ -2,7 +2,7 @@
 
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/exec.h>
 
diff --git a/src/execline/fdclose.c b/src/execline/fdclose.c
index 94972f3..7e33e50 100644
--- a/src/execline/fdclose.c
+++ b/src/execline/fdclose.c
@@ -1,7 +1,7 @@
 /* ISC license. */
 
 #include <skalibs/types.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/exec.h>
 
diff --git a/src/execline/fdmove.c b/src/execline/fdmove.c
index ef00d19..86c8983 100644
--- a/src/execline/fdmove.c
+++ b/src/execline/fdmove.c
@@ -2,7 +2,7 @@
 
 #include <skalibs/sgetopt.h>
 #include <skalibs/types.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/exec.h>
 
diff --git a/src/execline/fdreserve.c b/src/execline/fdreserve.c
index f389b32..15ee25a 100644
--- a/src/execline/fdreserve.c
+++ b/src/execline/fdreserve.c
@@ -4,7 +4,7 @@
 #include <sys/resource.h>
 
 #include <skalibs/types.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/exec.h>
 
diff --git a/src/execline/fdswap.c b/src/execline/fdswap.c
index 7a82061..069ce65 100644
--- a/src/execline/fdswap.c
+++ b/src/execline/fdswap.c
@@ -1,7 +1,7 @@
 /* ISC license. */
 
 #include <skalibs/types.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/exec.h>
 
diff --git a/src/execline/forbacktickx.c b/src/execline/forbacktickx.c
index 2248fe8..b25095e 100644
--- a/src/execline/forbacktickx.c
+++ b/src/execline/forbacktickx.c
@@ -6,7 +6,7 @@
 
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/exec.h>
 
 #include <execline/config.h>
diff --git a/src/execline/foreground.c b/src/execline/foreground.c
index 8164dcb..f52480b 100644
--- a/src/execline/foreground.c
+++ b/src/execline/foreground.c
@@ -1,6 +1,6 @@
 /* ISC license. */
 
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <execline/execline.h>
 
 int main (int argc, char const **argv, char const *const *envp)
diff --git a/src/execline/forstdin.c b/src/execline/forstdin.c
index 6d98d37..1714be3 100644
--- a/src/execline/forstdin.c
+++ b/src/execline/forstdin.c
@@ -6,7 +6,7 @@
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/buffer.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/genalloc.h>
 #include <skalibs/sig.h>
diff --git a/src/execline/forx.c b/src/execline/forx.c
index a11ee16..fa6c0e3 100644
--- a/src/execline/forx.c
+++ b/src/execline/forx.c
@@ -4,7 +4,7 @@
 
 #include <skalibs/sgetopt.h>
 #include <skalibs/bytestr.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/env.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/skamisc.h>
diff --git a/src/execline/getcwd.c b/src/execline/getcwd.c
index 5912aa9..7cb1714 100644
--- a/src/execline/getcwd.c
+++ b/src/execline/getcwd.c
@@ -3,7 +3,7 @@
 #include <string.h>
 
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/djbunix.h>
 
diff --git a/src/execline/getpid.c b/src/execline/getpid.c
index be9b6b8..e81c397 100644
--- a/src/execline/getpid.c
+++ b/src/execline/getpid.c
@@ -5,7 +5,7 @@
 
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 
 #include <execline/execline.h>
 
diff --git a/src/execline/heredoc.c b/src/execline/heredoc.c
index 500c6b2..af48968 100644
--- a/src/execline/heredoc.c
+++ b/src/execline/heredoc.c
@@ -7,7 +7,7 @@
 #include <skalibs/bytestr.h>
 #include <skalibs/types.h>
 #include <skalibs/allreadwrite.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/exec.h>
 
diff --git a/src/execline/homeof.c b/src/execline/homeof.c
index 1f4d6eb..d66fb64 100644
--- a/src/execline/homeof.c
+++ b/src/execline/homeof.c
@@ -3,7 +3,7 @@
 #include <pwd.h>
 #include <errno.h>
 #include <skalibs/buffer.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 
 #define USAGE "homeof user"
 
diff --git a/src/execline/if.c b/src/execline/if.c
index 228ada7..92729a4 100644
--- a/src/execline/if.c
+++ b/src/execline/if.c
@@ -4,7 +4,7 @@
 
 #include <skalibs/sgetopt.h>
 #include <skalibs/types.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/exec.h>
 
diff --git a/src/execline/ifelse.c b/src/execline/ifelse.c
index b8a4e1f..75705bf 100644
--- a/src/execline/ifelse.c
+++ b/src/execline/ifelse.c
@@ -4,7 +4,7 @@
 
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/exec.h>
 
diff --git a/src/execline/ifte.c b/src/execline/ifte.c
index 90d05c8..eeaca0e 100644
--- a/src/execline/ifte.c
+++ b/src/execline/ifte.c
@@ -5,7 +5,7 @@
 
 #include <skalibs/sgetopt.h>
 #include <skalibs/types.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/exec.h>
 
diff --git a/src/execline/ifthenelse.c b/src/execline/ifthenelse.c
index a409fe5..aaaee50 100644
--- a/src/execline/ifthenelse.c
+++ b/src/execline/ifthenelse.c
@@ -4,7 +4,7 @@
 
 #include <skalibs/sgetopt.h>
 #include <skalibs/types.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/exec.h>
 
diff --git a/src/execline/importas.c b/src/execline/importas.c
index bf20c64..9354c9b 100644
--- a/src/execline/importas.c
+++ b/src/execline/importas.c
@@ -1,6 +1,6 @@
 /* ISC license. */
 
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include "exlsn.h"
 
 #define USAGE "importas [ -i | -D default ] [ -u ] [ -N | -n ] [ -s ] [ -C | -c ] [ -d delim ] key var prog..."
diff --git a/src/execline/loopwhilex.c b/src/execline/loopwhilex.c
index acd60ed..b29d26a 100644
--- a/src/execline/loopwhilex.c
+++ b/src/execline/loopwhilex.c
@@ -3,7 +3,7 @@
 #include <errno.h>
 
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/types.h>
 #include <skalibs/djbunix.h>
 
diff --git a/src/execline/multidefine.c b/src/execline/multidefine.c
index b5685f5..1a96f07 100644
--- a/src/execline/multidefine.c
+++ b/src/execline/multidefine.c
@@ -1,6 +1,6 @@
 /* ISC license. */
 
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include "exlsn.h"
 
 #define USAGE "multidefine [ -0 ] [ -r ] [ -N | -n ] [ -C | -c ] [ -d delim ] value { vars... } prog..."
diff --git a/src/execline/multisubstitute.c b/src/execline/multisubstitute.c
index c9392dc..7e1eb91 100644
--- a/src/execline/multisubstitute.c
+++ b/src/execline/multisubstitute.c
@@ -1,7 +1,7 @@
 /* ISC license. */
 
 #include <string.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <execline/execline.h>
 #include "exlsn.h"
 
diff --git a/src/execline/pipeline.c b/src/execline/pipeline.c
index 922a769..00f4538 100644
--- a/src/execline/pipeline.c
+++ b/src/execline/pipeline.c
@@ -5,7 +5,7 @@
 
 #include <skalibs/sgetopt.h>
 #include <skalibs/types.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/exec.h>
 #include <skalibs/djbunix.h>
 
diff --git a/src/execline/piperw.c b/src/execline/piperw.c
index 769fdc8..b5897b3 100644
--- a/src/execline/piperw.c
+++ b/src/execline/piperw.c
@@ -3,7 +3,7 @@
 #include <unistd.h>
 
 #include <skalibs/types.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/exec.h>
 
diff --git a/src/execline/redirfd.c b/src/execline/redirfd.c
index d3cdcfa..4dc829d 100644
--- a/src/execline/redirfd.c
+++ b/src/execline/redirfd.c
@@ -5,7 +5,7 @@
 
 #include <skalibs/sgetopt.h>
 #include <skalibs/types.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/exec.h>
 
diff --git a/src/execline/runblock.c b/src/execline/runblock.c
index e6d7fd1..1173cd9 100644
--- a/src/execline/runblock.c
+++ b/src/execline/runblock.c
@@ -4,7 +4,7 @@
 
 #include <skalibs/sgetopt.h>
 #include <skalibs/types.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/env.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/genalloc.h>
diff --git a/src/execline/shift.c b/src/execline/shift.c
index d04f8ad..97efac4 100644
--- a/src/execline/shift.c
+++ b/src/execline/shift.c
@@ -4,7 +4,7 @@
 
 #include <skalibs/sgetopt.h>
 #include <skalibs/types.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/exec.h>
 
 #include <execline/execline.h>
diff --git a/src/execline/trap.c b/src/execline/trap.c
index 498b0bd..cc13595 100644
--- a/src/execline/trap.c
+++ b/src/execline/trap.c
@@ -9,7 +9,7 @@
 #include <skalibs/types.h>
 #include <skalibs/nsig.h>
 #include <skalibs/sig.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/iopause.h>
 #include <skalibs/selfpipe.h>
 #include <skalibs/env.h>
diff --git a/src/execline/tryexec.c b/src/execline/tryexec.c
index 42fbcb9..d765618 100644
--- a/src/execline/tryexec.c
+++ b/src/execline/tryexec.c
@@ -3,7 +3,7 @@
 #include <string.h>
 
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/exec.h>
 
 #include <execline/execline.h>
diff --git a/src/execline/unexport.c b/src/execline/unexport.c
index 6504a97..d2c06bc 100644
--- a/src/execline/unexport.c
+++ b/src/execline/unexport.c
@@ -2,7 +2,7 @@
 
 #include <string.h>
 
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/env.h>
 #include <skalibs/exec.h>
 
diff --git a/src/execline/wait.c b/src/execline/wait.c
index c63149a..5b9b93d 100644
--- a/src/execline/wait.c
+++ b/src/execline/wait.c
@@ -10,7 +10,7 @@
 
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/tai.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/selfpipe.h>
diff --git a/src/execline/withstdinas.c b/src/execline/withstdinas.c
index 64a3697..e8b5dfd 100644
--- a/src/execline/withstdinas.c
+++ b/src/execline/withstdinas.c
@@ -3,7 +3,7 @@
 #include <string.h>
 
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/djbunix.h>
 
diff --git a/src/libexecline/el_execsequence.c b/src/libexecline/el_execsequence.c
index debf527..9d0993e 100644
--- a/src/libexecline/el_execsequence.c
+++ b/src/libexecline/el_execsequence.c
@@ -4,7 +4,7 @@
 #include <unistd.h>
 
 #include <skalibs/types.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/exec.h>
 
diff --git a/src/libexecline/el_semicolon.c b/src/libexecline/el_semicolon.c
index cfbfffd..735fe9a 100644
--- a/src/libexecline/el_semicolon.c
+++ b/src/libexecline/el_semicolon.c
@@ -1,7 +1,7 @@
 /* ISC license. */
 
 #include <skalibs/env.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/types.h>
 #include <execline/execline.h>
 
diff --git a/src/libexecline/el_substandrun.c b/src/libexecline/el_substandrun.c
index 11502ea..3af7719 100644
--- a/src/libexecline/el_substandrun.c
+++ b/src/libexecline/el_substandrun.c
@@ -1,7 +1,7 @@
 /* ISC license. */
 
 #include <skalibs/env.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/skamisc.h>
 #include "exlsn.h"
 
diff --git a/src/libexecline/el_substandrun_str.c b/src/libexecline/el_substandrun_str.c
index 5786bc6..2501ad1 100644
--- a/src/libexecline/el_substandrun_str.c
+++ b/src/libexecline/el_substandrun_str.c
@@ -4,7 +4,7 @@
 
 #include <skalibs/exec.h>
 #include <skalibs/env.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/genalloc.h>
 
diff --git a/src/libexecline/exlp.c b/src/libexecline/exlp.c
index 1fae415..7129be1 100644
--- a/src/libexecline/exlp.c
+++ b/src/libexecline/exlp.c
@@ -2,7 +2,7 @@
 
 #include <string.h>
 #include <skalibs/env.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/genalloc.h>
 #include <skalibs/types.h>
diff --git a/src/libexecline/exlsn_elglob.c b/src/libexecline/exlsn_elglob.c
index db1bb35..c526e41 100644
--- a/src/libexecline/exlsn_elglob.c
+++ b/src/libexecline/exlsn_elglob.c
@@ -4,7 +4,7 @@
 #include <glob.h>
 #include <string.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/genalloc.h>
 #include <execline/execline.h>
diff --git a/src/libexecline/exlsn_importas.c b/src/libexecline/exlsn_importas.c
index 670b113..70c53a7 100644
--- a/src/libexecline/exlsn_importas.c
+++ b/src/libexecline/exlsn_importas.c
@@ -2,7 +2,7 @@
 
 #include <string.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/genalloc.h>
 #include <skalibs/env.h>
diff --git a/src/libexecline/exlsn_main.c b/src/libexecline/exlsn_main.c
index 8a923e3..a7dd8bd 100644
--- a/src/libexecline/exlsn_main.c
+++ b/src/libexecline/exlsn_main.c
@@ -1,7 +1,7 @@
 /* ISC license. */
 
 #include <skalibs/bytestr.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/genalloc.h>
 #include <execline/execline.h>
 #include "exlsn.h"
diff --git a/src/posix/posix-cd.c b/src/posix/posix-cd.c
index 3fd7d7c..e9bfd35 100644
--- a/src/posix/posix-cd.c
+++ b/src/posix/posix-cd.c
@@ -10,7 +10,7 @@
 #include <skalibs/bytestr.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/allreadwrite.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/env.h>
diff --git a/src/posix/posix-umask.c b/src/posix/posix-umask.c
index f477365..8785bed 100644
--- a/src/posix/posix-umask.c
+++ b/src/posix/posix-umask.c
@@ -9,7 +9,7 @@
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/buffer.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/exec.h>
 
 #define USAGE "posix-umask [ -S ] [ mask ] [ prog... ]"