--- ./contrib/mod_sftp/mod_sftp.c_orig  2026-07-09 09:50:25.097335593 -0500
+++ ./contrib/mod_sftp/mod_sftp.c       2026-07-09 09:51:25.632617046 -0500
@@ -47,7 +47,18 @@
 #include "utf8.h"
 
 #if defined(HAVE_SODIUM_H)
+
+#ifdef ip_len
+#pragma push_macro("ip_len")
+#undef ip_len
+#endif
+
 # include <sodium.h>
+
+#ifdef ip_len
+#pragma pop_macro("ip_len")
+#endif
+
 #endif /* HAVE_SODIUM_H */
 
 extern xaset_t *server_list;

--- ./contrib/mod_sftp/kex.c_orig	2026-07-09 09:59:32.885490798 -0500
+++ ./contrib/mod_sftp/kex.c	2026-07-09 10:00:27.834378714 -0500
@@ -39,7 +39,18 @@
 #include "misc.h"
 
 #if defined(PR_USE_SODIUM)
+
+#ifdef ip_len
+#pragma push_macro("ip_len")
+#undef ip_len
+#endif
+
 # include <sodium.h>
+
+#ifdef ip_len
+#pragma pop_macro("ip_len")
+#endif
+
 # define CURVE25519_SIZE	32
 #endif /* PR_USE_SODIUM */
 
--- ./contrib/mod_sql_passwd.c_orig	2026-07-09 10:07:45.985475377 -0500
+++ ./contrib/mod_sql_passwd.c	2026-07-09 10:08:30.275250953 -0500
@@ -32,7 +32,18 @@
 #define MOD_SQL_PASSWD_VERSION		"mod_sql_passwd/1.2"
 
 #ifdef PR_USE_SODIUM
+
+#ifdef ip_len
+#pragma push_macro("ip_len")
+#undef ip_len
+#endif
+
 # include <sodium.h>
+
+#ifdef ip_len
+#pragma pop_macro("ip_len")
+#endif
+
 /* Use/support Argon2, if libsodium is new enough. */
 # if SODIUM_LIBRARY_VERSION_MAJOR > 9 || \
      (SODIUM_LIBRARY_VERSION_MAJOR == 9 && \
--- ./contrib/mod_sftp/keys.c_orig	2026-07-09 10:14:55.769701206 -0500
+++ ./contrib/mod_sftp/keys.c	2026-07-09 10:15:50.712305305 -0500
@@ -35,7 +35,18 @@
 #include "session.h"
 #include "bcrypt.h"
 #if defined(PR_USE_SODIUM)
+
+#ifdef ip_len
+#pragma push_macro("ip_len")
+#undef ip_len
+#endif
+
 # include <sodium.h>
+
+#ifdef ip_len
+#pragma pop_macro("ip_len")
+#endif
+
 #endif /* PR_USE_SODIUM */
 
 #if defined(HAVE_X448_OPENSSL) && defined(HAVE_SHA512_OPENSSL)