--- ./src/ip/Address.cc.orig	2024-02-25 02:51:21.130315354 +0000
+++ ./src/ip/Address.cc	2024-02-25 02:51:35.280044077 +0000
@@ -606,7 +606,7 @@
 
     // set defaults
     // Mac OS X does not emit a flag indicating the output is numeric (IP address)
-#if _SQUID_APPLE_
+#if _SQUID_APPLE_ || _AIX
     dst->ai_flags = 0;
 #else
     dst->ai_flags = AI_NUMERICHOST;
--- ./src/Makefile.in.orig	2024-02-25 03:06:56.835899988 +0000
+++ ./src/Makefile.in	2024-02-25 03:43:22.541252763 +0000
@@ -1107,7 +1107,9 @@
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 	$(AM_CXXFLAGS) $(CXXFLAGS) $(tests_testNetDb_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am_tests_testRandomUuid_OBJECTS = tests/testRandomUuid.$(OBJEXT)
+am_tests_testRandomUuid_OBJECTS = tests/testRandomUuid.$(OBJEXT) base/TextException.lo \
+	base/Here.lo base/Assure.lo base/RandomUuid.lo \
+	base/Random.lo
 nodist_tests_testRandomUuid_OBJECTS = tests/stub_debug.$(OBJEXT) \
 	tests/stub_libmem.$(OBJEXT)
 tests_testRandomUuid_OBJECTS = $(am_tests_testRandomUuid_OBJECTS) \
@@ -1422,7 +1424,15 @@
 	tests/stub_store_rebuild.$(OBJEXT) \
 	tests/stub_store_stats.$(OBJEXT) store_swapout.$(OBJEXT) \
 	tests/TestSwapDir.$(OBJEXT) tests/stub_tools.$(OBJEXT) \
-	wordlist.$(OBJEXT)
+	wordlist.$(OBJEXT) ipc/mem/Segment.lo ipc/mem/PageStack.lo \
+	ipc/StoreMap.lo ipc/ReadWriteLock.lo ipc/mem/Pages.lo \
+	ipc/mem/PagePool.lo ipc/mem/Page.lo ipc/TypedMsgHdr.lo \
+	ipc/Queue.lo ipc/StrandSearch.lo ipc/QuestionerId.lo \
+	ipc/StrandCoord.lo http/Message.lo http/ContentLengthInterpreter.lo \
+	http/RegisteredHeaders.lo http/one/Parser.lo http/StatusLine.lo \
+	http/one/ResponseParser.lo http/StatusCode.lo http/RequestMethod.lo \
+	http/MethodType.lo acl/Gadgets.lo acl/UserData.lo mgr/StoreIoAction.lo \
+	mgr/Action.lo mgr/Response.lo DiskIO/IpcIo/IpcIoFile.lo
 nodist_tests_testStore_OBJECTS = $(am__objects_15) SquidMath.$(OBJEXT) \
 	tests/stub_libtime.$(OBJEXT) swap_log_op.$(OBJEXT)
 tests_testStore_OBJECTS = $(am_tests_testStore_OBJECTS) \
#@@ -1432,7 +1442,7 @@
# 	acl/libstate.la acl/libapi.la dns/libdns.la base/libbase.la \
# 	ip/libip.la fs/libfs.la mgr/libmgr.la anyp/libanyp.la \
# 	mem/libmem.la store/libstore.la sbuf/libsbuf.la \
#-	DiskIO/libdiskio.la ipc/libipc.la \
#+	ipc/libipc.la \
# 	$(top_builddir)/lib/libmisccontainers.la \
# 	$(top_builddir)/lib/libmiscencoding.la \
# 	$(top_builddir)/lib/libmiscutil.la $(am__DEPENDENCIES_1) \
@@ -3046,9 +3056,7 @@
 	tests/stub_libmem.cc
 
 tests_testRandomUuid_LDADD = \
-	libsquid.la \
 	sbuf/libsbuf.la \
-	base/libbase.la \
 	$(LIBCPPUNIT_LIBS) \
 	$(COMPAT_LIB) \
 	$(XTRA_LIBS)
@@ -3726,23 +3734,17 @@
 
 tests_testStore_LDADD = \
 	libsquid.la \
-	http/libhttp.la \
 	parser/libparser.la \
 	ident/libident.la \
-	acl/libacls.la \
 	acl/libstate.la \
 	acl/libapi.la \
 	dns/libdns.la \
 	base/libbase.la \
 	ip/libip.la \
-	fs/libfs.la \
-	mgr/libmgr.la \
 	anyp/libanyp.la \
 	mem/libmem.la \
 	store/libstore.la \
 	sbuf/libsbuf.la \
-	DiskIO/libdiskio.la \
-	ipc/libipc.la \
 	$(top_builddir)/lib/libmisccontainers.la \
 	$(top_builddir)/lib/libmiscencoding.la \
 	$(top_builddir)/lib/libmiscutil.la \