From f7683bc0d2e86f516de259b0b7015f6b77096488 Mon Sep 17 00:00:00 2001
From: jsing <jsing@openbsd.org>
Date: Mon, 5 May 2014 16:19:23 +0000
Subject: [PATCH] Sort and group includes.

---
 lib/libcrypto/bio/b_dump.c         |  4 +++-
 lib/libcrypto/bio/b_sock.c         | 17 ++++++++---------
 lib/libssl/src/crypto/bio/b_dump.c |  4 +++-
 lib/libssl/src/crypto/bio/b_sock.c | 17 ++++++++---------
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/lib/libcrypto/bio/b_dump.c b/lib/libcrypto/bio/b_dump.c
index 740686c957b..65238299f22 100644
--- a/lib/libcrypto/bio/b_dump.c
+++ b/lib/libcrypto/bio/b_dump.c
@@ -61,9 +61,11 @@
  */
 
 #include <stdio.h>
-#include "cryptlib.h"
+
 #include <openssl/bio.h>
 
+#include "cryptlib.h"
+
 #define TRUNCATE
 #define DUMP_WIDTH	16
 #define DUMP_WIDTH_LESS_INDENT(i) (DUMP_WIDTH - ((i - (i > 6 ? 6 : i) + 3) / 4))
diff --git a/lib/libcrypto/bio/b_sock.c b/lib/libcrypto/bio/b_sock.c
index 7da33d36b27..a9c4408a093 100644
--- a/lib/libcrypto/bio/b_sock.c
+++ b/lib/libcrypto/bio/b_sock.c
@@ -57,22 +57,21 @@
  */
 
 #include <sys/ioctl.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
 
+#include <errno.h>
+#include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <errno.h>
-#include "cryptlib.h"
-#include <openssl/bio.h>
-#include <sys/ioctl.h>
-
-#include <netdb.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
 
+#include <openssl/bio.h>
 #include <openssl/dso.h>
 
+#include "cryptlib.h"
+
 #define SOCKET_PROTOCOL IPPROTO_TCP
 
 #ifdef SO_MAXCONN
diff --git a/lib/libssl/src/crypto/bio/b_dump.c b/lib/libssl/src/crypto/bio/b_dump.c
index 740686c957b..65238299f22 100644
--- a/lib/libssl/src/crypto/bio/b_dump.c
+++ b/lib/libssl/src/crypto/bio/b_dump.c
@@ -61,9 +61,11 @@
  */
 
 #include <stdio.h>
-#include "cryptlib.h"
+
 #include <openssl/bio.h>
 
+#include "cryptlib.h"
+
 #define TRUNCATE
 #define DUMP_WIDTH	16
 #define DUMP_WIDTH_LESS_INDENT(i) (DUMP_WIDTH - ((i - (i > 6 ? 6 : i) + 3) / 4))
diff --git a/lib/libssl/src/crypto/bio/b_sock.c b/lib/libssl/src/crypto/bio/b_sock.c
index 7da33d36b27..a9c4408a093 100644
--- a/lib/libssl/src/crypto/bio/b_sock.c
+++ b/lib/libssl/src/crypto/bio/b_sock.c
@@ -57,22 +57,21 @@
  */
 
 #include <sys/ioctl.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
 
+#include <errno.h>
+#include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <errno.h>
-#include "cryptlib.h"
-#include <openssl/bio.h>
-#include <sys/ioctl.h>
-
-#include <netdb.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
 
+#include <openssl/bio.h>
 #include <openssl/dso.h>
 
+#include "cryptlib.h"
+
 #define SOCKET_PROTOCOL IPPROTO_TCP
 
 #ifdef SO_MAXCONN
-- 
2.20.1