--- atf-c/utils.c.org	2020-04-14 05:40:31 +0000
+++ atf-c/utils.c	2020-04-14 05:49:03 +0000
@@ -28,7 +28,7 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 
-#include <err.h>
+#include <openssl/err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <regex.h>

--- atf-c/detail/fs.c.org	2020-04-14 05:55:01 +0000
+++ atf-c/detail/fs.c	2020-04-14 05:55:31 +0000
@@ -31,7 +31,7 @@
 
 #include <sys/types.h>
 #include <sys/param.h>
-#include <sys/mount.h>
+#include <rpcsvc/mount.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 
--- atf-c/detail/sanity.c.org	2020-04-14 05:57:49 +0000
+++ atf-c/detail/sanity.c	2020-04-14 05:58:14 +0000
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include <err.h>
+#include <openssl/err.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>

--- atf-c++/detail/fs.cpp.org	2020-04-14 05:59:45 +0000
+++ atf-c++/detail/fs.cpp	2020-04-14 06:00:22 +0000
@@ -32,7 +32,7 @@
 extern "C" {
 #include <sys/param.h>
 #include <sys/types.h>
-#include <sys/mount.h>
+#include <rpcsvc/mount.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <dirent.h>