[PATCH 4/6] remove inclusion of non-system headers from iptraf-ng-compat.h

[Vitezslav Samel]

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz&gt;
---
 src/bar.c              |    2 ++
 src/deskman.c          |    4 ++++
 src/detstats.c         |    2 ++
 src/error.c            |    2 +-
 src/fltedit.c          |    5 +++++
 src/fltmgr.c           |    7 +++++++
 src/fltselect.c        |    4 ++++
 src/hostmon.c          |    3 +++
 src/ifstats.c          |    5 +++++
 src/ipfilter.c         |    4 ++++
 src/iptraf-ng-compat.h |    9 ---------
 src/iptraf.c           |    3 +++
 src/itrafmon.c         |    3 +++
 src/landesc.c          |    6 ++++++
 src/log.c              |    4 ++++
 src/options.c          |    5 +++++
 src/othptab.c          |    2 ++
 src/pktsize.c          |    2 ++
 src/serv.c             |    5 +++++
 src/tcptable.c         |    2 ++
 20 files changed, 69 insertions(+), 10 deletions(-)

diff --git a/src/bar.c b/src/bar.c
index 7c4fbbc..bc88c4c 100644
--- a/src/bar.c
+++ b/src/bar.c
@@ -12,6 +12,8 @@
 
 #include "iptraf-ng-compat.h"
 
+#include "tui/winops.h"
+
 #include "attrs.h"
 
 void set_barptr(void **barptr, void *entry, time_t * starttime, void *spanbr,
diff --git a/src/deskman.c b/src/deskman.c
index 4a6ad7a..25940dc 100644
--- a/src/deskman.c
+++ b/src/deskman.c
@@ -9,6 +9,10 @@ deskman.c - desktop management routines
 
 #include "iptraf-ng-compat.h"
 
+#include "tui/labels.h"
+#include "tui/msgboxes.h"
+#include "tui/winops.h"
+
 #include "deskman.h"
 
 /* Attribute variables */
diff --git a/src/detstats.c b/src/detstats.c
index 25fdcdd..e92031b 100644
--- a/src/detstats.c
+++ b/src/detstats.c
@@ -9,6 +9,8 @@ detstats.c	- the interface statistics module
 
 #include "iptraf-ng-compat.h"
 
+#include "tui/winops.h"
+
 #include "counters.h"
 #include "ifaces.h"
 #include "isdntab.h"
diff --git a/src/error.c b/src/error.c
index e4167e4..45d8e8c 100644
--- a/src/error.c
+++ b/src/error.c
@@ -9,8 +9,8 @@ error.c - Error-handling subroutines
 
 #include "iptraf-ng-compat.h"
 
-#include "error.h"
 #include "log.h"
+#include "tui/msgboxes.h"
 
 extern int daemonized;
 
diff --git a/src/fltedit.c b/src/fltedit.c
index c83b199..cd926f1 100644
--- a/src/fltedit.c
+++ b/src/fltedit.c
@@ -9,6 +9,11 @@ fltedit.c	- the filter editing Facility
 
 #include "iptraf-ng-compat.h"
 
+#include "tui/labels.h"
+#include "tui/menurt.h"
+#include "tui/msgboxes.h"
+#include "tui/winops.h"
+
 #include "fltdefs.h"
 #include "fltmgr.h"
 #include "ipfilter.h"
diff --git a/src/fltmgr.c b/src/fltmgr.c
index bb93bc1..5771f89 100644
--- a/src/fltmgr.c
+++ b/src/fltmgr.c
@@ -9,6 +9,13 @@ fltmgr.c - filter list management routines
 
 #include "iptraf-ng-compat.h"
 
+#include "tui/input.h"
+#include "tui/labels.h"
+#include "tui/listbox.h"
+#include "tui/menurt.h"
+#include "tui/msgboxes.h"
+#include "tui/winops.h"
+
 #include "attrs.h"
 #include "deskman.h"
 #include "dirs.h"
diff --git a/src/fltselect.c b/src/fltselect.c
index e51fbcf..42b2047 100644
--- a/src/fltselect.c
+++ b/src/fltselect.c
@@ -10,6 +10,10 @@ fltselect.c - a menu-based module that allows selection of
 
 #include "iptraf-ng-compat.h"
 
+#include "tui/menurt.h"
+#include "tui/msgboxes.h"
+#include "tui/winops.h"
+
 #include "addproto.h"
 #include "dirs.h"
 #include "fltdefs.h"
diff --git a/src/hostmon.c b/src/hostmon.c
index e9f3dc0..4f29879 100644
--- a/src/hostmon.c
+++ b/src/hostmon.c
@@ -10,6 +10,9 @@ Discovers LAN hosts and displays packet statistics for them
 
 #include "iptraf-ng-compat.h"
 
+#include "tui/labels.h"
+#include "tui/winops.h"
+
 #include "dirs.h"
 #include "deskman.h"
 #include "fltdefs.h"
diff --git a/src/ifstats.c b/src/ifstats.c
index 8cb384e..d7a0f75 100644
--- a/src/ifstats.c
+++ b/src/ifstats.c
@@ -9,6 +9,11 @@ ifstats.c	- the interface statistics module
 
 #include "iptraf-ng-compat.h"
 
+#include "tui/labels.h"
+#include "tui/listbox.h"
+#include "tui/msgboxes.h"
+#include "tui/winops.h"
+
 #include "ifaces.h"
 #include "isdntab.h"
 #include "fltdefs.h"
diff --git a/src/ipfilter.c b/src/ipfilter.c
index 162c997..aa03b3e 100644
--- a/src/ipfilter.c
+++ b/src/ipfilter.c
@@ -9,6 +9,10 @@ ipfilter.c - user interface and filter function for all IP packets
 
 #include "iptraf-ng-compat.h"
 
+#include "tui/input.h"
+#include "tui/menurt.h"
+#include "tui/msgboxes.h"
+
 #include "addproto.h"
 #include "dirs.h"
 #include "deskman.h"
diff --git a/src/iptraf-ng-compat.h b/src/iptraf-ng-compat.h
index ac8b612..a48e09c 100644
--- a/src/iptraf-ng-compat.h
+++ b/src/iptraf-ng-compat.h
@@ -45,15 +45,6 @@
 #include <linux/if.h>
 #include <linux/if_arp.h>
 
-/* move it out! */
-#include "tui/labels.h"
-#include "tui/listbox.h"
-#include "tui/input.h"
-#include "tui/menurt.h"
-#include "tui/winops.h"
-#include "tui/msgboxes.h"
-//#include "txbox.h"
-
 #define debug(...)							\
 	do {								\
                 fprintf(stderr, "%s:%s():%d:",				\
diff --git a/src/iptraf.c b/src/iptraf.c
index 0cf91b9..08ddeb5 100644
--- a/src/iptraf.c
+++ b/src/iptraf.c
@@ -10,6 +10,9 @@ An IP Network Statistics Utility
 
 #include "iptraf-ng-compat.h"
 
+#include "tui/menurt.h"
+#include "tui/winops.h"
+
 #include "dirs.h"
 #include "deskman.h"
 #include "fltdefs.h"
diff --git a/src/itrafmon.c b/src/itrafmon.c
index ebe053b..4228b31 100644
--- a/src/itrafmon.c
+++ b/src/itrafmon.c
@@ -9,6 +9,9 @@ itrafmon.c - the IP traffic monitor module
 
 #include "iptraf-ng-compat.h"
 
+#include "tui/labels.h"
+#include "tui/winops.h"
+
 #include "options.h"
 #include "tcptable.h"
 #include "othptab.h"
diff --git a/src/landesc.c b/src/landesc.c
index 38e01f2..4d67ed8 100644
--- a/src/landesc.c
+++ b/src/landesc.c
@@ -10,6 +10,12 @@ landesc.c	- LAN host description management module
 ***/
 
 #include "iptraf-ng-compat.h"
+
+#include "tui/input.h"
+#include "tui/listbox.h"
+#include "tui/msgboxes.h"
+#include "tui/menurt.h"
+
 #include "landesc.h"
 #include "deskman.h"
 #include "attrs.h"
diff --git a/src/log.c b/src/log.c
index ebe3c35..dfa2cd9 100644
--- a/src/log.c
+++ b/src/log.c
@@ -14,6 +14,10 @@ log.c - the iptraf logging facility
 #include "dirs.h"
 #include "log.h"
 
+#include "tui/input.h"
+#include "tui/msgboxes.h"
+#include "tui/winops.h"
+
 #define TARGET_LOGNAME_MAX	160
 
 int rotate_flag;
diff --git a/src/options.c b/src/options.c
index b62b9dd..ee693de 100644
--- a/src/options.c
+++ b/src/options.c
@@ -9,6 +9,11 @@ options.c - implements the configuration section of the utility
 
 #include "iptraf-ng-compat.h"
 
+#include "tui/input.h"
+#include "tui/menurt.h"
+#include "tui/msgboxes.h"
+#include "tui/winops.h"
+
 #include "serv.h"
 #include "options.h"
 #include "deskman.h"
diff --git a/src/othptab.c b/src/othptab.c
index dbd392c..c73eb39 100644
--- a/src/othptab.c
+++ b/src/othptab.c
@@ -9,6 +9,8 @@ othptab.c - non-TCP protocol display module
 
 #include "iptraf-ng-compat.h"
 
+#include "tui/winops.h"
+
 #include "arphdr.h"
 #include "options.h"
 #include "tcptable.h"
diff --git a/src/pktsize.c b/src/pktsize.c
index 7dfcb92..f544d0b 100644
--- a/src/pktsize.c
+++ b/src/pktsize.c
@@ -9,6 +9,8 @@ pktsize.c	- the packet size breakdown facility
 
 #include "iptraf-ng-compat.h"
 
+#include "tui/winops.h"
+
 #include "attrs.h"
 #include "dirs.h"
 #include "fltdefs.h"
diff --git a/src/serv.c b/src/serv.c
index 8fda3f5..e5584bb 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -9,6 +9,11 @@ serv.c  - TCP/UDP port statistics module
 
 #include "iptraf-ng-compat.h"
 
+#include "tui/input.h"
+#include "tui/labels.h"
+#include "tui/listbox.h"
+#include "tui/msgboxes.h"
+
 #include "dirs.h"
 #include "deskman.h"
 #include "isdntab.h"
diff --git a/src/tcptable.c b/src/tcptable.c
index bcc24ff..e6df461 100644
--- a/src/tcptable.c
+++ b/src/tcptable.c
@@ -9,6 +9,8 @@ tcptable.c - table manipulation routines for the IP monitor
 
 #include "iptraf-ng-compat.h"
 
+#include "tui/winops.h"
+
 #include "options.h"
 #include "tcptable.h"
 #include "deskman.h"
-- 
1.7.8.4