[#64,!35] Restored work

    Restored cummulative work.

23 files changed, 17 insertions, 2892 deletions

diff --git a/includes/Makefile.in b/includes/Makefile.in
index 3bfe6a80..09125f9e 100644
--- a/includes/Makefile.in
+++ b/includes/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -324,8 +324,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -428,7 +428,10 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
diff --git a/includes/cf/aix.h b/includes/cf/aix.h
deleted file mode 100644
index 67b05f62..00000000
--- a/includes/cf/aix.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* aix.h 
-
-   Configuration file for IBM's AIX operating system. */
-
-/*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-2003 by Internet Software Consortium
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * 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.
- *
- *   Internet Systems Consortium, Inc.
- *   950 Charter Street
- *   Redwood City, CA 94063
- *   <info@isc.org>
- *   https://www.isc.org/
- *
- */
-
-#define int8_t		char
-#define int16_t		short
-#define int32_t		long
-
-#define u_int8_t	unsigned char
-#define u_int16_t	unsigned short 
-#define u_int32_t	unsigned long 
-
-#include <sys/types.h>
-
-#include <syslog.h>
-
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/select.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <setjmp.h>
-#include <limits.h>
-
-#if !defined (h_errno)	/* It's a macro on newer instances of AIX. */
-extern int h_errno;
-#endif
-
-#include <net/if.h>
-#include <net/if_arp.h>
-#include <net/if_dl.h>
-
-#ifndef _PATH_DHCPD_PID
-#define _PATH_DHCPD_PID	"/etc/dhcpd.pid"
-#endif
-#ifndef _PATH_DHCPD6_PID
-#define _PATH_DHCPD6_PID "/etc/dhcpd6.pid"
-#endif
-#ifndef _PATH_DHCLIENT_PID
-#define _PATH_DHCLIENT_PID "/etc/dhclient.pid"
-#endif
-#ifndef _PATH_DHCLIENT6_PID
-#define _PATH_DHCLIENT6_PID "/etc/dhclient6.pid"
-#endif
-#ifndef _PATH_DHCRELAY_PID
-#define _PATH_DHCRELAY_PID "/etc/dhcrelay.pid"
-#endif
-
-#include <stdarg.h>
-#define VA_DOTDOTDOT ...
-#define VA_start(list, last) va_start (list)
-#define va_dcl
-
-/* The vsnprint function definition in /usr/include/ appears to use this
- * as a key for whether or not it should be declared.  Seems reasoanble for
- * us to use the same key.
- */
-#if (_XOPEN_SOURCE != 500)
-#define NO_SNPRINTF
-#endif
-
-#define EOL '\n'
-#define VOIDPTR void *
-
-#include <time.h>
-
-#define TIME time_t
-#define GET_TIME(x)	time ((x))
-
-#define random	rand
-
-#define USE_SOCKETS	1
-#define HAVE_SA_LEN	1
-#undef FDDI
-
-#ifdef NEED_PRAND_CONF
-const char *cmds[] = {
-	"/bin/ps -ef 2>&1",
-	"/usr/bin/netstat -an 2>&1",
-	"/bin/df  2>&1",
-	"/usr/bin/uptime  2>&1",
-	"/usr/bin/printenv  2>&1",
-	"/usr/bin/netstat -s 2>&1",
-	"/usr/bin/w  2>&1",
-	NULL
-};
-
-const char *dirs[] = {
-	"/tmp",
-	"/var/tmp",
-	".",
-	"/",
-	"/var/spool",
-	"/var/adm",
-	"/dev",
-	"/var/spool/mail",
-	"/home",
-	NULL
-};
-
-const char *files[] = {
-	"/var/adm/wtmp",
-	NULL
-};
-#endif /* NEED_PRAND_CONF */
diff --git a/includes/cf/alphaosf.h b/includes/cf/alphaosf.h
deleted file mode 100644
index f2689369..00000000
--- a/includes/cf/alphaosf.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* alphaosf.h
-
-   System dependencies for DEC Alpha/OSF1... */
-
-/*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-2003 by Internet Software Consortium
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * 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.
- *
- *   Internet Systems Consortium, Inc.
- *   950 Charter Street
- *   Redwood City, CA 94063
- *   <info@isc.org>
- *   https://www.isc.org/
- *
- */
-
-#include <syslog.h>
-#include <sys/types.h>
-#include <string.h>
-#include <paths.h>
-#include <errno.h>
-#include <malloc.h>
-#include <unistd.h>
-#include <setjmp.h>
-#include <limits.h>
-
-#include <sys/wait.h>
-#include <signal.h>
-
-extern int h_errno;
-
-#include <net/if.h>
-#include <net/if_dl.h>
-
-/* Define the basic integer types... */
-#if !defined (__BIT_TYPES_DEFINED__)
-typedef char int8_t;
-typedef short int16_t;
-typedef int int32_t;
-
-typedef unsigned char u_int8_t;
-typedef unsigned short u_int16_t;
-typedef unsigned int u_int32_t;
-typedef unsigned long u_int64_t;
-#endif
-
-/* Varargs stuff... */
-#include <stdarg.h>
-#define VA_DOTDOTDOT ...
-#undef va_dcl
-#define va_dcl
-#define VA_start(list, last) va_start (list, last)
-
-/* Our reports say that OSF/1 versions 4.0G and later have v/snprintf
- * implementations.  4.0F and previous do not.  This is detected at
- * ./configure time from 'sizer -v'.
- */
-#ifndef HAVE_SNPRINTF
-# define NO_SNPRINTF
-#endif
-
-#ifndef _PATH_DHCPD_PID
-#define _PATH_DHCPD_PID	"/var/run/dhcpd.pid"
-#endif
-#ifndef _PATH_DHCPD6_PID
-#define _PATH_DHCPD6_PID "/var/run/dhcpd6.pid"
-#endif
-#ifndef _PATH_DHCLIENT_PID
-#define _PATH_DHCLIENT_PID "/var/run/dhclient.pid"
-#endif
-#ifndef _PATH_DHCLIENT6_PID
-#define _PATH_DHCLIENT6_PID "/var/run/dhclient6.pid"
-#endif
-
-#define EOL	'\n'
-#define VOIDPTR void *
-
-/* Time stuff... */
-#include <sys/time.h>
-#define TIME time_t
-#define GET_TIME(x)	time ((x))
-
-/* The jmp_buf type is an array on OSF/1, so we can't dereference it
-   and must declare it differently. */
-#define jbp_decl(x)	jmp_buf x
-#define jref(x)		(x)
-#define jdref(x)	(x)
-#define jrefproto	jmp_buf
-
-#define NEED_OSF_PFILT_HACKS
-#define BPF_FORMAT "/dev/pf/pfilt%d"
-
-#if defined (USE_DEFAULT_NETWORK)
-#  define USE_BPF
-#  define DEC_FDDI
-#  define FDDI_HEADER_SIZE 14
-#endif
-
-#define PTRSIZE_64BIT
-
-#define SOCKLEN_T	int
-
-#ifdef NEED_PRAND_CONF
-const char *cmds[] = {
-	"/bin/ps -ef 2>&1",
-	"/usr/sbin/arp -an 2>&1",
-	"/usr/sbin/netstat -an 2>&1",
-	"/bin/df  2>&1",
-	"/usr/bin/dig com. soa +ti=1 +retry=0 2>&1",
-	"/usr/ucb/uptime  2>&1",
-	"/usr/sbin/netstat -an 2>&1",
-	"/bin/iostat  2>&1",
-	NULL
-};
-
-const char *dirs[] = {
-	"/tmp",
-	"/var/tmp",
-	".",
-	"/",
-	"/var/spool",
-	"/var/adm",
-	"/dev",
-	"/var/spool/mail",
-	"/home",
-	NULL
-};
-
-const char *files[] = {
-	"/var/adm/messages",
-	"/var/adm/wtmp",
-	"/var/adm/lastlog",
-	NULL
-};
-#endif /* NEED_PRAND_CONF */
diff --git a/includes/cf/bsdos.h b/includes/cf/bsdos.h
deleted file mode 100644
index f42ef797..00000000
--- a/includes/cf/bsdos.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* bsdos.h
-
-   System dependencies for BSDI BSD/OS... */
-
-/*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-2003 by Internet Software Consortium
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * 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.
- *
- *   Internet Systems Consortium, Inc.
- *   950 Charter Street
- *   Redwood City, CA 94063
- *   <info@isc.org>
- *   https://www.isc.org/
- *
- */
-
-#include <syslog.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <string.h>
-#include <paths.h>
-#include <errno.h>
-#include <unistd.h>
-#include <setjmp.h>
-#include <limits.h>
-
-#include <sys/wait.h>
-#include <signal.h>
-
-extern int h_errno;
-
-#include <net/if.h>
-#include <net/if_dl.h>
-#define INADDR_LOOPBACK	((u_int32_t)0x7f000001)
-
-/* Varargs stuff... */
-#include <stdarg.h>
-#define VA_DOTDOTDOT ...
-#define va_dcl
-#define VA_start(list, last) va_start (list, last)
-
-#ifndef _PATH_DHCPD_PID
-#define _PATH_DHCPD_PID	"/var/run/dhcpd.pid"
-#endif
-#ifndef _PATH_DHCPD6_PID
-#define _PATH_DHCPD6_PID "/var/run/dhcpd6.pid"
-#endif
-#ifndef _PATH_DHCPD_DB
-#define _PATH_DHCPD_DB "/var/db/dhcpd.leases"
-#endif
-#ifndef _PATH_DHCPD6_DB
-#define _PATH_DHCPD6_DB "/var/db/dhcpd6.leases"
-#endif
-#ifndef _PATH_DHCLIENT_PID
-#define _PATH_DHCLIENT_PID "/var/run/dhclient.pid"
-#endif
-#ifndef _PATH_DHCLIENT6_PID
-#define _PATH_DHCLIENT6_PID "/var/run/dhclient6.pid"
-#endif
-#ifndef _PATH_DHCLIENT_DB
-#define _PATH_DHCLIENT_DB "/var/db/dhclient.leases"
-#endif
-#ifndef _PATH_DHCLIENT6_DB
-#define _PATH_DHCLIENT6_DB "/var/db/dhclient6.leases"
-#endif
-
-#define EOL	'\n'
-#define VOIDPTR void *
-
-/* Time stuff... */
-#include <sys/time.h>
-#define TIME time_t
-#define GET_TIME(x)	time ((x))
-
-#define HAVE_SA_LEN
-
-#if defined (USE_DEFAULT_NETWORK)
-#  define USE_BPF
-#endif
-
-#if _BSDI_VERSION < 199802
-typedef int socklen_t;
-#endif
-
-#ifdef NEED_PRAND_CONF
-const char *cmds[] = {
-	"/bin/ps -axlw 2>&1",
-	"/usr/sbin/arp -an 2>&1",
-	"/usr/sbin/netstat -an 2>&1",
-	"/bin/df  2>&1",
-	"/usr/bin/dig com. soa +ti=1 +retry=0 2>&1",
-	"/usr/ucb/uptime  2>&1",
-	"/usr/sbin/netstat -an 2>&1",
-	"/usr/sbin/iostat  2>&1",
-	"/usr/sbin/vmstat  2>&1",
-	NULL
-};
-
-const char *dirs[] = {
-	"/tmp",
-	"/var/tmp",
-	".",
-	"/",
-	"/var/spool",
-	"/dev",
-	"/var/mail",
-	"/usr/home",
-	NULL
-};
-
-const char *files[] = {
-	"/var/log/messages",
-	"/var/log/wtmp",
-	"/var/log/lastlog",
-	NULL
-};
-#endif /* NEED_PRAND_CONF */
diff --git a/includes/cf/cygwin32.h b/includes/cf/cygwin32.h
deleted file mode 100644
index 17aef735..00000000
--- a/includes/cf/cygwin32.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* cygwin32.h
-
-   System dependencies for Win32, compiled with Cygwin32...   This
-   doesn't work yet, so don't get too excited! */
-
-/*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-2003 by Internet Software Consortium
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * 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.
- *
- *   Internet Systems Consortium, Inc.
- *   950 Charter Street
- *   Redwood City, CA 94063
- *   <info@isc.org>
- *   https://www.isc.org/
- *
- */
-
-#include <sys/time.h>
-
-#define IN
-#define OUT
-#undef fd_set
-#undef FD_SET
-#undef FD_CLR
-#undef FD_ZERO
-#undef FD_ISSET
-#undef FD_ISCLR
-#undef FD_SETSIZE
-#define IFNAMSIZ 16
-#include <winsock.h>
-
-#include <syslog.h>
-#include <string.h>
-#include <paths.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <setjmp.h>
-#include <limits.h>
-
-#include <sys/wait.h>
-#include <signal.h>
-
-#define NO_H_ERRNO
-
-#include <sys/param.h>
-
-/* Varargs stuff... */
-#include <stdarg.h>
-#define VA_DOTDOTDOT ...
-#define va_dcl
-#define VA_start(list, last) va_start (list, last)
-
-/* XXX: System is not believed to have vsnprintf.  Someone please verify. */
-#define NO_SNPRINTF
-
-#ifndef _PATH_DHCPD_PID
-#define _PATH_DHCPD_PID	"//e/etc/dhcpd.pid"
-#endif
-#ifndef _PATH_DHCPD6_PID
-#define _PATH_DHCPD6_PID "//e/etc/dhcpd6.pid"
-#endif
-#ifndef _PATH_DHCPD_DB
-#define _PATH_DHCPD_DB "//e/etc/dhcpd.leases"
-#endif
-#ifndef _PATH_DHCPD6_DB
-#define _PATH_DHCPD6_DB "//e/etc/dhcpd6.leases"
-#endif
-#ifndef _PATH_DHCPD_CONF
-#define _PATH_DHCPD_CONF "//e/etc/dhcpd.conf"
-#endif
-#ifndef _PATH_DHCLIENT_PID
-#define _PATH_DHCLIENT_PID "//e/etc/dhclient.pid"
-#endif
-#ifndef _PATH_DHCLIENT6_PID
-#define _PATH_DHCLIENT6_PID "//e/etc/dhclient6.pid"
-#endif
-#ifndef _PATH_DHCLIENT_DB
-#define _PATH_DHCLIENT_DB "//e/etc/dhclient.leases"
-#endif
-#ifndef _PATH_DHCLIENT6_DB
-#define _PATH_DHCLIENT6_DB "//e/etc/dhclient6.leases"
-#endif
-#ifndef _PATH_DHCLIENT_CONF
-#define _PATH_DHCLIENT_CONF "//e/etc/dhclient.conf"
-#endif
-#ifndef _PATH_DHCRELAY_PID
-#define _PATH_DHCRELAY_PID "//e/etc/dhcrelay.pid"
-#endif
-
-#ifndef _PATH_RESOLV_CONF
-#define _PATH_RESOLV_CONF "//e/etc/resolv.conf"
-#endif
-
-#define int8_t		char
-#define int16_t		short 
-#define int32_t		long 
-
-#define u_int8_t	unsigned char		/* Not quite POSIX... */
-#define u_int16_t	unsigned short 
-#define u_int32_t	unsigned long 
-
-#define EOL	'\n'
-#define VOIDPTR void *
-
-/* Time stuff... */
-#define TIME time_t
-#define GET_TIME(x)	time ((x))
-
-#if defined (USE_DEFAULT_NETWORK)
-#  define USE_SOCKETS
-#endif
-
-#ifdef __alpha__
-#define PTRSIZE_64BIT
-#endif
diff --git a/includes/cf/freebsd.h b/includes/cf/freebsd.h
deleted file mode 100644
index cd672ecb..00000000
--- a/includes/cf/freebsd.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/* freebsd.h
-
-   System dependencies for FreeBSD... */
-
-/*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-2003 by Internet Software Consortium
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * 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.
- *
- *   Internet Systems Consortium, Inc.
- *   950 Charter Street
- *   Redwood City, CA 94063
- *   <info@isc.org>
- *   https://www.isc.org/
- *
- */
-
-#include <syslog.h>
-#include <sys/types.h>
-#include <string.h>
-#include <paths.h>
-#include <errno.h>
-#include <unistd.h>
-#include <setjmp.h>
-#include <limits.h>
-
-#include <sys/wait.h>
-#include <signal.h>
-
-extern int h_errno;
-
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/if_arp.h>
-#if !defined (INADDR_LOOPBACK)
-# define INADDR_LOOPBACK ((u_int32_t)0x7f000001)
-#endif
-
-/* Varargs stuff... */
-#include <stdarg.h>
-#define VA_DOTDOTDOT ...
-#define va_dcl
-#define VA_start(list, last) va_start (list, last)
-
-#if defined(__alpha__) || defined(__amd64__) || defined(__ia64__) || \
-	defined(__sparc64__)
-# define PTRSIZE_64BIT
-#endif
-
-#ifndef _PATH_DHCPD_PID
-#define _PATH_DHCPD_PID	"/var/run/dhcpd.pid"
-#endif
-#ifndef _PATH_DHCPD6_PID
-#define _PATH_DHCPD6_PID "/var/run/dhcpd6.pid"
-#endif
-#ifndef _PATH_DHCPD_DB
-#define _PATH_DHCPD_DB	"/var/db/dhcpd.leases"
-#endif
-#ifndef _PATH_DHCPD6_DB
-#define _PATH_DHCPD6_DB	"/var/db/dhcpd6.leases"
-#endif
-#ifndef _PATH_DHCLIENT_PID
-#define _PATH_DHCLIENT_PID "/var/run/dhclient.pid"
-#endif
-#ifndef _PATH_DHCLIENT6_PID
-#define _PATH_DHCLIENT6_PID "/var/run/dhclient6.pid"
-#endif
-#ifndef _PATH_DHCLIENT_DB
-#define _PATH_DHCLIENT_DB "/var/db/dhclient.leases"
-#endif
-#ifndef _PATH_DHCLIENT6_DB
-#define _PATH_DHCLIENT6_DB "/var/db/dhclient6.leases"
-#endif
-
-#define EOL	'\n'
-#define VOIDPTR void *
-
-/* Time stuff... */
-#include <sys/time.h>
-#define TIME time_t
-#define GET_TIME(x)	time ((x))
-
-#define HAVE_SA_LEN
-
-/* socklen_t was first defined on November 24 in sys/socket.h, and
-   __FreeBSD_version was changed to 400013 on December 4, so if you
-   get a compile error on this, and you updated between those dates,
-   that's why.   Also, it may be that some 3.x version after 3.4 will
-   have socklen_t, but no such change has been made so far. */
-
-#if  __FreeBSD_version < 400013
-#define SOCKLEN_T int
-#endif
-
-#if defined (USE_DEFAULT_NETWORK)
-#  define USE_BPF
-#endif
-#define HAVE_MKSTEMP
-#ifdef NEED_PRAND_CONF
-#ifndef HAVE_DEV_RANDOM
- # define HAVE_DEV_RANDOM 1
- #endif /* HAVE_DEV_RANDOM */
-
-const char *cmds[] = {
-	"/bin/ps -axlw 2>&1",
-	"/usr/sbin/arp -an 2>&1",
-	"/usr/bin/netstat -an 2>&1",
-	"/bin/df  2>&1",
-	"/usr/bin/dig com. soa +ti=1 +retry=0 2>&1",
-	"/usr/bin/netstat -an 2>&1",
-	"/usr/bin/dig . soa +ti=1 +retry=0 2>&1",
-	"/usr/sbin/iostat  2>&1",
-	"/usr/bin/vmstat  2>&1",
-	"/usr/bin/w  2>&1",
-	NULL
-};
-
-const char *dirs[] = {
-	"/tmp",
-	"/usr/tmp",
-	".",
-	"/",
-	"/var/spool",
-	"/dev",
-	"/var/mail",
-	"/home",
-	"/usr/home",
-	NULL
-};
-
-const char *files[] = {
-	"/var/log/messages",
-	"/var/log/wtmp",
-	"/var/log/lastlog",
-	NULL
-};
-#endif /* NEED_PRAND_CONF */
diff --git a/includes/cf/hpux.h b/includes/cf/hpux.h
deleted file mode 100644
index 0246779d..00000000
--- a/includes/cf/hpux.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/* hpux.h
-
-   Configuration file for HP-UX */
-
-/*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-2003 by Internet Software Consortium
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * 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.
- *
- *   Internet Systems Consortium, Inc.
- *   950 Charter Street
- *   Redwood City, CA 94063
- *   <info@isc.org>
- *   https://www.isc.org/
- *
- */
-
-#define int8_t		char
-#define int16_t		short
-#define int32_t		long
-
-#define u_int8_t	unsigned char
-#define u_int16_t	unsigned short 
-#define u_int32_t	unsigned long 
-
-#include <sys/types.h>
-
-#include <syslog.h>
-
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <setjmp.h>
-#include <limits.h>
-
-extern int h_errno;
-
-#include <net/if.h>
-#include <net/if_arp.h>
-
-#define htons(x)        (x) /* sigh */
-
-#ifndef _PATH_DHCPD_PID
-#define _PATH_DHCPD_PID	"/etc/dhcpd.pid"
-#endif
-#ifndef _PATH_DHCPD6_PID
-#define _PATH_DHCPD6_PID "/etc/dhcpd6.pid"
-#endif
-#ifndef _PATH_DHCLIENT_PID
-#define _PATH_DHCLIENT_PID "/etc/dhclient.pid"
-#endif
-#ifndef _PATH_DHCLIENT6_PID
-#define _PATH_DHCLIENT6_PID "/etc/dhclient6.pid"
-#endif
-#ifndef _PATH_DHCRELAY_PID
-#define _PATH_DHCRELAY_PID "/etc/dhcrelay.pid"
-#endif
-
-#if !defined (__ANSI__)
-/* Varargs stuff: use stdarg.h instead ... */
-#include <stdarg.h>
-#define VA_DOTDOTDOT ...
-#define VA_start(list, last) va_start (list, last)
-#define va_dcl
-#else
-#include <varargs.h>
-#define VA_DOTDOTDOT va_alist
-#define VA_start(list, last) va_start (list)
-#endif
-
-#define USE_SOCKETS	1
-#define EOL '\n'
-#define VOIDPTR void *
-
-#include <time.h>
-
-#define TIME time_t
-#define GET_TIME(x)	time ((x))
-
-#define random	rand
-
-#define BYTE_ORDER BIG_ENDIAN
-#define BIG_ENDIAN 1
-
-#define SOCKLEN_T int
-
-#ifdef NEED_PRAND_CONF
-const char *cmds[] = {
-	"/usr/bin/ps -ef 2>&1",
-	"/usr/sbin/arp -an 2>&1",
-	"/usr/bin/netstat -an 2>&1",
-	"/usr/bin/df  2>&1",
-	"/usr/bin/netstat -an 2>&1",
-	"/usr/bin/vmstat  2>&1",
-	"/usr/bin/w  2>&1",
-	NULL
-};
-
-const char *dirs[] = {
-	"/tmp",
-	"/var/tmp",
-	".",
-	"/",
-	"/var/spool",
-	"/var/adm",
-	"/dev",
-	"/var/mail",
-	"/home",
-	NULL
-};
-
-const char *files[] = {
-	"/var/adm/wtmp",
-	NULL
-};
-#endif /* NEED_PRAND_CONF */
-
-/* these are #defined somewhere in /usr/include headers. */
-#undef NO
-#undef SERVER
-
diff --git a/includes/cf/irix.h b/includes/cf/irix.h
deleted file mode 100644
index 4a3eb8a6..00000000
--- a/includes/cf/irix.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* irix.h */
-
-/*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-2003 by Internet Software Consortium
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * 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.
- *
- *   Internet Systems Consortium, Inc.
- *   950 Charter Street
- *   Redwood City, CA 94063
- *   <info@isc.org>
- *   https://www.isc.org/
- */
-
-#define int8_t		char
-#define int16_t		short
-#define int32_t		long
-
-#define u_int8_t	unsigned char
-#define u_int16_t	unsigned short 
-#define u_int32_t	unsigned long 
-
-#include <sys/types.h>
-
-#include <syslog.h>
-
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <setjmp.h>
-#include <limits.h>
-#include <net/if_dl.h>
-
-extern int h_errno;
-
-#include <net/if.h>
-#include <net/if_arp.h>
-
-#define _PATH_DHCPD_CONF "/usr/local/etc/dhcpd.conf"
-
-#ifndef _PATH_DHCPD_DB
-#define _PATH_DHCPD_DB   "/usr/local/etc/dhcp/dhcpd.leases"
-#endif
-#ifndef _PATH_DHCPD6_DB
-#define _PATH_DHCPD6_DB   "/usr/local/etc/dhcp/dhcpd6.leases"
-#endif
-#ifndef _PATH_DHCPD_PID
-#define _PATH_DHCPD_PID	"/etc/dhcpd.pid"
-#endif
-#ifndef _PATH_DHCPD6_PID
-#define _PATH_DHCPD6_PID "/etc/dhcpd6.pid"
-#endif
-#ifndef _PATH_DHCLIENT_PID
-#define _PATH_DHCLIENT_PID "/etc/dhclient.pid"
-#endif
-#ifndef _PATH_DHCLIENT6_PID
-#define _PATH_DHCLIENT6_PID "/etc/dhclient6.pid"
-#endif
-#ifndef _PATH_DHCRELAY_PID
-#define _PATH_DHCRELAY_PID "/etc/dhcrelay.pid"
-#endif
-
-#include <stdarg.h>
-#define VA_DOTDOTDOT ...
-#define VA_start(list, last) va_start (list, last)
-#define va_dcl
-
-/* XXX: System is not believed to have snprintf/vsnprintf.  Please verify. */
-#define NO_SNPRINTF
-
-#if defined (USE_DEFAULT_NETWORK)
-# define USE_RAW_SOCKETS
-#endif
-
-#define EOL '\n'
-#define VOIDPTR void *
-
-#include <time.h>
-
-#define TIME time_t
-#define GET_TIME(x)	time ((x))
-
-#define random	rand
-#ifdef NEED_PRAND_CONF
-const char *cmds[] = {
-	"/bin/ps -ef 2>&1",
-	"/usr/etc/arp -a 2>&1",
-	"/usr/etc/netstat -an 2>&1",
-	"/bin/df  2>&1",
-	"/usr/bin/dig com. soa +ti=1 2>&1",
-	"/usr/bsd/uptime  2>&1",
-	"/usr/bin/printenv  2>&1",
-	"/usr/etc/netstat -s 2>&1",
-	"/usr/bin/dig . soa +ti=1 2>&1",
-	"/usr/bsd/w  2>&1",
-	NULL
-};
-
-const char *dirs[] = {
-	"/tmp",
-	"/var/tmp",
-	".",
-	"/",
-	"/var/spool",
-	"/var/adm",
-	"/dev",
-	"/var/mail",
-	NULL
-};
-
-const char *files[] = {
-	NULL
-};
-#endif /* NEED_PRAND_CONF */
diff --git a/includes/cf/linux.h b/includes/cf/linux.h
deleted file mode 100644
index 57344e85..00000000
--- a/includes/cf/linux.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/* linux.h
-
-   System dependencies for Linux.
-
-   Based on a configuration originally supplied by Jonathan Stone. */
-
-/*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-2003 by Internet Software Consortium
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * 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.
- *
- *   Internet Systems Consortium, Inc.
- *   950 Charter Street
- *   Redwood City, CA 94063
- *   <info@isc.org>
- *   https://www.isc.org/
- *
- */
-
-#include <features.h>
-#ifndef __BIT_TYPES_DEFINED__
-#define __BIT_TYPES_DEFINED__
-#undef __USE_BSD
-typedef char int8_t;
-typedef short int16_t;
-typedef long int32_t;
-
-typedef unsigned char u_int8_t;
-typedef unsigned short u_int16_t;
-typedef unsigned long u_int32_t;
-#endif /* __BIT_TYPES_DEFINED__ */
-
-typedef u_int8_t u8;
-typedef u_int16_t u16;
-typedef u_int32_t u32;
-
-#include <syslog.h>
-#include <sys/types.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <setjmp.h>
-#include <limits.h>
-
-extern int h_errno;
-
-#include <net/if.h>
-#include <net/route.h>
-
-#if LINUX_MAJOR == 1
-# include <linux/if_arp.h>
-# include <linux/time.h>		/* also necessary */
-#else
-# include <net/if_arp.h>
-#endif
-
-#include <sys/time.h>		/* gettimeofday()*/
-
-/* Databases go in /var/state/dhcp.   It would also be valid to put them
-   in /var/state/misc - indeed, given that there's only one lease file, it
-   would probably be better.   However, I have some ideas for optimizing
-   the lease database that may result in a _lot_ of smaller files being
-   created, so in that context it makes more sense to have a separate
-   directory. */
-
-#ifndef _PATH_DHCPD_DB
-#define _PATH_DHCPD_DB		"/var/state/dhcp/dhcpd.leases"
-#endif
-#ifndef _PATH_DHCPD6_DB
-#define _PATH_DHCPD6_DB		"/var/state/dhcp/dhcpd6.leases"
-#endif
-
-#ifndef _PATH_DHCLIENT_DB
-#define _PATH_DHCLIENT_DB	"/var/state/dhcp/dhclient.leases"
-#endif
-#ifndef _PATH_DHCLIENT6_DB
-#define _PATH_DHCLIENT6_DB	"/var/state/dhcp/dhclient6.leases"
-#endif
-
-/* Varargs stuff... */
-#include <stdarg.h>
-#define VA_DOTDOTDOT ...
-#define VA_start(list, last) va_start (list, last)
-#define va_dcl
-
-#define VOIDPTR	void *
-
-#if defined(__alpha__) || defined(__amd64__) || defined(__ia64__) || \
-	defined(__sparc64__)
-# define PTRSIZE_64BIT
-#endif
-
-#define EOL	'\n'
-
-/* Time stuff... */
-
-#include <time.h>
-
-#define TIME time_t
-#define GET_TIME(x)	time ((x))
-
-#if (LINUX_MAJOR >= 2)
-# if ((LINUX_MAJOR > 2) || (LINUX_MINOR >= 1))
-#  if defined (USE_DEFAULT_NETWORK)
-#   define USE_LPF
-#  endif
-#  if !defined (__sparc__)	/* XXX hopefully this will be fixed someday */
-#   define SIOCGIFCONF_ZERO_PROBE
-#  endif
-#  define LINUX_SLASHPROC_DISCOVERY
-#  define PROCDEV_DEVICE "/proc/net/dev"
-#  define HAVE_ARPHRD_TUNNEL
-#  define HAVE_TR_SUPPORT
-# endif
-# define HAVE_ARPHRD_METRICOM
-# define HAVE_ARPHRD_IEEE802
-# define HAVE_ARPHRD_LOOPBACK
-# define HAVE_SO_BINDTODEVICE
-# define HAVE_SIOCGIFHWADDR
-# define HAVE_SETFD
-#endif
-
-#if defined (SIOCGIFHWADDR) && !defined (HAVE_SIOCGIFHWADDR)
-# define HAVE_SIOCGIFHWADDR
-#endif
-
-#if !defined (USE_LPF)
-# if defined (USE_DEFAULT_NETWORK)
-#  define USE_SOCKETS
-#  define SOCKET_CAN_RECEIVE_UNICAST_UNCONFIGURED
-# endif
-# define IGNORE_HOSTUNREACH
-#endif
-
-#define ALIAS_NAMES_PERMUTED
-#define SKIP_DUMMY_INTERFACES
-
-#ifdef NEED_PRAND_CONF
-#ifndef HAVE_DEV_RANDOM
- # define HAVE_DEV_RANDOM 1
- #endif /* HAVE_DEV_RANDOM */
-
-const char *cmds[] = {
-	"/bin/ps -axlw 2>&1",
-	"/sbin/arp -an 2>&1",
-	"/bin/netstat -an 2>&1",
-	"/bin/df  2>&1",
-	"/usr/bin/dig com. soa +ti=1 +retry=0 2>&1",
-	"/usr/bin/uptime  2>&1",
-	"/bin/netstat -s 2>&1",
-	"/usr/bin/dig . soa +ti=1 +retry=0 2>&1",
-	"/usr/bin/vmstat  2>&1",
-	"/usr/bin/w  2>&1",
-	NULL
-};
-
-const char *dirs[] = {
-	"/tmp",
-	"/usr/tmp",
-	".",
-	"/",
-	"/var/spool",
-	"/dev",
-	"/var/spool/mail",
-	"/home",
-	"/usr/home",
-	NULL
-};
-
-const char *files[] = {
-	"/proc/stat",
-	"/proc/rtc",
-	"/proc/meminfo",
-	"/proc/interrupts",
-	"/proc/self/status",
-	"/var/log/messages",
-	"/var/log/wtmp",
-	"/var/log/lastlog",
-	NULL
-};
-#endif /* NEED_PRAND_CONF */
diff --git a/includes/cf/netbsd.h b/includes/cf/netbsd.h
deleted file mode 100644
index de862d51..00000000
--- a/includes/cf/netbsd.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/* netbsd.h
-
-   System dependencies for NetBSD... */
-
-/*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-2003 by Internet Software Consortium
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * 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.
- *
- *   Internet Systems Consortium, Inc.
- *   950 Charter Street
- *   Redwood City, CA 94063
- *   <info@isc.org>
- *   https://www.isc.org/
- *
- */
-
-#include <syslog.h>
-#include <sys/types.h>
-#include <string.h>
-#include <paths.h>
-#include <errno.h>
-#include <malloc.h>
-#include <unistd.h>
-#include <setjmp.h>
-#include <limits.h>
-
-#include <sys/wait.h>
-#include <signal.h>
-
-extern int h_errno;
-
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-#include <sys/sockio.h>
-
-#define ifr_netmask ifr_addr
-
-/* Varargs stuff... */
-#include <stdarg.h>
-#define VA_DOTDOTDOT ...
-#define va_dcl
-#define VA_start(list, last) va_start (list, last)
-
-#ifndef _PATH_DHCPD_PID
-#define _PATH_DHCPD_PID	"/var/run/dhcpd.pid"
-#endif
-#ifndef _PATH_DHCPD6_PID
-#define _PATH_DHCPD6_PID "/var/run/dhcpd6.pid"
-#endif
-#ifndef _PATH_DHCPD_DB
-#define _PATH_DHCPD_DB "/var/db/dhcpd.leases"
-#endif
-#ifndef _PATH_DHCPD6_DB
-#define _PATH_DHCPD6_DB "/var/db/dhcpd6.leases"
-#endif
-#ifndef _PATH_DHCLIENT_PID
-#define _PATH_DHCLIENT_PID "/var/run/dhclient.pid"
-#endif
-#ifndef _PATH_DHCLIENT6_PID
-#define _PATH_DHCLIENT6_PID "/var/run/dhclient6.pid"
-#endif
-#ifndef _PATH_DHCLIENT_DB
-#define _PATH_DHCLIENT_DB "/var/db/dhclient.leases"
-#endif
-#ifndef _PATH_DHCLIENT6_DB
-#define _PATH_DHCLIENT6_DB "/var/db/dhclient6.leases"
-#endif
-
-#define EOL	'\n'
-#define VOIDPTR void *
-
-/* Time stuff... */
-#include <sys/time.h>
-#define TIME time_t
-#define GET_TIME(x)	time ((x))
-
-#define HAVE_SA_LEN
-#define HAVE_MKSTEMP
-
-#if defined (USE_DEFAULT_NETWORK)
-#  define USE_BPF
-#endif
-
-#if defined (__alpha__) || defined (__sparc64__)
-#define PTRSIZE_64BIT
-#endif
-
-/* NetBSD added socklen_t in 1.3J, just prior to the 1.4 release. */
-#if __NetBSD_Version__ < 103090000
-#define SOCKLEN_T int
-#endif
-
-#ifdef NEED_PRAND_CONF
-/* prand_conf.h goop - remove when BIND 9 comes around. */
-#ifndef HAVE_DEV_RANDOM
- # define HAVE_DEV_RANDOM 1
- #endif /* HAVE_DEV_RANDOM */
-
-const char *cmds[] = {
-	"/bin/ps -axlw 2>&1",
-	"/usr/sbin/arp -an 2>&1",
-	"/usr/bin/netstat -an 2>&1",
-	"/bin/df  2>&1",
-	"/usr/bin/dig com. soa +ti=1 +retry=0 2>&1",
-	"/usr/bin/netstat -an 2>&1",
-	"/usr/bin/dig . soa +ti=1 +retry=0 2>&1",
-	"/usr/sbin/iostat  2>&1",
-	"/usr/bin/vmstat  2>&1",
-	"/usr/bin/w  2>&1",
-	NULL
-};
-
-const char *dirs[] = {
-	"/tmp",
-	"/var/tmp",
-	".",
-	"/",
-	"/var/spool",
-	"/dev",
-	"/var/mail",
-	"/home",
-	"/usr/home",
-	NULL
-};
-
-const char *files[] = {
-	"/var/log/messages",
-	"/var/log/wtmp",
-	"/var/log/lastlog",
-	NULL
-};
-#endif /* NEED_PRAND_CONF */
diff --git a/includes/cf/nextstep.h b/includes/cf/nextstep.h
deleted file mode 100644
index 74c0f4c4..00000000
--- a/includes/cf/nextstep.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/* nextstep.h
-
-   System dependencies for NEXTSTEP 3 & 4 (tested on 4.2PR2)... */
-
-/*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-2003 by Internet Software Consortium
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * 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.
- *
- *   Internet Systems Consortium, Inc.
- *   950 Charter Street
- *   Redwood City, CA 94063
- *   <info@isc.org>
- *   https://www.isc.org/
- *
- */
-
-/* NeXT needs BSD44 ssize_t */
-typedef int		ssize_t;
-/* NeXT doesn't have BSD setsid() */
-#define setsid getpid
-#import <sys/types.h>
-/* Porting::
-   The jmp_buf type as declared in <setjmp.h> is sometimes a structure
-   and sometimes an array.   By default, we assume it's a structure.
-   If it's an array on your system, you may get compile warnings or errors
-   as a result in confpars.c.   If so, try including the following definitions,
-   which treat jmp_buf as an array: */
-#if 0
-#define jbp_decl(x)	jmp_buf x
-#define jref(x)		(x)
-#define jdref(x)	(x)
-#define jrefproto	jmp_buf
-#endif
-#import <syslog.h>
-#import <string.h>
-#import <errno.h>
-#import <unistd.h>
-#import <sys/wait.h>
-#import <signal.h>
-#import <setjmp.h>
-#import <limits.h>
-extern int h_errno;
-#import <net/if.h>
-#import <net/if_arp.h>
-/* Porting::
-   Some older systems do not have defines for IP type-of-service,
-   or don't define them the way we expect.   If you get undefined
-   symbol errors on the following symbols, they probably need to be
-   defined here. */
-#if 0
-#define IPTOS_LOWDELAY          0x10
-#define IPTOS_THROUGHPUT        0x08
-#define IPTOS_RELIABILITY       0x04
-#endif
-
-#if !defined (_PATH_DHCPD_PID)
-# define _PATH_DHCPD_PID	"/etc/dhcpd.pid"
-#endif
-
-#if !defined (_PATH_DHCPD6_PID)
-# define _PATH_DHCPD6_PID	"/etc/dhcpd6.pid"
-#endif
-
-#if !defined (_PATH_DHCLIENT_PID)
-# define _PATH_DHCLIENT_PID	"/etc/dhclient.pid"
-#endif
-
-#if !defined (_PATH_DHCLIENT6_PID)
-# define _PATH_DHCLIENT6_PID	"/etc/dhclient6.pid"
-#endif
-
-#if !defined (_PATH_DHCRELAY_PID)
-# define _PATH_DHCRELAY_PID	"/etc/dhcrelay.pid"
-#endif
-
-/* Stdarg definitions for ANSI-compliant C compilers. */
-#import <stdarg.h>
-#define VA_DOTDOTDOT ...
-#define VA_start(list, last) va_start (list, last)
-#define va_dcl
-
-/* NeXT lacks snprintf */
-#define NO_SNPRINTF
-
-/* Porting::
-   You must define the default network API for your port.   This
-   will depend on whether one of the existing APIs will work for
-   you, or whether you need to implement support for a new API.
-   Currently, the following APIs are supported:
-   	The BSD socket API: define USE_SOCKETS.
-	The Berkeley Packet Filter: define USE_BPF.
-	The Streams Network Interface Tap (NIT): define USE_NIT.
-	Raw sockets: define USE_RAW_SOCKETS
-   If your system supports the BSD socket API and doesn't provide
-   one of the supported interfaces to the physical packet layer,
-   you can either provide support for the low-level API that your
-   system does support (if any) or just use the BSD socket interface.
-   The BSD socket interface doesn't support multiple network interfaces,
-   and on many systems, it does not support the all-ones broadcast
-   address, which can cause problems with some DHCP clients (e.g.
-   Microsoft Windows 95). */
-#define USE_BPF
-#if 0
-#if defined (USE_DEFAULT_NETWORK)
-#  define USE_SOCKETS
-#endif
-#endif
-#define EOL '\n'
-#define VOIDPTR void *
-#import <time.h>
-#define TIME time_t
-#define GET_TIME(x)	time ((x))
-
-#ifdef NEED_PRAND_CONF
-const char *cmds[] = {
-	"/bin/ps -axlw 2>&1",
-	"/usr/etc/arp -a 2>&1",
-	"/usr/ucb/netstat -an 2>&1",
-	"/bin/df  2>&1",
-	"/usr/local/bin/dig com. soa +ti=1 2>&1",
-	"/usr/ucb/uptime  2>&1",
-	"/usr/ucb/printenv  2>&1",
-	"/usr/ucb/netstat -s 2>&1",
-	"/usr/local/bin/dig . soa +ti=1 2>&1",
-	"/usr/bin/iostat  2>&1",
-	"/usr/bin/vm_stat  2>&1",
-	"/usr/ucb/w  2>&1",
-	NULL
-};
-
-const char *dirs[] = {
-	"/tmp",
-	"/usr/tmp",
-	".",
-	"/",
-	"/usr/spool",
-	"/dev",
-	NULL
-};
-
-const char *files[] = {
-	"/usr/adm/messages",
-	"/usr/adm/wtmp",
-	"/usr/adm/lastlog",
-	NULL
-};
-#endif /* NEED_PRAND_CONF */
diff --git a/includes/cf/openbsd.h b/includes/cf/openbsd.h
deleted file mode 100644
index 14afc8ef..00000000
--- a/includes/cf/openbsd.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/* openbsd.h
-
-   System dependencies for OpenBSD... */
-
-/*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-2003 by Internet Software Consortium
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * 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.
- *
- *   Internet Systems Consortium, Inc.
- *   950 Charter Street
- *   Redwood City, CA 94063
- *   <info@isc.org>
- *   https://www.isc.org/
- *
- */
-
-#include <syslog.h>
-#include <sys/types.h>
-#include <string.h>
-#include <paths.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <setjmp.h>
-#include <limits.h>
-
-#include <sys/wait.h>
-#include <signal.h>
-
-extern int h_errno;
-
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-#include <sys/sockio.h>
-
-#define ifr_netmask ifr_addr
-
-/* Varargs stuff... */
-#include <stdarg.h>
-#define VA_DOTDOTDOT ...
-#define va_dcl
-#define VA_start(list, last) va_start (list, last)
-
-#ifndef _PATH_DHCPD_PID
-#define _PATH_DHCPD_PID	"/var/run/dhcpd.pid"
-#endif
-#ifndef _PATH_DHCPD6_PID
-#define _PATH_DHCPD6_PID "/var/run/dhcpd6.pid"
-#endif
-#ifndef _PATH_DHCPD_DB
-#define _PATH_DHCPD_DB "/var/db/dhcpd.leases"
-#endif
-#ifndef _PATH_DHCPD6_DB
-#define _PATH_DHCPD6_DB "/var/db/dhcpd6.leases"
-#endif
-#ifndef _PATH_DHCLIENT_PID
-#define _PATH_DHCLIENT_PID "/var/run/dhclient.pid"
-#endif
-#ifndef _PATH_DHCLIENT6_PID
-#define _PATH_DHCLIENT6_PID "/var/run/dhclient6.pid"
-#endif
-#ifndef _PATH_DHCLIENT_DB
-#define _PATH_DHCLIENT_DB "/var/db/dhclient.leases"
-#endif
-#ifndef _PATH_DHCLIENT6_DB
-#define _PATH_DHCLIENT6_DB "/var/db/dhclient6.leases"
-#endif
-
-#define EOL	'\n'
-#define VOIDPTR void *
-
-/* Time stuff... */
-#include <sys/time.h>
-#define TIME time_t
-#define GET_TIME(x)	time ((x))
-
-#define HAVE_SA_LEN
-#define HAVE_MKSTEMP
-
-#if defined (USE_DEFAULT_NETWORK)
-#  define USE_BPF
-#endif
-
-#ifdef __alpha__
-#define PTRSIZE_64BIT
-#endif
-
-/* socklen_t first used right around the time 2.5 branched, it looks like. */
-#if OpenBSD < 199905
-#define SOCKLEN_T int
-#endif
-
-#ifdef NEED_PRAND_CONF
-#ifndef HAVE_DEV_RANDOM
- # define HAVE_DEV_RANDOM 1
- #endif /* HAVE_DEV_RANDOM */
-
-const char *cmds[] = {
-	"/bin/ps -axlw 2>&1",
-	"/usr/sbin/arp -an 2>&1",
-	"/usr/bin/netstat -an 2>&1",
-	"/bin/df  2>&1",
-	"/usr/bin/netstat -an 2>&1",
-	"/usr/sbin/iostat  2>&1",
-	"/usr/bin/vmstat  2>&1",
-	"/usr/bin/w  2>&1",
-	NULL
-};
-
-const char *dirs[] = {
-	"/tmp",
-	"/var/tmp",
-	".",
-	"/",
-	"/var/spool",
-	"/dev",
-	"/var/mail",
-	"/home",
-	NULL
-};
-
-const char *files[] = {
-	"/var/log/messages",
-	"/var/log/wtmp",
-	"/var/log/lastlog",
-	NULL
-};
-#endif /* NEED_PRAND_CONF */
diff --git a/includes/cf/qnx.h b/includes/cf/qnx.h
deleted file mode 100644
index 2692ce95..00000000
--- a/includes/cf/qnx.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/* qnx.h
-
-   System dependencies for QNX...  */
-
-/*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-2003 by Internet Software Consortium
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * 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.
- *
- *   Internet Systems Consortium, Inc.
- *   950 Charter Street
- *   Redwood City, CA 94063
- *   <info@isc.org>
- *   https://www.isc.org/
- *
- */
-
-#include <sys/types.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <setjmp.h>
-#include <limits.h>
-#include <syslog.h>
-#include <sys/select.h>
-
-#include <sys/wait.h>
-#include <signal.h>
-
-#ifdef __QNXNTO__
-#include <sys/param.h>
-#endif
-
-#include <netdb.h>
-extern int h_errno;
-
-#include <net/if.h>
-#ifndef __QNXNTO__
-# define INADDR_LOOPBACK ((u_long)0x7f000001)
-#endif
-
-/* Varargs stuff... */
-#include <stdarg.h>
-#define VA_DOTDOTDOT ...
-#define va_dcl
-#define VA_start(list, last) va_start (list, last)
-
-#ifndef _PATH_DHCPD_PID
-#define _PATH_DHCPD_PID	"/etc/dhcpd.pid"
-#endif
-#ifndef _PATH_DHCPD6_PID
-#define _PATH_DHCPD6_PID "/etc/dhcpd6.pid"
-#endif
-#ifndef _PATH_DHCLIENT_PID
-#define _PATH_DHCLIENT_PID "/etc/dhclient.pid"
-#endif
-#ifndef _PATH_DHCLIENT6_PID
-#define _PATH_DHCLIENT6_PID "/etc/dhclient6.pid"
-#endif
-#ifndef _PATH_DHCRELAY_PID
-#define _PATH_DHCRELAY_PID "/etc/dhcrelay.pid"
-#endif
-
-#define EOL	'\n'
-#define VOIDPTR void *
-
-/* Time stuff... */
-#include <sys/time.h>
-#define TIME time_t
-#define GET_TIME(x)	time ((x))
-#define TIME_DIFF(high, low)	 	(*(high) - *(low))
-#define SET_TIME(x, y)	(*(x) = (y))
-#define ADD_TIME(d, s1, s2) (*(d) = *(s1) + *(s2))
-#define SET_MAX_TIME(x)	(*(x) = INT_MAX)
-
-#ifndef __QNXNTO__
-typedef unsigned char	u_int8_t;
-typedef unsigned short	u_int16_t;
-typedef unsigned long	u_int32_t;
-typedef signed short	int16_t;
-typedef signed long	int32_t;
-#endif
-
-#ifdef __QNXNTO__
-typedef int socklen_t;
-#endif
-
-#define strcasecmp( s1, s2 )			stricmp( s1, s2 )
-#define strncasecmp( s1, s2, n )		strnicmp( s1, s2, n )
-#define random()				rand()
-
-#define HAVE_SA_LEN
-#define BROKEN_TM_GMT
-#define USE_SOCKETS
-#undef AF_LINK
-
-#ifndef __QNXNTO__
-# define NO_SNPRINTF
-#endif
-
-#ifdef __QNXNTO__
-# define GET_HOST_ID_MISSING
-#endif
-
-/*
-    NOTE: to get the routing of the 255.255.255.255 broadcasts to work
-    under QNX, you need to issue the following command before starting
-    the daemon:
-
-    	route add -interface 255.255.255.0 <hostname>
-
-    where <hostname> is replaced by the hostname or IP number of the
-    machine that dhcpd is running on.
-*/
-
-#ifndef __QNXNTO__
-# if defined (NSUPDATE)
-# error NSUPDATE is not supported on QNX at this time!!
-# endif
-#endif
-
-
-#ifdef NEED_PRAND_CONF
-#ifndef HAVE_DEV_RANDOM
-/* You should find and install the /dev/random driver */
- # define HAVE_DEV_RANDOM 1
- #endif /* HAVE_DEV_RANDOM */
-
-const char *cmds[] = {
-        "/bin/ps -a 2>&1",
-	"/bin/sin 2>&1",
-        "/sbin/arp -an 2>&1",
-        "/bin/netstat -an 2>&1",
-        "/bin/df  2>&1",
-	"/bin/sin fds 2>&1",
-        "/bin/netstat -s 2>&1",
-	"/bin/sin memory 2>&1",
-        NULL
-};
-
-const char *dirs[] = {
-        "/tmp",
-        ".",
-        "/",
-        "/var/spool",
-        "/dev",
-        "/var/spool/mail",
-        "/home",
-        NULL
-};
-
-const char *files[] = {
-        "/proc/ipstats",
-        "/proc/dumper",
-        "/proc/self/as",
-        "/var/log/messages",
-        NULL
-};
-#endif /* NEED_PRAND_CONF */
-
diff --git a/includes/cf/rhapsody.h b/includes/cf/rhapsody.h
deleted file mode 100644
index dbe900c6..00000000
--- a/includes/cf/rhapsody.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* rhapsody.h
-
-   System dependencies for NetBSD... */
-
-/*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-2003 by Internet Software Consortium
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * 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.
- *
- *   Internet Systems Consortium, Inc.
- *   950 Charter Street
- *   Redwood City, CA 94063
- *   <info@isc.org>
- *   https://www.isc.org/
- *
- */
-
-#include <syslog.h>
-#include <sys/types.h>
-#include <string.h>
-#include <paths.h>
-#include <errno.h>
-#include <unistd.h>
-#include <setjmp.h>
-#include <limits.h>
-
-#include <sys/wait.h>
-#include <signal.h>
-
-extern int h_errno;
-
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-#include <sys/sockio.h>
-#import <net/if_arp.h>
-
-#define ifr_netmask ifr_addr
-
-/* Varargs stuff... */
-#include <stdarg.h>
-#define VA_DOTDOTDOT ...
-#define va_dcl
-#define VA_start(list, last) va_start (list, last)
-
-#ifndef _PATH_DHCPD_PID
-#define _PATH_DHCPD_PID	"/var/run/dhcpd.pid"
-#endif
-#ifndef _PATH_DHCPD6_PID
-#define _PATH_DHCPD6_PID "/var/run/dhcpd6.pid"
-#endif
-#ifndef _PATH_DHCPD_DB
-#define _PATH_DHCPD_DB "/var/db/dhcpd.leases"
-#endif
-#ifndef _PATH_DHCPD6_DB
-#define _PATH_DHCPD6_DB "/var/db/dhcpd6.leases"
-#endif
-#ifndef _PATH_DHCLIENT_PID
-#define _PATH_DHCLIENT_PID "/var/run/dhclient.pid"
-#endif
-#ifndef _PATH_DHCLIENT6_PID
-#define _PATH_DHCLIENT6_PID "/var/run/dhclient6.pid"
-#endif
-#ifndef _PATH_DHCLIENT_DB
-#define _PATH_DHCLIENT_DB "/var/db/dhclient.leases"
-#endif
-#ifndef _PATH_DHCLIENT6_DB
-#define _PATH_DHCLIENT6_DB "/var/db/dhclient6.leases"
-#endif
-
-#define EOL	'\n'
-#define VOIDPTR void *
-
-/* Time stuff... */
-#include <sys/time.h>
-#define TIME time_t
-#define GET_TIME(x)	time ((x))
-
-#define HAVE_SA_LEN
-#define HAVE_MKSTEMP
-
-#if defined (USE_DEFAULT_NETWORK)
-#  define USE_BPF
-#endif
-
-#ifdef __alpha__
-#define PTRSIZE_64BIT
-#endif
-
-#define SOCKLEN_T int
-
-#ifdef NEED_PRAND_CONF
-const char *cmds[] = {
-	"/bin/ps -axlw 2>&1",
-	"/usr/sbin/netstat -an 2>&1",
-	"/bin/df  2>&1",
-	"/usr/bin/uptime  2>&1",
-	"/usr/bin/printenv  2>&1",
-	"/usr/sbin/netstat -s 2>&1",
-	"/usr/bin/vm_stat  2>&1",
-	"/usr/bin/w  2>&1",
-	NULL
-};
-
-const char *dirs[] = {
-	"/var/tmp",
-	".",
-	"/",
-	"/var/spool",
-	"/var/mail",
-	NULL
-};
-
-const char *files[] = {
-	"/var/log/wtmp",
-	NULL
-};
-#endif /* NEED_PRAND_CONF */
diff --git a/includes/cf/sample.h b/includes/cf/sample.h
deleted file mode 100644
index 465ea843..00000000
--- a/includes/cf/sample.h
+++ /dev/null
@@ -1,299 +0,0 @@
-/* sample.h
-
-   Sample config file for clients.
-
-   This file is provided as a sample in case the system you want to run
-   on is not currently supported.   If that is the case, follow the Porting::
-   comments here and in other files as guides for what to change.  Also,
-   note that this file hasn't been updated in a lo-o-o-ong time, so it's
-   probably worth looking at the config files for working ports as well. */
-
-/*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-2003 by Internet Software Consortium
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * 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.
- *
- *   Internet Systems Consortium, Inc.
- *   950 Charter Street
- *   Redwood City, CA 94063
- *   <info@isc.org>
- *   https://www.isc.org/
- *
- */
-
-/* Porting::
-
-   Some systems do not define basic integer types as shown below.
-   On some systems, you need to include <bitypes.h> or <sys/bitypes.h>.
-   If you get parse errors in dhcpd.h while compiling dhcpd.conf, try
-   including bitypes.h, and if that fails, use the hard-coded definitions
-   shown below. */
-   
-#if 0
-#include <sys/bitypes.h>
-#endif
-
-#if 0
-#define int8_t		char
-#define int16_t		short
-#define int32_t		long
-
-#define u_int8_t	unsigned char
-#define u_int16_t	unsigned short 
-#define u_int32_t	unsigned long 
-#endif
-
-#include <sys/types.h>
-
-/* Porting::
-
-   The jmp_buf type as declared in <setjmp.h> is sometimes a structure
-   and sometimes an array.   By default, we assume it's a structure.
-   If it's an array on your system, you may get compile warnings or errors
-   as a result in confpars.c.   If so, try including the following definitions,
-   which treat jmp_buf as an array: */
-
-#if 0
-#define jbp_decl(x)	jmp_buf x
-#define jref(x)		(x)
-#define jdref(x)	(x)
-#define jrefproto	jmp_buf
-#endif
-
-/* Porting::
-
-   Some older systems (e.g., Ultrix) still use the 4.2BSD-style syslog
-   API.  These differ from later versions of the syslog API in that the
-   openlog system call takes two arguments instead of three, and the
-   facility code (the third argument to modern versions of openlog())
-   is ORed into the log priority in the syslog() call.
-
-   If you are running with the 4.2BSD-style syslog interface, define
-   SYSLOG_4_2. */
-
-/* #define SYSLOG_4_2 */
-
-#include <syslog.h>
-
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <setjmp.h>
-#include <limits.h>
-
-extern int h_errno;
-
-#include <net/if.h>
-#include <net/if_arp.h>
-
-/* Porting::
-
-   Some older systems do not have defines for IP type-of-service,
-   or don't define them the way we expect.   If you get undefined
-   symbol errors on the following symbols, they probably need to be
-   defined here. */
-
-#if 0
-#define IPTOS_LOWDELAY          0x10
-#define IPTOS_THROUGHPUT        0x08
-#define IPTOS_RELIABILITY       0x04
-#endif
-
-/* Porting::
-
-   Newer BSD derivatives store non-permanent daemon files in a
-   directory called /var/run.   If your system has a /var/run,
-   use it; otherwise, use /etc. */
-
-#ifndef _PATH_DHCPD_PID
-#define _PATH_DHCPD_PID	"/etc/dhcpd.pid"
-#endif
-#ifndef _PATH_DHCPD6_PID
-#define _PATH_DHCPD6_PID "/etc/dhcpd6.pid"
-#endif
-#ifndef _PATH_DHCLIENT_PID
-#define _PATH_DHCLIENT_PID "/etc/dhclient.pid"
-#endif
-#ifndef _PATH_DHCLIENT6_PID
-#define _PATH_DHCLIENT6_PID "/etc/dhclient6.pid"
-#endif
-#ifndef _PATH_DHCRELAY_PID
-#define _PATH_DHCRELAY_PID "/etc/dhcrelay.pid"
-#endif
-
-/* Porting::
-
-   If your system supports standard ANSI C, it should provide the file
-   /usr/include/stdarg.h.   This contains the ANSI standard declarations
-   for functions which take a variable number of arguments.
-
-   Older systems with non-ANSI compilers cannot support this interface,
-   and generally use the older varargs interface, defined in <varargs.h>.
-   Some systems only support varargs, but define the interface in
-   <stdarg.h> anyway.
-
-   You must choose one of the two sets of definitions below.   Try
-   stdarg.h first, unless you know it won't work.   If you have
-   trouble compiling errwarn.c, try switching to the varargs.h definitions.
-   If that fails, try using stdarg.h with the varargs definitions. */
-
-#if 0
-/* Stdarg definitions for ANSI-compliant C compilers. */
-#include <stdarg.h>
-#define VA_DOTDOTDOT ...
-#define VA_start(list, last) va_start (list, last)
-#define va_dcl
-#endif
-
-#if 0
-/* Varargs definitions, for non-ANSI-compliant C compilers. */
-#include <varargs.h>
-#define VA_DOTDOTDOT va_alist
-#define VA_start(list, last) va_start (list)
-#endif
-
-/* Porting::
-
-   Some systems (notably 4.4BSD derivatives) support versions of the
-   sprintf functions which will deposit a limited number of characters
-   into the buffer; that limit is provided in an extra argument.
-   If your system doesn't support this functionality, you must include
-   the definition below for a dhcp-distribution-local version to be
-   built and used: */
-
-#if 0
-#define NO_SNPRINTF
-#endif
-
-/* Porting::
-
-   Some systems provide a function, strerror(), which takes the unix
-   error number (see errno) and returns a pointer to a static buffer
-   containing the corresponding error message.
-
-   If your system doesn't provide strerror(), define NO_STRERROR
-   as shown below: */
-
-#if 0
-#define NO_STRERROR
-char *strerror (int);
-#endif
-
-/* Porting::
-
-   Once dhcpd has initialized itself, it loops forever waiting for
-   packets to come in.   Since we need to support multiple input streams
-   in order to support multiple interfaces, dhcpd needs to be able to
-   do a syscall to determine which descriptors have input waiting on
-   them.
-
-   Normally, dhcpd uses the select() system call, which is a 4.2BSD
-   syscall invented precisely for this purpose.   Unfortunately, some
-   System V-based systems do not support select() properly when it
-   operates on streams.   The System V interface which does (largely)
-   the same thing as select is called poll().   In some cases, this may
-   work better than select() - if you find that dhcpd is hanging and not
-   responding to packets very consistently, you might try defining
-   USE_POLL and including <poll.h>. */
-
-#if 0
-#define USE_POLL
-#include <poll.h>
-#endif
-
-/* Porting::
-
-   You must define the default network API for your port.   This
-   will depend on whether one of the existing APIs will work for
-   you, or whether you need to implement support for a new API.
-   Currently, the following APIs are supported:
-
-   	The BSD socket API: define USE_SOCKETS.
-	The Berkeley Packet Filter: define USE_BPF.
-	The Streams Network Interface Tap (NIT): define USE_NIT.
-	Raw sockets: define USE_RAW_SOCKETS
-
-   If your system supports the BSD socket API and doesn't provide
-   one of the supported interfaces to the physical packet layer,
-   you can either provide support for the low-level API that your
-   system does support (if any) or just use the BSD socket interface.
-   The BSD socket interface doesn't support multiple network interfaces,
-   and on many systems, it does not support the all-ones broadcast
-   address, which can cause problems with some DHCP clients (e.g.
-   Microsoft Windows 95). */
-
-#if defined (USE_DEFAULT_NETWORK)
-#  define USE_SOCKETS
-#endif
-
-/* Porting::
-
-   Recent versions of BSD added a new element to the sockaddr structure:
-   sa_len.   This indicates the length of the structure, and is used
-   in a variety of places, not the least of which is the SIOCGIFCONF
-   ioctl, which is used to figure out what interfaces are attached to
-   the system.
-
-   You should be able to determine if your system has an sa_len element
-   by looking at the struct sockaddr definition in /usr/include/sys/socket.h.
-   If it does, you must define HAVE_SA_LEN.   Otherwise, you must not.
-   The most obvious symptom that you've got this wrong is either a compile
-   error complaining about the use of the sa_len structure element, or
-   the failure of dhcpd to find any interfaces. */
-
-/* #define HAVE_SA_LEN */
-
-/* Every operating system has its own way of separating lines in a
-   sequential text file.  Most modern systems use a single character,
-   either an ASCII Newline (10) or an ASCII Carriage Return (13).
-
-   The most notable exception is MS-DOS (and consequently, Windows),
-   which uses an ASCII Carriage Return followed by a Newline to
-   separate each line.  Fortunately, MS-DOS C compiler libraries
-   typically hide this from the programmer, returning just a Newline.
-
-   Define EOL to be whatever getc() returns for a newline. */
-
-#define EOL '\n'
-
-/* Some older C compilers don't support the void pointer type.
-   ANSI C defines void * to be a pointer type that matches
-   any other pointer type.   This is handy for returning a pointer
-   which will always need to be cast to a different value.   For
-   example, malloc() on an ANSI C-compliant system returns void *.
-
-   If your compiler doesn't support void pointers, you may need to
-   define VOIDPTR to be char *; otherwise, define it to be void *. */
-
-#define VOIDPTR void *
-
-/* Porting::
-
-   The following definitions for time should work on any unix machine.
-   They may not work (or at least, may not work well) on a variety of
-   non-unix machines.   If you are porting to a non-unix machine, you
-   probably need to change the definitions below and perhaps include
-   different headers.
-
-   I should note that dhcpd is not yet entirely clean of unix-specific
-   time references, so the list of defines shown below probably isn't
-   good enough if you're porting to a system that really doesn't support
-   unix time.   It's probably a reasonable place to start, though. */
-
-#include <time.h>
-
-#define TIME time_t
-#define GET_TIME(x)	time ((x))
diff --git a/includes/cf/sco.h b/includes/cf/sco.h
deleted file mode 100644
index 9e8486de..00000000
--- a/includes/cf/sco.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/* sco.h
-
-   System dependencies for SCO ODT 3.0...
-
-   Based on changes contributed by Gerald Rosenberg. */
-
-/*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-2003 by Internet Software Consortium
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * 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.
- *
- *   Internet Systems Consortium, Inc.
- *   950 Charter Street
- *   Redwood City, CA 94063
- *   <info@isc.org>
- *   https://www.isc.org/
- *
- */
-
-#include <syslog.h>
-#include <sys/types.h>
-
-/* Basic Integer Types not defined in SCO headers... */
-
-typedef char int8_t;
-typedef short int16_t;
-typedef long int32_t; 
-
-typedef unsigned char u_int8_t;
-typedef unsigned short u_int16_t; 
-typedef unsigned long u_int32_t;
-
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <setjmp.h>
-#include <limits.h>
-
-extern int h_errno;
-
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/if_arp.h>
-#include <netinet/tcp.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
-/* XXX dunno if this is required for SCO... */
-/*
- * Definitions for IP type of service (ip_tos)
- */
-#define IPTOS_LOWDELAY          0x10
-#define IPTOS_THROUGHPUT        0x08
-#define IPTOS_RELIABILITY       0x04
-/*      IPTOS_LOWCOST           0x02 XXX */
-
-/* SCO doesn't have /var/run. */
-#ifndef _PATH_DHCPD_CONF
-#define _PATH_DHCPD_CONF	"/etc/dhcpd.conf"
-#endif
-#ifndef _PATH_DHCPD_PID
-#define _PATH_DHCPD_PID 	"/etc/dhcpd.pid"
-#endif
-#ifndef _PATH_DHCPD6_PID
-#define _PATH_DHCPD6_PID 	"/etc/dhcpd6.pid"
-#endif
-#ifndef _PATH_DHCLIENT_PID
-#define _PATH_DHCLIENT_PID  "/etc/dhclient.pid"
-#endif
-#ifndef _PATH_DHCLIENT6_PID
-#define _PATH_DHCLIENT6_PID  "/etc/dhclient6.pid"
-#endif
-#ifndef _PATH_DHCRELAY_PID
-#define _PATH_DHCRELAY_PID  "/etc/dhcrelay.pid"
-#endif
-#ifndef _PATH_DHCPD_DB
-#define _PATH_DHCPD_DB      "/etc/dhcpd.leases"
-#endif
-#ifndef _PATH_DHCPD6_DB
-#define _PATH_DHCPD6_DB      "/etc/dhcpd6.leases"
-#endif
-#ifndef _PATH_DHCLIENT_DB
-#define _PATH_DHCLIENT_DB   "/etc/dhclient.leases"
-#endif
-#ifndef _PATH_DHCLIENT6_DB
-#define _PATH_DHCLIENT6_DB  "/etc/dhclient6.leases"
-#endif
-
-
-#if !defined (INADDR_LOOPBACK)
-#define INADDR_LOOPBACK	((u_int32_t)0x7f000001)
-#endif
-
-/* Varargs stuff: use stdarg.h instead ... */
-#include <stdarg.h>
-#define VA_DOTDOTDOT ...
-#define VA_start(list, last) va_start (list, last)
-#define va_dcl
-
-/* SCO doesn't support limited sprintfs. */
-#define NO_SNPRINTF
-
-/* By default, use BSD Socket API for receiving and sending packets.
-   This actually works pretty well on Solaris, which doesn't censor
-   the all-ones broadcast address. */
-#if defined (USE_DEFAULT_NETWORK)
-# define USE_SOCKETS
-#endif
-
-#define EOL	'\n'
-#define VOIDPTR	void *
-
-/* socklen_t */
-typedef int socklen_t;
-
-/*
- * Time stuff...
- *
- * Definitions for an ISC DHCPD system that uses time_t
- * to represent time internally as opposed to, for example,  struct timeval.)
- */
-
-#include <time.h>
-#include <sys/time.h>
-
-#define TIME time_t
-#define GET_TIME(x)	time ((x))
-
-#ifdef NEED_PRAND_CONF
-const char *cmds[] = {
-	"/bin/ps -ef 2>&1",
-	"/etc/arp -n -a 2>&1",
-	"/usr/bin/netstat -an 2>&1",
-	"/bin/df  2>&1",
-	"/usr/bin/uptime  2>&1",
-	"/usr/bin/netstat -s 2>&1",
-	"/usr/bin/vmstat  2>&1",
-	"/usr/bin/w  2>&1",
-	NULL
-};
-
-const char *dirs[] = {
-	"/tmp",
-	"/usr/tmp",
-	".",
-	"/",
-	"/var/spool",
-	"/var/adm",
-	"/dev",
-	NULL
-};
-
-const char *files[] = {
-	NULL
-};
-#endif /* NEED_PRAND_CONF */
diff --git a/includes/cf/sunos4.h b/includes/cf/sunos4.h
deleted file mode 100644
index ebc56388..00000000
--- a/includes/cf/sunos4.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/* sunos4.h
-
-   System dependencies for SunOS 4 (tested on 4.1.4)... */
-
-/*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-2003 by Internet Software Consortium
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * 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.
- *
- *   Internet Systems Consortium, Inc.
- *   950 Charter Street
- *   Redwood City, CA 94063
- *   <info@isc.org>
- *   https://www.isc.org/
- *
- */
-
-/* Basic Integer Types not defined in SunOS headers... */
-
-#define int8_t		char
-#define int16_t		short
-#define int32_t		int
-
-#define u_int8_t	unsigned char
-#define u_int16_t	unsigned short 
-#define u_int32_t	unsigned int
-
-#define	ssize_t		int
-
-#define SOCKLEN_T	int
-
-#define fpos_t		long
-#define fgetpos(f, p)	(((*(p)) = ftell (f)) == -1 ? -1 : 0)
-#define fsetpos(f, p)	(fseek (f, p, SEEK_SET))
-
-/* No endian.h either. */
-/*
- * Definitions for byte order, according to byte significance from low
- * address to high.
- */
-#define LITTLE_ENDIAN   1234    /* LSB first: i386, vax */
-#define BIG_ENDIAN      4321    /* MSB first: 68000, ibm, net */
-#define PDP_ENDIAN      3412    /* LSB first in word, MSW first in long */
-
-#define BYTE_ORDER      BIG_ENDIAN
-
-/* The jmp_buf type is an array on SunOS, so we can't dereference it
-   and must declare it differently. */
-#define jbp_decl(x)	jmp_buf x
-#define jref(x)		(x)
-#define jdref(x)	(x)
-#define jrefproto	jmp_buf
-
-#include <syslog.h>
-#include <sys/types.h>
-
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <setjmp.h>
-#include <limits.h>
-#include <poll.h>
-
-extern int h_errno;
-
-#include <net/if.h>
-#include <net/if_arp.h>
-
-/*
- * Definitions for IP type of service (ip_tos)
- */
-#define IPTOS_LOWDELAY          0x10
-#define IPTOS_THROUGHPUT        0x08
-#define IPTOS_RELIABILITY       0x04
-/*      IPTOS_LOWCOST           0x02 XXX */
-
-/* SunOS systems don't have /var/run, but some sites have added it.
-   If you want to put dhcpd.pid in /var/run, define _PATH_DHCPD_PID
-   in site.h. */
-#ifndef _PATH_DHCPD_PID
-#define _PATH_DHCPD_PID	"/etc/dhcpd.pid"
-#endif
-#ifndef _PATH_DHCPD6_PID
-#define _PATH_DHCPD6_PID "/etc/dhcpd6.pid"
-#endif
-#ifndef _PATH_DHCLIENT_PID
-#define _PATH_DHCLIENT_PID "/etc/dhclient.pid"
-#endif
-#ifndef _PATH_DHCLIENT6_PID
-#define _PATH_DHCLIENT6_PID "/etc/dhclient6.pid"
-#endif
-#ifndef _PATH_DHCRELAY_PID
-#define _PATH_DHCRELAY_PID "/etc/dhcrelay.pid"
-#endif
-
-#ifdef __GNUC__
-/* Varargs stuff: use stdarg.h instead ... */
-#include <stdarg.h>
-#define VA_DOTDOTDOT ...
-#define VA_start(list, last) va_start (list, last)
-#define va_dcl
-#else /* !__GNUC__*/
-/* Varargs stuff... */
-#include <varargs.h>
-#define VA_DOTDOTDOT va_alist
-#define VA_start(list, last) va_start (list)
-#endif /* !__GNUC__*/
-
-/* SunOS doesn't support limited sprintfs. */
-#define NO_SNPRINTF
-
-/* SunOS doesn't supply strerror... */
-#define NO_STRERROR
-char *strerror (int);
-
-#define NEED_INET_ATON
-
-/* By default, use NIT API for receiving and sending packets... */
-#if defined (USE_DEFAULT_NETWORK)
-#  define USE_NIT
-#endif
-
-#define EOL	'\n'
-#define VOIDPTR	void *
-
-#include <time.h>
-#include <sys/time.h>
-
-#define TIME time_t
-#define GET_TIME(x)	time ((x))
-
-#ifdef NEED_PRAND_CONF
-const char *cmds[] = {
-	"/bin/ps -axlw 2>&1",
-	"/usr/ucb/netstat -an 2>&1",
-	"/bin/df  2>&1",
-	"/usr/bin/dig com. soa +ti=1 +retry=0 2>&1",
-	"/usr/ucb/uptime  2>&1",
-	"/usr/ucb/netstat -an 2>&1",
-	"/bin/iostat  2>&1",
-	NULL
-};
-
-const char *dirs[] = {
-	"/tmp",
-	"/var/tmp",
-	".",
-	"/",
-	"/var/spool",
-	"/var/adm",
-	"/dev",
-	"/var/mail",
-	"/home",
-	NULL
-};
-
-const char *files[] = {
-	"/var/adm/messages",
-	"/var/adm/wtmp",
-	"/var/adm/lastlog",
-	NULL
-};
-#endif /* NEED_PRAND_CONF */
diff --git a/includes/cf/sunos5-5.h b/includes/cf/sunos5-5.h
deleted file mode 100644
index f4b2458a..00000000
--- a/includes/cf/sunos5-5.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/* sunos5-5.h
-
-   System dependencies for Solaris 2.x (tested on 2.5 with gcc)... */
-
-/*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-2003 by Internet Software Consortium
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * 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.
- *
- *   Internet Systems Consortium, Inc.
- *   950 Charter Street
- *   Redwood City, CA 94063
- *   <info@isc.org>
- *   https://www.isc.org/
- *
- */
-
-/* SunOS defines uint*_t and int*_t, but not u_int*_t.  */
-
-#if defined(_SYS_INT_TYPES_H)
-typedef uint8_t		u_int8_t;
-typedef uint16_t	u_int16_t;
-typedef uint32_t	u_int32_t;
-typedef uint64_t	u_int64_t;
-#else /* Older SunOS has no idea what these things mean. */
-typedef int8_t char
-typedef int16_t short
-typedef int32_t int	/* If _LP64, long is 64-bit, int is still 32. */
-typedef u_int8_t unsigned char
-typedef u_int16_t unsigned short
-typedef u_int32_t unsigned int
-#endif /* defined(_SYS_INT_TYPES_H) */
-
-/* The jmp_buf type is an array on Solaris, so we can't dereference it
-   and must declare it differently. */
-
-#define jbp_decl(x)	jmp_buf x
-#define jref(x)		(x)
-#define jdref(x)	(x)
-#define jrefproto	jmp_buf
-
-#include <syslog.h>
-#include <sys/types.h>
-#include <sys/sockio.h>
-
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <setjmp.h>
-#include <limits.h>
-
-extern int h_errno;
-
-#include <net/if.h>
-#include <net/if_arp.h>
-
-/* Solaris 2.6 defines AF_LINK, so we need the rest of the baggage that
-   comes with it, but of course Solaris 2.5 and previous do not. */
-#if defined (AF_LINK)
-#include <net/if_dl.h>
-#endif
-
-/*
- * Definitions for IP type of service (ip_tos)
- */
-#define IPTOS_LOWDELAY          0x10
-#define IPTOS_THROUGHPUT        0x08
-#define IPTOS_RELIABILITY       0x04
-/*      IPTOS_LOWCOST           0x02 XXX */
-
-/* Solaris systems don't have /var/run, but some sites have added it.
-   If you want to put dhcpd.pid in /var/run, define _PATH_DHCPD_PID
-   in site.h. */
-#ifndef _PATH_DHCPD_PID
-#define _PATH_DHCPD_PID	"/etc/dhcpd.pid"
-#endif
-#ifndef _PATH_DHCPD6_PID
-#define _PATH_DHCPD6_PID "/etc/dhcpd6.pid"
-#endif
-#ifndef _PATH_DHCLIENT_PID
-#define _PATH_DHCLIENT_PID "/etc/dhclient.pid"
-#endif
-#ifndef _PATH_DHCLIENT6_PID
-#define _PATH_DHCLIENT6_PID "/etc/dhclient6.pid"
-#endif
-#ifndef _PATH_DHCRELAY_PID
-#define _PATH_DHCRELAY_PID "/etc/dhcrelay.pid"
-#endif
-
-#if defined (__GNUC__) || defined (__SVR4)
-/* Varargs stuff: use stdarg.h instead ... */
-#include <stdarg.h>
-#define VA_DOTDOTDOT ...
-#define VA_start(list, last) va_start (list, last)
-#define va_dcl
-#else /* !__GNUC__*/
-/* Varargs stuff... */
-#include <varargs.h>
-#define VA_DOTDOTDOT va_alist
-#define VA_start(list, last) va_start (list)
-#endif /* !__GNUC__*/
-
-#define NEED_INET_ATON
-
-#if defined (USE_DEFAULT_NETWORK)
-# define USE_DLPI
-# define USE_DLPI_PFMOD
-#endif
-
-#define USE_POLL
-
-#define EOL	'\n'
-#define VOIDPTR	void *
-
-/* Time stuff... */
-
-#include <time.h>
-
-#define TIME time_t
-#define GET_TIME(x)	time ((x))
-
-#define HAVE_MKSTEMP
-
-/* Solaris prior to 2.5 didn't have random().   Rather than being clever and
-   using random() only on versions >2.5, always use rand() and srand(). */
-
-#if SOLARIS_MAJOR == 5 && SOLARIS_MINOR < 5
-#define random()	rand()
-#define srandom(x)	srand(x)
-#endif
-
-/* Solaris doesn't provide an endian.h, so we have to do it. */
-
-#if !defined (BIG_ENDIAN)
-# define BIG_ENDIAN 1
-#endif
-
-#if !defined (BIG_ENDIAN)
-# define LITTLE_ENDIAN 2
-#endif
-
-#if !defined (BYTE_ORDER)
-# if defined (__i386) || defined (i386)
-#  define BYTE_ORDER LITTLE_ENDIAN
-# else
-#  if defined (__sparc) || defined (sparc)
-#   define BYTE_ORDER BIG_ENDIAN
-#  else
-@@@ ERROR @@@   Unable to determine byte order!
-#  endif
-# endif
-#endif
-
-#define ALIAS_NAMES_PERMUTED
-
-#if SOLARIS_MAJOR == 5 && SOLARIS_MINOR < 7
-typedef int socklen_t;
-#endif
-
-#ifdef NEED_PRAND_CONF
-const char *cmds[] = {
-	"/bin/ps -ef 2>&1",
-	"/usr/ucb/netstat -an 2>&1",
-	"/bin/df  2>&1",
-	"/usr/bin/dig com. soa +ti=1 +retry=0 2>&1",
-	"/usr/ucb/uptime  2>&1",
-	"/usr/ucb/netstat -an 2>&1",
-	"/bin/iostat  2>&1",
-	NULL
-};
-
-const char *dirs[] = {
-	"/tmp",
-	"/var/tmp",
-	".",
-	"/",
-	"/var/spool",
-	"/var/adm",
-	"/dev",
-	"/var/mail",
-	"/home",
-	NULL
-};
-
-const char *files[] = {
-	"/proc/self/status",
-	"/var/adm/messages",
-	"/var/adm/wtmp",
-	"/var/adm/lastlog",
-	NULL
-};
-#endif /* NEED_PRAND_CONF */
diff --git a/includes/cf/ultrix.h b/includes/cf/ultrix.h
deleted file mode 100644
index b7047e72..00000000
--- a/includes/cf/ultrix.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/* ultrix.h
-
-   System dependencies for Ultrix 4.2 (tested on 4.2a+multicast)... */
-
-/*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-2003 by Internet Software Consortium
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * 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.
- *
- *   Internet Systems Consortium, Inc.
- *   950 Charter Street
- *   Redwood City, CA 94063
- *   <info@isc.org>
- *   https://www.isc.org/
- *
- */
-
-/* Ultrix uses the old 4.2BSD-style syslog(). */
-#include <sys/syslog.h>
-#define SYSLOG_4_2
-
-#include <sys/types.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <setjmp.h>
-#include <limits.h>
-
-extern int h_errno;
-
-#include <net/if.h>
-
-#ifndef _PATH_DHCPD_PID
-#define _PATH_DHCPD_PID	"/etc/dhcpd.pid"
-#endif
-#ifndef _PATH_DHCPD6_PID
-#define _PATH_DHCPD6_PID "/etc/dhcpd6.pid"
-#endif
-#ifndef _PATH_DHCLIENT_PID
-#define _PATH_DHCLIENT_PID "/etc/dhclient.pid"
-#endif
-#ifndef _PATH_DHCLIENT6_PID
-#define _PATH_DHCLIENT6_PID "/etc/dhclient6.pid"
-#endif
-#ifndef _PATH_DHCRELAY_PID
-#define _PATH_DHCRELAY_PID "/etc/dhcrelay.pid"
-#endif
-
-#define int8_t		char
-#define int16_t		short 
-#define int32_t		long 
-#define	ssize_t		long
-
-#define u_int8_t	unsigned char		/* Not quite POSIX... */
-#define u_int16_t	unsigned short 
-#define u_int32_t	unsigned long 
-
-#define	ssize_t		size_t
-
-/* The jmp_buf type is an array on ultrix, so we can't dereference it
-   and must declare it differently. */
-#define jbp_decl(x)	jmp_buf x
-#define jref(x)		(x)
-#define jdref(x)	(x)
-#define jrefproto	jmp_buf
-
-#define IPTOS_LOWDELAY		0x10
-/*      IPTOS_LOWCOST		0x02 XXX */
-
-/* Varargs stuff... */
-#include <varargs.h>
-#define VA_DOTDOTDOT va_alist
-#define VA_start(list, last) va_start (list)
-
-/* XXX: System is not thought to support snprintf/vsnprintf.  Please verify. */
-#define NO_SNPRINTF
-
-#define NEED_INET_ATON
-
-#define INADDR_LOOPBACK	((u_int32_t)0x7f000001)
-#define EOL	'\n'
-#define VOIDPTR	void *
-#define SOCKLEN_T int
-
-/*
- * Time stuff...
- *
- * Definitions for an ISC DHCPD system that uses time_t
- * to represent time internally as opposed to, for example,  struct timeval.)
- */
-
-#define TIME time_t
-#define GET_TIME(x)	time ((x))
-
-/* Ultrix doesn't provide an endian.h, but it only runs on little-endian
-   machines, so we'll just hack around the issue. */
-#define BIG_ENDIAN 1
-#define LITTLE_ENDIAN 2
-#define BYTE_ORDER LITTLE_ENDIAN
-
-#if defined (USE_DEFAULT_NETWORK)
-#  define USE_UPF
-#endif
-
-#ifdef NEED_PRAND_CONF
-const char *cmds[] = {
-	"/bin/ps -aux 2>&1",
-	"/usr/etc/arp -an 2>&1",
-	"/usr/ucb/netstat -an 2>&1",
-	"/usr/bin/df  2>&1",
-	"/usr/ucb/uptime  2>&1",
-	"/usr/ucb/netstat -an 2>&1",
-	"/usr/bin/iostat  2>&1",
-	NULL
-};
-
-const char *dirs[] = {
-	"/tmp",
-	"/var/tmp",
-	".",
-	"/",
-	"/var/spool",
-	"/var/adm",
-	"/dev",
-	"/var/spool/mail",
-	NULL
-};
-
-const char *files[] = {
-	"/var/spool/mqueue/syslog",
-	"/var/adm/wtmp",
-	"/var/adm/lastlog",
-	NULL
-};
-#endif /* NEED_PRAND_CONF */
diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index d4c81fc1..b20dd240 100644
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -2311,7 +2311,7 @@ int parse_auth_key (struct data_string *, struct parse *);
 int parse_warn (struct parse *, const char *, ...)
 	__attribute__((__format__(__printf__,2,3)));
 struct expression *parse_domain_list(struct parse *cfile, int);
-
+struct expression *parse_domain_name(struct parse *cfile);
 
 /* tree.c */
 extern struct binding_scope *global_scope;
diff --git a/includes/ns_name.h b/includes/ns_name.h
index 5095c1ce..a2c42769 100644
--- a/includes/ns_name.h
+++ b/includes/ns_name.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2001-2003 by Internet Software Consortium
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
@@ -31,6 +31,7 @@
  * <viraj_bais@ccm.fm.intel.com>
  */
 
+int MRns_name_len(const unsigned char *, const unsigned char *);
 int MRns_name_compress(const char *, u_char *, size_t, const unsigned char **,
 		       const unsigned char **);
 int MRns_name_unpack(const unsigned char *, const unsigned char *,
diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h
index a93117c9..b8f7c397 100644
--- a/includes/omapip/isclib.h
+++ b/includes/omapip/isclib.h
@@ -94,7 +94,8 @@
 typedef struct dhcp_context {
 	isc_mem_t	*mctx;
 	isc_appctx_t	*actx;
-	int              actx_started;
+	int              actx_started; // ISC_TRUE if ctxstart has been called
+	int              actx_running; // ISC_TRUE if ctxrun has been called
 	isc_taskmgr_t	*taskmgr;
 	isc_task_t	*task;
 	isc_socketmgr_t *socketmgr;
diff --git a/includes/osdep.h b/includes/osdep.h
index 73cbef41..3ee70bc0 100644
--- a/includes/osdep.h
+++ b/includes/osdep.h
@@ -138,6 +138,10 @@
 #  define USE_UPF_RECEIVE
 #endif
 
+#if defined (SO_BINDTODEVICE) && !defined (HAVE_SO_BINDTODEVICE)
+# define HAVE_SO_BINDTODEVICE
+#endif
+
 /* Porting::
 
    If you add support for sending packets directly out an interface,
@@ -263,10 +267,6 @@
 # define HAVE_ARPHRD_METRICOM
 #endif
 
-#if defined (SO_BINDTODEVICE) && !defined (HAVE_SO_BINDTODEVICE)
-# define HAVE_SO_BINDTODEVICE
-#endif
-
 #if defined (AF_LINK) && !defined (HAVE_AF_LINK)
 # define HAVE_AF_LINK
 #endif