summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/libpcap/nametoaddr.c6
-rw-r--r--sys/arch/sgi/sgi/ip30_machdep.c6
-rw-r--r--sys/dev/ic/ti.c3
-rw-r--r--sys/dev/pci/if_txp.c3
-rw-r--r--usr.bin/mg/extend.c4
5 files changed, 5 insertions, 17 deletions
diff --git a/lib/libpcap/nametoaddr.c b/lib/libpcap/nametoaddr.c
index f601c6b02ac..5fee6e19b70 100644
--- a/lib/libpcap/nametoaddr.c
+++ b/lib/libpcap/nametoaddr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nametoaddr.c,v 1.14 2014/03/21 02:55:29 lteo Exp $ */
+/* $OpenBSD: nametoaddr.c,v 1.15 2014/12/06 23:20:17 krw Exp $ */
/*
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996
@@ -36,10 +36,6 @@ struct rtentry;
#include <netinet/in.h>
#include <netinet/if_ether.h>
#include <arpa/inet.h>
-#ifdef INET6
-#include <netdb.h>
-#include <sys/socket.h>
-#endif /*INET6*/
#include <ctype.h>
#include <errno.h>
diff --git a/sys/arch/sgi/sgi/ip30_machdep.c b/sys/arch/sgi/sgi/ip30_machdep.c
index 2964bd13b3d..14facb69c41 100644
--- a/sys/arch/sgi/sgi/ip30_machdep.c
+++ b/sys/arch/sgi/sgi/ip30_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip30_machdep.c,v 1.62 2014/07/12 22:37:03 uebayasi Exp $ */
+/* $OpenBSD: ip30_machdep.c,v 1.63 2014/12/06 23:20:17 krw Exp $ */
/*
* Copyright (c) 2008, 2009 Miodrag Vallat.
@@ -48,10 +48,6 @@
#include <dev/ic/comvar.h>
-#ifdef MULTIPROCESSOR
-#include <sgi/xbow/xheartreg.h>
-#endif
-
extern char *hw_prod;
extern int mbprint(void *, const char *);
diff --git a/sys/dev/ic/ti.c b/sys/dev/ic/ti.c
index 6a0814f11d9..b1a445f554e 100644
--- a/sys/dev/ic/ti.c
+++ b/sys/dev/ic/ti.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ti.c,v 1.10 2014/08/20 01:02:02 dlg Exp $ */
+/* $OpenBSD: ti.c,v 1.11 2014/12/06 23:20:17 krw Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -100,7 +100,6 @@
#endif
#if NVLAN > 0
-#include <net/if_types.h>
#include <net/if_vlan_var.h>
#endif
diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c
index 37fcde407e1..2799380115a 100644
--- a/sys/dev/pci/if_txp.c
+++ b/sys/dev/pci/if_txp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_txp.c,v 1.111 2014/07/22 13:12:11 mpi Exp $ */
+/* $OpenBSD: if_txp.c,v 1.112 2014/12/06 23:20:17 krw Exp $ */
/*
* Copyright (c) 2001
@@ -60,7 +60,6 @@
#endif
#if NVLAN > 0
-#include <net/if_types.h>
#include <net/if_vlan_var.h>
#endif
diff --git a/usr.bin/mg/extend.c b/usr.bin/mg/extend.c
index 7a70e7f5a89..547b83719e8 100644
--- a/usr.bin/mg/extend.c
+++ b/usr.bin/mg/extend.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: extend.c,v 1.57 2014/11/16 04:16:41 guenther Exp $ */
+/* $OpenBSD: extend.c,v 1.58 2014/12/06 23:20:17 krw Exp $ */
/* This file is in the public domain. */
@@ -23,8 +23,6 @@
#endif /* !BINDKEY */
#endif /* FKEYS */
-#include <ctype.h>
-
static int remap(KEYMAP *, int, PF, KEYMAP *);
static KEYMAP *reallocmap(KEYMAP *);
static void fixmap(KEYMAP *, KEYMAP *, KEYMAP *);