From 1cccf6fa93c251f8f2805aa5fb163741d851c051 Mon Sep 17 00:00:00 2001
From: Andre Noll <maan@systemlinux.org>
Date: Sat, 7 Sep 2013 02:00:20 +0000
Subject: [PATCH] net: Remove networking headers from para.h.

Most files don't need these, so include all headers related to
networking in each individual file.
---
 acl.c            | 5 +++++
 afs.c            | 5 +++++
 audioc.c         | 5 +++++
 audiod.c         | 6 ++++++
 audiod_command.c | 5 +++++
 client_common.c  | 5 +++++
 command.c        | 5 +++++
 dccp_recv.c      | 5 +++++
 dccp_send.c      | 5 +++++
 http_recv.c      | 5 +++++
 http_send.c      | 5 +++++
 net.c            | 5 +++++
 para.h           | 6 ++----
 send_common.c    | 5 +++++
 server.c         | 6 ++++++
 udp_recv.c       | 5 +++++
 udp_send.c       | 6 +++++-
 vss.c            | 6 ++++++
 18 files changed, 90 insertions(+), 5 deletions(-)

diff --git a/acl.c b/acl.c
index e70ab9b3..7762a990 100644
--- a/acl.c
+++ b/acl.c
@@ -6,7 +6,12 @@
 
 /** \file acl.c Access control lists for paraslash senders. */
 
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <regex.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/afs.c b/afs.c
index 2f9df845..135888a7 100644
--- a/afs.c
+++ b/afs.c
@@ -6,10 +6,15 @@
 
 /** \file afs.c Paraslash's audio file selector. */
 
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <regex.h>
 #include <signal.h>
 #include <fnmatch.h>
 #include <osl.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "server.cmdline.h"
 #include "para.h"
diff --git a/audioc.c b/audioc.c
index 0edab366..79051a98 100644
--- a/audioc.c
+++ b/audioc.c
@@ -6,8 +6,13 @@
 
 /** \file audioc.c The client program used to connect to para_audiod. */
 
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <regex.h>
 #include <sys/types.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 #include <stdbool.h>
 #include <signal.h>
 
diff --git a/audiod.c b/audiod.c
index 5ef57781..f12dbc1b 100644
--- a/audiod.c
+++ b/audiod.c
@@ -5,8 +5,14 @@
  */
 
 /** \file audiod.c The paraslash's audio daemon. */
+
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <regex.h>
 #include <sys/types.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 #include <signal.h>
 
 #include "para.h"
diff --git a/audiod_command.c b/audiod_command.c
index 07b2c81c..1ffab87c 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -6,8 +6,13 @@
 
 /** \file audiod_command.c Commands for para_audiod. */
 
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <regex.h>
 #include <sys/types.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "para.h"
 #include "audiod.cmdline.h"
diff --git a/client_common.c b/client_common.c
index c19b7121..6652cc35 100644
--- a/client_common.c
+++ b/client_common.c
@@ -6,8 +6,13 @@
 
 /** \file client_common.c Common functions of para_client and para_audiod. */
 
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <regex.h>
 #include <sys/types.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/command.c b/command.c
index 3d40023f..93c68058 100644
--- a/command.c
+++ b/command.c
@@ -6,10 +6,15 @@
 
 /** \file command.c Client authentication and server commands. */
 
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <regex.h>
 #include <signal.h>
 #include <sys/types.h>
 #include <osl.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/dccp_recv.c b/dccp_recv.c
index c751f2f7..73d9999d 100644
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -11,8 +11,13 @@
  * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
  */
 
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <regex.h>
 #include <sys/types.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/dccp_send.c b/dccp_send.c
index 3979982c..22f2bd1b 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -11,9 +11,14 @@
  * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
  */
 
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <regex.h>
 #include <sys/types.h>
 #include <osl.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/http_recv.c b/http_recv.c
index 7db8ba19..9c42a1a8 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -7,7 +7,12 @@
 /** \file http_recv.c paraslash's http receiver */
 
 #include <regex.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <sys/types.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/http_send.c b/http_send.c
index 52383b06..60b877c0 100644
--- a/http_send.c
+++ b/http_send.c
@@ -6,9 +6,14 @@
 
 /** \file http_send.c paraslash's http sender */
 
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <regex.h>
 #include <sys/types.h>
 #include <osl.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/net.c b/net.c
index 740dfa18..07a646b7 100644
--- a/net.c
+++ b/net.c
@@ -12,6 +12,11 @@
  */
 #define _GNU_SOURCE
 
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <sys/types.h>
+#include <sys/socket.h>
 #include <netdb.h>
 
 /* At least NetBSD needs these. */
diff --git a/para.h b/para.h
index 29658f47..d1e266fc 100644
--- a/para.h
+++ b/para.h
@@ -19,13 +19,11 @@
 #include <limits.h>
 #include <stdarg.h>
 #include <ctype.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <sys/un.h> /* needed by create_pf_socket */
 #include <string.h>
 #include <assert.h>
 #include <stdbool.h>
+#include <inttypes.h>
+#include <sys/uio.h>
 #include "gcc-compat.h"
 
 /** used in various contexts */
diff --git a/send_common.c b/send_common.c
index 250a2a0b..a16869b0 100644
--- a/send_common.c
+++ b/send_common.c
@@ -6,8 +6,13 @@
 
 /** \file send_common.c Functions used by more than one paraslash sender. */
 
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <regex.h>
 #include <osl.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/server.c b/server.c
index 70d9137e..f92ef551 100644
--- a/server.c
+++ b/server.c
@@ -63,9 +63,15 @@
  *	- Forward error correction: \ref fec.c.
  */
 
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <signal.h>
 #include <regex.h>
 #include <osl.h>
+#include <sys/types.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/udp_recv.c b/udp_recv.c
index 436b298c..5cd9d9dd 100644
--- a/udp_recv.c
+++ b/udp_recv.c
@@ -5,9 +5,14 @@
  */
 /** \file udp_recv.c Paraslash's udp receiver */
 
+#include <netinet/in.h>
 #include <regex.h>
 #include <sys/socket.h>
 #include <net/if.h>
+#include <sys/types.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/udp_send.c b/udp_send.c
index 7930f092..4580f009 100644
--- a/udp_send.c
+++ b/udp_send.c
@@ -6,13 +6,17 @@
 
 /** \file udp_send.c Para_server's udp sender. */
 
-
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <regex.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/udp.h>
 #include <net/if.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
 #include <osl.h>
+#include <netdb.h>
 
 #include "server.cmdline.h"
 #include "para.h"
diff --git a/vss.c b/vss.c
index 06707d6c..2349b093 100644
--- a/vss.c
+++ b/vss.c
@@ -11,8 +11,14 @@
  * senders.
  */
 
+#include <sys/socket.h>
+#include <netinet/in.h>
 #include <regex.h>
 #include <osl.h>
+#include <sys/types.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "para.h"
 #include "error.h"
-- 
2.30.2