From b30abea6b0313e64ab27d584e50119a54820b356 Mon Sep 17 00:00:00 2001
From: Erik Ekman <erik@kryo.se>
Date: Fri, 10 Feb 2012 23:26:27 +0100
Subject: [PATCH] Reorganize imports for OpenBSD

---
 src/common.c | 2 +-
 src/common.h | 2 +-
 src/dns.c    | 1 +
 src/login.c  | 1 +
 src/tun.c    | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/common.c b/src/common.c
index 143fe34..fe88112 100644
--- a/src/common.c
+++ b/src/common.c
@@ -39,8 +39,8 @@
 #endif
 #include <termios.h>
 #include <err.h>
-#include <arpa/inet.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <syslog.h>
 #endif
 
diff --git a/src/common.h b/src/common.h
index 4ef25c5..4f8a6fc 100644
--- a/src/common.h
+++ b/src/common.h
@@ -37,8 +37,8 @@ extern const unsigned char raw_header[RAW_HDR_LEN];
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <err.h>
-#include <arpa/inet.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #endif
 
 #define DNS_PORT 53
diff --git a/src/dns.c b/src/dns.c
index a81ae09..fd3ce25 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -33,6 +33,7 @@
 #define BIND_8_COMPAT
 #include <arpa/nameser_compat.h>
 #endif
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <err.h>
 #endif
diff --git a/src/login.c b/src/login.c
index c8827c3..c562050 100644
--- a/src/login.c
+++ b/src/login.c
@@ -20,6 +20,7 @@
 #ifdef WINDOWS32
 #include "windows.h"
 #else
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #endif
 
diff --git a/src/tun.c b/src/tun.c
index 504451f..cbc5490 100644
--- a/src/tun.c
+++ b/src/tun.c
@@ -51,8 +51,8 @@ static void get_name(char *ifname, int namelen, char *dev_name);
 #define NET_CFG_INST_ID "NetCfgInstanceId"
 #else
 #include <err.h>
-#include <arpa/inet.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 
 #define TUN_MAX_TRY 50
 #endif