diff --git a/configure.ac b/configure.ac
index ed9e1e5b5..1367fc8fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,7 +112,7 @@ AX_TYPE_SOCKLEN_T
 AX_CREATE_STDINT_H([eggint.h])
 
 # Checks for functions and their arguments.
-AC_CHECK_FUNCS([clock_gettime dprintf explicit_bzero memset_explicit explicit_memset getrandom inet_aton memset_s snprintf strlcpy vsnprintf])
+AC_CHECK_FUNCS([clock_gettime dprintf explicit_bzero memset_explicit explicit_memset getrandom memset_s snprintf strlcpy vsnprintf])
 AC_FUNC_SELECT_ARGTYPES
 EGG_FUNC_B64_NTOP
 AC_FUNC_MMAP
diff --git a/src/Makefile.in b/src/Makefile.in
index 21e359131..d43454cd9 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -88,145 +88,130 @@ eggdrop.h:
 #safety hash
 bg.o: bg.c main.h ../config.h ../eggint.h ../lush.h lang.h eggdrop.h \
  compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h tclhash.h \
- chan.h users.h compat/compat.h compat/base64.h compat/inet_aton.h \
- ../src/main.h compat/snprintf.h compat/explicit_bzero.h compat/strlcpy.h \
- bg.h
+ chan.h users.h compat/compat.h compat/base64.h compat/snprintf.h \
+ ../src/main.h compat/explicit_bzero.h compat/strlcpy.h bg.h
 botcmd.o: botcmd.c main.h ../config.h ../eggint.h ../lush.h lang.h \
  eggdrop.h compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h \
  tclhash.h chan.h users.h compat/compat.h compat/base64.h \
- compat/inet_aton.h ../src/main.h compat/snprintf.h \
- compat/explicit_bzero.h compat/strlcpy.h tandem.h modules.h \
- mod/modvals.h
+ compat/snprintf.h ../src/main.h compat/explicit_bzero.h compat/strlcpy.h \
+ tandem.h modules.h mod/modvals.h
 botmsg.o: botmsg.c main.h ../config.h ../eggint.h ../lush.h lang.h \
  eggdrop.h compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h \
  tclhash.h chan.h users.h compat/compat.h compat/base64.h \
- compat/inet_aton.h ../src/main.h compat/snprintf.h \
- compat/explicit_bzero.h compat/strlcpy.h tandem.h
+ compat/snprintf.h ../src/main.h compat/explicit_bzero.h compat/strlcpy.h \
+ tandem.h
 botnet.o: botnet.c main.h ../config.h ../eggint.h ../lush.h lang.h \
  eggdrop.h compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h \
  tclhash.h chan.h users.h compat/compat.h compat/base64.h \
- compat/inet_aton.h ../src/main.h compat/snprintf.h \
- compat/explicit_bzero.h compat/strlcpy.h tandem.h
+ compat/snprintf.h ../src/main.h compat/explicit_bzero.h compat/strlcpy.h \
+ tandem.h
 chanprog.o: chanprog.c main.h ../config.h ../eggint.h ../lush.h lang.h \
  eggdrop.h compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h \
  tclhash.h chan.h users.h compat/compat.h compat/base64.h \
- compat/inet_aton.h ../src/main.h compat/snprintf.h \
- compat/explicit_bzero.h compat/strlcpy.h modules.h mod/modvals.h
+ compat/snprintf.h ../src/main.h compat/explicit_bzero.h compat/strlcpy.h \
+ modules.h mod/modvals.h
 cmds.o: cmds.c main.h ../config.h ../eggint.h ../lush.h lang.h eggdrop.h \
  compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h tclhash.h \
- chan.h users.h compat/compat.h compat/base64.h compat/inet_aton.h \
- ../src/main.h compat/snprintf.h compat/explicit_bzero.h compat/strlcpy.h \
- tandem.h modules.h mod/modvals.h
+ chan.h users.h compat/compat.h compat/base64.h compat/snprintf.h \
+ ../src/main.h compat/explicit_bzero.h compat/strlcpy.h tandem.h \
+ modules.h mod/modvals.h
 dcc.o: dcc.c main.h ../config.h ../eggint.h ../lush.h lang.h eggdrop.h \
  compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h tclhash.h \
- chan.h users.h compat/compat.h compat/base64.h compat/inet_aton.h \
- ../src/main.h compat/snprintf.h compat/explicit_bzero.h compat/strlcpy.h \
- tandem.h md5/md5.h
+ chan.h users.h compat/compat.h compat/base64.h compat/snprintf.h \
+ ../src/main.h compat/explicit_bzero.h compat/strlcpy.h tandem.h \
+ md5/md5.h
 dccutil.o: dccutil.c main.h ../config.h ../eggint.h ../lush.h lang.h \
  eggdrop.h compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h \
  tclhash.h chan.h users.h compat/compat.h compat/base64.h \
- compat/inet_aton.h ../src/main.h compat/snprintf.h \
- compat/explicit_bzero.h compat/strlcpy.h tandem.h
+ compat/snprintf.h ../src/main.h compat/explicit_bzero.h compat/strlcpy.h \
+ tandem.h
 dns.o: dns.c main.h ../config.h ../eggint.h ../lush.h lang.h eggdrop.h \
  compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h tclhash.h \
- chan.h users.h compat/compat.h compat/base64.h compat/inet_aton.h \
- ../src/main.h compat/snprintf.h compat/explicit_bzero.h compat/strlcpy.h \
- dns.h
+ chan.h users.h compat/compat.h compat/base64.h compat/snprintf.h \
+ ../src/main.h compat/explicit_bzero.h compat/strlcpy.h dns.h
 flags.o: flags.c main.h ../config.h ../eggint.h ../lush.h lang.h \
  eggdrop.h compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h \
  tclhash.h chan.h users.h compat/compat.h compat/base64.h \
- compat/inet_aton.h ../src/main.h compat/snprintf.h \
- compat/explicit_bzero.h compat/strlcpy.h
+ compat/snprintf.h ../src/main.h compat/explicit_bzero.h compat/strlcpy.h
 language.o: language.c main.h ../config.h ../eggint.h ../lush.h lang.h \
  eggdrop.h compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h \
  tclhash.h chan.h users.h compat/compat.h compat/base64.h \
- compat/inet_aton.h ../src/main.h compat/snprintf.h \
- compat/explicit_bzero.h compat/strlcpy.h
+ compat/snprintf.h ../src/main.h compat/explicit_bzero.h compat/strlcpy.h
 main.o: main.c ../config.h main.h ../eggint.h ../lush.h lang.h eggdrop.h \
  compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h tclhash.h \
- chan.h users.h compat/compat.h compat/base64.h compat/inet_aton.h \
- ../src/main.h compat/snprintf.h compat/explicit_bzero.h compat/strlcpy.h \
- version.h modules.h mod/modvals.h bg.h
+ chan.h users.h compat/compat.h compat/base64.h compat/snprintf.h \
+ ../src/main.h compat/explicit_bzero.h compat/strlcpy.h version.h \
+ modules.h mod/modvals.h bg.h
 match.o: match.c main.h ../config.h ../eggint.h ../lush.h lang.h \
  eggdrop.h compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h \
  tclhash.h chan.h users.h compat/compat.h compat/base64.h \
- compat/inet_aton.h ../src/main.h compat/snprintf.h \
- compat/explicit_bzero.h compat/strlcpy.h
+ compat/snprintf.h ../src/main.h compat/explicit_bzero.h compat/strlcpy.h
 mem.o: mem.c main.h ../config.h ../eggint.h ../lush.h lang.h eggdrop.h \
  compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h tclhash.h \
- chan.h users.h compat/compat.h compat/base64.h compat/inet_aton.h \
- ../src/main.h compat/snprintf.h compat/explicit_bzero.h compat/strlcpy.h \
- mod/modvals.h
+ chan.h users.h compat/compat.h compat/base64.h compat/snprintf.h \
+ ../src/main.h compat/explicit_bzero.h compat/strlcpy.h mod/modvals.h
 misc.o: misc.c main.h ../config.h ../eggint.h ../lush.h lang.h eggdrop.h \
  compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h tclhash.h \
- chan.h users.h compat/compat.h compat/base64.h compat/inet_aton.h \
- ../src/main.h compat/snprintf.h compat/explicit_bzero.h compat/strlcpy.h \
- tandem.h modules.h mod/modvals.h stat.h
+ chan.h users.h compat/compat.h compat/base64.h compat/snprintf.h \
+ ../src/main.h compat/explicit_bzero.h compat/strlcpy.h tandem.h \
+ modules.h mod/modvals.h stat.h
 misc_file.o: misc_file.c main.h ../config.h ../eggint.h ../lush.h lang.h \
  eggdrop.h compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h \
  tclhash.h chan.h users.h compat/compat.h compat/base64.h \
- compat/inet_aton.h ../src/main.h compat/snprintf.h \
- compat/explicit_bzero.h compat/strlcpy.h stat.h
+ compat/snprintf.h ../src/main.h compat/explicit_bzero.h compat/strlcpy.h \
+ stat.h
 modules.o: modules.c main.h ../config.h ../eggint.h ../lush.h lang.h \
  eggdrop.h compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h \
  tclhash.h chan.h users.h compat/compat.h compat/base64.h \
- compat/inet_aton.h ../src/main.h compat/snprintf.h \
- compat/explicit_bzero.h compat/strlcpy.h modules.h mod/modvals.h \
- tandem.h md5/md5.h
+ compat/snprintf.h ../src/main.h compat/explicit_bzero.h compat/strlcpy.h \
+ modules.h mod/modvals.h tandem.h md5/md5.h
 net.o: net.c main.h ../config.h ../eggint.h ../lush.h lang.h eggdrop.h \
  compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h tclhash.h \
- chan.h users.h compat/compat.h compat/base64.h compat/inet_aton.h \
- ../src/main.h compat/snprintf.h compat/explicit_bzero.h compat/strlcpy.h \
- modules.h mod/modvals.h
+ chan.h users.h compat/compat.h compat/base64.h compat/snprintf.h \
+ ../src/main.h compat/explicit_bzero.h compat/strlcpy.h modules.h \
+ mod/modvals.h
 rfc1459.o: rfc1459.c main.h ../config.h ../eggint.h ../lush.h lang.h \
  eggdrop.h compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h \
  tclhash.h chan.h users.h compat/compat.h compat/base64.h \
- compat/inet_aton.h ../src/main.h compat/snprintf.h \
- compat/explicit_bzero.h compat/strlcpy.h
+ compat/snprintf.h ../src/main.h compat/explicit_bzero.h compat/strlcpy.h
 tcl.o: tcl.c main.h ../config.h ../eggint.h ../lush.h lang.h eggdrop.h \
  compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h tclhash.h \
- chan.h users.h compat/compat.h compat/base64.h compat/inet_aton.h \
- ../src/main.h compat/snprintf.h compat/explicit_bzero.h compat/strlcpy.h
+ chan.h users.h compat/compat.h compat/base64.h compat/snprintf.h \
+ ../src/main.h compat/explicit_bzero.h compat/strlcpy.h
 tcldcc.o: tcldcc.c main.h ../config.h ../eggint.h ../lush.h lang.h \
  eggdrop.h compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h \
  tclhash.h chan.h users.h compat/compat.h compat/base64.h \
- compat/inet_aton.h ../src/main.h compat/snprintf.h \
- compat/explicit_bzero.h compat/strlcpy.h tandem.h modules.h \
- mod/modvals.h
+ compat/snprintf.h ../src/main.h compat/explicit_bzero.h compat/strlcpy.h \
+ tandem.h modules.h mod/modvals.h
 tclhash.o: tclhash.c main.h ../config.h ../eggint.h ../lush.h lang.h \
  eggdrop.h compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h \
  tclhash.h chan.h users.h compat/compat.h compat/base64.h \
- compat/inet_aton.h ../src/main.h compat/snprintf.h \
- compat/explicit_bzero.h compat/strlcpy.h
+ compat/snprintf.h ../src/main.h compat/explicit_bzero.h compat/strlcpy.h
 tclmisc.o: tclmisc.c main.h ../config.h ../eggint.h ../lush.h lang.h \
  eggdrop.h compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h \
  tclhash.h chan.h users.h compat/compat.h compat/base64.h \
- compat/inet_aton.h ../src/main.h compat/snprintf.h \
- compat/explicit_bzero.h compat/strlcpy.h modules.h mod/modvals.h \
- md5/md5.h
+ compat/snprintf.h ../src/main.h compat/explicit_bzero.h compat/strlcpy.h \
+ modules.h mod/modvals.h md5/md5.h
 tcluser.o: tcluser.c main.h ../config.h ../eggint.h ../lush.h lang.h \
  eggdrop.h compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h \
  tclhash.h chan.h users.h compat/compat.h compat/base64.h \
- compat/inet_aton.h ../src/main.h compat/snprintf.h \
- compat/explicit_bzero.h compat/strlcpy.h modules.h mod/modvals.h
+ compat/snprintf.h ../src/main.h compat/explicit_bzero.h compat/strlcpy.h \
+ modules.h mod/modvals.h
 tls.o: tls.c main.h ../config.h ../eggint.h ../lush.h lang.h eggdrop.h \
  compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h tclhash.h \
- chan.h users.h compat/compat.h compat/base64.h compat/inet_aton.h \
- ../src/main.h compat/snprintf.h compat/explicit_bzero.h compat/strlcpy.h
+ chan.h users.h compat/compat.h compat/base64.h compat/snprintf.h \
+ ../src/main.h compat/explicit_bzero.h compat/strlcpy.h
 userent.o: userent.c main.h ../config.h ../eggint.h ../lush.h lang.h \
  eggdrop.h compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h \
  tclhash.h chan.h users.h compat/compat.h compat/base64.h \
- compat/inet_aton.h ../src/main.h compat/snprintf.h \
- compat/explicit_bzero.h compat/strlcpy.h
+ compat/snprintf.h ../src/main.h compat/explicit_bzero.h compat/strlcpy.h
 userrec.o: userrec.c main.h ../config.h ../eggint.h ../lush.h lang.h \
  eggdrop.h compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h \
  tclhash.h chan.h users.h compat/compat.h compat/base64.h \
- compat/inet_aton.h ../src/main.h compat/snprintf.h \
- compat/explicit_bzero.h compat/strlcpy.h modules.h mod/modvals.h \
- tandem.h
+ compat/snprintf.h ../src/main.h compat/explicit_bzero.h compat/strlcpy.h \
+ modules.h mod/modvals.h tandem.h
 users.o: users.c main.h ../config.h ../eggint.h ../lush.h lang.h \
  eggdrop.h compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h \
  tclhash.h chan.h users.h compat/compat.h compat/base64.h \
- compat/inet_aton.h ../src/main.h compat/snprintf.h \
- compat/explicit_bzero.h compat/strlcpy.h modules.h mod/modvals.h \
- tandem.h
+ compat/snprintf.h ../src/main.h compat/explicit_bzero.h compat/strlcpy.h \
+ modules.h mod/modvals.h tandem.h
diff --git a/src/compat/Makefile.in b/src/compat/Makefile.in
index c431ee491..cdc7a63b7 100644
--- a/src/compat/Makefile.in
+++ b/src/compat/Makefile.in
@@ -17,7 +17,7 @@ STRIP = @STRIP@
 CFLAGS = @CFLAGS@ -I../.. -I$(top_srcdir) -I$(top_srcdir)/src @SSL_INCLUDES@ @DEFS@ $(CFLGS)
 CPPFLAGS = @CPPFLAGS@
 
-OBJS = base64.o explicit_bzero.o in6.o inet_aton.o snprintf.o strlcpy.o
+OBJS = base64.o explicit_bzero.o in6.o snprintf.o strlcpy.o
 
 doofus:
 	@echo ""
@@ -43,20 +43,11 @@ compat: $(OBJS)
 base64.o: base64.c ../../config.h
 explicit_bzero.o: explicit_bzero.c ../../config.h
 in6.o: in6.c in6.h
-inet_aton.o: inet_aton.c ../../src/main.h ../../config.h ../../eggint.h \
- ../../lush.h ../../src/lang.h ../../src/eggdrop.h ../../src/compat/in6.h \
- ../../src/flags.h ../../src/proto.h ../../src/misc_file.h \
- ../../src/cmdt.h ../../src/tclegg.h ../../src/tclhash.h ../../src/chan.h \
- ../../src/users.h ../../src/compat/compat.h ../../src/compat/base64.h \
- ../../src/compat/inet_aton.h ../../src/main.h \
- ../../src/compat/snprintf.h ../../src/compat/explicit_bzero.h \
- ../../src/compat/strlcpy.h inet_aton.h
 snprintf.o: snprintf.c ../../src/main.h ../../config.h ../../eggint.h \
  ../../lush.h ../../src/lang.h ../../src/eggdrop.h ../../src/compat/in6.h \
  ../../src/flags.h ../../src/proto.h ../../src/misc_file.h \
  ../../src/cmdt.h ../../src/tclegg.h ../../src/tclhash.h ../../src/chan.h \
  ../../src/users.h ../../src/compat/compat.h ../../src/compat/base64.h \
- ../../src/compat/inet_aton.h ../../src/main.h \
- ../../src/compat/snprintf.h ../../src/compat/explicit_bzero.h \
- ../../src/compat/strlcpy.h snprintf.h
+ ../../src/compat/snprintf.h ../../src/main.h \
+ ../../src/compat/explicit_bzero.h ../../src/compat/strlcpy.h snprintf.h
 strlcpy.o: strlcpy.c ../../config.h
diff --git a/src/compat/compat.h b/src/compat/compat.h
index 6294c6711..f0cfaf3cd 100644
--- a/src/compat/compat.h
+++ b/src/compat/compat.h
@@ -24,7 +24,6 @@
 #define _EGG_COMPAT_COMPAT_H
 
 #include "base64.h"
-#include "inet_aton.h"
 #include "snprintf.h"
 #include "explicit_bzero.h"
 #include "strlcpy.h"
diff --git a/src/compat/inet_aton.c b/src/compat/inet_aton.c
deleted file mode 100644
index cb471b287..000000000
--- a/src/compat/inet_aton.c
+++ /dev/null
@@ -1,204 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * inet_aton.c -- provides inet_aton() if necessary.
- *
- * Portions Copyright (C) 2000 - 2024 Eggheads Development Team
- */
-
-#include "main.h"
-#include "inet_aton.h"
-
-#ifndef HAVE_ISASCII
-#  define inet_isascii(x) 1 /* Let checks succeed if we don't have isascii(). */
-#else
-#  define inet_isascii(x) egg_isascii(x)
-#endif
-
-#ifndef HAVE_INET_ATON
-/*-
- * SPDX-License-Identifier: (BSD-3-Clause AND ISC)
- *
- * Copyright (c) 1983, 1990, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)inet_addr.c  8.1 (Berkeley) 6/17/93";
-static const char rcsid[] = "$Id: inet_addr.c,v 1.5 2005/04/27 04:56:19 sra Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <ctype.h>
-
-/*
- * Check whether "cp" is a valid ascii representation
- * of an Internet address and convert to a binary address.
- * Returns 1 if the address is valid, 0 if not.
- * This replaces inet_addr, the return value from which
- * cannot distinguish between failure and a local broadcast address.
- */
-int egg_inet_aton(const char *cp, struct in_addr *addr) {
-  u_long val;
-  int base, n;
-  char c;
-  u_int8_t parts[4];
-  u_int8_t *pp = parts;
-  int digit;
-
-  c = *cp;
-  for (;;) {
-    /*
-     * Collect number up to ``.''.
-     * Values are specified as for C:
-     * 0x=hex, 0=octal, isdigit=decimal.
-     */
-    if (!isdigit((unsigned char)c))
-      return (0);
-    val = 0; base = 10; digit = 0;
-    if (c == '0') {
-      c = *++cp;
-      if (c == 'x' || c == 'X')
-        base = 16, c = *++cp;
-      else {
-        base = 8;
-        digit = 1 ;
-      }
-    }
-    for (;;) {
-      if (isascii(c) && isdigit((unsigned char)c)) {
-        if (base == 8 && (c == '8' || c == '9'))
-          return (0);
-        val = (val * base) + (c - '0');
-        c = *++cp;
-        digit = 1;
-      } else if (base == 16 && isascii(c) && 
-           isxdigit((unsigned char)c)) {
-        val = (val << 4) |
-          (c + 10 - (islower((unsigned char)c) ? 'a' : 'A'));
-        c = *++cp;
-        digit = 1;
-      } else
-        break;
-    }
-    if (c == '.') {
-      /*
-       * Internet format:
-       *  a.b.c.d
-       *  a.b.c  (with c treated as 16 bits)
-       *  a.b  (with b treated as 24 bits)
-       */
-      if (pp >= parts + 3 || val > 0xffU)
-        return (0);
-      *pp++ = val;
-      c = *++cp;
-    } else
-      break;
-  }
-  /*
-   * Check for trailing characters.
-   */
-  if (c != '\0' && (!isascii(c) || !isspace((unsigned char)c)))
-    return (0);
-  /*
-   * Did we get a valid digit?
-   */
-  if (!digit)
-    return (0);
-  /*
-   * Concoct the address according to
-   * the number of parts specified.
-   */
-  n = pp - parts + 1;
-  switch (n) {
-  case 1:        /* a -- 32 bits */
-    break;
-
-  case 2:        /* a.b -- 8.24 bits */
-    if (val > 0xffffffU)
-      return (0);
-    val |= (uint32_t)parts[0] << 24;
-    break;
-
-  case 3:        /* a.b.c -- 8.8.16 bits */
-    if (val > 0xffffU)
-      return (0);
-    val |= ((uint32_t)parts[0] << 24) | (parts[1] << 16);
-    break;
-
-  case 4:        /* a.b.c.d -- 8.8.8.8 bits */
-    if (val > 0xffU)
-      return (0);
-    val |= ((uint32_t)parts[0] << 24) | (parts[1] << 16) |
-        (parts[2] << 8);
-    break;
-  }
-  if (addr != NULL)
-    addr->s_addr = htonl(val);
-  return (1);
-}
-#endif /* !HAVE_INET_ATON */
diff --git a/src/compat/inet_aton.h b/src/compat/inet_aton.h
deleted file mode 100644
index 78acf4463..000000000
--- a/src/compat/inet_aton.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * inet_aton.h
- *   prototypes for inet_aton.c
- */
-/*
- * Copyright (C) 2000 - 2024 Eggheads Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#ifndef _EGG_COMPAT_INET_ATON_H
-#define _EGG_COMPAT_INET_ATON_H
-
-#include "src/main.h"
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#ifndef HAVE_INET_ATON
-/* Use our own implementation. */
-int egg_inet_aton(const char *cp, struct in_addr *addr);
-#else
-#  define egg_inet_aton inet_aton
-#endif
-
-#endif /* !__EGG_COMPAT_INET_ATON_H */
diff --git a/src/eggdrop.h b/src/eggdrop.h
index 393de019d..9400bd308 100644
--- a/src/eggdrop.h
+++ b/src/eggdrop.h
@@ -266,6 +266,7 @@ typedef uint32_t IP;
 
 /* The following functions are for backward compatibility only */
 #define egg_bzero(dest, len) memset(dest, 0, len)
+#define egg_inet_aton(src, dst) inet_pton(AF_INET, src, dst)
 #define egg_memcpy memcpy
 #define egg_memset memset
 #define egg_strcasecmp strcasecmp
@@ -288,6 +289,7 @@ typedef int (*IntFunc) ();
 
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 
 typedef struct {
   int family;
diff --git a/src/md5/Makefile.in b/src/md5/Makefile.in
index 81fb52a98..09bb5a0ec 100644
--- a/src/md5/Makefile.in
+++ b/src/md5/Makefile.in
@@ -45,5 +45,5 @@ md5c.o: md5c.c md5.h ../../src/main.h ../../config.h ../../eggint.h \
  ../../src/flags.h ../../src/proto.h ../../src/misc_file.h \
  ../../src/cmdt.h ../../src/tclegg.h ../../src/tclhash.h ../../src/chan.h \
  ../../src/users.h ../../src/compat/compat.h ../../src/compat/base64.h \
- ../../src/compat/inet_aton.h ../../src/compat/snprintf.h \
- ../../src/compat/explicit_bzero.h ../../src/compat/strlcpy.h
+ ../../src/compat/snprintf.h ../../src/compat/explicit_bzero.h \
+ ../../src/compat/strlcpy.h
diff --git a/src/mod/assoc.mod/Makefile b/src/mod/assoc.mod/Makefile
index 5bc160183..2d6cfb929 100644
--- a/src/mod/assoc.mod/Makefile
+++ b/src/mod/assoc.mod/Makefile
@@ -34,6 +34,6 @@ distclean: clean
  ../../../src/flags.h ../../../src/cmdt.h ../../../src/tclegg.h \
  ../../../src/tclhash.h ../../../src/chan.h ../../../src/users.h \
  ../../../src/compat/compat.h ../../../src/compat/base64.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/snprintf.h \
- ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \
- ../../../src/mod/modvals.h ../../../src/tandem.h .././assoc.mod/assoc.h
+ ../../../src/compat/snprintf.h ../../../src/compat/explicit_bzero.h \
+ ../../../src/compat/strlcpy.h ../../../src/mod/modvals.h \
+ ../../../src/tandem.h .././assoc.mod/assoc.h
diff --git a/src/mod/blowfish.mod/Makefile b/src/mod/blowfish.mod/Makefile
index 64b1e7344..3512367a1 100644
--- a/src/mod/blowfish.mod/Makefile
+++ b/src/mod/blowfish.mod/Makefile
@@ -34,7 +34,7 @@ distclean: clean
  ../../../src/flags.h ../../../src/cmdt.h ../../../src/tclegg.h \
  ../../../src/tclhash.h ../../../src/chan.h ../../../src/users.h \
  ../../../src/compat/compat.h ../../../src/compat/base64.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/snprintf.h \
- ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \
- ../../../src/mod/modvals.h ../../../src/tandem.h \
- .././blowfish.mod/blowfish.h .././blowfish.mod/bf_tab.h
+ ../../../src/compat/snprintf.h ../../../src/compat/explicit_bzero.h \
+ ../../../src/compat/strlcpy.h ../../../src/mod/modvals.h \
+ ../../../src/tandem.h .././blowfish.mod/blowfish.h \
+ .././blowfish.mod/bf_tab.h
diff --git a/src/mod/channels.mod/Makefile b/src/mod/channels.mod/Makefile
index b53d568cd..abf25701d 100644
--- a/src/mod/channels.mod/Makefile
+++ b/src/mod/channels.mod/Makefile
@@ -34,9 +34,8 @@ distclean: clean
  ../../../src/flags.h ../../../src/cmdt.h ../../../src/tclegg.h \
  ../../../src/tclhash.h ../../../src/chan.h ../../../src/users.h \
  ../../../src/compat/compat.h ../../../src/compat/base64.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/snprintf.h \
- ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \
- ../../../src/mod/modvals.h ../../../src/tandem.h \
- .././channels.mod/channels.h .././channels.mod/cmdschan.c \
- .././channels.mod/tclchan.c .././channels.mod/userchan.c \
- .././channels.mod/udefchan.c
+ ../../../src/compat/snprintf.h ../../../src/compat/explicit_bzero.h \
+ ../../../src/compat/strlcpy.h ../../../src/mod/modvals.h \
+ ../../../src/tandem.h .././channels.mod/channels.h \
+ .././channels.mod/cmdschan.c .././channels.mod/tclchan.c \
+ .././channels.mod/userchan.c .././channels.mod/udefchan.c
diff --git a/src/mod/compress.mod/Makefile.in b/src/mod/compress.mod/Makefile.in
index fb02da4f3..0c25675d5 100644
--- a/src/mod/compress.mod/Makefile.in
+++ b/src/mod/compress.mod/Makefile.in
@@ -38,8 +38,7 @@ distclean: clean
  ../../../src/flags.h ../../../src/cmdt.h ../../../src/tclegg.h \
  ../../../src/tclhash.h ../../../src/chan.h ../../../src/users.h \
  ../../../src/compat/compat.h ../../../src/compat/base64.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/snprintf.h \
- ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \
- ../../../src/mod/modvals.h ../../../src/tandem.h \
- ../../../src/mod/share.mod/share.h .././compress.mod/compress.h \
- .././compress.mod/tclcompress.c
+ ../../../src/compat/snprintf.h ../../../src/compat/explicit_bzero.h \
+ ../../../src/compat/strlcpy.h ../../../src/mod/modvals.h \
+ ../../../src/tandem.h ../../../src/mod/share.mod/share.h \
+ .././compress.mod/compress.h .././compress.mod/tclcompress.c
diff --git a/src/mod/console.mod/Makefile b/src/mod/console.mod/Makefile
index a678d1176..dd520e542 100644
--- a/src/mod/console.mod/Makefile
+++ b/src/mod/console.mod/Makefile
@@ -34,7 +34,6 @@ distclean: clean
  ../../../src/flags.h ../../../src/cmdt.h ../../../src/tclegg.h \
  ../../../src/tclhash.h ../../../src/chan.h ../../../src/users.h \
  ../../../src/compat/compat.h ../../../src/compat/base64.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/snprintf.h \
- ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \
- ../../../src/mod/modvals.h ../../../src/tandem.h \
- .././console.mod/console.h
+ ../../../src/compat/snprintf.h ../../../src/compat/explicit_bzero.h \
+ ../../../src/compat/strlcpy.h ../../../src/mod/modvals.h \
+ ../../../src/tandem.h .././console.mod/console.h
diff --git a/src/mod/ctcp.mod/Makefile b/src/mod/ctcp.mod/Makefile
index dec8c9d97..c28ab011b 100644
--- a/src/mod/ctcp.mod/Makefile
+++ b/src/mod/ctcp.mod/Makefile
@@ -34,7 +34,7 @@ distclean: clean
  ../../../src/eggdrop.h ../../../src/compat/in6.h ../../../src/flags.h \
  ../../../src/cmdt.h ../../../src/tclegg.h ../../../src/tclhash.h \
  ../../../src/chan.h ../../../src/users.h ../../../src/compat/compat.h \
- ../../../src/compat/base64.h ../../../src/compat/inet_aton.h \
- ../../../src/compat/snprintf.h ../../../src/compat/explicit_bzero.h \
- ../../../src/compat/strlcpy.h ../../../src/mod/modvals.h \
- ../../../src/tandem.h ../../../src/mod/server.mod/server.h
+ ../../../src/compat/base64.h ../../../src/compat/snprintf.h \
+ ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \
+ ../../../src/mod/modvals.h ../../../src/tandem.h \
+ ../../../src/mod/server.mod/server.h
diff --git a/src/mod/dns.mod/Makefile.in b/src/mod/dns.mod/Makefile.in
index b2508d6a9..a74014703 100644
--- a/src/mod/dns.mod/Makefile.in
+++ b/src/mod/dns.mod/Makefile.in
@@ -39,6 +39,6 @@ distclean: clean
  ../../../src/flags.h ../../../src/cmdt.h ../../../src/tclegg.h \
  ../../../src/tclhash.h ../../../src/chan.h ../../../src/users.h \
  ../../../src/compat/compat.h ../../../src/compat/base64.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/snprintf.h \
- ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \
- ../../../src/mod/modvals.h ../../../src/tandem.h
+ ../../../src/compat/snprintf.h ../../../src/compat/explicit_bzero.h \
+ ../../../src/compat/strlcpy.h ../../../src/mod/modvals.h \
+ ../../../src/tandem.h
diff --git a/src/mod/dns.mod/dns.c b/src/mod/dns.mod/dns.c
index e60621aa0..dab82b1ec 100644
--- a/src/mod/dns.mod/dns.c
+++ b/src/mod/dns.mod/dns.c
@@ -181,7 +181,7 @@ static char *dns_change(ClientData cdata, Tcl_Interp *irp,
       } else
         port = NAMESERVER_PORT; /* port 53 */
       /* Ignore invalid addresses */
-      if (egg_inet_aton(list[i], &myres.nsaddr_list[myres.nscount].sin_addr)) {
+      if (inet_pton(AF_INET, list[i], &myres.nsaddr_list[myres.nscount].sin_addr)) {
         myres.nsaddr_list[myres.nscount].sin_port = htons(port);
         myres.nsaddr_list[myres.nscount].sin_family = AF_INET;
         myres.nscount++;
diff --git a/src/mod/filesys.mod/Makefile b/src/mod/filesys.mod/Makefile
index f1a7e1309..63c8f4ab4 100644
--- a/src/mod/filesys.mod/Makefile
+++ b/src/mod/filesys.mod/Makefile
@@ -34,12 +34,12 @@ distclean: clean
  ../../../src/flags.h ../../../src/cmdt.h ../../../src/tclegg.h \
  ../../../src/tclhash.h ../../../src/chan.h ../../../src/users.h \
  ../../../src/compat/compat.h ../../../src/compat/base64.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/snprintf.h \
- ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \
- ../../../src/mod/modvals.h ../../../src/tandem.h \
- .././filesys.mod/filedb3.h .././filesys.mod/filesys.h \
- ../../../src/lang.h ../../../src/mod/transfer.mod/transfer.h \
- .././filesys.mod/files.h .././filesys.mod/dbcompat.h \
- .././filesys.mod/filelist.h .././filesys.mod/files.c ../../../src/stat.h \
- .././filesys.mod/filedb3.c .././filesys.mod/tclfiles.c \
- .././filesys.mod/dbcompat.c .././filesys.mod/filelist.c
+ ../../../src/compat/snprintf.h ../../../src/compat/explicit_bzero.h \
+ ../../../src/compat/strlcpy.h ../../../src/mod/modvals.h \
+ ../../../src/tandem.h .././filesys.mod/filedb3.h \
+ .././filesys.mod/filesys.h ../../../src/lang.h \
+ ../../../src/mod/transfer.mod/transfer.h .././filesys.mod/files.h \
+ .././filesys.mod/dbcompat.h .././filesys.mod/filelist.h \
+ .././filesys.mod/files.c ../../../src/stat.h .././filesys.mod/filedb3.c \
+ .././filesys.mod/tclfiles.c .././filesys.mod/dbcompat.c \
+ .././filesys.mod/filelist.c
diff --git a/src/mod/ident.mod/Makefile b/src/mod/ident.mod/Makefile
index 071e7ef01..3063bfd3f 100644
--- a/src/mod/ident.mod/Makefile
+++ b/src/mod/ident.mod/Makefile
@@ -34,7 +34,6 @@ distclean: clean
  ../../../src/flags.h ../../../src/cmdt.h ../../../src/tclegg.h \
  ../../../src/tclhash.h ../../../src/chan.h ../../../src/users.h \
  ../../../src/compat/compat.h ../../../src/compat/base64.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/snprintf.h \
- ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \
- ../../../src/mod/modvals.h ../../../src/tandem.h \
- ../../../src/mod/server.mod/server.h
+ ../../../src/compat/snprintf.h ../../../src/compat/explicit_bzero.h \
+ ../../../src/compat/strlcpy.h ../../../src/mod/modvals.h \
+ ../../../src/tandem.h ../../../src/mod/server.mod/server.h
diff --git a/src/mod/irc.mod/Makefile b/src/mod/irc.mod/Makefile
index 8a17bf80c..7c2cb055a 100644
--- a/src/mod/irc.mod/Makefile
+++ b/src/mod/irc.mod/Makefile
@@ -34,9 +34,9 @@ distclean: clean
  ../../../src/flags.h ../../../src/cmdt.h ../../../src/tclegg.h \
  ../../../src/tclhash.h ../../../src/chan.h ../../../src/users.h \
  ../../../src/compat/compat.h ../../../src/compat/base64.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/snprintf.h \
- ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \
- ../../../src/mod/modvals.h ../../../src/tandem.h .././irc.mod/irc.h \
+ ../../../src/compat/snprintf.h ../../../src/compat/explicit_bzero.h \
+ ../../../src/compat/strlcpy.h ../../../src/mod/modvals.h \
+ ../../../src/tandem.h .././irc.mod/irc.h \
  ../../../src/mod/server.mod/server.h \
  ../../../src/mod/channels.mod/channels.h .././irc.mod/chan.c \
  .././irc.mod/mode.c .././irc.mod/cmdsirc.c .././irc.mod/msgcmds.c \
diff --git a/src/mod/module.h b/src/mod/module.h
index 41f74e5d1..1b60a4ff1 100644
--- a/src/mod/module.h
+++ b/src/mod/module.h
@@ -60,9 +60,6 @@
 #undef Assert
 
 /* Compatibility functions. */
-#ifdef egg_inet_aton
-#  undef egg_inet_aton
-#endif
 #ifdef egg_vsnprintf
 #  undef egg_vsnprintf
 #endif
@@ -422,7 +419,7 @@ typedef void (*chanout_butfunc)(int, int, const char *, ...) ATTRIBUTE_FORMAT(pr
 #define sock_has_data ((int(*)(int, int))global[248])
 #define bots_in_subtree ((int (*)(tand_t *))global[249])
 #define users_in_subtree ((int (*)(tand_t *))global[250])
-#define egg_inet_aton ((int (*)(const char *cp, struct in_addr *addr))global[251])
+/* was egg_inet_aton -- use inet_pton() instead */
 /* 252 - 255 */
 #define egg_snprintf (global[252])
 #define egg_vsnprintf ((int (*)(char *, size_t, const char *, va_list))global[253])
diff --git a/src/mod/notes.mod/Makefile b/src/mod/notes.mod/Makefile
index 0c3ce51a5..5613a9016 100644
--- a/src/mod/notes.mod/Makefile
+++ b/src/mod/notes.mod/Makefile
@@ -34,7 +34,6 @@ distclean: clean
  ../../../src/flags.h ../../../src/cmdt.h ../../../src/tclegg.h \
  ../../../src/tclhash.h ../../../src/chan.h ../../../src/users.h \
  ../../../src/compat/compat.h ../../../src/compat/base64.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/snprintf.h \
- ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \
- ../../../src/mod/modvals.h ../../../src/tandem.h .././notes.mod/notes.h \
- .././notes.mod/cmdsnote.c
+ ../../../src/compat/snprintf.h ../../../src/compat/explicit_bzero.h \
+ ../../../src/compat/strlcpy.h ../../../src/mod/modvals.h \
+ ../../../src/tandem.h .././notes.mod/notes.h .././notes.mod/cmdsnote.c
diff --git a/src/mod/pbkdf2.mod/Makefile b/src/mod/pbkdf2.mod/Makefile
index 38e70d0fe..338ac6935 100644
--- a/src/mod/pbkdf2.mod/Makefile
+++ b/src/mod/pbkdf2.mod/Makefile
@@ -34,7 +34,6 @@ distclean: clean
  ../../../src/flags.h ../../../src/cmdt.h ../../../src/tclegg.h \
  ../../../src/tclhash.h ../../../src/chan.h ../../../src/users.h \
  ../../../src/compat/compat.h ../../../src/compat/base64.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/snprintf.h \
- ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \
- ../../../src/mod/modvals.h ../../../src/tandem.h \
- .././pbkdf2.mod/tclpbkdf2.c
+ ../../../src/compat/snprintf.h ../../../src/compat/explicit_bzero.h \
+ ../../../src/compat/strlcpy.h ../../../src/mod/modvals.h \
+ ../../../src/tandem.h .././pbkdf2.mod/tclpbkdf2.c
diff --git a/src/mod/python.mod/Makefile.in b/src/mod/python.mod/Makefile.in
index b7282f311..f3147ae2d 100644
--- a/src/mod/python.mod/Makefile.in
+++ b/src/mod/python.mod/Makefile.in
@@ -38,8 +38,8 @@ distclean: clean
  ../../../src/flags.h ../../../src/cmdt.h ../../../src/tclegg.h \
  ../../../src/tclhash.h ../../../src/chan.h ../../../src/users.h \
  ../../../src/compat/compat.h ../../../src/compat/base64.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/snprintf.h \
- ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \
- ../../../src/mod/modvals.h ../../../src/tandem.h \
- ../../../src/mod/server.mod/server.h .././python.mod/python.h \
- .././python.mod/pycmds.c .././python.mod/tclpython.c
+ ../../../src/compat/snprintf.h ../../../src/compat/explicit_bzero.h \
+ ../../../src/compat/strlcpy.h ../../../src/mod/modvals.h \
+ ../../../src/tandem.h ../../../src/mod/server.mod/server.h \
+ .././python.mod/python.h .././python.mod/pycmds.c \
+ .././python.mod/tclpython.c
diff --git a/src/mod/seen.mod/Makefile b/src/mod/seen.mod/Makefile
index bcf2454c0..3a78e1345 100644
--- a/src/mod/seen.mod/Makefile
+++ b/src/mod/seen.mod/Makefile
@@ -34,7 +34,7 @@ distclean: clean
  ../../../src/flags.h ../../../src/cmdt.h ../../../src/tclegg.h \
  ../../../src/tclhash.h ../../../src/chan.h ../../../src/users.h \
  ../../../src/compat/compat.h ../../../src/compat/base64.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/snprintf.h \
- ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \
- ../../../src/mod/modvals.h ../../../src/tandem.h ../../../src/users.h \
- ../../../src/chan.h ../../../src/mod/channels.mod/channels.h
+ ../../../src/compat/snprintf.h ../../../src/compat/explicit_bzero.h \
+ ../../../src/compat/strlcpy.h ../../../src/mod/modvals.h \
+ ../../../src/tandem.h ../../../src/users.h ../../../src/chan.h \
+ ../../../src/mod/channels.mod/channels.h
diff --git a/src/mod/server.mod/Makefile b/src/mod/server.mod/Makefile
index 1b26a1043..c7350089e 100644
--- a/src/mod/server.mod/Makefile
+++ b/src/mod/server.mod/Makefile
@@ -34,11 +34,10 @@ distclean: clean
  ../../../src/flags.h ../../../src/cmdt.h ../../../src/tclegg.h \
  ../../../src/tclhash.h ../../../src/chan.h ../../../src/users.h \
  ../../../src/compat/compat.h ../../../src/compat/base64.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/snprintf.h \
- ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \
- ../../../src/mod/modvals.h ../../../src/tandem.h \
- .././server.mod/server.h .././server.mod/isupport.c \
- .././server.mod/tclisupport.c .././server.mod/servmsg.c \
- .././server.mod/../irc.mod/irc.h \
+ ../../../src/compat/snprintf.h ../../../src/compat/explicit_bzero.h \
+ ../../../src/compat/strlcpy.h ../../../src/mod/modvals.h \
+ ../../../src/tandem.h .././server.mod/server.h \
+ .././server.mod/isupport.c .././server.mod/tclisupport.c \
+ .././server.mod/servmsg.c .././server.mod/../irc.mod/irc.h \
  .././server.mod/../channels.mod/channels.h .././server.mod/cmdsserv.c \
  .././server.mod/tclserv.c
diff --git a/src/mod/share.mod/Makefile b/src/mod/share.mod/Makefile
index 5543e3570..6117eaf22 100644
--- a/src/mod/share.mod/Makefile
+++ b/src/mod/share.mod/Makefile
@@ -34,9 +34,9 @@ distclean: clean
  ../../../src/flags.h ../../../src/cmdt.h ../../../src/tclegg.h \
  ../../../src/tclhash.h ../../../src/chan.h ../../../src/users.h \
  ../../../src/compat/compat.h ../../../src/compat/base64.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/snprintf.h \
- ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \
- ../../../src/mod/modvals.h ../../../src/tandem.h ../../../src/chan.h \
- ../../../src/users.h ../../../src/mod/transfer.mod/transfer.h \
+ ../../../src/compat/snprintf.h ../../../src/compat/explicit_bzero.h \
+ ../../../src/compat/strlcpy.h ../../../src/mod/modvals.h \
+ ../../../src/tandem.h ../../../src/chan.h ../../../src/users.h \
+ ../../../src/mod/transfer.mod/transfer.h \
  ../../../src/mod/channels.mod/channels.h .././share.mod/share.h \
  .././share.mod/uf_features.c
diff --git a/src/mod/transfer.mod/Makefile b/src/mod/transfer.mod/Makefile
index 21de50e84..eb4062bf2 100644
--- a/src/mod/transfer.mod/Makefile
+++ b/src/mod/transfer.mod/Makefile
@@ -34,8 +34,8 @@ distclean: clean
  ../../../src/flags.h ../../../src/cmdt.h ../../../src/tclegg.h \
  ../../../src/tclhash.h ../../../src/chan.h ../../../src/users.h \
  ../../../src/compat/compat.h ../../../src/compat/base64.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/snprintf.h \
- ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \
- ../../../src/mod/modvals.h ../../../src/tandem.h ../../../src/users.h \
- .././transfer.mod/transfer.h .././transfer.mod/transferfstat.c \
- .././transfer.mod/transferqueue.c .././transfer.mod/tcltransfer.c
+ ../../../src/compat/snprintf.h ../../../src/compat/explicit_bzero.h \
+ ../../../src/compat/strlcpy.h ../../../src/mod/modvals.h \
+ ../../../src/tandem.h ../../../src/users.h .././transfer.mod/transfer.h \
+ .././transfer.mod/transferfstat.c .././transfer.mod/transferqueue.c \
+ .././transfer.mod/tcltransfer.c
diff --git a/src/mod/twitch.mod/Makefile b/src/mod/twitch.mod/Makefile
index 3477b6281..939ece49c 100644
--- a/src/mod/twitch.mod/Makefile
+++ b/src/mod/twitch.mod/Makefile
@@ -34,8 +34,7 @@ distclean: clean
  ../../../src/flags.h ../../../src/cmdt.h ../../../src/tclegg.h \
  ../../../src/tclhash.h ../../../src/chan.h ../../../src/users.h \
  ../../../src/compat/compat.h ../../../src/compat/base64.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/snprintf.h \
- ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \
- ../../../src/mod/modvals.h ../../../src/tandem.h \
- ../../../src/mod/twitch.mod/twitch.h \
+ ../../../src/compat/snprintf.h ../../../src/compat/explicit_bzero.h \
+ ../../../src/compat/strlcpy.h ../../../src/mod/modvals.h \
+ ../../../src/tandem.h ../../../src/mod/twitch.mod/twitch.h \
  ../../../src/mod/server.mod/server.h
diff --git a/src/mod/uptime.mod/Makefile b/src/mod/uptime.mod/Makefile
index ff49761a4..0563a3b7c 100644
--- a/src/mod/uptime.mod/Makefile
+++ b/src/mod/uptime.mod/Makefile
@@ -33,7 +33,7 @@ distclean: clean
  ../../../src/eggdrop.h ../../../src/compat/in6.h ../../../src/flags.h \
  ../../../src/cmdt.h ../../../src/tclegg.h ../../../src/tclhash.h \
  ../../../src/chan.h ../../../src/users.h ../../../src/compat/compat.h \
- ../../../src/compat/base64.h ../../../src/compat/inet_aton.h \
- ../../../src/compat/snprintf.h ../../../src/compat/explicit_bzero.h \
- ../../../src/compat/strlcpy.h .././uptime.mod/../modvals.h \
- ../../../src/tandem.h .././uptime.mod/../server.mod/server.h
+ ../../../src/compat/base64.h ../../../src/compat/snprintf.h \
+ ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \
+ .././uptime.mod/../modvals.h ../../../src/tandem.h \
+ .././uptime.mod/../server.mod/server.h
diff --git a/src/mod/woobie.mod/Makefile b/src/mod/woobie.mod/Makefile
index 9ce22150a..5d4a02b55 100644
--- a/src/mod/woobie.mod/Makefile
+++ b/src/mod/woobie.mod/Makefile
@@ -33,7 +33,6 @@ distclean: clean
  ../../../src/eggdrop.h ../../../src/compat/in6.h ../../../src/flags.h \
  ../../../src/cmdt.h ../../../src/tclegg.h ../../../src/tclhash.h \
  ../../../src/chan.h ../../../src/users.h ../../../src/compat/compat.h \
- ../../../src/compat/base64.h ../../../src/compat/inet_aton.h \
- ../../../src/compat/snprintf.h ../../../src/compat/explicit_bzero.h \
- ../../../src/compat/strlcpy.h ../../../src/mod/modvals.h \
- ../../../src/tandem.h
+ ../../../src/compat/base64.h ../../../src/compat/snprintf.h \
+ ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \
+ ../../../src/mod/modvals.h ../../../src/tandem.h
diff --git a/src/modules.c b/src/modules.c
index 5c703a298..dcf64ccb6 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -515,7 +515,7 @@ Function global_table[] = {
   (Function) sock_has_data,
   (Function) bots_in_subtree,
   (Function) users_in_subtree,
-  (Function) egg_inet_aton,
+  (Function) 0,                   /* was egg_inet_aton -- use inet_pton() instead */
   /* 252 - 255 */
   (Function) egg_snprintf,
   (Function) egg_vsnprintf,