From 03eccbf1c868b0b909d7c51d5fa4aef655b32964 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dsafonov@virtuozzo.com>
Date: Fri, 28 Apr 2017 21:28:38 +0300
Subject: [PATCH] soccr: clean a bit includes list

soccr.h:
After previous patch <linux/types.h> is not needed anymore,
<netinet/tcp.h> is needed as we test for it in feature tests,
i.e., struct tcp_repair_window is declared there.
Also drop forward-declaration of (struct libsoccr_sk) - it's
declared again below.

soccr.c:
Sort headers by name so errors like twice-including errno.h
will not happen again. Also remove assert.h.

Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
---
 soccr/soccr.c | 10 ++++------
 soccr/soccr.h |  9 ++++-----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/soccr/soccr.c b/soccr/soccr.c
index 0a7748149..583f1eaaa 100644
--- a/soccr/soccr.c
+++ b/soccr/soccr.c
@@ -1,13 +1,11 @@
+#include <errno.h>
+#include <libnet.h>
+#include <linux/sockios.h>
+#include <linux/types.h>
 #include <netinet/tcp.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/ioctl.h>
-#include <errno.h>
-#include <linux/sockios.h>
-#include <libnet.h>
-#include <assert.h>
-#include <errno.h>
-
 #include "soccr.h"
 
 #ifndef SIOCOUTQNSD
diff --git a/soccr/soccr.h b/soccr/soccr.h
index 2957fd6c4..c9d138bfc 100644
--- a/soccr/soccr.h
+++ b/soccr/soccr.h
@@ -1,8 +1,9 @@
 #ifndef __LIBSOCCR_H__
 #define __LIBSOCCR_H__
-#include <linux/types.h>
-#include <netinet/in.h>
-#include <stdint.h>
+#include <netinet/in.h>		/* sockaddr_in, sockaddr_in6 */
+#include <netinet/tcp.h>	/* TCP_REPAIR_WINDOW, TCP_TIMESTAMP */
+#include <stdint.h>		/* uint32_t */
+#include <sys/socket.h>		/* sockaddr */
 
 #include "config.h"
 
@@ -49,8 +50,6 @@ enum {
 #define TCP_REPAIR_WINDOW       29
 #endif
 
-struct libsoccr_sk;
-
 void libsoccr_set_log(unsigned int level, void (*fn)(unsigned int level, const char *fmt, ...));
 
 #define SOCCR_LOG_ERR	1