39 files changed, 0 insertions, 103 deletions

diff --git a/sys/dev/hea/eni_globals.c b/sys/dev/hea/eni_globals.c
index 0c7d5207e81bf..684fdb1432e2d 100644
--- a/sys/dev/hea/eni_globals.c
+++ b/sys/dev/hea/eni_globals.c
@@ -39,7 +39,6 @@
 
 #include <dev/hea/eni_stats.h>
 #include <dev/hea/eni.h>
-#include <dev/hea/eni_var.h>
 
 #ifndef lint
 __RCSID("@(#) $FreeBSD$");
diff --git a/sys/netatm/ipatm/ipatm_if.c b/sys/netatm/ipatm/ipatm_if.c
index eeb3c00659e66..3f39fea60d7d8 100644
--- a/sys/netatm/ipatm/ipatm_if.c
+++ b/sys/netatm/ipatm/ipatm_if.c
@@ -37,7 +37,6 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/ipatm/ipatm.h>
 #include <netatm/ipatm/ipatm_var.h>
 #include <netatm/ipatm/ipatm_serv.h>
 
diff --git a/sys/netatm/ipatm/ipatm_input.c b/sys/netatm/ipatm/ipatm_input.c
index e3049cfb63ddd..8f380b957e8ee 100644
--- a/sys/netatm/ipatm/ipatm_input.c
+++ b/sys/netatm/ipatm/ipatm_input.c
@@ -37,9 +37,7 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/ipatm/ipatm.h>
 #include <netatm/ipatm/ipatm_var.h>
-#include <netatm/ipatm/ipatm_serv.h>
 
 #ifndef lint
 __RCSID("@(#) $FreeBSD$");
diff --git a/sys/netatm/ipatm/ipatm_load.c b/sys/netatm/ipatm/ipatm_load.c
index 29e9837687c41..08c5d43cf7606 100644
--- a/sys/netatm/ipatm/ipatm_load.c
+++ b/sys/netatm/ipatm/ipatm_load.c
@@ -43,7 +43,6 @@
 
 #include <netatm/ipatm/ipatm.h>
 #include <netatm/ipatm/ipatm_var.h>
-#include <netatm/ipatm/ipatm_serv.h>
 
 #ifndef lint
 __RCSID("@(#) $FreeBSD$");
diff --git a/sys/netatm/ipatm/ipatm_output.c b/sys/netatm/ipatm/ipatm_output.c
index c7a1933d8dd2e..cdbe2a8e41528 100644
--- a/sys/netatm/ipatm/ipatm_output.c
+++ b/sys/netatm/ipatm/ipatm_output.c
@@ -37,7 +37,6 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/ipatm/ipatm.h>
 #include <netatm/ipatm/ipatm_var.h>
 #include <netatm/ipatm/ipatm_serv.h>
 
diff --git a/sys/netatm/ipatm/ipatm_usrreq.c b/sys/netatm/ipatm/ipatm_usrreq.c
index d10f7c743ee81..017fe40453072 100644
--- a/sys/netatm/ipatm/ipatm_usrreq.c
+++ b/sys/netatm/ipatm/ipatm_usrreq.c
@@ -37,7 +37,6 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/ipatm/ipatm.h>
 #include <netatm/ipatm/ipatm_var.h>
 #include <netatm/ipatm/ipatm_serv.h>
 
diff --git a/sys/netatm/sigpvc/sigpvc.h b/sys/netatm/sigpvc/sigpvc.h
deleted file mode 100644
index 8cc8374b1ee50..0000000000000
--- a/sys/netatm/sigpvc/sigpvc.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *
- * ===================================
- * HARP  |  Host ATM Research Platform
- * ===================================
- *
- *
- * This Host ATM Research Platform ("HARP") file (the "Software") is
- * made available by Network Computing Services, Inc. ("NetworkCS")
- * "AS IS".  NetworkCS does not provide maintenance, improvements or
- * support of any kind.
- *
- * NETWORKCS MAKES NO WARRANTIES OR REPRESENTATIONS, EXPRESS OR IMPLIED,
- * INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE, AS TO ANY ELEMENT OF THE
- * SOFTWARE OR ANY SUPPORT PROVIDED IN CONNECTION WITH THIS SOFTWARE.
- * In no event shall NetworkCS be responsible for any damages, including
- * but not limited to consequential damages, arising from or relating to
- * any use of the Software or related support.
- *
- * Copyright 1994-1998 Network Computing Services, Inc.
- *
- * Copies of this Software may be made, however, the above copyright
- * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
- */
-
-/*
- * PVC-only Signalling Manager
- * ---------------------------
- *
- * Protocol definitions
- *
- */
-
-#ifndef _SIGPVC_SIGPVC_H
-#define _SIGPVC_SIGPVC_H
-
-/*
- * Protocol Variables
- */
-#define	SIGPVC_DOWN_DELAY	(15 * ATM_HZ)	/* Delay til i/f marked down */
-#define	SIGPVC_UP_DELAY		(5 * ATM_HZ)	/* Delay til i/f marked up */
-
-#endif	/* _SIGPVC_SIGPVC_H */
diff --git a/sys/netatm/sigpvc/sigpvc_if.c b/sys/netatm/sigpvc/sigpvc_if.c
index bbd7d28d2840d..3c454f6d6422c 100644
--- a/sys/netatm/sigpvc/sigpvc_if.c
+++ b/sys/netatm/sigpvc/sigpvc_if.c
@@ -42,7 +42,6 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/sigpvc/sigpvc.h>
 #include <netatm/sigpvc/sigpvc_var.h>
 
 #ifndef lint
diff --git a/sys/netatm/sigpvc/sigpvc_subr.c b/sys/netatm/sigpvc/sigpvc_subr.c
index adf462b0256fe..97834b4e0af9e 100644
--- a/sys/netatm/sigpvc/sigpvc_subr.c
+++ b/sys/netatm/sigpvc/sigpvc_subr.c
@@ -37,7 +37,6 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/sigpvc/sigpvc.h>
 #include <netatm/sigpvc/sigpvc_var.h>
 
 #ifndef lint
diff --git a/sys/netatm/uni/q2110_sigaa.c b/sys/netatm/uni/q2110_sigaa.c
index cdec794f522ff..3038f1406fb91 100644
--- a/sys/netatm/uni/q2110_sigaa.c
+++ b/sys/netatm/uni/q2110_sigaa.c
@@ -37,10 +37,8 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/uni/uni.h>
 #include <netatm/uni/sscop.h>
 #include <netatm/uni/sscop_misc.h>
-#include <netatm/uni/sscop_pdu.h>
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
diff --git a/sys/netatm/uni/q2110_sigcpcs.c b/sys/netatm/uni/q2110_sigcpcs.c
index 6fdf512cfb752..dec7091ecbf3e 100644
--- a/sys/netatm/uni/q2110_sigcpcs.c
+++ b/sys/netatm/uni/q2110_sigcpcs.c
@@ -37,7 +37,6 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/uni/uni.h>
 #include <netatm/uni/sscop.h>
 #include <netatm/uni/sscop_misc.h>
 #include <netatm/uni/sscop_pdu.h>
diff --git a/sys/netatm/uni/q2110_subr.c b/sys/netatm/uni/q2110_subr.c
index f1ea3776572db..5e92f98a9ffea 100644
--- a/sys/netatm/uni/q2110_subr.c
+++ b/sys/netatm/uni/q2110_subr.c
@@ -37,10 +37,8 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/uni/uni.h>
 #include <netatm/uni/sscop.h>
 #include <netatm/uni/sscop_misc.h>
-#include <netatm/uni/sscop_pdu.h>
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
diff --git a/sys/netatm/uni/qsaal1_sigaa.c b/sys/netatm/uni/qsaal1_sigaa.c
index 579e08bdeb222..a9d07fffca2eb 100644
--- a/sys/netatm/uni/qsaal1_sigaa.c
+++ b/sys/netatm/uni/qsaal1_sigaa.c
@@ -37,10 +37,8 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/uni/uni.h>
 #include <netatm/uni/sscop.h>
 #include <netatm/uni/sscop_misc.h>
-#include <netatm/uni/sscop_pdu.h>
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
diff --git a/sys/netatm/uni/qsaal1_sigcpcs.c b/sys/netatm/uni/qsaal1_sigcpcs.c
index 8f579845de149..4e9bd44eefad8 100644
--- a/sys/netatm/uni/qsaal1_sigcpcs.c
+++ b/sys/netatm/uni/qsaal1_sigcpcs.c
@@ -37,7 +37,6 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/uni/uni.h>
 #include <netatm/uni/sscop.h>
 #include <netatm/uni/sscop_misc.h>
 #include <netatm/uni/sscop_pdu.h>
diff --git a/sys/netatm/uni/qsaal1_subr.c b/sys/netatm/uni/qsaal1_subr.c
index ee18866be3734..9fc884cdca031 100644
--- a/sys/netatm/uni/qsaal1_subr.c
+++ b/sys/netatm/uni/qsaal1_subr.c
@@ -37,10 +37,8 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/uni/uni.h>
 #include <netatm/uni/sscop.h>
 #include <netatm/uni/sscop_misc.h>
-#include <netatm/uni/sscop_pdu.h>
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
diff --git a/sys/netatm/uni/sscf_uni.c b/sys/netatm/uni/sscf_uni.c
index 7a8bbaaacd0ae..fd700015aa021 100644
--- a/sys/netatm/uni/sscf_uni.c
+++ b/sys/netatm/uni/sscf_uni.c
@@ -38,8 +38,6 @@
 #include <netatm/kern_include.h>
 
 #include <netatm/uni/uni.h>
-#include <netatm/uni/sscop.h>
-#include <netatm/uni/sscf_uni.h>
 #include <netatm/uni/sscf_uni_var.h>
 
 #ifndef lint
diff --git a/sys/netatm/uni/sscf_uni_upper.c b/sys/netatm/uni/sscf_uni_upper.c
index df0ea2565df16..bec890222581a 100644
--- a/sys/netatm/uni/sscf_uni_upper.c
+++ b/sys/netatm/uni/sscf_uni_upper.c
@@ -39,7 +39,6 @@
 
 #include <netatm/uni/uni.h>
 #include <netatm/uni/sscop.h>
-#include <netatm/uni/sscf_uni.h>
 #include <netatm/uni/sscf_uni_var.h>
 
 #ifndef lint
diff --git a/sys/netatm/uni/sscop.c b/sys/netatm/uni/sscop.c
index ad50d3d25219f..ae67a48077b2c 100644
--- a/sys/netatm/uni/sscop.c
+++ b/sys/netatm/uni/sscop.c
@@ -37,7 +37,6 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/uni/uni.h>
 #include <netatm/uni/sscop.h>
 #include <netatm/uni/sscop_misc.h>
 #include <netatm/uni/sscop_pdu.h>
diff --git a/sys/netatm/uni/sscop_lower.c b/sys/netatm/uni/sscop_lower.c
index 393a39413e5f5..23d6ca8d50b36 100644
--- a/sys/netatm/uni/sscop_lower.c
+++ b/sys/netatm/uni/sscop_lower.c
@@ -37,10 +37,8 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/uni/uni.h>
 #include <netatm/uni/sscop.h>
 #include <netatm/uni/sscop_misc.h>
-#include <netatm/uni/sscop_pdu.h>
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
diff --git a/sys/netatm/uni/sscop_pdu.c b/sys/netatm/uni/sscop_pdu.c
index 5fd4c07bb9af7..2668b776b756c 100644
--- a/sys/netatm/uni/sscop_pdu.c
+++ b/sys/netatm/uni/sscop_pdu.c
@@ -37,7 +37,6 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/uni/uni.h>
 #include <netatm/uni/sscop.h>
 #include <netatm/uni/sscop_misc.h>
 #include <netatm/uni/sscop_pdu.h>
diff --git a/sys/netatm/uni/sscop_sigaa.c b/sys/netatm/uni/sscop_sigaa.c
index 5e91d7cde51fc..5588914e945ae 100644
--- a/sys/netatm/uni/sscop_sigaa.c
+++ b/sys/netatm/uni/sscop_sigaa.c
@@ -37,10 +37,8 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/uni/uni.h>
 #include <netatm/uni/sscop.h>
 #include <netatm/uni/sscop_misc.h>
-#include <netatm/uni/sscop_pdu.h>
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
diff --git a/sys/netatm/uni/sscop_sigcpcs.c b/sys/netatm/uni/sscop_sigcpcs.c
index 9223bb2cfec0e..edaabb6d3cb67 100644
--- a/sys/netatm/uni/sscop_sigcpcs.c
+++ b/sys/netatm/uni/sscop_sigcpcs.c
@@ -37,7 +37,6 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/uni/uni.h>
 #include <netatm/uni/sscop.h>
 #include <netatm/uni/sscop_misc.h>
 #include <netatm/uni/sscop_pdu.h>
diff --git a/sys/netatm/uni/sscop_subr.c b/sys/netatm/uni/sscop_subr.c
index 1a70d3bc033ea..172de7420f63d 100644
--- a/sys/netatm/uni/sscop_subr.c
+++ b/sys/netatm/uni/sscop_subr.c
@@ -37,7 +37,6 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/uni/uni.h>
 #include <netatm/uni/sscop.h>
 #include <netatm/uni/sscop_misc.h>
 #include <netatm/uni/sscop_pdu.h>
diff --git a/sys/netatm/uni/sscop_timer.c b/sys/netatm/uni/sscop_timer.c
index 42a98fb072154..9947ced826d8d 100644
--- a/sys/netatm/uni/sscop_timer.c
+++ b/sys/netatm/uni/sscop_timer.c
@@ -37,10 +37,8 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/uni/uni.h>
 #include <netatm/uni/sscop.h>
 #include <netatm/uni/sscop_misc.h>
-#include <netatm/uni/sscop_pdu.h>
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
diff --git a/sys/netatm/uni/sscop_upper.c b/sys/netatm/uni/sscop_upper.c
index 5f345fc61a511..733b76dd6ec26 100644
--- a/sys/netatm/uni/sscop_upper.c
+++ b/sys/netatm/uni/sscop_upper.c
@@ -37,7 +37,6 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/uni/uni.h>
 #include <netatm/uni/sscop.h>
 #include <netatm/uni/sscop_misc.h>
 #include <netatm/uni/sscop_pdu.h>
diff --git a/sys/netatm/uni/uni_load.c b/sys/netatm/uni/uni_load.c
index bd51a4774b067..2f776bde2bb44 100644
--- a/sys/netatm/uni/uni_load.c
+++ b/sys/netatm/uni/uni_load.c
@@ -41,8 +41,6 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/uni/uni.h>
-
 #ifndef lint
 __RCSID("@(#) $FreeBSD$");
 #endif
diff --git a/sys/netatm/uni/uniarp_input.c b/sys/netatm/uni/uniarp_input.c
index afa9927a58baa..0fdef9ba0002b 100644
--- a/sys/netatm/uni/uniarp_input.c
+++ b/sys/netatm/uni/uniarp_input.c
@@ -39,7 +39,6 @@
 
 #include <netatm/ipatm/ipatm_var.h>
 #include <netatm/ipatm/ipatm_serv.h>
-#include <netatm/uni/unisig_var.h>
 #include <netatm/uni/uniip_var.h>
 
 #ifndef lint
diff --git a/sys/netatm/uni/uniarp_timer.c b/sys/netatm/uni/uniarp_timer.c
index 2b550ad9d3427..0c2ea88af3751 100644
--- a/sys/netatm/uni/uniarp_timer.c
+++ b/sys/netatm/uni/uniarp_timer.c
@@ -39,7 +39,6 @@
 
 #include <netatm/ipatm/ipatm_var.h>
 #include <netatm/ipatm/ipatm_serv.h>
-#include <netatm/uni/unisig_var.h>
 #include <netatm/uni/uniip_var.h>
 
 #ifndef lint
diff --git a/sys/netatm/uni/uniarp_vcm.c b/sys/netatm/uni/uniarp_vcm.c
index 95e20e2785d28..a7d2de8b15a4f 100644
--- a/sys/netatm/uni/uniarp_vcm.c
+++ b/sys/netatm/uni/uniarp_vcm.c
@@ -39,7 +39,6 @@
 
 #include <netatm/ipatm/ipatm_var.h>
 #include <netatm/ipatm/ipatm_serv.h>
-#include <netatm/uni/unisig_var.h>
 #include <netatm/uni/uniip_var.h>
 
 #ifndef lint
diff --git a/sys/netatm/uni/unisig_decode.c b/sys/netatm/uni/unisig_decode.c
index 6cd9bde21412a..6313c11178a2b 100644
--- a/sys/netatm/uni/unisig_decode.c
+++ b/sys/netatm/uni/unisig_decode.c
@@ -37,7 +37,6 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/uni/unisig.h>
 #include <netatm/uni/unisig_var.h>
 #include <netatm/uni/unisig_msg.h>
 #include <netatm/uni/unisig_mbuf.h>
diff --git a/sys/netatm/uni/unisig_encode.c b/sys/netatm/uni/unisig_encode.c
index 9789ae94fa7c6..8a670d237b1d3 100644
--- a/sys/netatm/uni/unisig_encode.c
+++ b/sys/netatm/uni/unisig_encode.c
@@ -37,7 +37,6 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/uni/unisig.h>
 #include <netatm/uni/unisig_var.h>
 #include <netatm/uni/unisig_msg.h>
 #include <netatm/uni/unisig_mbuf.h>
diff --git a/sys/netatm/uni/unisig_if.c b/sys/netatm/uni/unisig_if.c
index 08dad264ae36c..4b559a5ff6455 100644
--- a/sys/netatm/uni/unisig_if.c
+++ b/sys/netatm/uni/unisig_if.c
@@ -41,7 +41,6 @@
 #include <netatm/ipatm/ipatm_serv.h>
 #include <netatm/uni/uniip_var.h>
 
-#include <netatm/uni/uni.h>
 #include <netatm/uni/unisig.h>
 #include <netatm/uni/unisig_var.h>
 #include <netatm/uni/unisig_msg.h>
diff --git a/sys/netatm/uni/unisig_msg.c b/sys/netatm/uni/unisig_msg.c
index 7d4125883832c..4fb6c540dea87 100644
--- a/sys/netatm/uni/unisig_msg.c
+++ b/sys/netatm/uni/unisig_msg.c
@@ -37,7 +37,6 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/uni/unisig.h>
 #include <netatm/uni/unisig_var.h>
 #include <netatm/uni/unisig_msg.h>
 #include <netatm/uni/unisig_mbuf.h>
diff --git a/sys/netatm/uni/unisig_print.c b/sys/netatm/uni/unisig_print.c
index 174b7518902fc..7892d034a3317 100644
--- a/sys/netatm/uni/unisig_print.c
+++ b/sys/netatm/uni/unisig_print.c
@@ -37,7 +37,6 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/uni/unisig.h>
 #include <netatm/uni/unisig_var.h>
 #include <netatm/uni/unisig_msg.h>
 #include <netatm/uni/unisig_print.h>
diff --git a/sys/netatm/uni/unisig_proto.c b/sys/netatm/uni/unisig_proto.c
index 39aa8b0e44a69..eae71b64cf95e 100644
--- a/sys/netatm/uni/unisig_proto.c
+++ b/sys/netatm/uni/unisig_proto.c
@@ -37,10 +37,7 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/uni/unisig.h>
 #include <netatm/uni/unisig_var.h>
-#include <netatm/uni/unisig_msg.h>
-#include <netatm/uni/unisig_mbuf.h>
 
 #ifndef lint
 __RCSID("@(#) $FreeBSD$");
diff --git a/sys/netatm/uni/unisig_sigmgr_state.c b/sys/netatm/uni/unisig_sigmgr_state.c
index b4360c9a5f212..e6a700d5ab551 100644
--- a/sys/netatm/uni/unisig_sigmgr_state.c
+++ b/sys/netatm/uni/unisig_sigmgr_state.c
@@ -40,11 +40,6 @@
 #include <netatm/uni/uni.h>
 #include <netatm/uni/unisig.h>
 #include <netatm/uni/unisig_var.h>
-#include <netatm/uni/unisig_msg.h>
-#include <netatm/uni/unisig_mbuf.h>
-#include <netatm/uni/unisig_decode.h>
-
-#include <netatm/uni/sscf_uni.h>
 
 #ifndef lint
 __RCSID("@(#) $FreeBSD$");
diff --git a/sys/netatm/uni/unisig_subr.c b/sys/netatm/uni/unisig_subr.c
index 124784a5eae88..7420cd100e300 100644
--- a/sys/netatm/uni/unisig_subr.c
+++ b/sys/netatm/uni/unisig_subr.c
@@ -37,7 +37,6 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/uni/unisig.h>
 #include <netatm/uni/unisig_var.h>
 #include <netatm/uni/unisig_msg.h>
 
diff --git a/sys/netatm/uni/unisig_util.c b/sys/netatm/uni/unisig_util.c
index 5243628dd0b29..5fb82c8176d04 100644
--- a/sys/netatm/uni/unisig_util.c
+++ b/sys/netatm/uni/unisig_util.c
@@ -37,7 +37,6 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/uni/unisig.h>
 #include <netatm/uni/unisig_var.h>
 #include <netatm/uni/unisig_msg.h>
 
diff --git a/sys/netatm/uni/unisig_vc_state.c b/sys/netatm/uni/unisig_vc_state.c
index b6775095d730c..7b66ed0f3cc37 100644
--- a/sys/netatm/uni/unisig_vc_state.c
+++ b/sys/netatm/uni/unisig_vc_state.c
@@ -37,11 +37,8 @@
 
 #include <netatm/kern_include.h>
 
-#include <netatm/uni/unisig.h>
 #include <netatm/uni/unisig_var.h>
 #include <netatm/uni/unisig_msg.h>
-#include <netatm/uni/unisig_mbuf.h>
-#include <netatm/uni/unisig_decode.h>
 
 #ifndef lint
 __RCSID("@(#) $FreeBSD$");