27 files changed, 56 insertions, 239 deletions
diff --git a/usr.sbin/ldpd/accept.c b/usr.sbin/ldpd/accept.c
index d4c4a10483d..8bcf34d937a 100644
--- a/usr.sbin/ldpd/accept.c
+++ b/usr.sbin/ldpd/accept.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: accept.c,v 1.6 2016/05/23 19:09:25 renato Exp $ */
+/*	$OpenBSD: accept.c,v 1.7 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2012 Claudio Jeker <claudio@openbsd.org>
@@ -16,9 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/queue.h>
-#include <sys/time.h>
-#include <event.h>
+#include <sys/types.h>
 #include <stdlib.h>
 
 #include "ldpd.h"
diff --git a/usr.sbin/ldpd/address.c b/usr.sbin/ldpd/address.c
index e15514f51ab..ee7181d6111 100644
--- a/usr.sbin/ldpd/address.c
+++ b/usr.sbin/ldpd/address.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: address.c,v 1.24 2016/05/23 19:09:25 renato Exp $ */
+/*	$OpenBSD: address.c,v 1.25 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -17,18 +17,7 @@
  */
 
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-
-#include <netinet/in.h>
-#include <netinet/ip.h>
 #include <arpa/inet.h>
-#include <net/if_dl.h>
-#include <unistd.h>
-
-#include <errno.h>
-#include <event.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "ldpd.h"
diff --git a/usr.sbin/ldpd/adjacency.c b/usr.sbin/ldpd/adjacency.c
index f55fce564c2..dd03c173f77 100644
--- a/usr.sbin/ldpd/adjacency.c
+++ b/usr.sbin/ldpd/adjacency.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adjacency.c,v 1.20 2016/05/23 19:09:25 renato Exp $ */
+/*	$OpenBSD: adjacency.c,v 1.21 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -19,16 +19,12 @@
  */
 
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <arpa/inet.h>
-
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "ldpd.h"
 #include "ldpe.h"
-#include "control.h"
 #include "log.h"
 
 static void	 adj_itimer(int, short, void *);
diff --git a/usr.sbin/ldpd/control.c b/usr.sbin/ldpd/control.c
index e9ed9d1fc61..1671da2e9f2 100644
--- a/usr.sbin/ldpd/control.c
+++ b/usr.sbin/ldpd/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.25 2016/05/23 19:09:25 renato Exp $ */
+/*	$OpenBSD: control.c,v 1.26 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -18,16 +18,13 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/socket.h>
 #include <sys/un.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "ldpd.h"
-#include "ldp.h"
 #include "ldpe.h"
 #include "log.h"
 #include "control.h"
diff --git a/usr.sbin/ldpd/control.h b/usr.sbin/ldpd/control.h
index b59002209d1..400c695c94e 100644
--- a/usr.sbin/ldpd/control.h
+++ b/usr.sbin/ldpd/control.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.h,v 1.7 2016/05/23 19:09:25 renato Exp $ */
+/*	$OpenBSD: control.h,v 1.8 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -19,9 +19,8 @@
 #ifndef _CONTROL_H_
 #define	_CONTROL_H_
 
+#include <sys/types.h>
 #include <sys/queue.h>
-#include <sys/time.h>
-#include <event.h>
 
 struct ctl_conn {
 	TAILQ_ENTRY(ctl_conn)	entry;
diff --git a/usr.sbin/ldpd/hello.c b/usr.sbin/ldpd/hello.c
index 588f46d3519..b90a3c43720 100644
--- a/usr.sbin/ldpd/hello.c
+++ b/usr.sbin/ldpd/hello.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hello.c,v 1.41 2016/05/23 19:09:25 renato Exp $ */
+/*	$OpenBSD: hello.c,v 1.42 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -17,23 +17,12 @@
  */
 
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-
-#include <netinet/in.h>
-#include <netinet/ip.h>
 #include <arpa/inet.h>
-#include <net/if_dl.h>
-
-#include <errno.h>
-#include <event.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "ldpd.h"
-#include "ldp.h"
-#include "log.h"
 #include "ldpe.h"
+#include "log.h"
 
 static int	gen_hello_prms_tlv(struct ibuf *buf, uint16_t, uint16_t);
 static int	gen_opt4_hello_prms_tlv(struct ibuf *, uint16_t, uint32_t);
diff --git a/usr.sbin/ldpd/init.c b/usr.sbin/ldpd/init.c
index 7d81c988d2d..ddaadf14d60 100644
--- a/usr.sbin/ldpd/init.c
+++ b/usr.sbin/ldpd/init.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init.c,v 1.26 2016/05/23 19:09:25 renato Exp $ */
+/*	$OpenBSD: init.c,v 1.27 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -17,24 +17,12 @@
  */
 
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-
-#include <netinet/in.h>
-#include <netinet/ip.h>
 #include <arpa/inet.h>
-#include <net/if_dl.h>
-#include <unistd.h>
-
-#include <errno.h>
-#include <event.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "ldpd.h"
-#include "ldp.h"
-#include "log.h"
 #include "ldpe.h"
+#include "log.h"
 
 static int	gen_init_prms_tlv(struct ibuf *, struct nbr *, uint16_t);
 static int	tlv_decode_opt_init_prms(char *, uint16_t);
diff --git a/usr.sbin/ldpd/interface.c b/usr.sbin/ldpd/interface.c
index 9ef13fc4ae4..a579f7ef32e 100644
--- a/usr.sbin/ldpd/interface.c
+++ b/usr.sbin/ldpd/interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: interface.c,v 1.42 2016/05/23 19:09:25 renato Exp $ */
+/*	$OpenBSD: interface.c,v 1.43 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -18,26 +18,14 @@
  */
 
 #include <sys/types.h>
-#include <sys/ioctl.h>
 #include <sys/time.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
 #include <arpa/inet.h>
-#include <net/if.h>
-#include <net/if_types.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <err.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
-#include <event.h>
 
 #include "ldpd.h"
-#include "ldp.h"
-#include "log.h"
 #include "ldpe.h"
+#include "log.h"
 
 static struct if_addr	*if_addr_new(struct kaddr *);
 static struct if_addr	*if_addr_lookup(struct if_addr_head *, struct kaddr *);
diff --git a/usr.sbin/ldpd/keepalive.c b/usr.sbin/ldpd/keepalive.c
index 65a0e224448..10cdecb80ff 100644
--- a/usr.sbin/ldpd/keepalive.c
+++ b/usr.sbin/ldpd/keepalive.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: keepalive.c,v 1.15 2016/05/23 17:43:42 renato Exp $ */
+/*	$OpenBSD: keepalive.c,v 1.16 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -17,24 +17,11 @@
  */
 
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <arpa/inet.h>
-#include <net/if_dl.h>
-#include <unistd.h>
-
-#include <errno.h>
-#include <event.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "ldpd.h"
-#include "ldp.h"
-#include "log.h"
 #include "ldpe.h"
+#include "log.h"
 
 void
 send_keepalive(struct nbr *nbr)
diff --git a/usr.sbin/ldpd/kroute.c b/usr.sbin/ldpd/kroute.c
index 3c5bd14857e..8dddc938699 100644
--- a/usr.sbin/ldpd/kroute.c
+++ b/usr.sbin/ldpd/kroute.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kroute.c,v 1.58 2016/05/23 19:09:25 renato Exp $ */
+/*	$OpenBSD: kroute.c,v 1.59 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -22,19 +22,11 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/sysctl.h>
-#include <sys/tree.h>
-#include <sys/uio.h>
-#include <netinet/in.h>
 #include <arpa/inet.h>
-#include <net/if.h>
 #include <net/if_dl.h>
-#include <net/if_types.h>
 #include <net/route.h>
 #include <netmpls/mpls.h>
-#include <err.h>
 #include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/usr.sbin/ldpd/l2vpn.c b/usr.sbin/ldpd/l2vpn.c
index d852877f960..75ef27cb0f3 100644
--- a/usr.sbin/ldpd/l2vpn.c
+++ b/usr.sbin/ldpd/l2vpn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: l2vpn.c,v 1.15 2016/05/23 19:09:25 renato Exp $ */
+/*	$OpenBSD: l2vpn.c,v 1.16 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2015 Renato Westphal <renato@openbsd.org>
@@ -20,18 +20,13 @@
  */
 
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-
-#include <err.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <limits.h>
 
 #include "ldpd.h"
-#include "lde.h"
 #include "ldpe.h"
-#include "control.h"
+#include "lde.h"
 #include "log.h"
 
 static void	 l2vpn_pw_fec(struct l2vpn_pw *, struct fec *);
diff --git a/usr.sbin/ldpd/labelmapping.c b/usr.sbin/ldpd/labelmapping.c
index 3697f483466..06ecafb4d33 100644
--- a/usr.sbin/ldpd/labelmapping.c
+++ b/usr.sbin/ldpd/labelmapping.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: labelmapping.c,v 1.44 2016/05/23 19:09:25 renato Exp $ */
+/*	$OpenBSD: labelmapping.c,v 1.45 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -18,25 +18,15 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/uio.h>
-
-#include <netinet/in.h>
-#include <netinet/ip.h>
 #include <arpa/inet.h>
-#include <net/if_dl.h>
 #include <netmpls/mpls.h>
-#include <unistd.h>
-
-#include <errno.h>
-#include <event.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "ldpd.h"
-#include "ldp.h"
-#include "log.h"
 #include "ldpe.h"
+#include "log.h"
 
 static void	 enqueue_pdu(struct nbr *, struct ibuf *, uint16_t);
 static void	 gen_label_tlv(struct ibuf *, uint32_t);
diff --git a/usr.sbin/ldpd/lde.c b/usr.sbin/ldpd/lde.c
index 71b711e62b2..d1a4bad16d9 100644
--- a/usr.sbin/ldpd/lde.c
+++ b/usr.sbin/ldpd/lde.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lde.c,v 1.55 2016/05/23 19:09:25 renato Exp $ */
+/*	$OpenBSD: lde.c,v 1.56 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org>
@@ -19,19 +19,18 @@
  */
 
 #include <sys/types.h>
+#include <sys/time.h>
 #include <sys/socket.h>
-#include <sys/queue.h>
 #include <netinet/in.h>
 #include <netmpls/mpls.h>
 #include <arpa/inet.h>
-#include <err.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <string.h>
 #include <pwd.h>
 #include <unistd.h>
-#include <event.h>
+#include <limits.h>
 
 #include "ldp.h"
 #include "ldpd.h"
diff --git a/usr.sbin/ldpd/lde.h b/usr.sbin/ldpd/lde.h
index 463f2255ed4..a3708fcb4a6 100644
--- a/usr.sbin/ldpd/lde.h
+++ b/usr.sbin/ldpd/lde.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lde.h,v 1.36 2016/05/23 19:09:25 renato Exp $ */
+/*	$OpenBSD: lde.h,v 1.37 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -20,11 +20,8 @@
 #define _LDE_H_
 
 #include <sys/types.h>
-#include <sys/time.h>
-#include <sys/tree.h>
 #include <sys/queue.h>
-#include <event.h>
-#include <limits.h>
+#include <sys/tree.h>
 
 enum fec_type {
 	FEC_TYPE_IPV4,
diff --git a/usr.sbin/ldpd/lde_lib.c b/usr.sbin/ldpd/lde_lib.c
index ab0a8797506..ae437771f2b 100644
--- a/usr.sbin/ldpd/lde_lib.c
+++ b/usr.sbin/ldpd/lde_lib.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lde_lib.c,v 1.56 2016/05/23 19:09:25 renato Exp $ */
+/*	$OpenBSD: lde_lib.c,v 1.57 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -17,26 +17,15 @@
  */
 
 #include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
 #include <sys/socket.h>
-#include <net/if.h>
-#include <net/if_types.h>
-#include <netinet/in.h>
 #include <netmpls/mpls.h>
-#include <arpa/inet.h>
-#include <ctype.h>
-#include <err.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
-#include <event.h>
+#include <limits.h>
 
 #include "ldpd.h"
-#include "ldp.h"
-#include "log.h"
 #include "lde.h"
+#include "log.h"
 
 static __inline int	 fec_compare(struct fec *, struct fec *);
 static int		 lde_nbr_is_nexthop(struct fec_node *,
diff --git a/usr.sbin/ldpd/ldp.h b/usr.sbin/ldpd/ldp.h
index bbf12ca89ff..ecab3201dbb 100644
--- a/usr.sbin/ldpd/ldp.h
+++ b/usr.sbin/ldpd/ldp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldp.h,v 1.27 2016/05/23 18:58:48 renato Exp $ */
+/*	$OpenBSD: ldp.h,v 1.28 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -22,7 +22,7 @@
 #ifndef _LDP_H_
 #define _LDP_H_
 
-#include <netinet/in.h>
+#include <sys/types.h>
 
 /* misc */
 #define LDP_VERSION		1
diff --git a/usr.sbin/ldpd/ldpd.c b/usr.sbin/ldpd/ldpd.c
index d4509c8274f..a190927ec34 100644
--- a/usr.sbin/ldpd/ldpd.c
+++ b/usr.sbin/ldpd/ldpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldpd.c,v 1.45 2016/05/23 19:09:25 renato Exp $ */
+/*	$OpenBSD: ldpd.c,v 1.46 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -19,17 +19,7 @@
  */
 
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/queue.h>
-#include <sys/time.h>
-#include <sys/stat.h>
 #include <sys/wait.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netmpls/mpls.h>
-
-#include <event.h>
 #include <err.h>
 #include <errno.h>
 #include <pwd.h>
@@ -40,11 +30,9 @@
 #include <unistd.h>
 
 #include "ldpd.h"
-#include "ldp.h"
 #include "ldpe.h"
-#include "control.h"
-#include "log.h"
 #include "lde.h"
+#include "log.h"
 
 static void		 main_sig_handler(int, short, void *);
 static __dead void	 usage(void);
diff --git a/usr.sbin/ldpd/ldpd.h b/usr.sbin/ldpd/ldpd.h
index 757191f6a9c..d8b4260f990 100644
--- a/usr.sbin/ldpd/ldpd.h
+++ b/usr.sbin/ldpd/ldpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldpd.h,v 1.72 2016/05/23 19:09:25 renato Exp $ */
+/*	$OpenBSD: ldpd.h,v 1.73 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -21,16 +21,15 @@
 #ifndef _LDPD_H_
 #define _LDPD_H_
 
-#include <sys/queue.h>
+#include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/time.h>
+#include <sys/queue.h>
 #include <sys/tree.h>
-#include <md5.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <event.h>
-
 #include <imsg.h>
+
 #include "ldp.h"
 
 #define CONF_FILE		"/etc/ldpd.conf"
diff --git a/usr.sbin/ldpd/ldpe.c b/usr.sbin/ldpd/ldpe.c
index 93050d50224..5ba09019aa7 100644
--- a/usr.sbin/ldpd/ldpe.c
+++ b/usr.sbin/ldpd/ldpe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldpe.c,v 1.58 2016/05/23 19:09:25 renato Exp $ */
+/*	$OpenBSD: ldpe.c,v 1.59 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -19,25 +19,14 @@
  */
 
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/queue.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <net/if_types.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <string.h>
-#include <fcntl.h>
 #include <pwd.h>
 #include <unistd.h>
-#include <event.h>
 #include <arpa/inet.h>
-#include <err.h>
 #include <errno.h>
-#include <stdio.h>
 
-#include "ldp.h"
 #include "ldpd.h"
 #include "ldpe.h"
 #include "lde.h"
diff --git a/usr.sbin/ldpd/ldpe.h b/usr.sbin/ldpd/ldpe.h
index 83248b5f78f..87ffe1eecc0 100644
--- a/usr.sbin/ldpd/ldpe.h
+++ b/usr.sbin/ldpd/ldpe.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldpe.h,v 1.53 2016/05/23 19:09:25 renato Exp $ */
+/*	$OpenBSD: ldpe.h,v 1.54 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2004, 2005, 2008 Esben Norby <norby@openbsd.org>
@@ -19,15 +19,16 @@
 #ifndef _LDPE_H_
 #define _LDPE_H_
 
-#define min(x,y) ((x) <= (y) ? (x) : (y))
-#define max(x,y) ((x) > (y) ? (x) : (y))
-
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
+#include <sys/queue.h>
+#include <sys/tree.h>
 #include <net/pfkeyv2.h>
 
+#include "ldpd.h"
+
+#define min(x,y) ((x) <= (y) ? (x) : (y))
+#define max(x,y) ((x) > (y) ? (x) : (y))
+
 struct hello_source {
 	enum hello_type		 type;
 	struct {
diff --git a/usr.sbin/ldpd/log.c b/usr.sbin/ldpd/log.c
index df44847c68b..16c1bbcae54 100644
--- a/usr.sbin/ldpd/log.c
+++ b/usr.sbin/ldpd/log.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.c,v 1.26 2016/05/23 19:09:25 renato Exp $ */
+/*	$OpenBSD: log.c,v 1.27 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -16,13 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
 #include <arpa/inet.h>
-
 #include <errno.h>
-#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/ldpd/neighbor.c b/usr.sbin/ldpd/neighbor.c
index f56462956c0..c93f4a27d73 100644
--- a/usr.sbin/ldpd/neighbor.c
+++ b/usr.sbin/ldpd/neighbor.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: neighbor.c,v 1.69 2016/05/23 19:09:25 renato Exp $ */
+/*	$OpenBSD: neighbor.c,v 1.70 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -19,29 +19,18 @@
  */
 
 #include <sys/types.h>
-#include <sys/ioctl.h>
 #include <sys/time.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
-#include <net/if.h>
-
-#include <ctype.h>
-#include <err.h>
 #include <errno.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <event.h>
 #include <unistd.h>
 
 #include "ldpd.h"
-#include "ldp.h"
 #include "ldpe.h"
-#include "control.h"
-#include "log.h"
 #include "lde.h"
+#include "log.h"
 
 static __inline int	 nbr_id_compare(struct nbr *, struct nbr *);
 static __inline int	 nbr_addr_compare(struct nbr *, struct nbr *);
diff --git a/usr.sbin/ldpd/notification.c b/usr.sbin/ldpd/notification.c
index 32bb2794bdc..871195c7969 100644
--- a/usr.sbin/ldpd/notification.c
+++ b/usr.sbin/ldpd/notification.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: notification.c,v 1.29 2016/05/23 19:09:25 renato Exp $ */
+/*	$OpenBSD: notification.c,v 1.30 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -17,18 +17,7 @@
  */
 
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-
-#include <netinet/in.h>
-#include <netinet/ip.h>
 #include <arpa/inet.h>
-#include <net/if_dl.h>
-#include <unistd.h>
-
-#include <errno.h>
-#include <event.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "ldpd.h"
diff --git a/usr.sbin/ldpd/packet.c b/usr.sbin/ldpd/packet.c
index e14f1a20e05..21411c1985a 100644
--- a/usr.sbin/ldpd/packet.c
+++ b/usr.sbin/ldpd/packet.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: packet.c,v 1.56 2016/05/23 19:09:25 renato Exp $ */
+/*	$OpenBSD: packet.c,v 1.57 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -18,26 +18,18 @@
  */
 
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-
 #include <netinet/in.h>
-#include <netinet/ip.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 #include <net/if_dl.h>
-#include <fcntl.h>
 #include <unistd.h>
-
 #include <errno.h>
-#include <event.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "ldpd.h"
-#include "ldp.h"
-#include "log.h"
 #include "ldpe.h"
+#include "log.h"
 
 static struct iface		*disc_find_iface(unsigned int, int,
 				    union ldpd_addr *, int);
diff --git a/usr.sbin/ldpd/parse.y b/usr.sbin/ldpd/parse.y
index 963b59d2417..6aa7ed4caaa 100644
--- a/usr.sbin/ldpd/parse.y
+++ b/usr.sbin/ldpd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.51 2016/05/23 19:09:25 renato Exp $ */
+/*	$OpenBSD: parse.y,v 1.52 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2004, 2005, 2008 Esben Norby <norby@openbsd.org>
@@ -22,27 +22,20 @@
  */
 
 %{
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <sys/stat.h>
-#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <ctype.h>
 #include <err.h>
-#include <errno.h>
 #include <unistd.h>
 #include <ifaddrs.h>
 #include <net/if_types.h>
 #include <limits.h>
-#include <stdarg.h>
 #include <stdio.h>
-#include <string.h>
 #include <syslog.h>
 
-#include "ldp.h"
 #include "ldpd.h"
-#include "lde.h"
 #include "ldpe.h"
+#include "lde.h"
 #include "log.h"
 
 struct file {
diff --git a/usr.sbin/ldpd/pfkey.c b/usr.sbin/ldpd/pfkey.c
index b31663726cd..57b8f4ac096 100644
--- a/usr.sbin/ldpd/pfkey.c
+++ b/usr.sbin/ldpd/pfkey.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfkey.c,v 1.9 2016/05/23 19:09:25 renato Exp $ */
+/*	$OpenBSD: pfkey.c,v 1.10 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -18,13 +18,7 @@
  */
 
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-#include <net/pfkeyv2.h>
-#include <netinet/ip_ipsp.h>
-#include <ctype.h>
 #include <errno.h>
-#include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/usr.sbin/ldpd/printconf.c b/usr.sbin/ldpd/printconf.c
index c57baa3f358..08083ff2e2b 100644
--- a/usr.sbin/ldpd/printconf.c
+++ b/usr.sbin/ldpd/printconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: printconf.c,v 1.23 2016/05/23 19:09:25 renato Exp $ */
+/*	$OpenBSD: printconf.c,v 1.24 2016/05/23 19:11:42 renato Exp $ */
 
 /*
  * Copyright (c) 2004, 2005, 2008 Esben Norby <norby@openbsd.org>
@@ -16,15 +16,10 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/queue.h>
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
 #include <arpa/inet.h>
-
 #include <stdio.h>
 
-#include "ldp.h"
 #include "ldpd.h"
 #include "ldpe.h"
 #include "log.h"