--- ./src/CommandLine.h.orig	2020-07-31 03:00:57 +0000
+++ ./src/CommandLine.h	2020-07-31 03:01:38 +0000
@@ -9,9 +9,7 @@
 #ifndef SQUID_COMMANDLINE_H
 #define SQUID_COMMANDLINE_H
 
-#if HAVE_GETOPT_H
-#include <getopt.h>
-#endif
+#include "../getopt_long.c"
 #include <vector>
 
 typedef struct option RawLongOption;
--- ./tools/squidclient/Ping.cc.orig	2020-07-31 03:15:15 +0000
+++ ./tools/squidclient/Ping.cc	2020-07-31 03:15:35 +0000
@@ -15,9 +15,7 @@
 #include <csignal>
 #include <iostream>
 
-#if HAVE_GETOPT_H
-#include <getopt.h>
-#endif
+#include "../../getopt_long.c"
 
 namespace Ping
 {
--- ./tools/squidclient/Transport.cc.orig	2020-07-31 03:22:27 +0000
+++ ./tools/squidclient/Transport.cc	2020-07-31 03:22:51 +0000
@@ -12,9 +12,7 @@
 #include "tools/squidclient/Ping.h"
 #include "tools/squidclient/Transport.h"
 
-#if HAVE_GETOPT_H
-#include <getopt.h>
-#endif
+#include "../../getopt_long.c"
 #if HAVE_GNUTLS_X509_H
 #include <gnutls/x509.h>
 #endif
--- ./tools/squidclient/squidclient.cc.orig	2020-07-31 03:20:19 +0000
+++ ./tools/squidclient/squidclient.cc	2020-07-31 03:20:48 +0000
@@ -49,9 +49,8 @@
 #if HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#if HAVE_GETOPT_H
-#include <getopt.h>
-#endif
+#include "../../getopt_long.c"
+#include "fde.h"
 
 #ifndef BUFSIZ
 #define BUFSIZ      8192
--- tools/Makefile.in.orig	2020-08-03 05:37:30 +0000
+++ tools/Makefile.in	2020-08-03 05:38:00 +0000
@@ -173,7 +173,7 @@
 	cachemgr__CGIEXT_-stub_debug.$(OBJEXT) \
 	cachemgr__CGIEXT_-stub_libmem.$(OBJEXT) \
 	cachemgr__CGIEXT_-test_tools.$(OBJEXT) \
-	cachemgr__CGIEXT_-time.$(OBJEXT)
+	cachemgr__CGIEXT_-time.$(OBJEXT) $(top_builddir)/src/ip/Address.$(OBJEXT) $(top_builddir)/src/ip/tools.$(OBJEXT)
 cachemgr__CGIEXT__OBJECTS = $(am_cachemgr__CGIEXT__OBJECTS)
 cachemgr__CGIEXT__LDADD = $(LDADD)
 @ENABLE_XPROF_STATS_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/lib/profiler/libprofiler.la
@@ -802,7 +802,6 @@
 man_MANS = cachemgr.cgi.8
 DISTCLEANFILES = 
 LDADD = \
-	$(top_builddir)/src/ip/libip.la \
 	$(top_builddir)/lib/libmiscencoding.la \
 	$(top_builddir)/lib/libmiscutil.la \
 	$(COMPAT_LIB) \
--- tools/squidclient/Makefile.in.orig	2020-08-03 05:21:40 +0000
+++ tools/squidclient/Makefile.in	2020-08-03 05:37:14 +0000
@@ -168,7 +168,7 @@
 am_squidclient_OBJECTS = gssapi_support.$(OBJEXT) Ping.$(OBJEXT) \
 	squidclient.$(OBJEXT) stub_debug.$(OBJEXT) \
 	test_tools.$(OBJEXT) stub_libmem.$(OBJEXT) time.$(OBJEXT) \
-	Transport.$(OBJEXT)
+	Transport.$(OBJEXT) $(top_builddir)/src/ip/Address.$(OBJEXT) $(top_builddir)/src/ip/tools.$(OBJEXT)
 squidclient_OBJECTS = $(am_squidclient_OBJECTS)
 squidclient_LDADD = $(LDADD)
 @ENABLE_XPROF_STATS_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/lib/profiler/libprofiler.la
@@ -786,7 +786,6 @@
 man_MANS = squidclient.1
 DISTCLEANFILES = 
 LDADD = \
-	$(top_builddir)/src/ip/libip.la \
 	$(top_builddir)/src/base/libbase.la \
 	$(top_builddir)/lib/libmiscencoding.la \
 	$(top_builddir)/lib/libmiscutil.la \