--- tools/purge/purge.cc.orig   2017-06-12 08:33:35 -0500
+++ tools/purge/purge.cc        2017-06-12 08:34:44 -0500
@@ -121,6 +121,7 @@
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 #include <netdb.h>
+#include "../../compat/psignal.c"

 #include "conffile.hh"
 #include "convert.hh"

--- tools/squidclient/Transport.cc.orig	2018-03-13 06:48:04 -0400
+++ tools/squidclient/Transport.cc	2018-03-09 05:08:18 -0500
@@ -11,6 +11,7 @@
 #include "ip/tools.h"
 #include "tools/squidclient/Ping.h"
 #include "tools/squidclient/Transport.h"
+#include "../../getopt_long.c"
 
 #if HAVE_GETOPT_H
 #include <getopt.h>
--- tools/squidclient/Ping.cc.orig	2018-03-13 06:48:20 -0400
+++ tools/squidclient/Ping.cc	2018-03-09 06:40:07 -0500
@@ -10,6 +10,7 @@
 #include "SquidTime.h"
 #include "tools/squidclient/Parameters.h"
 #include "tools/squidclient/Ping.h"
+#include "../../getopt_long.c"
 
 #include <climits>
 #include <csignal>
--- tools/squidclient/squidclient.cc.orig	2018-03-13 06:57:00 -0400
+++ tools/squidclient/squidclient.cc	2018-03-13 06:47:41 -0400
@@ -15,6 +15,8 @@
 #include "tools/squidclient/Parameters.h"
 #include "tools/squidclient/Ping.h"
 #include "tools/squidclient/Transport.h"
+#include "../../getopt_long.c"
+#include "../../src/fde.h"
 
 #if _SQUID_WINDOWS_
 /** \cond AUTODOCS-IGNORE */

--- src/CommandLine.h.orig	2018-08-02 09:56:28 +0000
+++ src/CommandLine.h	2018-08-02 09:56:45 +0000
@@ -13,6 +13,7 @@
 #include <getopt.h>
 #endif
 #include <vector>
+#include "../getopt_long.c"
 
 typedef struct option RawLongOption;
 
--- tools/Makefile.in.orig	2018-08-08 06:47:52 +0000
+++ tools/Makefile.in	2018-08-08 06:48:20 +0000
@@ -172,7 +172,13 @@
 	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/*.$(OBJEXT) $(top_builddir)/src/DiskIO/AIO/*.$(OBJEXT) \
+	$(top_builddir)/src/DiskIO/Blocking/*.$(OBJEXT) $(top_builddir)/src/DiskIO/DiskDaemon/*.$(OBJEXT) \
+	$(top_builddir)/src/DiskIO/*.$(OBJEXT) $(top_builddir)/src/DiskIO/DiskThreads/*.$(OBJEXT) \
+	$(top_builddir)/src/DiskIO/IpcIo/*.$(OBJEXT) $(top_builddir)/src/DiskIO/Mmapped/*.$(OBJEXT) \
+	$(top_builddir)/src/repl/lru/*.$(OBJEXT) \
+	$(top_builddir)/lib/libTrie/Trie.$(OBJEXT) $(top_builddir)/lib/libTrie/TrieNode.$(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
@@ -790,6 +796,40 @@
 	$(top_builddir)/src/ip/libip.la \
 	$(top_builddir)/lib/libmiscencoding.la \
 	$(top_builddir)/lib/libmiscutil.la \
+	$(top_builddir)/src/mem/libmem.la \
+        $(top_builddir)/src/dns/libdns.la \
+        $(top_builddir)/src/esi/libesi.la \
+        $(top_builddir)/src/sbuf/libsbuf.la \
+        $(top_builddir)/src/store/libstore.la \
+        $(top_builddir)/src/security/libsecurity.la \
+	$(top_builddir)/lib/snmplib/libsnmplib.la \
+        $(top_builddir)/src/mgr/libmgr.la \
+        $(top_builddir)/src/log/liblog.la \
+        $(top_builddir)/src/ipc/libipc.la \
+        $(top_builddir)/src/ident/libident.la \
+        $(top_builddir)/src/ftp/libftp.la \
+        $(top_builddir)/src/fs/libfs.la \
+        $(top_builddir)/src/format/libformat.la \
+        $(top_builddir)/src/eui/libeui.la \
+        $(top_builddir)/src/base/libbase.la \
+        $(top_builddir)/src/icmp/libicmp.la \
+        $(top_builddir)/src/anyp/libanyp.la \
+        $(top_builddir)/src/adaptation/libadaptation.la \
+        $(top_builddir)/src/acl/libapi.la \
+        $(top_builddir)/src/acl/libacls.la \
+        $(top_builddir)/src/acl/libstate.la \
+        $(top_builddir)/src/libsquid.la \
+        $(top_builddir)/src/clients/libclients.la \
+        $(top_builddir)/src/comm/libcomm.la \
+        $(top_builddir)/src/helper/libhelper.la \
+        $(top_builddir)/src/http/libhttp.la \
+        $(top_builddir)/src/servers/libservers.la \
+        $(top_builddir)/src/parser/libparser.la \
+        $(top_builddir)/lib/libmisccontainers.la \
+        $(top_builddir)/src/snmp/libsnmp.la \
+        $(XMLLIB) \
+        $(EXPATLIB) \
+        $(ATOMICLIB) \
 	$(COMPAT_LIB) \
 	$(NETTLELIB) \
 	$(KRB5LIBS) \
--- tools/squidclient/Makefile.in.orig	2018-08-08 07:12:42 +0000
+++ tools/squidclient/Makefile.in	2018-08-08 07:12:16 +0000
@@ -168,7 +168,12 @@
 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/*.$(OBJEXT) $(top_builddir)/src/DiskIO/AIO/*.$(OBJEXT) \
+        $(top_builddir)/src/DiskIO/Blocking/*.$(OBJEXT) $(top_builddir)/src/DiskIO/DiskDaemon/*.$(OBJEXT) \
+        $(top_builddir)/src/DiskIO/*.$(OBJEXT) $(top_builddir)/src/DiskIO/DiskThreads/*.$(OBJEXT) \
+        $(top_builddir)/src/DiskIO/IpcIo/*.$(OBJEXT) $(top_builddir)/src/DiskIO/Mmapped/*.$(OBJEXT) \
+        $(top_builddir)/src/repl/lru/*.$(OBJEXT) \
+        $(top_builddir)/lib/libTrie/Trie.$(OBJEXT) $(top_builddir)/lib/libTrie/TrieNode.$(OBJEXT)
 squidclient_OBJECTS = $(am_squidclient_OBJECTS)
 squidclient_LDADD = $(LDADD)
 @ENABLE_XPROF_STATS_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/lib/profiler/libprofiler.la
@@ -782,6 +787,40 @@
 	$(top_builddir)/src/base/libbase.la \
 	$(top_builddir)/lib/libmiscencoding.la \
 	$(top_builddir)/lib/libmiscutil.la \
+	$(top_builddir)/src/mem/libmem.la \
+        $(top_builddir)/src/dns/libdns.la \
+        $(top_builddir)/src/esi/libesi.la \
+        $(top_builddir)/src/sbuf/libsbuf.la \
+        $(top_builddir)/src/store/libstore.la \
+        $(top_builddir)/src/security/libsecurity.la \
+        $(top_builddir)/lib/snmplib/libsnmplib.la \
+        $(top_builddir)/src/mgr/libmgr.la \
+        $(top_builddir)/src/log/liblog.la \
+        $(top_builddir)/src/ipc/libipc.la \
+        $(top_builddir)/src/ident/libident.la \
+        $(top_builddir)/src/ftp/libftp.la \
+        $(top_builddir)/src/fs/libfs.la \
+        $(top_builddir)/src/format/libformat.la \
+        $(top_builddir)/src/eui/libeui.la \
+        $(top_builddir)/src/base/libbase.la \
+        $(top_builddir)/src/icmp/libicmp.la \
+        $(top_builddir)/src/anyp/libanyp.la \
+        $(top_builddir)/src/adaptation/libadaptation.la \
+        $(top_builddir)/src/acl/libapi.la \
+        $(top_builddir)/src/acl/libacls.la \
+        $(top_builddir)/src/acl/libstate.la \
+        $(top_builddir)/src/libsquid.la \
+        $(top_builddir)/src/clients/libclients.la \
+        $(top_builddir)/src/comm/libcomm.la \
+        $(top_builddir)/src/helper/libhelper.la \
+        $(top_builddir)/src/http/libhttp.la \
+        $(top_builddir)/src/servers/libservers.la \
+        $(top_builddir)/src/parser/libparser.la \
+        $(top_builddir)/lib/libmisccontainers.la \
+        $(top_builddir)/src/snmp/libsnmp.la \
+        $(XMLLIB) \
+        $(EXPATLIB) \
+        $(ATOMICLIB) \
 	$(COMPAT_LIB) \
 	$(LIBGNUTLS_LIBS) \
 	$(NETTLELIB) \