further header cleanup

diff --git a/fade.c b/fade.c
index 33a6fa055b7e00c4852c79b4daba207e2acdebe6..94b866969358126a06d76218832a86f0a985752d 100644 (file)
--- a/fade.c
+++ b/fade.c
@@ -22,6 +22,7 @@
 #include "para.h"
 #include "fd.h"
 
+#include <stropts.h>
 #include <ctype.h>
 #include <curses.h>
 #include <stdlib.h> /* EXIT_SUCCESS */

diff --git a/fd.c b/fd.c
index 4928850e38d7d01688702d8acb8e898da53e284d..dc22d147711cbf2d152d895293bf79a4190352b5 100644 (file)
--- a/fd.c
+++ b/fd.c
@@ -20,6 +20,7 @@
 
 #include "para.h"
 
+#include <fcntl.h>
 #include <sys/select.h>
 
 #include "error.h"

diff --git a/net.c b/net.c
index 9ca5ceac95bc47f1b3becf71d83318894f8a719a..66d19fd4617111e13a00c3c4850223d945689abb 100644 (file)
--- a/net.c
+++ b/net.c
@@ -20,9 +20,9 @@
 
 #include "para.h"
 #include "net.h"
+#include "string.h"
 #include <netdb.h>
 #include "error.h"
-#include "string.h"
 
 extern void (*crypt_function_recv)(unsigned long len, const unsigned char *indata, unsigned char *outdata);
 extern void (*crypt_function_send)(unsigned long len, const unsigned char *indata, unsigned char *outdata);

diff --git a/para.h b/para.h
index 6c853611e381f2ef2a8aef954746520107d16b3a..1ac056b31bc38d455a41a08c7ef094ea3d7c8090 100644 (file)
--- a/para.h
+++ b/para.h
@@ -23,23 +23,19 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/wait.h>
-#include <signal.h>
-#include <sys/signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <time.h> /* time(), localtime() */
 #include <unistd.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>
-#include <stropts.h>
-#include <poll.h>
-#include <sys/socket.h>
+#include <ctype.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <ctype.h>
+#include <sys/socket.h>
 #include <sys/un.h> /* needed by create_pf_socket */
+#include <string.h>
 #include "gcc-compat.h"
 
 /* some internal constants */
@@ -219,6 +215,3 @@ __printf_2_3 void para_log(int, const char*, ...);
                p = para_realloc(p, size); \
        } \
 }
-
-
-

diff --git a/signal.c b/signal.c
index 6de9adf817f1a7b1885133729cd741dcff72399f..2d40d49bdc30cad6a926c3da7aa1bec71d5417df 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -17,8 +17,13 @@
  */
 /** \file signal.c signal handling functions */
 
+
+
 #include "para.h"
 #include "fd.h"
+
+#include <signal.h>
+
 #include "error.h"
 static int signal_pipe[2];
 

diff --git a/string.c b/string.c
index fba36e5fcc6f92ca1542fd9b5989f61099ad584a..056a414bb48b8d0cf1d62444aa9586cbde36c91c 100644 (file)
--- a/string.c
+++ b/string.c
@@ -18,13 +18,16 @@
 
 /** \file string.c memory allocation and string handling functions */
 
-#include <sys/time.h> /* gettimeofday */
 #include "para.h"
+#include "string.h"
+
+#include <sys/time.h> /* gettimeofday */
 #include <regex.h>
 #include <pwd.h>
 #include <sys/utsname.h> /* uname() */
+#include <string.h>
+
 #include "error.h"
-#include "string.h"
 
 /**
  * paraslash's version of realloc()