Index: tools/compat/compat_defs.h
===================================================================
RCS file: /cvsroot/src/tools/compat/compat_defs.h,v
retrieving revision 1.130
diff -u -p -r1.130 compat_defs.h
--- tools/compat/compat_defs.h	19 Dec 2025 13:55:33 -0000	1.130
+++ tools/compat/compat_defs.h	11 Jan 2026 06:21:36 -0000
@@ -1112,7 +1112,10 @@ int	 cgetset(const char *);
 int	 cgetstr(char *, const char *, char **);
 int	 cgetustr(char *, const char *, char **);
 
-/* <sys/endian.h> */
+
+#ifdef HAVE_SYS_ENDIAN_H
+#include <sys/endian.h>
+#endif
 
 #if WORDS_BIGENDIAN
 #if !HAVE_DECL_HTOBE16
Index: tools/compat/configure
===================================================================
RCS file: /cvsroot/src/tools/compat/configure,v
retrieving revision 1.110
diff -u -p -r1.110 configure
--- tools/compat/configure	18 Dec 2025 00:20:22 -0000	1.110
+++ tools/compat/configure	11 Jan 2026 06:21:39 -0000
@@ -6975,7 +6975,7 @@ fi
 printf "%s\n" "#define HAVE_DECL_VWARNX $ac_have_decl" >>confdefs.h
 
 
-ac_fn_check_decl "$LINENO" "htobe16" "ac_cv_have_decl_htobe16" "#include <sys/types.h>
+ac_fn_check_decl "$LINENO" "htobe16" "ac_cv_have_decl_htobe16" "#include <sys/endian.h>
 " "$ac_c_undeclared_builtin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_htobe16" = xyes
 then :
@@ -6985,7 +6985,7 @@ else case e in #(
 esac
 fi
 printf "%s\n" "#define HAVE_DECL_HTOBE16 $ac_have_decl" >>confdefs.h
-ac_fn_check_decl "$LINENO" "htobe32" "ac_cv_have_decl_htobe32" "#include <sys/types.h>
+ac_fn_check_decl "$LINENO" "htobe32" "ac_cv_have_decl_htobe32" "#include <sys/endian.h>
 " "$ac_c_undeclared_builtin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_htobe32" = xyes
 then :
@@ -6995,7 +6995,7 @@ else case e in #(
 esac
 fi
 printf "%s\n" "#define HAVE_DECL_HTOBE32 $ac_have_decl" >>confdefs.h
-ac_fn_check_decl "$LINENO" "htobe64" "ac_cv_have_decl_htobe64" "#include <sys/types.h>
+ac_fn_check_decl "$LINENO" "htobe64" "ac_cv_have_decl_htobe64" "#include <sys/endian.h>
 " "$ac_c_undeclared_builtin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_htobe64" = xyes
 then :
@@ -7005,7 +7005,7 @@ else case e in #(
 esac
 fi
 printf "%s\n" "#define HAVE_DECL_HTOBE64 $ac_have_decl" >>confdefs.h
-ac_fn_check_decl "$LINENO" "htole16" "ac_cv_have_decl_htole16" "#include <sys/types.h>
+ac_fn_check_decl "$LINENO" "htole16" "ac_cv_have_decl_htole16" "#include <sys/endian.h>
 " "$ac_c_undeclared_builtin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_htole16" = xyes
 then :
@@ -7015,7 +7015,7 @@ else case e in #(
 esac
 fi
 printf "%s\n" "#define HAVE_DECL_HTOLE16 $ac_have_decl" >>confdefs.h
-ac_fn_check_decl "$LINENO" "htole32" "ac_cv_have_decl_htole32" "#include <sys/types.h>
+ac_fn_check_decl "$LINENO" "htole32" "ac_cv_have_decl_htole32" "#include <sys/endian.h>
 " "$ac_c_undeclared_builtin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_htole32" = xyes
 then :
@@ -7025,7 +7025,7 @@ else case e in #(
 esac
 fi
 printf "%s\n" "#define HAVE_DECL_HTOLE32 $ac_have_decl" >>confdefs.h
-ac_fn_check_decl "$LINENO" "htole64" "ac_cv_have_decl_htole64" "#include <sys/types.h>
+ac_fn_check_decl "$LINENO" "htole64" "ac_cv_have_decl_htole64" "#include <sys/endian.h>
 " "$ac_c_undeclared_builtin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_htole64" = xyes
 then :
@@ -7035,7 +7035,7 @@ else case e in #(
 esac
 fi
 printf "%s\n" "#define HAVE_DECL_HTOLE64 $ac_have_decl" >>confdefs.h
-ac_fn_check_decl "$LINENO" "be16toh" "ac_cv_have_decl_be16toh" "#include <sys/types.h>
+ac_fn_check_decl "$LINENO" "be16toh" "ac_cv_have_decl_be16toh" "#include <sys/endian.h>
 " "$ac_c_undeclared_builtin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_be16toh" = xyes
 then :
@@ -7045,7 +7045,7 @@ else case e in #(
 esac
 fi
 printf "%s\n" "#define HAVE_DECL_BE16TOH $ac_have_decl" >>confdefs.h
-ac_fn_check_decl "$LINENO" "be32toh" "ac_cv_have_decl_be32toh" "#include <sys/types.h>
+ac_fn_check_decl "$LINENO" "be32toh" "ac_cv_have_decl_be32toh" "#include <sys/endian.h>
 " "$ac_c_undeclared_builtin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_be32toh" = xyes
 then :
@@ -7055,7 +7055,7 @@ else case e in #(
 esac
 fi
 printf "%s\n" "#define HAVE_DECL_BE32TOH $ac_have_decl" >>confdefs.h
-ac_fn_check_decl "$LINENO" "be64toh" "ac_cv_have_decl_be64toh" "#include <sys/types.h>
+ac_fn_check_decl "$LINENO" "be64toh" "ac_cv_have_decl_be64toh" "#include <sys/endian.h>
 " "$ac_c_undeclared_builtin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_be64toh" = xyes
 then :
@@ -7065,7 +7065,7 @@ else case e in #(
 esac
 fi
 printf "%s\n" "#define HAVE_DECL_BE64TOH $ac_have_decl" >>confdefs.h
-ac_fn_check_decl "$LINENO" "le16toh" "ac_cv_have_decl_le16toh" "#include <sys/types.h>
+ac_fn_check_decl "$LINENO" "le16toh" "ac_cv_have_decl_le16toh" "#include <sys/endian.h>
 " "$ac_c_undeclared_builtin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_le16toh" = xyes
 then :
@@ -7075,7 +7075,7 @@ else case e in #(
 esac
 fi
 printf "%s\n" "#define HAVE_DECL_LE16TOH $ac_have_decl" >>confdefs.h
-ac_fn_check_decl "$LINENO" "le32toh" "ac_cv_have_decl_le32toh" "#include <sys/types.h>
+ac_fn_check_decl "$LINENO" "le32toh" "ac_cv_have_decl_le32toh" "#include <sys/endian.h>
 " "$ac_c_undeclared_builtin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_le32toh" = xyes
 then :
@@ -7085,7 +7085,7 @@ else case e in #(
 esac
 fi
 printf "%s\n" "#define HAVE_DECL_LE32TOH $ac_have_decl" >>confdefs.h
-ac_fn_check_decl "$LINENO" "le64toh" "ac_cv_have_decl_le64toh" "#include <sys/types.h>
+ac_fn_check_decl "$LINENO" "le64toh" "ac_cv_have_decl_le64toh" "#include <sys/endian.h>
 " "$ac_c_undeclared_builtin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_le64toh" = xyes
 then :
Index: tools/compat/configure.ac
===================================================================
RCS file: /cvsroot/src/tools/compat/configure.ac,v
retrieving revision 1.112
diff -u -p -r1.112 configure.ac
--- tools/compat/configure.ac	18 Dec 2025 00:19:40 -0000	1.112
+++ tools/compat/configure.ac	11 Jan 2026 06:21:39 -0000
@@ -279,7 +279,7 @@ AC_CHECK_DECLS([err, errc, errx, verrc, 
 
 AC_CHECK_DECLS([htobe16, htobe32, htobe64, htole16, htole32, htole64,
 		be16toh, be32toh, be64toh, le16toh, le32toh, le64toh],,,
-		[#include <sys/types.h>])
+		[#include <sys/endian.h>])
 
 AC_CHECK_DECLS([bswap16, bswap32, bswap64],,, [#include <machine/bswap.h>])