diff --git a/src/compat/base64.c b/src/compat/base64.c
index 31244e0d3..0e911d6f3 100644
--- a/src/compat/base64.c
+++ b/src/compat/base64.c
@@ -75,7 +75,6 @@
 #include <arpa/nameser.h>
 
 #include <ctype.h>
-#include <resolv.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/main.c b/src/main.c
index 525b0db49..b17d91ef7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -49,7 +49,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <resolv.h>
 #include <setjmp.h>
 #include <signal.h>
 
diff --git a/src/main.h b/src/main.h
index f892dc808..8a77fd7f0 100644
--- a/src/main.h
+++ b/src/main.h
@@ -74,6 +74,15 @@
 #endif
 
 #include <sys/types.h>
+
+#undef answer /* before resolv.h because it could collide with src/mod/module.h
+               * (dietlibc) */
+#include <resolv.h> /* base64 encode b64_ntop() and base64 decode b64_pton() */
+#ifndef HAVE_BASE64
+#  undef b64_ntop
+#  undef b64_pton
+#endif
+
 #include "lush.h"
 #include "lang.h"
 #include "eggdrop.h"
diff --git a/src/mod/dns.mod/coredns.c b/src/mod/dns.mod/coredns.c
index d82685c79..39279ad06 100644
--- a/src/mod/dns.mod/coredns.c
+++ b/src/mod/dns.mod/coredns.c
@@ -35,13 +35,12 @@
  * Released under the GPL, as above.
  */
 
+#include "src/mod/module.h"
+
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <arpa/nameser.h>
-#undef answer /* before resolv.h because it could collide with src/mod/module.h
-                 (dietlibc) */
-#include <resolv.h>
 #include <errno.h>
 
 /* OpenBSD */
diff --git a/src/mod/pbkdf2.mod/pbkdf2.c b/src/mod/pbkdf2.mod/pbkdf2.c
index 233e38507..48c7ba32a 100644
--- a/src/mod/pbkdf2.mod/pbkdf2.c
+++ b/src/mod/pbkdf2.mod/pbkdf2.c
@@ -15,7 +15,6 @@ static Function *global = NULL; /* before tclpbkdf2.c */
 
 #define MODULE_NAME "encryption2"
 
-#include <resolv.h> /* base64 encode b64_ntop() and base64 decode b64_pton() */
 #include <openssl/err.h>
 #include <openssl/rand.h>
 
diff --git a/src/mod/python.mod/configure b/src/mod/python.mod/configure
index 85b89e6f8..2186a56b9 100755
--- a/src/mod/python.mod/configure
+++ b/src/mod/python.mod/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac 63ef680.
+# From configure.ac .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.71 for Eggdrop Python Module 1.10.0.
 #
@@ -2062,6 +2062,12 @@ fi
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python C flags" >&5
 printf %s "checking for python C flags... " >&6; }
   PYTHON_CFLAGS=`$python_config_bin $PYTHON_CONFIG_ARGS --cflags`
+  # remove preprocessor args
+  PYTHON_CFLAGS=`echo $PYTHON_CFLAGS | sed 's/-Wp,.*//'`
+  # remove march
+  PYTHON_CFLAGS=`echo $PYTHON_CFLAGS | sed 's/-march=[^ ]*//g'`
+  # remove mtune
+  PYTHON_CFLAGS=`echo $PYTHON_CFLAGS | sed 's/-mtune=[^ ]*//g'`
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PYTHON_CFLAGS" >&5
 printf "%s\n" "$PYTHON_CFLAGS" >&6; }
 
diff --git a/src/mod/python.mod/configure.ac b/src/mod/python.mod/configure.ac
index 8e4beb260..c0c12ad0b 100644
--- a/src/mod/python.mod/configure.ac
+++ b/src/mod/python.mod/configure.ac
@@ -49,6 +49,12 @@ if test "x$python_config_bin" != "x"; then
 
   AC_MSG_CHECKING([for python C flags])
   PYTHON_CFLAGS=`$python_config_bin $PYTHON_CONFIG_ARGS --cflags`
+  # remove preprocessor args
+  PYTHON_CFLAGS=`echo $PYTHON_CFLAGS | sed 's/-Wp,.*//'`
+  # remove march
+  PYTHON_CFLAGS=`echo $PYTHON_CFLAGS | sed 's/-march=@<:@^ @:>@*//g'`
+  # remove mtune
+  PYTHON_CFLAGS=`echo $PYTHON_CFLAGS | sed 's/-mtune=@<:@^ @:>@*//g'`
   AC_MSG_RESULT([$PYTHON_CFLAGS])
   AC_SUBST(PYTHON_CFLAGS)
 
diff --git a/src/mod/server.mod/sasl.c b/src/mod/server.mod/sasl.c
index 6db69bccc..6c05ffb13 100644
--- a/src/mod/server.mod/sasl.c
+++ b/src/mod/server.mod/sasl.c
@@ -7,9 +7,7 @@
  * Copyright (C) 2019 - 2025 Eggheads Development Team
  */
 
-#undef answer /* before resolv.h because it could collide with src/mod/module.h
-               * (dietlibc) */
-#include <resolv.h> /* base64 encode b64_ntop() and base64 decode b64_pton() */
+#include "src/mod/module.h"
 
 /* RFC 5802 - printable ASCII characters excluding ','
  * printable = %x21-2B / %x2D-7E