FIXME Move header files back to libnetworking

100 files changed, 12 insertions, 110 deletions

diff --git a/c/src/aclocal/check-networking.m4 b/c/src/aclocal/check-networking.m4
index 250d669705..89e53f638e 100644
--- a/c/src/aclocal/check-networking.m4
+++ b/c/src/aclocal/check-networking.m4
@@ -2,6 +2,7 @@ AC_DEFUN([RTEMS_CHECK_NETWORKING],
 [dnl
 AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl
 AC_REQUIRE([RTEMS_ENABLE_NETWORKING])dnl
+AC_REQUIRE([RTEMS_INCLUDES])dnl
 
 AC_CACHE_CHECK([whether BSP supports networking],
   rtems_cv_HAS_NETWORKING,
@@ -21,6 +22,7 @@ AC_CACHE_CHECK([whether BSP supports networking],
     esac])
 if test "$rtems_cv_HAS_NETWORKING" = "yes"; then
   HAS_NETWORKING="yes";
+  RTEMS_CPPFLAGS="${RTEMS_CPPFLAGS} -I${RTEMS_SOURCE_ROOT}/cpukit/libnetworking";
 else
   HAS_NETWORKING="no";
 fi
diff --git a/c/src/configure.ac b/c/src/configure.ac
index 1bffce2149..95a216334a 100644
--- a/c/src/configure.ac
+++ b/c/src/configure.ac
@@ -22,7 +22,6 @@ RTEMS_ENV_RTEMSBSP
 
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 
-RTEMS_CHECK_NETWORKING(RTEMS_BSP)
 RTEMS_CHECK_POSIX_API(RTEMS_BSP)
 RTEMS_CHECK_SMP
 
@@ -112,6 +111,7 @@ RTEMS_CHECK_GCC_WEAK
 
 AC_SUBST(CUSTOM_CFG_FILES)
 
+RTEMS_CHECK_NETWORKING(RTEMS_BSP)
 RTEMS_CHECK_MULTIPROCESSING
 
 BSP_SUBDIRS=
diff --git a/cpukit/aclocal/check-networking.m4 b/cpukit/aclocal/check-networking.m4
index e15cf05aca..72730d2084 100644
--- a/cpukit/aclocal/check-networking.m4
+++ b/cpukit/aclocal/check-networking.m4
@@ -3,6 +3,7 @@ AC_DEFUN([RTEMS_CHECK_NETWORKING],
 [dnl
 AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl
 AC_REQUIRE([RTEMS_ENABLE_NETWORKING])dnl
+AC_REQUIRE([RTEMS_INCLUDES])dnl
 
 AC_CACHE_CHECK([whether CPU supports networking],
   rtems_cv_HAS_NETWORKING,
@@ -23,7 +24,8 @@ AC_CACHE_CHECK([whether CPU supports networking],
           && test x"$ac_cv_type_uint32_t" = xyes \
           && test x"$ac_cv_type_int64_t" = xyes \
           && test x"$ac_cv_type_uint64_t" = xyes],
-        [rtems_cv_HAS_NETWORKING=yes],
+        [rtems_cv_HAS_NETWORKING=yes
+        RTEMS_CPPFLAGS="${RTEMS_CPPFLAGS} -I${RTEMS_SOURCE_ROOT}/cpukit/libnetworking"],
         [rtems_cv_HAS_NETWORKING=no])
       ],[
         rtems_cv_HAS_NETWORKING=disabled
diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am
index a107b65348..3ce1fa4c9e 100644
--- a/cpukit/libnetworking/Makefile.am
+++ b/cpukit/libnetworking/Makefile.am
@@ -1,8 +1,6 @@
 include $(top_srcdir)/automake/multilib.am
 include $(top_srcdir)/automake/compile.am
 
-AM_CPPFLAGS += -I$(srcdir)
-
 EXTRA_DIST = README
 EXTRA_DIST += rtems/bootp.h
 
diff --git a/cpukit/include/arpa/ftp.h b/cpukit/libnetworking/arpa/ftp.h
index 9a36488540..9a36488540 100644
--- a/cpukit/include/arpa/ftp.h
+++ b/cpukit/libnetworking/arpa/ftp.h
diff --git a/cpukit/include/arpa/nameser.h b/cpukit/libnetworking/arpa/nameser.h
index d499611875..d499611875 100644
--- a/cpukit/include/arpa/nameser.h
+++ b/cpukit/libnetworking/arpa/nameser.h
diff --git a/cpukit/include/arpa/nameser_compat.h b/cpukit/libnetworking/arpa/nameser_compat.h
index 8fcceaa6c1..8fcceaa6c1 100644
--- a/cpukit/include/arpa/nameser_compat.h
+++ b/cpukit/libnetworking/arpa/nameser_compat.h
diff --git a/cpukit/include/dev/mii/mii.h b/cpukit/libnetworking/dev/mii/mii.h
index 14e45b0462..14e45b0462 100644
--- a/cpukit/include/dev/mii/mii.h
+++ b/cpukit/libnetworking/dev/mii/mii.h
diff --git a/cpukit/include/ifaddrs.h b/cpukit/libnetworking/ifaddrs.h
index 7d3aa953ec..7d3aa953ec 100644
--- a/cpukit/include/ifaddrs.h
+++ b/cpukit/libnetworking/ifaddrs.h
diff --git a/cpukit/include/machine/_align.h b/cpukit/libnetworking/machine/_align.h
index fa26a54f6a..fa26a54f6a 100644
--- a/cpukit/include/machine/_align.h
+++ b/cpukit/libnetworking/machine/_align.h
diff --git a/cpukit/include/machine/_kernel_lock.h b/cpukit/libnetworking/machine/_kernel_lock.h
index 710cecca97..710cecca97 100644
--- a/cpukit/include/machine/_kernel_lock.h
+++ b/cpukit/libnetworking/machine/_kernel_lock.h
diff --git a/cpukit/include/machine/cpu.h b/cpukit/libnetworking/machine/cpu.h
index 87fc20463c..87fc20463c 100644
--- a/cpukit/include/machine/cpu.h
+++ b/cpukit/libnetworking/machine/cpu.h
diff --git a/cpukit/include/machine/cpufunc.h b/cpukit/libnetworking/machine/cpufunc.h
index 87fc20463c..87fc20463c 100644
--- a/cpukit/include/machine/cpufunc.h
+++ b/cpukit/libnetworking/machine/cpufunc.h
diff --git a/cpukit/include/machine/in_cksum.h b/cpukit/libnetworking/machine/in_cksum.h
index 67dafb644c..67dafb644c 100644
--- a/cpukit/include/machine/in_cksum.h
+++ b/cpukit/libnetworking/machine/in_cksum.h
diff --git a/cpukit/include/machine/vmparam.h b/cpukit/libnetworking/machine/vmparam.h
index 87fc20463c..87fc20463c 100644
--- a/cpukit/include/machine/vmparam.h
+++ b/cpukit/libnetworking/machine/vmparam.h
diff --git a/cpukit/include/net/bpf.h b/cpukit/libnetworking/net/bpf.h
index caac0441bd..caac0441bd 100644
--- a/cpukit/include/net/bpf.h
+++ b/cpukit/libnetworking/net/bpf.h
diff --git a/cpukit/include/net/ethernet.h b/cpukit/libnetworking/net/ethernet.h
index 86a89fca98..86a89fca98 100644
--- a/cpukit/include/net/ethernet.h
+++ b/cpukit/libnetworking/net/ethernet.h
diff --git a/cpukit/include/net/if_arp.h b/cpukit/libnetworking/net/if_arp.h
index 7fbd36fcbb..7fbd36fcbb 100644
--- a/cpukit/include/net/if_arp.h
+++ b/cpukit/libnetworking/net/if_arp.h
diff --git a/cpukit/include/net/if_dl.h b/cpukit/libnetworking/net/if_dl.h
index 4048528fea..4048528fea 100644
--- a/cpukit/include/net/if_dl.h
+++ b/cpukit/libnetworking/net/if_dl.h
diff --git a/cpukit/include/net/if_llc.h b/cpukit/libnetworking/net/if_llc.h
index 5f95f3fd78..5f95f3fd78 100644
--- a/cpukit/include/net/if_llc.h
+++ b/cpukit/libnetworking/net/if_llc.h
diff --git a/cpukit/include/net/if_media.h b/cpukit/libnetworking/net/if_media.h
index 9a2b179061..9a2b179061 100644
--- a/cpukit/include/net/if_media.h
+++ b/cpukit/libnetworking/net/if_media.h
diff --git a/cpukit/include/net/if_ppp.h b/cpukit/libnetworking/net/if_ppp.h
index c8dcfc87ed..c8dcfc87ed 100644
--- a/cpukit/include/net/if_ppp.h
+++ b/cpukit/libnetworking/net/if_ppp.h
diff --git a/cpukit/include/net/if_pppvar.h b/cpukit/libnetworking/net/if_pppvar.h
index 9d708a4fcc..9d708a4fcc 100644
--- a/cpukit/include/net/if_pppvar.h
+++ b/cpukit/libnetworking/net/if_pppvar.h
diff --git a/cpukit/include/net/if_types.h b/cpukit/libnetworking/net/if_types.h
index aa924d3c1a..aa924d3c1a 100644
--- a/cpukit/include/net/if_types.h
+++ b/cpukit/libnetworking/net/if_types.h
diff --git a/cpukit/include/net/if_var.h b/cpukit/libnetworking/net/if_var.h
index 222862c451..222862c451 100644
--- a/cpukit/include/net/if_var.h
+++ b/cpukit/libnetworking/net/if_var.h
diff --git a/cpukit/include/net/netisr.h b/cpukit/libnetworking/net/netisr.h
index eb204e78c2..eb204e78c2 100644
--- a/cpukit/include/net/netisr.h
+++ b/cpukit/libnetworking/net/netisr.h
diff --git a/cpukit/include/net/ppp_comp.h b/cpukit/libnetworking/net/ppp_comp.h
index c78997d2e2..c78997d2e2 100644
--- a/cpukit/include/net/ppp_comp.h
+++ b/cpukit/libnetworking/net/ppp_comp.h
diff --git a/cpukit/include/net/ppp_defs.h b/cpukit/libnetworking/net/ppp_defs.h
index 3636bf9f0e..3636bf9f0e 100644
--- a/cpukit/include/net/ppp_defs.h
+++ b/cpukit/libnetworking/net/ppp_defs.h
diff --git a/cpukit/include/net/radix.h b/cpukit/libnetworking/net/radix.h
index cf132a4ab9..cf132a4ab9 100644
--- a/cpukit/include/net/radix.h
+++ b/cpukit/libnetworking/net/radix.h
diff --git a/cpukit/include/net/raw_cb.h b/cpukit/libnetworking/net/raw_cb.h
index 907e3c08e1..907e3c08e1 100644
--- a/cpukit/include/net/raw_cb.h
+++ b/cpukit/libnetworking/net/raw_cb.h
diff --git a/cpukit/include/net/route.h b/cpukit/libnetworking/net/route.h
index a9a07839e4..a9a07839e4 100644
--- a/cpukit/include/net/route.h
+++ b/cpukit/libnetworking/net/route.h
diff --git a/cpukit/include/net/slcompress.h b/cpukit/libnetworking/net/slcompress.h
index 511a8d8554..511a8d8554 100644
--- a/cpukit/include/net/slcompress.h
+++ b/cpukit/libnetworking/net/slcompress.h
diff --git a/cpukit/include/netinet/icmp_var.h b/cpukit/libnetworking/netinet/icmp_var.h
index 31eea3bea0..31eea3bea0 100644
--- a/cpukit/include/netinet/icmp_var.h
+++ b/cpukit/libnetworking/netinet/icmp_var.h
diff --git a/cpukit/include/netinet/if_ether.h b/cpukit/libnetworking/netinet/if_ether.h
index f45c4149c9..f45c4149c9 100644
--- a/cpukit/include/netinet/if_ether.h
+++ b/cpukit/libnetworking/netinet/if_ether.h
diff --git a/cpukit/include/netinet/igmp.h b/cpukit/libnetworking/netinet/igmp.h
index b397ccd156..b397ccd156 100644
--- a/cpukit/include/netinet/igmp.h
+++ b/cpukit/libnetworking/netinet/igmp.h
diff --git a/cpukit/include/netinet/igmp_var.h b/cpukit/libnetworking/netinet/igmp_var.h
index d1454e0521..d1454e0521 100644
--- a/cpukit/include/netinet/igmp_var.h
+++ b/cpukit/libnetworking/netinet/igmp_var.h
diff --git a/cpukit/include/netinet/in_pcb.h b/cpukit/libnetworking/netinet/in_pcb.h
index ad8b99cf09..ad8b99cf09 100644
--- a/cpukit/include/netinet/in_pcb.h
+++ b/cpukit/libnetworking/netinet/in_pcb.h
diff --git a/cpukit/include/netinet/in_systm.h b/cpukit/libnetworking/netinet/in_systm.h
index f0f3fa9a41..f0f3fa9a41 100644
--- a/cpukit/include/netinet/in_systm.h
+++ b/cpukit/libnetworking/netinet/in_systm.h
diff --git a/cpukit/include/netinet/in_var.h b/cpukit/libnetworking/netinet/in_var.h
index 9ade9c482e..9ade9c482e 100644
--- a/cpukit/include/netinet/in_var.h
+++ b/cpukit/libnetworking/netinet/in_var.h
diff --git a/cpukit/include/netinet/ip.h b/cpukit/libnetworking/netinet/ip.h
index 6a2dcad65b..6a2dcad65b 100644
--- a/cpukit/include/netinet/ip.h
+++ b/cpukit/libnetworking/netinet/ip.h
diff --git a/cpukit/include/netinet/ip_fw.h b/cpukit/libnetworking/netinet/ip_fw.h
index c511154617..c511154617 100644
--- a/cpukit/include/netinet/ip_fw.h
+++ b/cpukit/libnetworking/netinet/ip_fw.h
diff --git a/cpukit/include/netinet/ip_icmp.h b/cpukit/libnetworking/netinet/ip_icmp.h
index 2e66a5f68f..2e66a5f68f 100644
--- a/cpukit/include/netinet/ip_icmp.h
+++ b/cpukit/libnetworking/netinet/ip_icmp.h
diff --git a/cpukit/include/netinet/ip_mroute.h b/cpukit/libnetworking/netinet/ip_mroute.h
index 9a28574ff8..9a28574ff8 100644
--- a/cpukit/include/netinet/ip_mroute.h
+++ b/cpukit/libnetworking/netinet/ip_mroute.h
diff --git a/cpukit/include/netinet/ip_var.h b/cpukit/libnetworking/netinet/ip_var.h
index a6e0bc87cc..a6e0bc87cc 100644
--- a/cpukit/include/netinet/ip_var.h
+++ b/cpukit/libnetworking/netinet/ip_var.h
diff --git a/cpukit/include/netinet/tcp_debug.h b/cpukit/libnetworking/netinet/tcp_debug.h
index 55004f3aa4..55004f3aa4 100644
--- a/cpukit/include/netinet/tcp_debug.h
+++ b/cpukit/libnetworking/netinet/tcp_debug.h
diff --git a/cpukit/include/netinet/tcp_fsm.h b/cpukit/libnetworking/netinet/tcp_fsm.h
index ceb053ecb3..ceb053ecb3 100644
--- a/cpukit/include/netinet/tcp_fsm.h
+++ b/cpukit/libnetworking/netinet/tcp_fsm.h
diff --git a/cpukit/include/netinet/tcp_seq.h b/cpukit/libnetworking/netinet/tcp_seq.h
index c24b294250..c24b294250 100644
--- a/cpukit/include/netinet/tcp_seq.h
+++ b/cpukit/libnetworking/netinet/tcp_seq.h
diff --git a/cpukit/include/netinet/tcp_timer.h b/cpukit/libnetworking/netinet/tcp_timer.h
index 4bbbb712b6..4bbbb712b6 100644
--- a/cpukit/include/netinet/tcp_timer.h
+++ b/cpukit/libnetworking/netinet/tcp_timer.h
diff --git a/cpukit/include/netinet/tcp_var.h b/cpukit/libnetworking/netinet/tcp_var.h
index cd70970641..cd70970641 100644
--- a/cpukit/include/netinet/tcp_var.h
+++ b/cpukit/libnetworking/netinet/tcp_var.h
diff --git a/cpukit/include/netinet/tcpip.h b/cpukit/libnetworking/netinet/tcpip.h
index 1f16bd0f1c..1f16bd0f1c 100644
--- a/cpukit/include/netinet/tcpip.h
+++ b/cpukit/libnetworking/netinet/tcpip.h
diff --git a/cpukit/include/netinet/udp.h b/cpukit/libnetworking/netinet/udp.h
index 98fc433e28..98fc433e28 100644
--- a/cpukit/include/netinet/udp.h
+++ b/cpukit/libnetworking/netinet/udp.h
diff --git a/cpukit/include/netinet/udp_var.h b/cpukit/libnetworking/netinet/udp_var.h
index c06e12d19a..c06e12d19a 100644
--- a/cpukit/include/netinet/udp_var.h
+++ b/cpukit/libnetworking/netinet/udp_var.h
diff --git a/cpukit/include/nfs/nfsproto.h b/cpukit/libnetworking/nfs/nfsproto.h
index 6eebd81d94..6eebd81d94 100644
--- a/cpukit/include/nfs/nfsproto.h
+++ b/cpukit/libnetworking/nfs/nfsproto.h
diff --git a/cpukit/include/nfs/rpcv2.h b/cpukit/libnetworking/nfs/rpcv2.h
index 9d49133ea2..9d49133ea2 100644
--- a/cpukit/include/nfs/rpcv2.h
+++ b/cpukit/libnetworking/nfs/rpcv2.h
diff --git a/cpukit/include/nfs/xdr_subs.h b/cpukit/libnetworking/nfs/xdr_subs.h
index b29c172615..b29c172615 100644
--- a/cpukit/include/nfs/xdr_subs.h
+++ b/cpukit/libnetworking/nfs/xdr_subs.h
diff --git a/cpukit/include/nfsclient/nfsargs.h b/cpukit/libnetworking/nfsclient/nfsargs.h
index c8609721df..c8609721df 100644
--- a/cpukit/include/nfsclient/nfsargs.h
+++ b/cpukit/libnetworking/nfsclient/nfsargs.h
diff --git a/cpukit/include/nfsclient/nfsdiskless.h b/cpukit/libnetworking/nfsclient/nfsdiskless.h
index ee6be125cc..ee6be125cc 100644
--- a/cpukit/include/nfsclient/nfsdiskless.h
+++ b/cpukit/libnetworking/nfsclient/nfsdiskless.h
diff --git a/cpukit/include/resolv.h b/cpukit/libnetworking/resolv.h
index 06d3a55a16..06d3a55a16 100644
--- a/cpukit/include/resolv.h
+++ b/cpukit/libnetworking/resolv.h
diff --git a/cpukit/include/rtems/bsdnet/_types.h b/cpukit/libnetworking/rtems/bsdnet/_types.h
index d557e31c1f..d557e31c1f 100644
--- a/cpukit/include/rtems/bsdnet/_types.h
+++ b/cpukit/libnetworking/rtems/bsdnet/_types.h
diff --git a/cpukit/include/rtems/bsdnet/servers.h b/cpukit/libnetworking/rtems/bsdnet/servers.h
index 8886d05405..8886d05405 100644
--- a/cpukit/include/rtems/bsdnet/servers.h
+++ b/cpukit/libnetworking/rtems/bsdnet/servers.h
diff --git a/cpukit/include/rtems/dhcp.h b/cpukit/libnetworking/rtems/dhcp.h
index eb7f42d2fd..eb7f42d2fd 100644
--- a/cpukit/include/rtems/dhcp.h
+++ b/cpukit/libnetworking/rtems/dhcp.h
diff --git a/cpukit/include/rtems/ftpfs.h b/cpukit/libnetworking/rtems/ftpfs.h
index c1f615b85b..c1f615b85b 100644
--- a/cpukit/include/rtems/ftpfs.h
+++ b/cpukit/libnetworking/rtems/ftpfs.h
diff --git a/cpukit/include/rtems/mkrootfs.h b/cpukit/libnetworking/rtems/mkrootfs.h
index 8bd443693b..8bd443693b 100644
--- a/cpukit/include/rtems/mkrootfs.h
+++ b/cpukit/libnetworking/rtems/mkrootfs.h
diff --git a/cpukit/include/rtems/rtems_bsdnet.h b/cpukit/libnetworking/rtems/rtems_bsdnet.h
index a97c058f78..a97c058f78 100644
--- a/cpukit/include/rtems/rtems_bsdnet.h
+++ b/cpukit/libnetworking/rtems/rtems_bsdnet.h
diff --git a/cpukit/include/rtems/rtems_bsdnet_internal.h b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
index d103c56153..d103c56153 100644
--- a/cpukit/include/rtems/rtems_bsdnet_internal.h
+++ b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
diff --git a/cpukit/include/rtems/rtems_dhcp_failsafe.h b/cpukit/libnetworking/rtems/rtems_dhcp_failsafe.h
index 3c5a59fcb0..3c5a59fcb0 100644
--- a/cpukit/include/rtems/rtems_dhcp_failsafe.h
+++ b/cpukit/libnetworking/rtems/rtems_dhcp_failsafe.h
diff --git a/cpukit/include/rtems/rtems_mii_ioctl.h b/cpukit/libnetworking/rtems/rtems_mii_ioctl.h
index dfeebf169b..dfeebf169b 100644
--- a/cpukit/include/rtems/rtems_mii_ioctl.h
+++ b/cpukit/libnetworking/rtems/rtems_mii_ioctl.h
diff --git a/cpukit/include/rtems/rtems_netdb.h b/cpukit/libnetworking/rtems/rtems_netdb.h
index ca4d3dd14d..ca4d3dd14d 100644
--- a/cpukit/include/rtems/rtems_netdb.h
+++ b/cpukit/libnetworking/rtems/rtems_netdb.h
diff --git a/cpukit/include/rtems/rtems_netinet_in.h b/cpukit/libnetworking/rtems/rtems_netinet_in.h
index 53240e415b..53240e415b 100644
--- a/cpukit/include/rtems/rtems_netinet_in.h
+++ b/cpukit/libnetworking/rtems/rtems_netinet_in.h
diff --git a/cpukit/include/rtems/tftp.h b/cpukit/libnetworking/rtems/tftp.h
index ed3ebd7865..ed3ebd7865 100644
--- a/cpukit/include/rtems/tftp.h
+++ b/cpukit/libnetworking/rtems/tftp.h
diff --git a/cpukit/include/sys/callout.h b/cpukit/libnetworking/sys/callout.h
index 150609eef6..150609eef6 100644
--- a/cpukit/include/sys/callout.h
+++ b/cpukit/libnetworking/sys/callout.h
diff --git a/cpukit/include/sys/conf.h b/cpukit/libnetworking/sys/conf.h
index 45abb1c4d6..45abb1c4d6 100644
--- a/cpukit/include/sys/conf.h
+++ b/cpukit/libnetworking/sys/conf.h
diff --git a/cpukit/include/sys/domain.h b/cpukit/libnetworking/sys/domain.h
index 0112f574be..0112f574be 100644
--- a/cpukit/include/sys/domain.h
+++ b/cpukit/libnetworking/sys/domain.h
diff --git a/cpukit/include/sys/kernel.h b/cpukit/libnetworking/sys/kernel.h
index 045bf19baf..045bf19baf 100644
--- a/cpukit/include/sys/kernel.h
+++ b/cpukit/libnetworking/sys/kernel.h
diff --git a/cpukit/include/sys/libkern.h b/cpukit/libnetworking/sys/libkern.h
index 7aa6e8b7c9..7aa6e8b7c9 100644
--- a/cpukit/include/sys/libkern.h
+++ b/cpukit/libnetworking/sys/libkern.h
diff --git a/cpukit/include/sys/linker_set.h b/cpukit/libnetworking/sys/linker_set.h
index c83d7c845a..c83d7c845a 100644
--- a/cpukit/include/sys/linker_set.h
+++ b/cpukit/libnetworking/sys/linker_set.h
diff --git a/cpukit/include/sys/malloc.h b/cpukit/libnetworking/sys/malloc.h
index 2341053166..2341053166 100644
--- a/cpukit/include/sys/malloc.h
+++ b/cpukit/libnetworking/sys/malloc.h
diff --git a/cpukit/include/sys/mbuf.h b/cpukit/libnetworking/sys/mbuf.h
index c54b760b3e..c54b760b3e 100644
--- a/cpukit/include/sys/mbuf.h
+++ b/cpukit/libnetworking/sys/mbuf.h
diff --git a/cpukit/include/sys/mount.h b/cpukit/libnetworking/sys/mount.h
index c422c7f8c4..c422c7f8c4 100644
--- a/cpukit/include/sys/mount.h
+++ b/cpukit/libnetworking/sys/mount.h
diff --git a/cpukit/libnetworking/sys/poll.h b/cpukit/libnetworking/sys/poll.h
deleted file mode 100644
index 9ea42b9ddf..0000000000
--- a/cpukit/libnetworking/sys/poll.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-
- * Copyright (c) 1997 Peter Wemm <peter@freebsd.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/sys/poll.h,v 1.13 2002/07/10 04:47:25 mike Exp $
- */
-
-#ifndef _SYS_POLL_H_
-#define	_SYS_POLL_H_
-
-#include <sys/cdefs.h>
-
-/*
- * This file is intended to be compatible with the traditional poll.h.
- */
-
-typedef	unsigned int	nfds_t;
-
-/*
- * This structure is passed as an array to poll(2).
- */
-struct pollfd {
-	int	fd;		/* which file descriptor to poll */
-	short	events;		/* events we are interested in */
-	short	revents;	/* events found on return */
-};
-
-/*
- * Requestable events.  If poll(2) finds any of these set, they are
- * copied to revents on return.
- * XXX Note that FreeBSD doesn't make much distinction between POLLPRI
- * and POLLRDBAND since none of the file types have distinct priority
- * bands - and only some have an urgent "mode".
- * XXX Note POLLIN isn't really supported in true SVSV terms.  Under SYSV
- * POLLIN includes all of normal, band and urgent data.  Most poll handlers
- * on FreeBSD only treat it as "normal" data.
- */
-#define	POLLIN		0x0001		/* any readable data available */
-#define	POLLPRI		0x0002		/* OOB/Urgent readable data */
-#define	POLLOUT		0x0004		/* file descriptor is writeable */
-#define	POLLRDNORM	0x0040		/* non-OOB/URG data available */
-#define	POLLWRNORM	POLLOUT		/* no write type differentiation */
-#define	POLLRDBAND	0x0080		/* OOB/Urgent readable data */
-#define	POLLWRBAND	0x0100		/* OOB/Urgent data can be written */
-
-#if __BSD_VISIBLE
-/* General FreeBSD extension (currently only supported for sockets): */
-#define	POLLINIGNEOF	0x2000		/* like POLLIN, except ignore EOF */
-#endif
-
-/*
- * These events are set if they occur regardless of whether they were
- * requested.
- */
-#define	POLLERR		0x0008		/* some poll error occurred */
-#define	POLLHUP		0x0010		/* file descriptor was "hung up" */
-#define	POLLNVAL	0x0020		/* requested events "invalid" */
-
-#if __BSD_VISIBLE
-
-#define	POLLSTANDARD	(POLLIN|POLLPRI|POLLOUT|POLLRDNORM|POLLRDBAND|\
-			 POLLWRBAND|POLLERR|POLLHUP|POLLNVAL)
-
-/*
- * Request that poll() wait forever.
- * XXX in SYSV, this is defined in stropts.h, which is not included
- * by poll.h.
- */
-#define	INFTIM		(-1)
-
-#endif
-
-#ifndef _KERNEL
-
-__BEGIN_DECLS
-int	poll(struct pollfd _pfd[], nfds_t _nfds, int _timeout);
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif /* !_SYS_POLL_H_ */
diff --git a/cpukit/include/sys/proc.h b/cpukit/libnetworking/sys/proc.h
index 8b8b7dc1b9..8b8b7dc1b9 100644
--- a/cpukit/include/sys/proc.h
+++ b/cpukit/libnetworking/sys/proc.h
diff --git a/cpukit/include/sys/protosw.h b/cpukit/libnetworking/sys/protosw.h
index e1119f9378..e1119f9378 100644
--- a/cpukit/include/sys/protosw.h
+++ b/cpukit/libnetworking/sys/protosw.h
diff --git a/cpukit/include/sys/reboot.h b/cpukit/libnetworking/sys/reboot.h
index 191f3a477a..191f3a477a 100644
--- a/cpukit/include/sys/reboot.h
+++ b/cpukit/libnetworking/sys/reboot.h
diff --git a/cpukit/include/sys/resourcevar.h b/cpukit/libnetworking/sys/resourcevar.h
index 87fc20463c..87fc20463c 100644
--- a/cpukit/include/sys/resourcevar.h
+++ b/cpukit/libnetworking/sys/resourcevar.h
diff --git a/cpukit/include/sys/selinfo.h b/cpukit/libnetworking/sys/selinfo.h
index 68ec92a6a3..68ec92a6a3 100644
--- a/cpukit/include/sys/selinfo.h
+++ b/cpukit/libnetworking/sys/selinfo.h
diff --git a/cpukit/include/sys/signalvar.h b/cpukit/libnetworking/sys/signalvar.h
index c2311cf05a..c2311cf05a 100644
--- a/cpukit/include/sys/signalvar.h
+++ b/cpukit/libnetworking/sys/signalvar.h
diff --git a/cpukit/include/sys/socketvar.h b/cpukit/libnetworking/sys/socketvar.h
index 2cdd5158ef..2cdd5158ef 100644
--- a/cpukit/include/sys/socketvar.h
+++ b/cpukit/libnetworking/sys/socketvar.h
diff --git a/cpukit/include/sys/sysctl.h b/cpukit/libnetworking/sys/sysctl.h
index 12e3845402..12e3845402 100644
--- a/cpukit/include/sys/sysctl.h
+++ b/cpukit/libnetworking/sys/sysctl.h
diff --git a/cpukit/include/sys/systm.h b/cpukit/libnetworking/sys/systm.h
index ae70148184..ae70148184 100644
--- a/cpukit/include/sys/systm.h
+++ b/cpukit/libnetworking/sys/systm.h
diff --git a/cpukit/include/sys/ucred.h b/cpukit/libnetworking/sys/ucred.h
index 84c4ebc2e6..84c4ebc2e6 100644
--- a/cpukit/include/sys/ucred.h
+++ b/cpukit/libnetworking/sys/ucred.h
diff --git a/cpukit/include/vm/vm.h b/cpukit/libnetworking/vm/vm.h
index b6be3d1ca0..b6be3d1ca0 100644
--- a/cpukit/include/vm/vm.h
+++ b/cpukit/libnetworking/vm/vm.h
diff --git a/cpukit/include/vm/vm_extern.h b/cpukit/libnetworking/vm/vm_extern.h
index c495af60f9..c495af60f9 100644
--- a/cpukit/include/vm/vm_extern.h
+++ b/cpukit/libnetworking/vm/vm_extern.h
diff --git a/cpukit/include/vm/vm_kern.h b/cpukit/libnetworking/vm/vm_kern.h
index f020f2da8f..f020f2da8f 100644
--- a/cpukit/include/vm/vm_kern.h
+++ b/cpukit/libnetworking/vm/vm_kern.h
diff --git a/cpukit/include/vm/vm_param.h b/cpukit/libnetworking/vm/vm_param.h
index 41c52ef488..41c52ef488 100644
--- a/cpukit/include/vm/vm_param.h
+++ b/cpukit/libnetworking/vm/vm_param.h
diff --git a/testsuites/libtests/ftp01/Makefile.am b/testsuites/libtests/ftp01/Makefile.am
index a3b8f3e2b4..4a0fd4efe6 100644
--- a/testsuites/libtests/ftp01/Makefile.am
+++ b/testsuites/libtests/ftp01/Makefile.am
@@ -11,7 +11,7 @@ include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/termios04
+AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
 
 LINK_OBJS = $(ftp01_OBJECTS) $(ftp01_LDADD)
 LINK_LIBS = $(ftp01_LDLIBS)
diff --git a/testsuites/libtests/mghttpd01/Makefile.am b/testsuites/libtests/mghttpd01/Makefile.am
index 909a646970..d3c89d86ca 100644
--- a/testsuites/libtests/mghttpd01/Makefile.am
+++ b/testsuites/libtests/mghttpd01/Makefile.am
@@ -12,6 +12,7 @@ include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
 
 LINK_OBJS = $(mghttpd01_OBJECTS) $(mghttpd01_LDADD)
 LINK_LIBS = $(mghttpd01_LDLIBS)
diff --git a/testsuites/libtests/networking01/Makefile.am b/testsuites/libtests/networking01/Makefile.am
index 0f1fb70bd3..3bc93cebd7 100644
--- a/testsuites/libtests/networking01/Makefile.am
+++ b/testsuites/libtests/networking01/Makefile.am
@@ -10,7 +10,7 @@ include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/termios04
+AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
 
 LINK_OBJS = $(networking01_OBJECTS)
 LINK_LIBS = $(networking01_LDLIBS)
diff --git a/testsuites/libtests/syscall01/Makefile.am b/testsuites/libtests/syscall01/Makefile.am
index 126cd30aa7..6d8038e20b 100644
--- a/testsuites/libtests/syscall01/Makefile.am
+++ b/testsuites/libtests/syscall01/Makefile.am
@@ -8,6 +8,7 @@ include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
 
 LINK_OBJS = $(syscall01_OBJECTS)
 LINK_LIBS = $(syscall01_LDLIBS)
diff --git a/testsuites/samples/loopback/Makefile.am b/testsuites/samples/loopback/Makefile.am
index d0cebb989f..51d30c2b33 100644
--- a/testsuites/samples/loopback/Makefile.am
+++ b/testsuites/samples/loopback/Makefile.am
@@ -9,6 +9,7 @@ include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
 
 LINK_OBJS = $(loopback_OBJECTS)
 LINK_LIBS = $(loopback_LDLIBS)
diff --git a/testsuites/samples/pppd/Makefile.am b/testsuites/samples/pppd/Makefile.am
index 6a989f8c51..6ef0562362 100644
--- a/testsuites/samples/pppd/Makefile.am
+++ b/testsuites/samples/pppd/Makefile.am
@@ -10,6 +10,7 @@ include $(top_srcdir)/../automake/leaf.am
 pppd_LDLIBS = -lpppd
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
 
 LINK_OBJS = $(pppd_OBJECTS)
 LINK_LIBS = $(pppd_LDLIBS)