X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/blobdiff_plain/22616013c4eef383b19b8ad4f95780a316d0a51b..071d8001c928b4929a48dada8d855ebe014b3792:/openssh/openbsd-compat/port-tun.c

diff --git a/openssh/openbsd-compat/port-tun.c b/openssh/openbsd-compat/port-tun.c
index ddc92d0..3192161 100644
--- a/openssh/openbsd-compat/port-tun.c
+++ b/openssh/openbsd-compat/port-tun.c
@@ -16,24 +16,9 @@
 
 #include "includes.h"
 
-#include <sys/types.h>
-#include <sys/ioctl.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netinet/ip.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "openbsd-compat/sys-queue.h"
 #include "log.h"
 #include "misc.h"
-#include "buffer.h"
-#include "channels.h"
+#include "bufaux.h"
 
 /*
  * This is the portable version of the SSH tunnel forwarding, it
@@ -41,7 +26,6 @@
  * settings.
  *
  * SSH_TUN_LINUX	Use the (newer) Linux tun/tap device
- * SSH_TUN_FREEBSD	Use the FreeBSD tun/tap device
  * SSH_TUN_COMPAT_AF	Translate the OpenBSD address family
  * SSH_TUN_PREPEND_AF	Prepend/remove the address family
  */
@@ -109,10 +93,7 @@ sys_tun_open(int tun, int mode)
 #ifdef SSH_TUN_FREEBSD
 #include <sys/socket.h>
 #include <net/if.h>
-
-#ifdef HAVE_NET_IF_TUN_H
 #include <net/if_tun.h>
-#endif
 
 int
 sys_tun_open(int tun, int mode)