--- client/dhclient.c.orig	2020-01-21 19:21:48 UTC

+++ client/dhclient.c

@@ -83,8 +83,6 @@ static const char message [] = "Internet Systems Conso

 static const char url [] = "For info, please visit https://www.isc.org/software/dhcp/";

 #endif /* UNIT_TEST */

-u_int16_t local_port = 0;

-u_int16_t remote_port = 0;

 #if defined(DHCPv6) && defined(DHCP4o6)

 int dhcp4o6_state = -1; /* -1 = stopped, 0 = polling, 1 = started */

 #endif

--- relay/dhcrelay.c.orig	2020-01-21 19:21:48 UTC

+++ relay/dhcrelay.c

@@ -95,9 +95,6 @@ enum { forward_and_append,	/* Forward and append our o

        forward_untouched,	/* Forward without changes. */

        discard } agent_relay_mode = forward_and_replace;

-u_int16_t local_port;

-u_int16_t remote_port;

-

 /* Relay agent server list. */

 struct server_list {

 	struct server_list *next;

--- server/mdb.c.orig	2020-01-21 19:21:48 UTC

+++ server/mdb.c

@@ -67,8 +67,6 @@ static host_id_info_t *host_id_info = NULL;

 int numclasseswritten;

-omapi_object_type_t *dhcp_type_host;

-

 isc_result_t enter_class(cd, dynamicp, commit)

 	struct class *cd;

 	int dynamicp;