From 1ffabf09041a095a65e20e3a129f87ac4287c86d Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Sun, 5 Jul 2015 01:00:50 +0200
Subject: [PATCH] Remove duplicate includes in <iconv.h> and <sys/socket.h>.

---
 include/iconv.h  |  1 -
 sys/sys/socket.h | 19 +++++--------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/include/iconv.h b/include/iconv.h
index f8cc2d75d1..b92e80807e 100644
--- a/include/iconv.h
+++ b/include/iconv.h
@@ -36,7 +36,6 @@
 #include <sys/types.h>
 
 #include <wchar.h>
-#include <sys/types.h>
 
 #ifdef __cplusplus
 typedef	bool	__iconv_bool;
diff --git a/sys/sys/socket.h b/sys/sys/socket.h
index 22938a3f6b..c0c182ec3e 100644
--- a/sys/sys/socket.h
+++ b/sys/sys/socket.h
@@ -37,6 +37,10 @@
 #ifndef _SYS_SOCKET_H_
 #define	_SYS_SOCKET_H_
 
+#ifndef _SYS_CDEFS_H_
+#include <sys/cdefs.h>
+#endif
+
 #include <sys/_iovec.h>
 
 #ifndef _SYS_TYPES_H_
@@ -470,10 +474,6 @@ struct sf_hdtr {
 
 #if !defined(_KERNEL) || defined(_KERNEL_VIRTUAL)
 
-#ifndef _SYS_CDEFS_H_
-#include <sys/cdefs.h>
-#endif
-
 __BEGIN_DECLS
 int	accept (int, struct sockaddr *, socklen_t *);
 int	extaccept (int, int, struct sockaddr *, socklen_t *);
@@ -495,21 +495,12 @@ int	sendfile (int, int, off_t, size_t, struct sf_hdtr *, off_t *, int);
 int	setsockopt (int, int, int, const void *, socklen_t);
 int	shutdown (int, int);
 int	sockatmark(int);
+int	socket (int, int, int);
 int	socketpair (int, int, int, int *);
 
 void	pfctlinput (int, struct sockaddr *);
 __END_DECLS
 
-#endif /* !_KERNEL */
-
-#if !defined(_KERNEL) || defined(_KERNEL_VIRTUAL)
-#ifndef _SYS_CDEFS_H_
-#include <sys/cdefs.h>
-#endif
-
-__BEGIN_DECLS
-int	socket (int, int, int);
-__END_DECLS
 #endif	/* !_KERNEL || _KERNEL_VIRTUAL */
 
 #endif /* !_SYS_SOCKET_H_ */
-- 
2.41.0