diff --git a/control.c b/control.c
index 5ef8c21..0cd2649 100644
--- a/control.c
+++ b/control.c
@@ -19,17 +19,16 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/un.h>
+
 #include <errno.h>
-#include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "eigrpd.h"
-#include "eigrp.h"
 #include "eigrpe.h"
-#include "log.h"
 #include "control.h"
+#include "log.h"
 
 #define	CONTROL_BACKLOG	5
 
diff --git a/control.h b/control.h
index ca9a29b..1de31dd 100644
--- a/control.h
+++ b/control.h
@@ -20,7 +20,7 @@
 #define	_CONTROL_H_
 
 #include <sys/queue.h>
-#include <sys/time.h>
+
 #include <event.h>
 
 struct {
diff --git a/eigrp.h b/eigrp.h
index 5599a1c..d36e5de 100644
--- a/eigrp.h
+++ b/eigrp.h
@@ -21,9 +21,6 @@
 #ifndef _EIGRP_H_
 #define _EIGRP_H_
 
-#include <netinet/in.h>
-#include <stddef.h>
-
 /* misc */
 #define EIGRP_VERSION		2
 #define IPPROTO_EIGRP		88
diff --git a/eigrpd.c b/eigrpd.c
index 80185ee..0cfd2e2 100644
--- a/eigrpd.c
+++ b/eigrpd.c
@@ -19,24 +19,23 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/sysctl.h>
-#include <arpa/inet.h>
+
 #include <err.h>
 #include <errno.h>
 #include <pwd.h>
-#include <string.h>
 #include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 #include "eigrpd.h"
-#include "eigrp.h"
 #include "eigrpe.h"
-#include "control.h"
-#include "log.h"
 #include "rde.h"
+#include "log.h"
 
 void		main_sig_handler(int, short, void *);
 __dead void	usage(void);
diff --git a/eigrpd.h b/eigrpd.h
index 2e5142e..bac1a2c 100644
--- a/eigrpd.h
+++ b/eigrpd.h
@@ -22,15 +22,14 @@
 #define _EIGRPD_H_
 
 #include <sys/queue.h>
-#include <sys/socket.h>
-#include <sys/time.h>
 #include <sys/tree.h>
-#include <net/route.h>
+#include <sys/socket.h>
 #include <net/if.h>
 #include <netinet/in.h>
-#include <event.h>
 
+#include <event.h>
 #include <imsg.h>
+
 #include "eigrp.h"
 
 #define CONF_FILE		"/etc/eigrpd.conf"
diff --git a/eigrpe.c b/eigrpe.c
index 83a3cb4..554e2e4 100644
--- a/eigrpe.c
+++ b/eigrpe.c
@@ -19,21 +19,23 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdlib.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+
 #include <arpa/inet.h>
+#include <errno.h>
+#include <pwd.h>
 #include <signal.h>
+#include <stdlib.h>
 #include <string.h>
-#include <fcntl.h>
-#include <pwd.h>
 #include <unistd.h>
-#include <errno.h>
 
-#include "eigrp.h"
 #include "eigrpd.h"
 #include "eigrpe.h"
 #include "rde.h"
-#include "control.h"
 #include "log.h"
+#include "control.h"
 
 void		 eigrpe_sig_handler(int, short, void *);
 __dead void	 eigrpe_shutdown(void);
diff --git a/eigrpe.h b/eigrpe.h
index d236ceb..0efba9b 100644
--- a/eigrpe.h
+++ b/eigrpe.h
@@ -20,10 +20,10 @@
 #ifndef _EIGRPE_H_
 #define _EIGRPE_H_
 
-#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 <event.h>
 
 TAILQ_HEAD(ctl_conns, ctl_conn)	ctl_conns;
 
diff --git a/hello.c b/hello.c
index 174459a..f1ef2e6 100644
--- a/hello.c
+++ b/hello.c
@@ -16,13 +16,16 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <string.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+
 #include <arpa/inet.h>
+#include <string.h>
 
 #include "eigrpd.h"
-#include "eigrp.h"
-#include "log.h"
 #include "eigrpe.h"
+#include "log.h"
 
 /* hello packet handling */
 
diff --git a/interface.c b/interface.c
index 3440f59..3759795 100644
--- a/interface.c
+++ b/interface.c
@@ -18,18 +18,19 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
+#include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/ioctl.h>
 #include <arpa/inet.h>
+
 #include <ctype.h>
+#include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "eigrpd.h"
-#include "eigrp.h"
-#include "log.h"
 #include "eigrpe.h"
+#include "log.h"
 
 extern struct eigrpd_conf        *econf;
 
diff --git a/kroute.c b/kroute.c
index b126b5f..43110d4 100644
--- a/kroute.c
+++ b/kroute.c
@@ -21,21 +21,16 @@
 #include <sys/types.h>
 #include <sys/socket.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 <netinet/in.h>
+
+#include <arpa/inet.h>
 #include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <limits.h>
 
 #include "eigrpd.h"
 #include "log.h"
diff --git a/log.c b/log.c
index ed7b6d0..8a2d032 100644
--- a/log.c
+++ b/log.c
@@ -16,15 +16,17 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <sys/types.h>
+
+#include <arpa/inet.h>
 #include <errno.h>
+#include <netdb.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
 #include <unistd.h>
-#include <arpa/inet.h>
-#include <netdb.h>
 
 #include "eigrpd.h"
 #include "rde.h"
diff --git a/neighbor.c b/neighbor.c
index d503c08..630a514 100644
--- a/neighbor.c
+++ b/neighbor.c
@@ -16,13 +16,12 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdlib.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
+#include <sys/types.h>
+
 #include <string.h>
+#include <stdlib.h>
 
 #include "eigrpd.h"
-#include "eigrp.h"
 #include "eigrpe.h"
 #include "rde.h"
 #include "log.h"
diff --git a/packet.c b/packet.c
index b541563..e42e4c4 100644
--- a/packet.c
+++ b/packet.c
@@ -17,17 +17,20 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <arpa/inet.h>
+#include <sys/types.h>
 #include <net/if_dl.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+
+#include <arpa/inet.h>
 #include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "eigrpd.h"
-#include "eigrp.h"
-#include "log.h"
 #include "eigrpe.h"
+#include "log.h"
 
 extern struct eigrpd_conf	*econf;
 
diff --git a/parse.y b/parse.y
index 5213dd0..032bad4 100644
--- a/parse.y
+++ b/parse.y
@@ -26,20 +26,17 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
-#include <netinet/in.h>
+#include <net/route.h>
+
 #include <arpa/inet.h>
 #include <ctype.h>
 #include <err.h>
-#include <errno.h>
-#include <unistd.h>
 #include <ifaddrs.h>
 #include <limits.h>
-#include <stdarg.h>
 #include <stdio.h>
-#include <string.h>
 #include <syslog.h>
+#include <unistd.h>
 
-#include "eigrp.h"
 #include "eigrpd.h"
 #include "eigrpe.h"
 #include "log.h"
diff --git a/printconf.c b/printconf.c
index 75ce628..5ecd7fb 100644
--- a/printconf.c
+++ b/printconf.c
@@ -16,12 +16,12 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdio.h>
+#include <sys/types.h>
+
 #include <arpa/inet.h>
+#include <stdio.h>
 
-#include "eigrp.h"
 #include "eigrpd.h"
-#include "eigrpe.h"
 #include "log.h"
 
 void	print_mainconf(struct eigrpd_conf *);
diff --git a/query.c b/query.c
index bdfcfc5..cbf7baf 100644
--- a/query.c
+++ b/query.c
@@ -16,14 +16,16 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdlib.h>
+#include <sys/types.h>
 #include <netinet/in.h>
+#include <netinet/ip.h>
 #include <netinet/ip6.h>
 
+#include <stdlib.h>
+
 #include "eigrpd.h"
-#include "eigrp.h"
-#include "log.h"
 #include "eigrpe.h"
+#include "log.h"
 
 extern struct eigrpd_conf	*econf;
 
diff --git a/rde.c b/rde.c
index 566e1f1..e610ef0 100644
--- a/rde.c
+++ b/rde.c
@@ -19,19 +19,21 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <arpa/inet.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/route.h>
+
 #include <errno.h>
+#include <pwd.h>
 #include <signal.h>
+#include <stdlib.h>
 #include <string.h>
-#include <pwd.h>
+#include <unistd.h>
 
-#include "eigrp.h"
 #include "eigrpd.h"
 #include "eigrpe.h"
-#include "log.h"
 #include "rde.h"
+#include "log.h"
 
 void		 rde_sig_handler(int sig, short, void *);
 __dead void	 rde_shutdown(void);
diff --git a/rde.h b/rde.h
index 7429fc6..688e6d8 100644
--- a/rde.h
+++ b/rde.h
@@ -19,12 +19,10 @@
 #ifndef _RDE_H_
 #define _RDE_H_
 
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/tree.h>
 #include <sys/queue.h>
+#include <sys/tree.h>
+
 #include <event.h>
-#include <limits.h>
 
 /* just the info RDE needs */
 struct rde_nbr {
diff --git a/rde_dual.c b/rde_dual.c
index 89936e5..0a958f0 100644
--- a/rde_dual.c
+++ b/rde_dual.c
@@ -16,15 +16,15 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <sys/types.h>
+
 #include <stdlib.h>
 #include <string.h>
-#include <arpa/inet.h>
 
-#include "eigrp.h"
 #include "eigrpd.h"
 #include "eigrpe.h"
-#include "log.h"
 #include "rde.h"
+#include "log.h"
 
 void	reply_active_timer(int, short, void *);
 void	reply_active_start_timer(struct reply_node *);
diff --git a/reply.c b/reply.c
index 5b61d50..c371458 100644
--- a/reply.c
+++ b/reply.c
@@ -16,14 +16,16 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdlib.h>
+#include <sys/types.h>
 #include <netinet/in.h>
+#include <netinet/ip.h>
 #include <netinet/ip6.h>
 
+#include <stdlib.h>
+
 #include "eigrpd.h"
-#include "eigrp.h"
-#include "log.h"
 #include "eigrpe.h"
+#include "log.h"
 
 extern struct eigrpd_conf	*econf;
 
diff --git a/rtp.c b/rtp.c
index c2ed541..87b0efc 100644
--- a/rtp.c
+++ b/rtp.c
@@ -16,14 +16,14 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+
 #include <stdlib.h>
-#include <string.h>
-#include <arpa/inet.h>
 
 #include "eigrpd.h"
-#include "eigrp.h"
 #include "eigrpe.h"
-#include "rde.h"
 #include "log.h"
 
 void		 rtp_retrans_timer(int, short, void *);
diff --git a/tlv.c b/tlv.c
index e6b0d0a..2e834b1 100644
--- a/tlv.c
+++ b/tlv.c
@@ -16,17 +16,16 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/utsname.h>
+
 #include <stdio.h>
-#include <inttypes.h>
+#include <stdlib.h>
 #include <string.h>
-#include <sys/uio.h>
-#include <sys/utsname.h>
 
 #include "eigrpd.h"
-#include "eigrp.h"
-#include "log.h"
 #include "eigrpe.h"
+#include "log.h"
 
 int
 gen_parameter_tlv(struct ibuf *buf, struct eigrp_iface *ei, int peerterm)
diff --git a/update.c b/update.c
index d3a0fd5..2b51269 100644
--- a/update.c
+++ b/update.c
@@ -16,14 +16,16 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdlib.h>
+#include <sys/types.h>
 #include <netinet/in.h>
+#include <netinet/ip.h>
 #include <netinet/ip6.h>
 
+#include <stdlib.h>
+
 #include "eigrpd.h"
-#include "eigrp.h"
-#include "log.h"
 #include "eigrpe.h"
+#include "log.h"
 
 extern struct eigrpd_conf	*econf;
 
diff --git a/util.c b/util.c
index 2c218ae..987a064 100644
--- a/util.c
+++ b/util.c
@@ -19,7 +19,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <netinet/in.h>
+#include <sys/types.h>
+
 #include <string.h>
 
 #include "eigrpd.h"