From 001805d9998229534264758432c06295614f8e2a Mon Sep 17 00:00:00 2001
From: "/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org"
 </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org>
Date: Thu, 17 Jan 2008 17:36:32 +0000
Subject: Max Kellermann <max@duempel.org>: import only required C headers and
 put local headers on top to check

---
 include/alarm.h      | 2 ++
 include/cache.h      | 1 -
 include/conntrack.h  | 1 -
 include/conntrackd.h | 9 +--------
 include/ignore.h     | 2 ++
 include/linux_list.h | 2 ++
 include/local.h      | 2 --
 include/network.h    | 2 ++
 include/queue.h      | 3 ---
 9 files changed, 9 insertions(+), 15 deletions(-)

(limited to 'include')

diff --git a/include/alarm.h b/include/alarm.h
index 338968a..532084a 100644
--- a/include/alarm.h
+++ b/include/alarm.h
@@ -3,6 +3,8 @@
 
 #include "linux_list.h"
 
+#include <sys/time.h>
+
 struct alarm_list {
 	struct list_head	head;
 	struct timeval		tv;
diff --git a/include/cache.h b/include/cache.h
index 0743d3f..a2b2005 100644
--- a/include/cache.h
+++ b/include/cache.h
@@ -3,7 +3,6 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <time.h>
 
 /* cache features */
 enum {
diff --git a/include/conntrack.h b/include/conntrack.h
index d6b6150..63facf4 100644
--- a/include/conntrack.h
+++ b/include/conntrack.h
@@ -2,7 +2,6 @@
 #define _CONNTRACK_H
 
 #include "linux_list.h"
-#include <getopt.h>
 #include <stdint.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 
diff --git a/include/conntrackd.h b/include/conntrackd.h
index bb4b183..c16d3d7 100644
--- a/include/conntrackd.h
+++ b/include/conntrackd.h
@@ -6,14 +6,7 @@
 
 #include <stdint.h>
 #include <stdio.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack.h> 
-#include "cache.h"
-#include "buffer.h"
-#include "debug.h"
-#include <signal.h>
-#include "state_helper.h"
-#include "linux_list.h"
-#include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
+#include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 #include <syslog.h>
 
 /* UNIX facilities */
diff --git a/include/ignore.h b/include/ignore.h
index f1c2846..efb375d 100644
--- a/include/ignore.h
+++ b/include/ignore.h
@@ -3,6 +3,8 @@
 
 #include <stdint.h>
 
+struct nf_conntrack;
+
 struct ignore_pool {
 	struct hashtable *h;
 };
diff --git a/include/linux_list.h b/include/linux_list.h
index b84b1c4..de182a4 100644
--- a/include/linux_list.h
+++ b/include/linux_list.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_LIST_H
 #define _LINUX_LIST_H
 
+#include <stddef.h>
+
 #undef offsetof
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 
diff --git a/include/local.h b/include/local.h
index aae73a7..be77d35 100644
--- a/include/local.h
+++ b/include/local.h
@@ -1,8 +1,6 @@
 #ifndef _LOCAL_SOCKET_H_
 #define _LOCAL_SOCKET_H_
 
-#include <sys/un.h>
-
 #ifndef UNIX_PATH_MAX
 #define UNIX_PATH_MAX   108
 #endif
diff --git a/include/network.h b/include/network.h
index f9976dd..6dfd79d 100644
--- a/include/network.h
+++ b/include/network.h
@@ -3,6 +3,8 @@
 
 #include <stdint.h>
 
+struct nf_conntrack;
+
 struct nethdr {
 	uint16_t flags;
 	uint16_t len;
diff --git a/include/queue.h b/include/queue.h
index ab04d62..9a5d7b8 100644
--- a/include/queue.h
+++ b/include/queue.h
@@ -1,9 +1,6 @@
 #ifndef _QUEUE_H_
 #define _QUEUE_H_
 
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
 #include "linux_list.h"
 
 struct queue {
-- 
cgit v1.2.3