Merged from 4.5.0-beta3a

33 files changed, 314 insertions, 500 deletions

diff --git a/c/src/libnetworking/Makefile.am b/c/src/libnetworking/Makefile.am
index ce9cf6c399..7e41fce2b3 100644
--- a/c/src/libnetworking/Makefile.am
+++ b/c/src/libnetworking/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
@@ -9,7 +9,7 @@ SUBDIRS = include arpa kern machine sys vm lib libc net netinet nfs rtems \
     rtems_servers pppd rtems_webserver wrapup
 
 EXTRA_DIST = CHANGELOG bpfilter.h loop.h netdb.h opt_ipfw.h opt_mrouting.h \
-    opt_tcpdebug.h poll.h resolv.h syslog.h
+    opt_tcpdebug.h poll.h resolv.h syslog.h memory.h
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libnetworking/arpa/Makefile.am b/c/src/libnetworking/arpa/Makefile.am
index dba97b83d5..6ee4bfbe74 100644
--- a/c/src/libnetworking/arpa/Makefile.am
+++ b/c/src/libnetworking/arpa/Makefile.am
@@ -4,6 +4,18 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-EXTRA_DIST = ftp.h inet.h nameser.h nameser_compat.h telnet.h
+H_FILES = ftp.h inet.h nameser.h nameser_compat.h telnet.h
+
+noinst_HEADERS = $(H_FILES)
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/arpa $(H_FILES:%=$(PROJECT_INCLUDE)/arpa/%)
+
+$(PROJECT_INCLUDE)/arpa:
+	@$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/arpa/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
+all-local: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libnetworking/include/Makefile.am b/c/src/libnetworking/include/Makefile.am
index 1ea3cf037a..888ef5599d 100644
--- a/c/src/libnetworking/include/Makefile.am
+++ b/c/src/libnetworking/include/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 ##
 ## FIXME: This Makefile.am is pretty ugly and deserves to be reworked :(
 ##
@@ -8,58 +8,10 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 H_FILES = ../bpfilter.h ../loop.h ../netdb.h ../opt_ipfw.h ../opt_mrouting.h \
-    ../opt_tcpdebug.h ../poll.h ../resolv.h ../syslog.h
-
-SYS_H_FILES = ../sys/buf.h ../sys/callout.h ../sys/cdefs.h ../sys/conf.h \
-    ../sys/domain.h ../sys/filio.h ../sys/ioccom.h ../sys/ioctl.h \
-    ../sys/kernel.h ../sys/libkern.h ../sys/malloc.h ../sys/mbuf.h \
-    ../sys/mount.h ../sys/param.h ../sys/proc.h ../sys/protosw.h \
-    ../sys/queue.h ../sys/reboot.h ../sys/resourcevar.h ../sys/rtprio.h \
-    ../sys/select.h ../sys/signalvar.h ../sys/socket.h ../sys/socketvar.h \
-    ../sys/sockio.h ../sys/sysctl.h ../sys/syslimits.h ../sys/syslog.h \
-    ../sys/systm.h ../sys/ttycom.h ../sys/ttydefaults.h ../sys/ucred.h \
-    ../sys/uio.h
-
-RTEMS_H_FILES = ../rtems/rtems_bsdnet.h ../rtems/rtems_bsdnet_internal.h \
-    ../rtems/tftp.h
-
-MACHINE_H_FILES = ../machine/conf.h ../machine/cpu.h ../machine/cpufunc.h \
-    ../machine/endian.h ../machine/in_cksum.h ../machine/limits.h \
-    ../machine/param.h ../machine/types.h ../machine/vmparam.h
-
-VM_H_FILES = ../vm/vm.h ../vm/vm_extern.h ../vm/vm_kern.h ../vm/vm_param.h
-
-NET_H_FILES = ../net/bpf.h ../net/ethernet.h ../net/if.h ../net/if_arp.h \
-    ../net/if_dl.h ../net/if_llc.h ../net/if_ppp.h ../net/if_types.h \
-    ../net/netisr.h ../net/ppp-comp.h ../net/ppp_defs.h ../net/radix.h \
-    ../net/raw_cb.h ../net/route.h
-
-NETINET_H_FILES = ../netinet/icmp_var.h ../netinet/if_ether.h \
-    ../netinet/igmp.h ../netinet/igmp_var.h ../netinet/in.h \
-    ../netinet/in_pcb.h ../netinet/in_systm.h ../netinet/in_var.h \
-    ../netinet/ip.h ../netinet/ip_fw.h ../netinet/ip_icmp.h \
-    ../netinet/ip_mroute.h ../netinet/ip_var.h ../netinet/tcp.h \
-    ../netinet/tcp_debug.h ../netinet/tcp_fsm.h ../netinet/tcp_seq.h \
-    ../netinet/tcp_timer.h ../netinet/tcp_var.h ../netinet/tcpip.h \
-    ../netinet/udp.h ../netinet/udp_var.h
-
-ARPA_H_FILES = ../arpa/ftp.h ../arpa/inet.h ../arpa/nameser.h \
-    ../arpa/nameser_compat.h ../arpa/telnet.h
-
-NFS_H_FILES = ../nfs/krpc.h ../nfs/nfs.h ../nfs/nfsdiskless.h \
-    ../nfs/nfsproto.h ../nfs/rpcv2.h ../nfs/xdr_subs.h
-
-RTEMS_SERVERS_H_FILES = ../rtems_servers/ftpd.h
-
-RTEMS_WEBSERVER_H_FILES = ../rtems_webserver/rtems_webserver.h
+    ../opt_tcpdebug.h ../poll.h ../resolv.h ../syslog.h ../memory.h
 
 # We only make the install point for the networking header files if needed.
 
-INSTALLDIRS = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/sys \
-    $(PROJECT_INCLUDE)/machine $(PROJECT_INCLUDE)/rtems \
-    $(PROJECT_INCLUDE)/vm $(PROJECT_INCLUDE)/net $(PROJECT_INCLUDE)/netinet \
-    $(PROJECT_INCLUDE)/arpa $(PROJECT_INCLUDE)/nfs
-
 $(INSTALLDIRS):
 	$(mkinstalldirs) $@
 
@@ -90,298 +42,7 @@ $(PROJECT_INCLUDE)/resolv.h: ../resolv.h
 $(PROJECT_INCLUDE)/syslog.h: ../syslog.h
 	$(INSTALL_DATA) $< $@
 
-$(PROJECT_INCLUDE)/sys/buf.h: ../sys/buf.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/callout.h: ../sys/callout.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/cdefs.h: ../sys/cdefs.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/conf.h: ../sys/conf.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/domain.h: ../sys/domain.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/filio.h: ../sys/filio.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/ioccom.h: ../sys/ioccom.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/ioctl.h: ../sys/ioctl.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/kernel.h: ../sys/kernel.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/libkern.h: ../sys/libkern.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/malloc.h: ../sys/malloc.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/mbuf.h: ../sys/mbuf.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/mount.h: ../sys/mount.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/param.h: ../sys/param.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/proc.h: ../sys/proc.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/protosw.h: ../sys/protosw.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/queue.h: ../sys/queue.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/reboot.h: ../sys/reboot.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/resourcevar.h: ../sys/resourcevar.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/rtprio.h: ../sys/rtprio.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/select.h: ../sys/select.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/signalvar.h: ../sys/signalvar.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/socket.h: ../sys/socket.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/socketvar.h: ../sys/socketvar.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/sockio.h: ../sys/sockio.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/sysctl.h: ../sys/sysctl.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/syslimits.h: ../sys/syslimits.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/syslog.h: ../sys/syslog.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/systm.h: ../sys/systm.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/ttycom.h: ../sys/ttycom.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/ttydefaults.h: ../sys/ttydefaults.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/ucred.h: ../sys/ucred.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/uio.h: ../sys/uio.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/rtems/rtems_bsdnet.h: ../rtems/rtems_bsdnet.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/rtems/rtems_bsdnet_internal.h: ../rtems/rtems_bsdnet_internal.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/rtems/tftp.h: ../rtems/tftp.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/machine/conf.h: ../machine/conf.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/machine/cpu.h: ../machine/cpu.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/machine/cpufunc.h: ../machine/cpufunc.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/machine/endian.h: ../machine/endian.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/machine/in_cksum.h: ../machine/in_cksum.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/machine/limits.h: ../machine/limits.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/machine/param.h: ../machine/param.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/machine/types.h: ../machine/types.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/machine/vmparam.h: ../machine/vmparam.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/vm/vm.h: ../vm/vm.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/vm/vm_extern.h: ../vm/vm_extern.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/vm/vm_kern.h: ../vm/vm_kern.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/vm/vm_param.h: ../vm/vm_param.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/bpf.h: ../net/bpf.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/ethernet.h: ../net/ethernet.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/if.h: ../net/if.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/if_arp.h: ../net/if_arp.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/if_dl.h: ../net/if_dl.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/if_llc.h: ../net/if_llc.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/if_ppp.h: ../net/if_ppp.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/if_types.h: ../net/if_types.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/netisr.h: ../net/netisr.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/ppp-comp.h: ../net/ppp-comp.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/ppp_defs.h: ../net/ppp_defs.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/radix.h: ../net/radix.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/raw_cb.h: ../net/raw_cb.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/route.h: ../net/route.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/icmp_var.h: ../netinet/icmp_var.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/if_ether.h: ../netinet/if_ether.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/igmp.h: ../netinet/igmp.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/igmp_var.h: ../netinet/igmp_var.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/in.h: ../netinet/in.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/in_pcb.h: ../netinet/in_pcb.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/in_systm.h: ../netinet/in_systm.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/in_var.h: ../netinet/in_var.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/ip.h: ../netinet/ip.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/ip_fw.h: ../netinet/ip_fw.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/ip_icmp.h: ../netinet/ip_icmp.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/ip_mroute.h: ../netinet/ip_mroute.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/ip_var.h: ../netinet/ip_var.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/tcp.h: ../netinet/tcp.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/tcp_debug.h: ../netinet/tcp_debug.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/tcp_fsm.h: ../netinet/tcp_fsm.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/tcp_seq.h: ../netinet/tcp_seq.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/tcp_timer.h: ../netinet/tcp_timer.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/tcp_var.h: ../netinet/tcp_var.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/tcpip.h: ../netinet/tcpip.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/udp.h: ../netinet/udp.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/udp_var.h: ../netinet/udp_var.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/arpa/ftp.h: ../arpa/ftp.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/arpa/inet.h: ../arpa/inet.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/arpa/nameser.h: ../arpa/nameser.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/arpa/nameser_compat.h: ../arpa/nameser_compat.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/arpa/telnet.h: ../arpa/telnet.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/nfs/krpc.h: ../nfs/krpc.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/nfs/nfs.h: ../nfs/nfs.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/nfs/nfsdiskless.h: ../nfs/nfsdiskless.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/nfs/nfsproto.h: ../nfs/nfsproto.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/nfs/rpcv2.h: ../nfs/rpcv2.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/nfs/xdr_subs.h: ../nfs/xdr_subs.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/ftpd.h: ../rtems_servers/ftpd.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/rtems_webserver.h: ../rtems_webserver/rtems_webserver.h
+$(PROJECT_INCLUDE)/memory.h: ../memory.h
 	$(INSTALL_DATA) $< $@
 
 PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bpfilter.h \
@@ -389,64 +50,7 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bpfilter.h \
     $(PROJECT_INCLUDE)/opt_ipfw.h $(PROJECT_INCLUDE)/opt_mrouting.h \
     $(PROJECT_INCLUDE)/opt_tcpdebug.h $(PROJECT_INCLUDE)/poll.h \
     $(PROJECT_INCLUDE)/resolv.h $(PROJECT_INCLUDE)/syslog.h \
-    $(PROJECT_INCLUDE)/sys $(PROJECT_INCLUDE)/sys/buf.h \
-    $(PROJECT_INCLUDE)/sys/callout.h $(PROJECT_INCLUDE)/sys/cdefs.h \
-    $(PROJECT_INCLUDE)/sys/conf.h $(PROJECT_INCLUDE)/sys/domain.h \
-    $(PROJECT_INCLUDE)/sys/filio.h $(PROJECT_INCLUDE)/sys/ioccom.h \
-    $(PROJECT_INCLUDE)/sys/ioctl.h $(PROJECT_INCLUDE)/sys/kernel.h \
-    $(PROJECT_INCLUDE)/sys/libkern.h $(PROJECT_INCLUDE)/sys/malloc.h \
-    $(PROJECT_INCLUDE)/sys/mbuf.h $(PROJECT_INCLUDE)/sys/mount.h \
-    $(PROJECT_INCLUDE)/sys/param.h $(PROJECT_INCLUDE)/sys/proc.h \
-    $(PROJECT_INCLUDE)/sys/protosw.h $(PROJECT_INCLUDE)/sys/queue.h \
-    $(PROJECT_INCLUDE)/sys/reboot.h $(PROJECT_INCLUDE)/sys/resourcevar.h \
-    $(PROJECT_INCLUDE)/sys/rtprio.h $(PROJECT_INCLUDE)/sys/select.h \
-    $(PROJECT_INCLUDE)/sys/signalvar.h $(PROJECT_INCLUDE)/sys/socket.h \
-    $(PROJECT_INCLUDE)/sys/socketvar.h $(PROJECT_INCLUDE)/sys/sockio.h \
-    $(PROJECT_INCLUDE)/sys/sysctl.h $(PROJECT_INCLUDE)/sys/syslimits.h \
-    $(PROJECT_INCLUDE)/sys/syslog.h $(PROJECT_INCLUDE)/sys/systm.h \
-    $(PROJECT_INCLUDE)/sys/ttycom.h $(PROJECT_INCLUDE)/sys/ttydefaults.h \
-    $(PROJECT_INCLUDE)/sys/ucred.h $(PROJECT_INCLUDE)/sys/uio.h \
-    $(PROJECT_INCLUDE)/rtems $(PROJECT_INCLUDE)/rtems/rtems_bsdnet.h \
-    $(PROJECT_INCLUDE)/rtems/rtems_bsdnet_internal.h \
-    $(PROJECT_INCLUDE)/rtems/tftp.h $(PROJECT_INCLUDE)/machine \
-    $(PROJECT_INCLUDE)/machine/conf.h $(PROJECT_INCLUDE)/machine/cpu.h \
-    $(PROJECT_INCLUDE)/machine/cpufunc.h $(PROJECT_INCLUDE)/machine/endian.h \
-    $(PROJECT_INCLUDE)/machine/in_cksum.h \
-    $(PROJECT_INCLUDE)/machine/limits.h $(PROJECT_INCLUDE)/machine/param.h \
-    $(PROJECT_INCLUDE)/machine/types.h $(PROJECT_INCLUDE)/machine/vmparam.h \
-    $(PROJECT_INCLUDE)/vm $(PROJECT_INCLUDE)/vm/vm.h \
-    $(PROJECT_INCLUDE)/vm/vm_extern.h $(PROJECT_INCLUDE)/vm/vm_kern.h \
-    $(PROJECT_INCLUDE)/vm/vm_param.h $(PROJECT_INCLUDE)/net \
-    $(PROJECT_INCLUDE)/net/bpf.h $(PROJECT_INCLUDE)/net/ethernet.h \
-    $(PROJECT_INCLUDE)/net/if.h $(PROJECT_INCLUDE)/net/if_arp.h \
-    $(PROJECT_INCLUDE)/net/if_dl.h $(PROJECT_INCLUDE)/net/if_llc.h \
-    $(PROJECT_INCLUDE)/net/if_ppp.h $(PROJECT_INCLUDE)/net/if_types.h \
-    $(PROJECT_INCLUDE)/net/netisr.h $(PROJECT_INCLUDE)/net/ppp-comp.h \
-    $(PROJECT_INCLUDE)/net/ppp_defs.h $(PROJECT_INCLUDE)/net/radix.h \
-    $(PROJECT_INCLUDE)/net/raw_cb.h $(PROJECT_INCLUDE)/net/route.h \
-    $(PROJECT_INCLUDE)/netinet $(PROJECT_INCLUDE)/netinet/icmp_var.h \
-    $(PROJECT_INCLUDE)/netinet/if_ether.h $(PROJECT_INCLUDE)/netinet/igmp.h \
-    $(PROJECT_INCLUDE)/netinet/igmp_var.h $(PROJECT_INCLUDE)/netinet/in.h \
-    $(PROJECT_INCLUDE)/netinet/in_pcb.h \
-    $(PROJECT_INCLUDE)/netinet/in_systm.h \
-    $(PROJECT_INCLUDE)/netinet/in_var.h $(PROJECT_INCLUDE)/netinet/ip.h \
-    $(PROJECT_INCLUDE)/netinet/ip_fw.h $(PROJECT_INCLUDE)/netinet/ip_icmp.h \
-    $(PROJECT_INCLUDE)/netinet/ip_mroute.h \
-    $(PROJECT_INCLUDE)/netinet/ip_var.h $(PROJECT_INCLUDE)/netinet/tcp.h \
-    $(PROJECT_INCLUDE)/netinet/tcp_debug.h \
-    $(PROJECT_INCLUDE)/netinet/tcp_fsm.h \
-    $(PROJECT_INCLUDE)/netinet/tcp_seq.h \
-    $(PROJECT_INCLUDE)/netinet/tcp_timer.h \
-    $(PROJECT_INCLUDE)/netinet/tcp_var.h $(PROJECT_INCLUDE)/netinet/tcpip.h \
-    $(PROJECT_INCLUDE)/netinet/udp.h $(PROJECT_INCLUDE)/netinet/udp_var.h \
-    $(PROJECT_INCLUDE)/arpa $(PROJECT_INCLUDE)/arpa/ftp.h \
-    $(PROJECT_INCLUDE)/arpa/inet.h $(PROJECT_INCLUDE)/arpa/nameser.h \
-    $(PROJECT_INCLUDE)/arpa/nameser_compat.h \
-    $(PROJECT_INCLUDE)/arpa/telnet.h $(PROJECT_INCLUDE)/nfs \
-    $(PROJECT_INCLUDE)/nfs/krpc.h $(PROJECT_INCLUDE)/nfs/nfs.h \
-    $(PROJECT_INCLUDE)/nfs/nfsdiskless.h $(PROJECT_INCLUDE)/nfs/nfsproto.h \
-    $(PROJECT_INCLUDE)/nfs/rpcv2.h $(PROJECT_INCLUDE)/nfs/xdr_subs.h \
-    $(PROJECT_INCLUDE)/ftpd.h $(PROJECT_INCLUDE)/rtems_webserver.h
+    $(PROJECT_INCLUDE)/memory.h
 
 all-local: $(PREINSTALL_FILES)
 
diff --git a/c/src/libnetworking/kern/Makefile.am b/c/src/libnetworking/kern/Makefile.am
index aedc2bbadf..878f23612e 100644
--- a/c/src/libnetworking/kern/Makefile.am
+++ b/c/src/libnetworking/kern/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/libnetworking/lib/Makefile.am b/c/src/libnetworking/lib/Makefile.am
index 5f8d151e13..64e3a0e8f4 100644
--- a/c/src/libnetworking/lib/Makefile.am
+++ b/c/src/libnetworking/lib/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/libnetworking/lib/rtems_bsdnet_ntp.c b/c/src/libnetworking/lib/rtems_bsdnet_ntp.c
index 11b0cef63a..54974aa332 100644
--- a/c/src/libnetworking/lib/rtems_bsdnet_ntp.c
+++ b/c/src/libnetworking/lib/rtems_bsdnet_ntp.c
@@ -111,7 +111,7 @@ rtems_bsdnet_synchronize_ntp (int interval, rtems_task_priority priority)
 		printf ("Can't set socket receive timeout: %s", strerror (errno));
 		return -1;
 	}
-	memset (&myAddr, sizeof myAddr, 0);
+	memset (&myAddr, 0, sizeof myAddr);
 	myAddr.sin_family = AF_INET;
 	myAddr.sin_port = htons (123);
 	myAddr.sin_addr.s_addr = htonl (INADDR_ANY);
@@ -126,14 +126,14 @@ rtems_bsdnet_synchronize_ntp (int interval, rtems_task_priority priority)
 		 * server out there somewhere.
 		 */
 		if (rtems_bsdnet_ntpserver_count > 0) {
-			memset (&farAddr, sizeof farAddr, 0);
+			memset (&farAddr, 0, sizeof farAddr);
 			farAddr.sin_family = AF_INET;
 			farAddr.sin_port = htons (123);
 			/*
 			 * For now, try only the first server.
 			 */
 			farAddr.sin_addr = rtems_bsdnet_ntpserver[0];
-			memset (&packet, sizeof packet, 0);
+			memset (&packet, 0, sizeof packet);
 			packet.li_vn_mode = (3 << 3) | 3; /* NTP version 3, client */
 			i = sendto (s, &packet, sizeof packet, 0, (struct sockaddr *)&farAddr, sizeof farAddr);
 			if (i != sizeof packet) {
diff --git a/c/src/libnetworking/libc/Makefile.am b/c/src/libnetworking/libc/Makefile.am
index 57b2b412f2..aca9052ee2 100644
--- a/c/src/libnetworking/libc/Makefile.am
+++ b/c/src/libnetworking/libc/Makefile.am
@@ -1,20 +1,21 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4 no-installman
 
 LIBNAME = lib.a
 LIB = $(ARCH)/$(LIBNAME)
 
-C_FILES = base64.c gethostbydns.c gethostbyht.c gethostbynis.c \
-    gethostnamadr.c getnetbydns.c getnetbyht.c getnetbynis.c getnetnamadr.c \
-    getproto.c getprotoent.c getprotoname.c getservbyname.c getservbyport.c \
-    getservent.c herror.c inet_addr.c inet_lnaof.c inet_makeaddr.c \
-    inet_network.c inet_ntoa.c inet_ntop.c inet_pton.c map_v4v6.c \
-    nsap_addr.c ns_name.c ns_netint.c ns_parse.c ns_print.c ns_ttl.c \
-    res_comp.c res_data.c res_debug.c res_init.c res_mkquery.c \
-    res_mkupdate.c res_query.c res_send.c res_stubs.c res_update.c strsep.c
+C_FILES = addr2ascii.c ascii2addr.c base64.c gethostbydns.c gethostbyht.c \
+    gethostbynis.c gethostnamadr.c getnetbydns.c getnetbyht.c getnetbynis.c \
+    getnetnamadr.c getproto.c getprotoent.c getprotoname.c getservbyname.c \
+    getservbyport.c getservent.c herror.c inet_addr.c inet_lnaof.c \
+    inet_makeaddr.c inet_netof.c inet_network.c inet_ntoa.c inet_ntop.c \
+    inet_pton.c linkaddr.c map_v4v6.c nsap_addr.c ns_name.c ns_netint.c \
+    ns_parse.c ns_print.c ns_ttl.c res_comp.c res_data.c res_debug.c \
+    res_init.c res_mkquery.c res_mkupdate.c res_query.c res_send.c \
+    res_stubs.c res_update.c strsep.c
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 OBJS = $(C_O_FILES)
@@ -30,8 +31,7 @@ man_MANS = addr2ascii.3 byteorder.3 ethers.3 gethostbyname.3 getnetent.3 \
 # Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNOPOLL -DNOSELECT
-AM_CPPFLAGS += -U__STRICT_ANSI__
+AM_CPPFLAGS += -DNOPOLL -DNOSELECT -U__STRICT_ANSI__
 
 $(LIB): $(OBJS)
 	$(make-library)
@@ -47,7 +47,7 @@ EXTRA_DIST = addr2ascii.3 addr2ascii.c ascii2addr.c base64.c byteorder.3 \
     getprotoent.c getprotoname.c getservbyname.c getservbyport.c \
     getservent.3 getservent.c herror.c inet.3 inet_addr.c inet_lnaof.c \
     inet_makeaddr.c inet_net_ntop.c inet_net_pton.c inet_neta.c inet_netof.c \
-    inet_network.c inet_ntoa.c inet_ntop.c inet_pton.c iso_addr.3 iso_addr.c \
+    inet_netof.c inet_network.c inet_ntoa.c inet_ntop.c inet_pton.c map_v4v6.c \
     linkaddr.3 linkaddr.c map_v4v6.c ns.3 ns_addr.c ns_name.c ns_netint.c \
     ns_ntoa.c ns_parse.c ns_print.c ns_ttl.c nsap_addr.c rcmd.3 rcmd.c \
     recv.c res_comp.c res_config.h res_data.c res_debug.c res_init.c \
diff --git a/c/src/libnetworking/machine/Makefile.am b/c/src/libnetworking/machine/Makefile.am
index 11e23bf86c..e703d0b82b 100644
--- a/c/src/libnetworking/machine/Makefile.am
+++ b/c/src/libnetworking/machine/Makefile.am
@@ -1,10 +1,23 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-EXTRA_DIST = conf.h cpu.h cpufunc.h endian.h in_cksum.h limits.h param.h \
+H_FILES = conf.h cpu.h cpufunc.h endian.h in_cksum.h limits.h param.h \
     types.h vmparam.h
 
+noinst_HEADERS = $(H_FILES)
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine \
+    $(H_FILES:%=$(PROJECT_INCLUDE)/machine/%)
+
+$(PROJECT_INCLUDE)/machine:
+	@$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/machine/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
+all-local: $(PREINSTALL_FILES)
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libnetworking/memory.h b/c/src/libnetworking/memory.h
index e69de29bb2..7ef4cda388 100644
--- a/c/src/libnetworking/memory.h
+++ b/c/src/libnetworking/memory.h
@@ -0,0 +1,5 @@
+/*
+ * Dummy include file for FreeBSD routines
+ */
+
+#include <string.h>
diff --git a/c/src/libnetworking/net/Makefile.am b/c/src/libnetworking/net/Makefile.am
index d965963974..eda18a9c76 100644
--- a/c/src/libnetworking/net/Makefile.am
+++ b/c/src/libnetworking/net/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
@@ -26,12 +26,24 @@ AM_CPPFLAGS += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS -DDIAGNOSTIC \
 $(LIB): $(OBJS)
 	$(make-library)
 
-all-local: $(ARCH) $(OBJS) $(LIB)
+all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB)
 
 .PRECIOUS: $(LIB)
 
-EXTRA_DIST = bpf.h ethernet.h if.c if.h if_arp.h if_dl.h if_ethersubr.c \
-    if_llc.h if_loop.c if_ppp.h if_types.h netisr.h ppp-comp.h ppp_defs.h \
-    radix.c radix.h raw_cb.c raw_cb.h raw_usrreq.c route.c route.h rtsock.c
+EXTRA_DIST = if.c if_ethersubr.c if_loop.c \
+    radix.c raw_cb.c raw_usrreq.c route.c rtsock.c
+
+H_FILES = bpf.h ethernet.h if.h if_arp.h if_dl.h if_llc.h if_ppp.h if_types.h \
+    netisr.h ppp-comp.h ppp_defs.h radix.h raw_cb.h route.h
+
+noinst_HEADERS = $(H_FILES)
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/net $(H_FILES:%=$(PROJECT_INCLUDE)/net/%)
+
+$(PROJECT_INCLUDE)/net:
+	@$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/net/%.h: %.h
+	$(INSTALL_DATA) $< $@
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libnetworking/net/if_loop.c b/c/src/libnetworking/net/if_loop.c
index 3823c28744..345730c729 100644
--- a/c/src/libnetworking/net/if_loop.c
+++ b/c/src/libnetworking/net/if_loop.c
@@ -118,6 +118,7 @@ rtems_bsdnet_loopattach(dummy)
 	    ifp->if_type = IFT_LOOP;
 	    ifp->if_hdrlen = 0;
 	    ifp->if_addrlen = 0;
+	    ifp->if_snd.ifq_maxlen = ifqmaxlen;
 	    if_attach(ifp);
 #if NBPFILTER > 0
 	    bpfattach(ifp, DLT_NULL, sizeof(u_int));
diff --git a/c/src/libnetworking/netinet/Makefile.am b/c/src/libnetworking/netinet/Makefile.am
index f967b65cd7..dedeb31ac7 100644
--- a/c/src/libnetworking/netinet/Makefile.am
+++ b/c/src/libnetworking/netinet/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
@@ -28,16 +28,30 @@ AM_CPPFLAGS += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS -DDIAGNOSTIC \
 $(LIB): $(OBJS)
 	$(make-library)
 
-all-local: $(ARCH) $(OBJS) $(LIB)
+all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB)
 
 .PRECIOUS: $(LIB)
 
-EXTRA_DIST = icmp_var.h if_ether.c if_ether.h igmp.c igmp.h igmp_var.h in.c \
-    in.h in_cksum.c in_cksum_i386.c in_cksum_m68k.c in_cksum_powerpc.c \
-    in_pcb.c in_pcb.h in_proto.c in_rmx.c in_systm.h in_var.h ip.h \
-    ip_divert.c ip_fw.c ip_fw.h ip_icmp.c ip_icmp.h ip_input.c ip_mroute.c \
-    ip_mroute.h ip_output.c ip_var.h raw_ip.c tcp.h tcp_debug.c tcp_debug.h \
-    tcp_fsm.h tcp_input.c tcp_output.c tcp_seq.h tcp_subr.c tcp_timer.c \
-    tcp_timer.h tcp_usrreq.c tcp_var.h tcpip.h udp.h udp_usrreq.c udp_var.h
+EXTRA_DIST = if_ether.c igmp.c igmp_var.h in.c in_cksum.c in_cksum_i386.c \
+    in_cksum_m68k.c in_cksum_powerpc.c in_pcb.c in_proto.c in_rmx.c \
+    ip_divert.c ip_fw.c ip_icmp.c ip_input.c ip_mroute.c ip_output.c \
+    raw_ip.c tcp_debug.c tcp_input.c tcp_output.c tcp_subr.c tcp_timer.c \
+    tcp_usrreq.c udp_usrreq.c 
+
+H_FILES = icmp_var.h if_ether.h igmp.h igmp_var.h in.h \
+    in_pcb.h in_systm.h in_var.h ip.h ip_fw.h ip_icmp.h \
+    ip_mroute.h ip_var.h tcp.h tcp_debug.h tcp_fsm.h tcp_seq.h \
+    tcp_timer.h tcp_var.h tcpip.h udp.h udp_var.h
+
+noinst_HEADERS = $(H_FILES)
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet \
+    $(H_FILES:%=$(PROJECT_INCLUDE)/netinet/%)
+
+$(PROJECT_INCLUDE)/netinet:
+	@$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/netinet/%.h: %.h
+	$(INSTALL_DATA) $< $@
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libnetworking/netinet/in.h b/c/src/libnetworking/netinet/in.h
index ba3cbb21cc..36d2d4e867 100644
--- a/c/src/libnetworking/netinet/in.h
+++ b/c/src/libnetworking/netinet/in.h
@@ -255,6 +255,9 @@ struct in_addr {
 #define	INADDR_MAX_LOCAL_GROUP	(u_long)0xe00000ff	/* 224.0.0.255 */
 
 #define	IN_LOOPBACKNET		127			/* official! */
+#ifndef INADDR_LOOPBACK
+#define	INADDR_LOOPBACK		(u_long)0x7F000001	/* 127.0.0.1 */
+#endif
 
 /*
  * Socket address, internet style.
diff --git a/c/src/libnetworking/nfs/Makefile.am b/c/src/libnetworking/nfs/Makefile.am
index 51184e47ae..9a8b43e31a 100644
--- a/c/src/libnetworking/nfs/Makefile.am
+++ b/c/src/libnetworking/nfs/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
@@ -25,11 +25,23 @@ AM_CPPFLAGS += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS -DDIAGNOSTIC \
 $(LIB): $(OBJS)
 	$(make-library)
 
-all-local: $(ARCH) $(OBJS) $(LIB)
+all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB)
 
 .PRECIOUS: $(LIB)
 
-EXTRA_DIST = bootp_subr.c krpc.h nfs.h nfsdiskless.h nfsproto.h rpcv2.h \
-    xdr_subs.h
+EXTRA_DIST = bootp_subr.c 
+
+H_FILES = krpc.h nfs.h nfsdiskless.h nfsproto.h rpcv2.h xdr_subs.h
+
+noinst_HEADERS = $(H_FILES)
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/nfs $(H_FILES:%=$(PROJECT_INCLUDE)/nfs/%)
+
+$(PROJECT_INCLUDE)/nfs:
+	@$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/nfs/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libnetworking/pppd/Makefile.am b/c/src/libnetworking/pppd/Makefile.am
index 1c860d5a14..e6a27c80c8 100644
--- a/c/src/libnetworking/pppd/Makefile.am
+++ b/c/src/libnetworking/pppd/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/libnetworking/pppd/options.c b/c/src/libnetworking/pppd/options.c
index 6eafb89eca..759ed988f8 100644
--- a/c/src/libnetworking/pppd/options.c
+++ b/c/src/libnetworking/pppd/options.c
@@ -93,8 +93,8 @@ char *connector[]={"TIMEOUT","3","ABORT","\nBUSY\r","ABORT","\nNO DIALTONE\r","A
 /*char *connector[]={"TIMEOUT","3","ABORT","\nBUSY\r","ABORT","\nNO DIALTONE\r","ABORT","\nNO CARRIER\r","ABORT","\nNO ANSWER\r","ABORT","\nRINGING\r\n\r\nRINGING\r",
 												"","\rAT","OK-+++\\c-OK","ATH0","TIMEOUT","30","OK","ATDT0202122","CONNECT","","ppp","","Username:","ppp","Password:","ppp"};
 */
-char	*disconnector [];	/* Script to disestablish physical link */
-char	*welcomer [];	/* Script to run after phys link estab. */
+char	**disconnector;	/* Script to disestablish physical link */
+char	**welcomer;	/* Script to run after phys link estab. */
 int	maxconnect = 0;		/* Maximum connect time */
 char	user[MAXNAMELEN]="stb";	/* Username for PAP */
 char	passwd[MAXSECRETLEN]="stb";	/* Password for PAP */
diff --git a/c/src/libnetworking/pppd/pppd.h b/c/src/libnetworking/pppd/pppd.h
index 7c12e38ae5..274eb07176 100644
--- a/c/src/libnetworking/pppd/pppd.h
+++ b/c/src/libnetworking/pppd/pppd.h
@@ -86,8 +86,8 @@ extern u_int32_t netmask;	/* IP netmask to set on interface */
 extern int	lockflag;	/* Create lock file to lock the serial dev */
 extern int	nodetach;	/* Don't detach from controlling tty */
 extern char	*connector[];	/* Script to establish physical link */
-extern char	*disconnector[];	/* Script to disestablish physical link */
-extern char	*welcomer[];	/* Script to welcome client after connection */
+extern char	**disconnector;	/* Script to disestablish physical link */
+extern char	**welcomer;	/* Script to welcome client after connection */
 extern int	maxconnect;	/* Maximum connect time (seconds) */
 extern char	user[];		/* Our name for authenticating ourselves */
 extern char	passwd[];	/* Password for PAP */
diff --git a/c/src/libnetworking/pppd/rtems-ppp.c b/c/src/libnetworking/pppd/rtems-ppp.c
index 4bc8f925b2..d54825c9ef 100644
--- a/c/src/libnetworking/pppd/rtems-ppp.c
+++ b/c/src/libnetworking/pppd/rtems-ppp.c
@@ -507,8 +507,8 @@ output(unit, p, len)
 }
 
 extern int rtems_bsdnet_microseconds_per_tick;
-#include <rtems/rtems_bsdnet_internal.h>
-#include <rtems/rtems/event.h>
+#include <rtems.h>
+#include <rtems/rtems_bsdnet.h>
 /*
  * wait_input - wait until there is data available on ttyfd,
  * for the length of time specified by *timo (indefinite
@@ -1039,7 +1039,7 @@ dodefaultroute(g, cmd)
 
 	struct sockaddr_in address;
 	struct sockaddr_in netmask;
-	struct sockaddr_in broadcast;
+	/* struct sockaddr_in broadcast; */
 	struct sockaddr_in gateway;
    
 /*    struct {
diff --git a/c/src/libnetworking/rtems/Makefile.am b/c/src/libnetworking/rtems/Makefile.am
index 28df4629c4..dfcac20c4b 100644
--- a/c/src/libnetworking/rtems/Makefile.am
+++ b/c/src/libnetworking/rtems/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
@@ -15,6 +15,19 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 OBJS = $(C_O_FILES)
 
+H_FILES = rtems_bsdnet.h rtems_bsdnet_internal.h tftp.h
+
+noinst_HEADERS = $(H_FILES)
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
+
+$(PROJECT_INCLUDE)/rtems:
+	@$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/rtems/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
+
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/lib.am
 
@@ -28,14 +41,12 @@ AM_CPPFLAGS += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS -DDIAGNOSTIC \
 $(LIB): $(OBJS)
 	$(make-library)
 
-all-local: $(ARCH) $(OBJS) $(LIB)
+all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB)
 
 .PRECIOUS: $(LIB)
 
-EXTRA_DIST = issetugid.c rtems_bootp.c rtems_bsdnet.h \
-    rtems_bsdnet_internal.h rtems_glue.c rtems_select.c rtems_showicmpstat.c \
+EXTRA_DIST = issetugid.c rtems_bootp.c rtems_glue.c rtems_select.c rtems_showicmpstat.c \
     rtems_showifstat.c rtems_showipstat.c rtems_showmbuf.c rtems_showroute.c \
-    rtems_showtcpstat.c rtems_showudpstat.c rtems_syscall.c sghostname.c \
-    tftp.h
+    rtems_showtcpstat.c rtems_showudpstat.c rtems_syscall.c sghostname.c
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libnetworking/rtems/rtems_syscall.c b/c/src/libnetworking/rtems/rtems_syscall.c
index 05217f7212..d04ae95afb 100644
--- a/c/src/libnetworking/rtems/rtems_syscall.c
+++ b/c/src/libnetworking/rtems/rtems_syscall.c
@@ -136,11 +136,8 @@ connect (int s, struct sockaddr *name, int namelen)
 		return -1;
 	}
 	error = soconnect (so, nam);
-	if (error) {
-		errno = error;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
+	if (error)
+		goto bad;
 	if ((so->so_state & SS_NBIO) && (so->so_state & SS_ISCONNECTING)) {
 		m_freem(nam);
 		errno = EINPROGRESS;
@@ -148,15 +145,20 @@ connect (int s, struct sockaddr *name, int namelen)
 		return -1;
 	}
 	while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0) {
-		so->so_error = soconnsleep (so);
+		error = soconnsleep (so);
+		if (error)
+			break;
 	}
 	if (error == 0) {
 		error = so->so_error;
 		so->so_error = 0;
 	}
+    bad:
 	so->so_state &= ~SS_ISCONNECTING;
 	m_freem (nam);
-	if (error == 0)
+	if (error)
+		errno = error;
+	else
 		ret = 0;
 	rtems_bsdnet_semaphore_release ();
 	return ret;
@@ -605,6 +607,7 @@ getpeersockname (int s, struct sockaddr *name, int *namelen, int pflag)
 	else
 		error = (*so->so_proto->pr_usrreqs->pru_sockaddr)(so, m);
 	if (error) {
+		m_freem(m);
 		errno = error;
 		rtems_bsdnet_semaphore_release ();
 		return -1;
diff --git a/c/src/libnetworking/rtems_servers/Makefile.am b/c/src/libnetworking/rtems_servers/Makefile.am
index 77d1677844..2c1d356fab 100644
--- a/c/src/libnetworking/rtems_servers/Makefile.am
+++ b/c/src/libnetworking/rtems_servers/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
@@ -22,10 +22,19 @@ include $(top_srcdir)/../../../automake/lib.am
 $(LIB): $(OBJS)
 	$(make-library)
 
-all-local: $(ARCH) $(OBJS) $(LIB)
+all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB)
 
 .PRECIOUS: $(LIB)
 
 EXTRA_DIST = ftpd.c ftpd.h
 
+H_FILES = ftpd.h
+
+noinst_HEADERS = $(H_FILES)
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%)
+
+$(PROJECT_INCLUDE)/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libnetworking/rtems_servers/ftpd.c b/c/src/libnetworking/rtems_servers/ftpd.c
index 25b1f3c4e4..aef88c82c7 100644
--- a/c/src/libnetworking/rtems_servers/ftpd.c
+++ b/c/src/libnetworking/rtems_servers/ftpd.c
@@ -899,6 +899,11 @@ rtems_ftpd_session(rtems_task_argument arg)
  * Change History:                                                        *
  *  12/01/97 - Creation (JWJ)                                             *
  *************************************************************************/
+
+/* this is not prototyped in strict ansi mode */
+
+FILE *fdopen (int fildes, const char *mode);
+
 static void
 rtems_ftpd_daemon()
 {
diff --git a/c/src/libnetworking/rtems_webserver/Makefile.am b/c/src/libnetworking/rtems_webserver/Makefile.am
index 3dae7f9676..f14ceaaf67 100644
--- a/c/src/libnetworking/rtems_webserver/Makefile.am
+++ b/c/src/libnetworking/rtems_webserver/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
@@ -9,12 +9,13 @@ LIB = $(ARCH)/$(LIBNAME)
 
 C_FILES = asp.c balloc.c wbase64.c default.c ejlex.c ejparse.c form.c h.c \
     handler.c mime.c misc.c webpage.c ringq.c rom.c security.c socket.c \
-    sym.c uemf.c url.c value.c webcomp.c webrom.c webs.c websuemf.c \
-    webmain.c
+    sym.c uemf.c url.c value.c webrom.c webs.c websuemf.c webmain.c
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 OBJS = $(C_O_FILES)
 
+H_FILES = ej.h uemf.h webs.h wsIntrn.h
+
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/lib.am
 
@@ -27,8 +28,24 @@ AM_CPPFLAGS += -DWEBS -DUEMF -DOS="RTEMS"
 $(LIB): $(OBJS)
 	$(make-library)
 
+$(PROJECT_INCLUDE):
+	$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/goahead:
+	$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/goahead/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
+$(PROJECT_INCLUDE)/rtems_webserver.h: rtems_webserver.h
+	$(INSTALL_DATA) $< $@
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE) \
+    $(PROJECT_INCLUDE)/rtems_webserver.h $(PROJECT_INCLUDE)/goahead \
+    $(H_FILES:%.h=$(PROJECT_INCLUDE)/goahead/%.h)
+
 if HAS_POSIX
-all-local: $(ARCH) $(OBJS) $(LIB)
+all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB)
 endif
 
 .PRECIOUS: $(LIB)
diff --git a/c/src/libnetworking/rtems_webserver/balloc.c b/c/src/libnetworking/rtems_webserver/balloc.c
index 20612ed148..f2dae27867 100644
--- a/c/src/libnetworking/rtems_webserver/balloc.c
+++ b/c/src/libnetworking/rtems_webserver/balloc.c
@@ -224,7 +224,7 @@ void *balloc(B_ARGS_DEC, int size)
 #endif
 			bp = (bType*) malloc(memSize);
 			if (bp == NULL) {
-				trace(0, T("B: malloc failed for %s:%d, size %d\n"),
+				goahead_trace(0, T("B: malloc failed for %s:%d, size %d\n"),
 					B_ARGS, memSize);
 				return NULL;
 			}
@@ -236,7 +236,7 @@ void *balloc(B_ARGS_DEC, int size)
 #endif
 
 		} else {
-			trace(0, T("B: balloc failed for %s:%d, size %d\n"),
+			goahead_trace(0, T("B: balloc failed for %s:%d, size %d\n"),
 				B_ARGS, memSize);
 			return NULL;
 		}
@@ -286,7 +286,7 @@ void *balloc(B_ARGS_DEC, int size)
  *			Nothing left on the primary free list, so malloc a new block
  */
 			if ((bp = (bType*) malloc(memSize)) == NULL) {
-				trace(0, T("B: malloc failed for %s:%d size %d\n"),
+				goahead_trace(0, T("B: malloc failed for %s:%d size %d\n"),
 					B_ARGS, memSize);
 				return NULL;
 			}
@@ -300,7 +300,7 @@ void *balloc(B_ARGS_DEC, int size)
 			bp->flags = B_MALLOCED;
 
 		} else {
-			trace(0, T("B: alloc failed for %s:%d size %d\n"), B_ARGS, size);
+			goahead_trace(0, T("B: alloc failed for %s:%d size %d\n"), B_ARGS, size);
 			return NULL;
 		}
 	}
@@ -577,7 +577,7 @@ static void bstatsWrite(int handle, char_t *fmt, ...)
 	buf = NULL;
 	gvsnprintf(&buf, VALUE_MAX_STRING, fmt, args);
 	va_end(args);
-	trace(0, buf);
+	goahead_trace(0, buf);
 	if (buf) {
 		bfree(B_L, buf);
 	}
diff --git a/c/src/libnetworking/rtems_webserver/ejlex.c b/c/src/libnetworking/rtems_webserver/ejlex.c
index 67e1504bd7..091d17411b 100644
--- a/c/src/libnetworking/rtems_webserver/ejlex.c
+++ b/c/src/libnetworking/rtems_webserver/ejlex.c
@@ -189,7 +189,7 @@ void ejLexFreeInputState(ej_t* ep, ejinput_t* state)
 int ejLexGetToken(ej_t* ep, int state)
 {
 	ep->tid = getLexicalToken(ep, state);
-	trace(7, T("ejGetToken: %d, \"%s\"\n"), ep->tid, ep->token);
+	goahead_trace(7, T("ejGetToken: %d, \"%s\"\n"), ep->tid, ep->token);
 	return ep->tid;
 }
 
diff --git a/c/src/libnetworking/rtems_webserver/handler.c b/c/src/libnetworking/rtems_webserver/handler.c
index d481ec3c0c..fb42d2d097 100644
--- a/c/src/libnetworking/rtems_webserver/handler.c
+++ b/c/src/libnetworking/rtems_webserver/handler.c
@@ -264,7 +264,7 @@ int websUrlHandlerRequest(webs_t wp)
 				return 1;
 			}
 			if (!websValid(wp)) {
-				trace(0, 
+				goahead_trace(0, 
 				T("webs: handler %s called websDone, but didn't return 1\n"),
 					sp->urlPrefix);
 				return 1;
diff --git a/c/src/libnetworking/rtems_webserver/uemf.c b/c/src/libnetworking/rtems_webserver/uemf.c
index 8a6675f944..a9302f989c 100644
--- a/c/src/libnetworking/rtems_webserver/uemf.c
+++ b/c/src/libnetworking/rtems_webserver/uemf.c
@@ -47,7 +47,7 @@ void error(E_ARGS_DEC, int flags, char_t *fmt, ...)
  *	Trace log. Customize this function to log trace output
  */
 
-void trace(int level, char_t *afmt, ...)
+void goahead_trace(int level, char_t *afmt, ...)
 {
 #if DEBUG
 	va_list 	args;
diff --git a/c/src/libnetworking/rtems_webserver/uemf.h b/c/src/libnetworking/rtems_webserver/uemf.h
index c63e75bd99..8945907dfb 100644
--- a/c/src/libnetworking/rtems_webserver/uemf.h
+++ b/c/src/libnetworking/rtems_webserver/uemf.h
@@ -649,7 +649,7 @@ extern sym_t	*symEnter(sym_fd_t sd, char_t *name, value_t v, int arg);
 extern int		 symDelete(sym_fd_t sd, char_t *name);
 extern void 	 symWalk(sym_fd_t sd, void (*fn)(sym_t *symp));
 
-extern void		 trace(int lev, char_t *fmt, ...);
+extern void		 goahead_trace(int lev, char_t *fmt, ...);
  
 extern value_t 	 valueInteger(long value);
 extern value_t	 valueString(char_t *value, int flags);
diff --git a/c/src/libnetworking/rtems_webserver/webs.c b/c/src/libnetworking/rtems_webserver/webs.c
index e198cc1e9a..cee03ee01c 100644
--- a/c/src/libnetworking/rtems_webserver/webs.c
+++ b/c/src/libnetworking/rtems_webserver/webs.c
@@ -193,7 +193,7 @@ int websOpenListen(int port, int retries)
 			orig, port - 1);
 		return -1;
 	} 
-	trace(0, T("webs: Listening for HTTP requests on port %d\n"), port);
+	goahead_trace(0, T("webs: Listening for HTTP requests on port %d\n"), port);
 
 /*
  *	Determine the full URL address to access the home page for this web server
@@ -269,7 +269,7 @@ static int websAccept(int sid, char *ipaddr, int port)
  *	Arrange for a timeout to kill hung requests
  */
 	wp->timeout = emfCreateTimer(WEBS_TIMEOUT, websTimeout, (long) wp);
-	trace(5, T("webs: accept request\n"));
+	goahead_trace(5, T("webs: accept request\n"));
 	return 0;
 }
 
@@ -1144,7 +1144,7 @@ int websWrite(webs_t wp, char_t* fmt, ...)
 	buf = NULL;
 	rc = 0;
 	if (gvsnprintf(&buf, WEBS_BUFSIZE, fmt, vargs) >= WEBS_BUFSIZE) {
-		trace(0, T("webs: websWrite lost data, buffer overflow\n"));
+		goahead_trace(0, T("webs: websWrite lost data, buffer overflow\n"));
 	}
 	va_end(vargs);
 	a_assert(buf);
diff --git a/c/src/libnetworking/sys/Makefile.am b/c/src/libnetworking/sys/Makefile.am
index 3fe88aff59..07888ddcc7 100644
--- a/c/src/libnetworking/sys/Makefile.am
+++ b/c/src/libnetworking/sys/Makefile.am
@@ -4,10 +4,22 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-EXTRA_DIST = buf.h callout.h cdefs.h conf.h domain.h filio.h ioccom.h \
+H_FILES = buf.h callout.h cdefs.h conf.h domain.h filio.h ioccom.h \
     ioctl.h kernel.h libkern.h malloc.h mbuf.h mount.h param.h proc.h \
     protosw.h queue.h reboot.h resourcevar.h rtprio.h select.h signalvar.h \
     socket.h socketvar.h sockio.h sysctl.h syslimits.h syslog.h systm.h \
-    ttycom.h ttydefaults.h ucred.h uio.h
+    ttycom.h ttydefaults.h ucred.h uio.h un.h
+
+noinst_HEADERS = $(H_FILES)
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys $(H_FILES:%=$(PROJECT_INCLUDE)/sys/%)
+
+$(PROJECT_INCLUDE)/sys:
+	@$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/sys/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
+all-local: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libnetworking/sys/un.h b/c/src/libnetworking/sys/un.h
index e69de29bb2..d742bb7d5d 100644
--- a/c/src/libnetworking/sys/un.h
+++ b/c/src/libnetworking/sys/un.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 1982, 1986, 1993
+ *	The Regents of the University of California.  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. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ *
+ *	@(#)un.h	8.3 (Berkeley) 2/19/95
+ * $FreeBSD: src/sys/sys/un.h,v 1.17 1999/12/29 04:24:49 peter Exp $
+ */
+
+#ifndef _SYS_UN_H_
+#define _SYS_UN_H_
+
+/*
+ * Definitions for UNIX IPC domain.
+ */
+struct	sockaddr_un {
+	u_char	sun_len;		/* sockaddr len including null */
+	u_char	sun_family;		/* AF_UNIX */
+	char	sun_path[104];		/* path name (gag) */
+};
+
+#ifdef _KERNEL
+struct mbuf;
+struct socket;
+
+int	uipc_usrreq __P((struct socket *so, int req, struct mbuf *m,
+		struct mbuf *nam, struct mbuf *control));
+int	unp_connect2 __P((struct socket *so, struct socket *so2));
+void	unp_dispose __P((struct mbuf *m));
+int	unp_externalize __P((struct mbuf *rights));
+void	unp_init __P((void));
+extern	struct pr_usrreqs uipc_usrreqs;
+#else /* !_KERNEL */
+
+/* actual length of an initialized sockaddr_un */
+#define SUN_LEN(su) \
+	(sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
+
+#endif /* _KERNEL */
+
+#endif /* !_SYS_UN_H_ */
diff --git a/c/src/libnetworking/vm/Makefile.am b/c/src/libnetworking/vm/Makefile.am
index 3f307c7cfb..b72458f6cc 100644
--- a/c/src/libnetworking/vm/Makefile.am
+++ b/c/src/libnetworking/vm/Makefile.am
@@ -1,9 +1,22 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-EXTRA_DIST = vm.h vm_extern.h vm_kern.h vm_param.h
+H_FILES = vm.h vm_extern.h vm_kern.h vm_param.h
+
+noinst_HEADERS = $(H_FILES)
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/vm \
+    $(H_FILES:%=$(PROJECT_INCLUDE)/vm/%)
+
+$(PROJECT_INCLUDE)/vm:
+	@$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/vm/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
+all-local: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libnetworking/wrapup/Makefile.am b/c/src/libnetworking/wrapup/Makefile.am
index 5d2a73a05e..5553252d11 100644
--- a/c/src/libnetworking/wrapup/Makefile.am
+++ b/c/src/libnetworking/wrapup/Makefile.am
@@ -1,12 +1,12 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
 if HAS_POSIX
 POSIX_PIECES = rtems_webserver
-endif 
+endif
 
 NET_O_PIECES = kern lib libc net netinet nfs rtems rtems_servers pppd \
     $(POSIX_PIECES)